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

[COMPONENT][Collection][FeedController] Fix group scope, we should use the IN context actor to check the group

Browse Source
This commit is contained in:
Diogo Peralta Cordeiro
2022-02-15 17:49:50 +00:00
parent 40590bbd11
commit 54b9ec48b4
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/Collection/Util/Controller/FeedController.php
View File

@@ -50,7 +50,7 @@ abstract class FeedController extends OrderedCollection
$actor = Common::actor();
if (\array_key_exists('notes', $result)) {
$notes = $result['notes'];
self::enforceScope($notes, $actor);
self::enforceScope($notes, $actor, $result['actor'] ?? null);
Event::handle('FilterNoteList', [$actor, &$notes, $result['request']]);
Event::handle('FormatNoteList', [$notes, &$result['notes'], &$result['request']]);
}
@@ -58,8 +58,8 @@ abstract class FeedController extends OrderedCollection
return $result;
}
private static function enforceScope(array &$notes, ?Actor $actor): void
private static function enforceScope(array &$notes, ?Actor $actor, ?Actor $in = null): void
{
$notes = F\select($notes, fn (Note $n) => $n->isVisibleTo($actor));
$notes = F\select($notes, fn (Note $n) => $n->isVisibleTo($actor, $in));
}
}