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

[PLUGIN][ActivityPub][Inbox] Add event for notifications triggered by AP Inbox

Browse Source
This commit is contained in:
Diogo Peralta Cordeiro 2022-02-18 21:12:14 +00:00
parent e86dbad6d6
commit 496701ce73
Signed by: diogo
GPG Key ID: 18D2D35001FBFAB0
3 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/ActivityPub/Controller/Inbox.php
View File

@ -178,8 +178,11 @@ class Inbox extends Controller
if (!empty($ap_act->_object_mention_ids)) { if (!empty($ap_act->_object_mention_ids)) {
$already_known_ids = $ap_act->_object_mention_ids; $already_known_ids = $ap_act->_object_mention_ids;
} }
DB::flush(); DB::flush();
Event::handle('NewNotification', [$actor, $ap_act->getActivity(), $already_known_ids, _m('{nickname} mentioned you.', ['{nickname}' => $actor->getNickname()])]); if (Event::handle('ActivityPubNewNotification', [$actor, $ap_act->getActivity(), $already_known_ids, _m('{nickname} mentioned you.', ['{nickname}' => $actor->getNickname()])]) === Event::next) {
Event::handle('NewNotification', [$actor, $ap_act->getActivity(), $already_known_ids, _m('{nickname} mentioned you.', ['{nickname}' => $actor->getNickname()])]);
}
dd($ap_act, $act = $ap_act->getActivity(), $act->getActor(), $act->getObject()); dd($ap_act, $act = $ap_act->getActivity(), $act->getActor(), $act->getObject());

28
plugins/Favourite/Favourite.php
View File

@ -313,15 +313,9 @@ class Favourite extends NoteHandlerPlugin
} }
if ($type_activity->get('type') === 'Like') { if ($type_activity->get('type') === 'Like') {
if (!\is_null($activity = self::favourNote($note_id, $actor->getId(), source: 'ActivityPub'))) { $activity = self::favourNote($note_id, $actor->getId(), source: 'ActivityPub');
DB::flush();
Event::handle('NewNotification', [$actor, $activity, [], _m('{nickname} favoured note {note_id}.', ['{nickname}' => $actor->getNickname(), '{note_id}' => $activity->getObjectId()])]);
}
} else { } else {
if (!\is_null($activity = self::unfavourNote($note_id, $actor->getId(), source: 'ActivityPub'))) { $activity = self::unfavourNote($note_id, $actor->getId(), source: 'ActivityPub');
DB::flush();
Event::handle('NewNotification', [$actor, $activity, [], _m('{nickname} unfavoured note {note_id}.', ['{nickname}' => $actor->getNickname(), '{note_id}' => $activity->getObjectId()])]);
}
} }
if (!\is_null($activity)) { if (!\is_null($activity)) {
// Store ActivityPub Activity // Store ActivityPub Activity
@ -336,6 +330,24 @@ class Favourite extends NoteHandlerPlugin
return Event::stop; return Event::stop;
} }
public function onActivityPubNewNotification(Actor $sender, Activity $activity, array $ids_already_known = [], ?string $reason = null): bool
{
switch ($activity->getVerb()) {
case 'favourite':
Event::handle('NewNotification', [$sender, $activity, [], _m('{nickname} favoured note {note_id}.', ['{nickname}' => $sender->getNickname(), '{note_id}' => $activity->getObjectId()])]);
return Event::stop;
case 'undo':
if ($activity->getObjectType() === 'activity') {
$undone_favourite = $activity->getObject();
if ($undone_favourite->getVerb() === 'favourite') {
Event::handle('NewNotification', [$sender, $activity, [], _m('{nickname} unfavoured note {note_id}.', ['{nickname}' => $sender->getNickname(), '{note_id}' => $activity->getObjectId()])]);
return Event::stop;
}
}
}
return Event::next;
}
/** /**
* Convert an Activity Streams 2.0 Like or Undo Like into the appropriate Favourite and Undo Favourite entities * Convert an Activity Streams 2.0 Like or Undo Like into the appropriate Favourite and Undo Favourite entities
* *

28
plugins/RepeatNote/RepeatNote.php
View File

@ -390,15 +390,9 @@ class RepeatNote extends NoteHandlerPlugin
} }
if ($type_activity->get('type') === 'Announce') { if ($type_activity->get('type') === 'Announce') {
if (!\is_null($activity = self::repeatNote($note ?? Note::getById($note_id), $actor->getId(), source: 'ActivityPub'))) { $activity = self::repeatNote($note ?? Note::getById($note_id), $actor->getId(), source: 'ActivityPub');
DB::flush();
Event::handle('NewNotification', [$actor, $activity, [], _m('{nickname} repeated note {note_id}.', ['{nickname}' => $actor->getNickname(), '{note_id}' => $activity->getObjectId()])]);
}
} else { } else {
if (!\is_null($activity = self::unrepeatNote($note_id, $actor->getId(), source: 'ActivityPub'))) { $activity = self::unrepeatNote($note_id, $actor->getId(), source: 'ActivityPub');
DB::flush();
Event::handle('NewNotification', [$actor, $activity, [], _m('{nickname} unrepeated note {note_id}.', ['{nickname}' => $actor->getNickname(), '{note_id}' => $note_id])]);
}
} }
if (!\is_null($activity)) { if (!\is_null($activity)) {
// Store ActivityPub Activity // Store ActivityPub Activity
@ -413,6 +407,24 @@ class RepeatNote extends NoteHandlerPlugin
return Event::stop; return Event::stop;
} }
public function onActivityPubNewNotification(Actor $sender, Activity $activity, array $ids_already_known = [], ?string $reason = null): bool
{
switch ($activity->getVerb()) {
case 'repeat':
Event::handle('NewNotification', [$sender, $activity, [], _m('{nickname} repeated note {note_id}.', ['{nickname}' => $sender->getNickname(), '{note_id}' => $activity->getObjectId()])]);
return Event::stop;
case 'undo':
if ($activity->getObjectType() === 'activity') {
$undone_repeat = $activity->getObject();
if ($undone_repeat->getVerb() === 'repeat') {
Event::handle('NewNotification', [$sender, $activity, [], _m('{nickname} unrepeated note {note_id}.', ['{nickname}' => $sender->getNickname(), '{note_id}' => $undone_repeat->getObjectId()])]);
return Event::stop;
}
}
}
return Event::next;
}
/** /**
* Convert an Activity Streams 2.0 Announce or Undo Announce into the appropriate Repeat and Undo Repeat entities * Convert an Activity Streams 2.0 Announce or Undo Announce into the appropriate Repeat and Undo Repeat entities
* *