eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

[PLUGIN][NoteTypeFeedFilter][MediaFeed][COMPONENT][Feed] Rename MediaFeed to NoteTypeFeedFilter and add support for filtering by more types, moving functionality from Feed component

Browse Source
This commit is contained in:
Hugo Sales
2021-12-31 19:13:19 +00:00
parent b7872ba4ee
commit 0050371de7
6 changed files with 175 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
components/Feed/Util/FeedController.php
View File

@@ -34,12 +34,9 @@ namespace Component\Feed\Util;
use App\Core\Controller;
use App\Core\Event;
use function App\Core\I18n\_m;
use App\Entity\Actor;
use App\Entity\Note;
use App\Util\Common;
use App\Util\Exception\ClientException;
use App\Util\Formatting;
use Functional as F;
abstract class FeedController extends Controller
@@ -56,10 +53,6 @@ abstract class FeedController extends Controller
if (\array_key_exists('notes', $result)) {
$notes = $result['notes'];
self::enforceScope($notes, $actor);
$types = $this->string('types');
if (!\is_null($types)) {
self::filterNoteType($notes, $types);
}
Event::handle('FilterNoteList', [$actor, &$notes, $result['request']]);
Event::handle('FormatNoteList', [$notes, &$result['notes']]);
}
@@ -67,43 +60,6 @@ abstract class FeedController extends Controller
return $result;
}
private static function filterNoteType(array &$notes, string $types): void
{
$types = explode(',', $types);
$types = [
...$types,
// Add any missing types as a negation
...array_diff(['!media', '!link', '!text', '!tags'], F\map($types, fn ($t) => $t[0] === '!' ? $t : '!' . $t)),
];
$notes = F\select($notes, function (Note $note) use ($types) {
$include = false;
foreach ($types as $type) {
$is_negate = $type[0] === '!';
$type = Formatting::removePrefix($type, '!');
$ret = (function () use ($note, $type) {
switch ($type) {
case 'media':
return !empty($note->getAttachments());
case 'link':
return !empty($note->getLinks());
case 'text':
return !\is_null($note->getContent());
case 'tags':
return !empty($note->getTags());
default:
throw new ClientException(_m('Unknown note type requested ({type})', ['{type}' => $type]));
}
})();
if ($is_negate && $ret) {
return false;
}
$include = $include || $ret;
}
return $include;
});
}
private static function enforceScope(array &$notes, ?Actor $actor): void
{
$notes = F\select($notes, fn (Note $n) => $n->isVisibleTo($actor));