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

[ENTITY][Actor][ActorTag] Make Actor->getSelfTags and Actor->getOtherTags return [ActorCircle[], ActorTag[]], rather than ActorCrircle alone

Browse Source
This commit is contained in:
Hugo Sales
2021-11-29 15:31:02 +00:00
committed by Diogo Peralta Cordeiro
parent 3477ad5efc
commit 98568b6f53
3 changed files with 35 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Entity/Activity.php
View File

@@ -29,6 +29,7 @@ use App\Entity\Actor;
use Component\Notification\Entity\Notification;
use DateTimeInterface;
use Exception;
use Functional as F;
/**
* Entity for all activities we know about
@@ -160,13 +161,8 @@ class Activity extends Entity
*/
public function getNotificationTargetIdsFromActorTags(): array
{
$actors = [];
$self_tags = $this->getActor()->getSelfTags();
foreach ($self_tags as $circle) {
// Get subscriptions
array_push($actors, ...$circle->getSubscribedActors());
}
return $actors;
[$actor_circles, $actor_tags] = $this->getActor()->getSelfTags();
return F\flat_map($actor_circles, fn ($circle) => $circle->getSubscribedActors());
}
/**