GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[EVENT][AddFeedActions] Add bool param which denotes whether the feed is empty. [PLUGIN][NoteTypeFeedFilter] Don't show filters if the feed is empty

Browse Source
This commit is contained in:
Hugo Sales
2022-01-02 21:44:08 +00:00
committed by Diogo Peralta Cordeiro
parent d5a6fa924b
commit 8fa04bb47d
2 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/Collection/templates/collection/notes.html.twig
View File

@@ -14,7 +14,7 @@
<h1>{{ page_title | trans }}</h1>
{% endif %}
<nav class="feed-actions">
{% for block in handle_event('AddFeedActions', app.request) %}
{% for block in handle_event('AddFeedActions', app.request, notes is defined and notes is not empty) %}
{{ block | raw }}
{% endfor %}
</nav>

56
plugins/NoteTypeFeedFilter/NoteTypeFeedFilter.php
View File

@@ -124,37 +124,39 @@ class NoteTypeFeedFilter extends Plugin
/**
* Draw the media feed navigation.
*/
public function onAddFeedActions(Request $request, &$res): bool
public function onAddFeedActions(Request $request, bool $is_not_empty, &$res): bool
{
$qs = [];
parse_str($request->getQueryString(), $qs);
if (\array_key_exists('p', $qs) && \is_string($qs['p'])) {
unset($qs['p']);
}
$types = $this->normalizeTypesList(\is_null($request->get('note-types')) ? [] : explode(',', $request->get('note-types')), add_missing: false);
$ftypes = array_flip($types);
if ($is_not_empty) {
$qs = [];
parse_str($request->getQueryString(), $qs);
if (\array_key_exists('p', $qs) && \is_string($qs['p'])) {
unset($qs['p']);
}
$types = $this->normalizeTypesList(\is_null($request->get('note-types')) ? [] : explode(',', $request->get('note-types')), add_missing: false);
$ftypes = array_flip($types);
$tabs = [
'all' => [
'active' => empty($types) || $types === self::ALLOWED_TYPES,
'url' => '?' . http_build_query(['note-types' => implode(',', self::ALLOWED_TYPES)], '', '&', \PHP_QUERY_RFC3986),
'icon' => 'All',
],
];
foreach (self::ALLOWED_TYPES as $allowed_type) {
$active = \array_key_exists($allowed_type, $ftypes);
$new_types = $this->normalizeTypesList([($active ? '!' : '') . $allowed_type, ...$types], add_missing: false);
$new_qs = $qs;
$new_qs['note-types'] = implode(',', $new_types);
$tabs[$allowed_type] = [
'active' => $active,
'url' => '?' . http_build_query($new_qs, '', '&', \PHP_QUERY_RFC3986),
'icon' => $allowed_type,
$tabs = [
'all' => [
'active' => empty($types) || $types === self::ALLOWED_TYPES,
'url' => '?' . http_build_query(['note-types' => implode(',', self::ALLOWED_TYPES)], '', '&', \PHP_QUERY_RFC3986),
'icon' => 'All',
],
];
}
$res[] = Formatting::twigRenderFile('NoteTypeFeedFilter/tabs.html.twig', ['tabs' => $tabs]);
foreach (self::ALLOWED_TYPES as $allowed_type) {
$active = \array_key_exists($allowed_type, $ftypes);
$new_types = $this->normalizeTypesList([($active ? '!' : '') . $allowed_type, ...$types], add_missing: false);
$new_qs = $qs;
$new_qs['note-types'] = implode(',', $new_types);
$tabs[$allowed_type] = [
'active' => $active,
'url' => '?' . http_build_query($new_qs, '', '&', \PHP_QUERY_RFC3986),
'icon' => $allowed_type,
];
}
$res[] = Formatting::twigRenderFile('NoteTypeFeedFilter/tabs.html.twig', ['tabs' => $tabs]);
}
return Event::next;
}