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

Merge branch 'actor_outbox' into 'dev' 

Fix some issues from previous commit

See merge request dansup/ActivityPub!19
This commit is contained in:
Diogo Cordeiro 2018-08-04 05:06:43 +00:00
parent 7cf223fb24 dca1d8f0c5
commit 2bada457c2
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actions/apactoroutbox.php
View File

@ -123,7 +123,10 @@ class apActorOutboxAction extends ManagedAction
// TODO: Handle other types // TODO: Handle other types
if ($note->object_type == 'http://activitystrea.ms/schema/1.0/note') { if ($note->object_type == 'http://activitystrea.ms/schema/1.0/note') {
$notices[] = Activitypub_notice::notice_to_array($note); $notices[] = Activitypub_create::create_to_array(
ActivityPubPlugin::actor_uri($note->getProfile()),
Activitypub_notice::notice_to_array($note)
);
} }
} }

4
classes/Activitypub_create.php
View File

@ -48,14 +48,14 @@ class Activitypub_create extends Managed_DataObject
* @param array $object * @param array $object
* @return pretty array to be used in a response * @return pretty array to be used in a response
*/ */
public static function create_to_array($id, $actor, $object) public static function create_to_array($actor, $object)
{ {
$res = [ $res = [
'@context' => [ '@context' => [
'https://www.w3.org/ns/activitystreams', 'https://www.w3.org/ns/activitystreams',
'https://w3id.org/security/v1' 'https://w3id.org/security/v1'
], ],
'id' => $id.'/create', 'id' => $object.'/create',
'type' => 'Create', 'type' => 'Create',
'to' => $object['to'], 'to' => $object['to'],
'cc' => $object['cc'], 'cc' => $object['cc'],

1
utils/postman.php
View File

@ -231,7 +231,6 @@ class Activitypub_postman
public function create($notice) public function create($notice)
{ {
$data = Activitypub_create::create_to_array( $data = Activitypub_create::create_to_array(
$notice->getUrl(),
$this->actor_uri, $this->actor_uri,
Activitypub_notice::notice_to_array($notice) Activitypub_notice::notice_to_array($notice)
); );