GNUsocial
/
gnu-social-v2-archive-activitypub-plugin
Archived
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify some logic

This commit is contained in:
Diogo Cordeiro 2018-08-06 16:44:11 +01:00
parent 0475954741
commit 76bea7b17e
2 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ActivityPubPlugin.php
View File

@ -793,24 +793,6 @@ class ActivityPubPlugin extends Plugin
}
}
// Is an Announce?
if ($notice->isRepeat()) {
$repeated_notice = Notice::getKV('id', $notice->repeat_of);
if ($repeated_notice instanceof Notice) {
try {
$other[] = Activitypub_profile::from_profile($repeated_notice->getProfile());
} catch (Exception $e) {
// Local user can be ignored
}
$postman = new Activitypub_postman($profile, $other);
// That was it
$postman->announce($repeated_notice);
return true;
}
}
// Is a reply?
if ($notice->reply_to) {
try {
@ -834,13 +816,26 @@ class ActivityPubPlugin extends Plugin
}
}
// That was it
try {
$postman = new Activitypub_postman($profile, $other);
$postman->create_note($notice);
} catch (Exception $e) {
// Let another plugin handle this instead.
// Is an Announce?
if ($notice->isRepeat()) {
$repeated_notice = Notice::getKV('id', $notice->repeat_of);
if ($repeated_notice instanceof Notice) {
try {
$other[] = Activitypub_profile::from_profile($repeated_notice->getProfile());
} catch (Exception $e) {
// Local user can be ignored
}
// That was it
$postman = new Activitypub_postman($profile, $other);
$postman->announce($repeated_notice);
return true;
}
}
// That was it
$postman = new Activitypub_postman($profile, $other);
$postman->create_note($notice);
return true;
}

4
utils/postman.php
View File

@ -63,10 +63,6 @@ class Activitypub_postman
public function __construct($from, $to)
{
$this->actor = $from;
if (empty ($to)) {
throw new Exception ('You can not summon up a postman without recipients!');
}
$discovery = new Activitypub_explorer();
$this->to = $to;
$followers = apActorFollowersAction::generate_followers($this->actor, 0, null);