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

Fix Notice typo and follow request system

Browse Source
This commit is contained in:
Diogo Cordeiro 2018-07-31 20:25:47 +01:00
parent f77bad0159
commit d90fabd15e
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Activitypub_notice.php
View File

@ -77,7 +77,7 @@ class Activitypub_notice extends Managed_DataObject
'type' => 'Note', 'type' => 'Note',
'published' => str_replace(' ', 'T', $notice->getCreated()).'Z', 'published' => str_replace(' ', 'T', $notice->getCreated()).'Z',
'url' => $notice->getUrl(), 'url' => $notice->getUrl(),
'atributedTo' => ActivityPubPlugin::actor_uri($profile), 'atributtedTo' => ActivityPubPlugin::actor_uri($profile),
'to' => $to, 'to' => $to,
'cc' => common_local_url('apActorFollowers', ['id' => $profile->getID()]), 'cc' => common_local_url('apActorFollowers', ['id' => $profile->getID()]),
'atomUri' => $notice->getUrl(), 'atomUri' => $notice->getUrl(),

8
utils/postman.php
View File

@ -118,18 +118,14 @@ class Activitypub_postman
if ($res->getStatusCode() == 200 || $res->getStatusCode() == 409) { if ($res->getStatusCode() == 200 || $res->getStatusCode() == 409) {
$pending_list = new Activitypub_pending_follow_requests($this->actor->getID(), $this->to[0]->getID()); $pending_list = new Activitypub_pending_follow_requests($this->actor->getID(), $this->to[0]->getID());
if (! ($res->getStatusCode() == 409 || $res_body->type == "Accept")) {
$pending_list->add(); $pending_list->add();
throw new Exception("Your follow request is pending acceptation.");
}
$pending_list->remove();
return true; return true;
} elseif (isset($res_body[0]->error)) { } elseif (isset($res_body[0]->error)) {
throw new Exception($res_body[0]->error); throw new Exception($res_body[0]->error);
} } else {
throw new Exception("An unknown error occurred."); throw new Exception("An unknown error occurred.");
} }
}
/** /**
* Send a Undo Follow notification to remote instance * Send a Undo Follow notification to remote instance