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

[COMPONENT][Notification] Support empty array of targets

Browse Source
This commit is contained in:
Diogo Peralta Cordeiro 2021-12-10 04:01:57 +00:00
parent b89f57ce93
commit 60d31e097e
Signed by: diogo
GPG Key ID: 18D2D35001FBFAB0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Entity/Activity.php
View File

@ -187,7 +187,8 @@ class Activity extends Entity
array_push($target_ids, ...$ids_already_known['additional']); array_push($target_ids, ...$ids_already_known['additional']);
} }
return DB::findBy('actor', ['id' => array_unique($target_ids)]); $target_ids = array_unique($target_ids);
return $target_ids === [] ? [] : DB::findBy('actor', ['id' => $target_ids]);
} }
public static function schemaDef(): array public static function schemaDef(): array

2
src/Entity/Note.php
View File

@ -350,7 +350,7 @@ class Note extends Entity
{ {
$rendered = null; $rendered = null;
$mentions = []; $mentions = [];
Event::handle('RenderNoteContent', [$this->getContent(), $this->getContentType(), &$rendered, &$mentions, $this->getActor(), Language::getById($this->getLanguageId())->getLocale()]); Event::handle('RenderNoteContent', [$this->getContent(), $this->getContentType(), &$rendered, $this->getActor(), Language::getById($this->getLanguageId())->getLocale(), &$mentions]);
$mentioned = []; $mentioned = [];
foreach ($mentions as $mention) { foreach ($mentions as $mention) {
foreach ($mention['mentioned'] as $m) { foreach ($mention['mentioned'] as $m) {