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

[ActivityPub] Fix DELETE

Browse Source
This commit is contained in:
Diogo Cordeiro
2020-08-29 11:12:02 +01:00
committed by Diogo Peralta Cordeiro
parent af0366ed58
commit 751b23f6fe
11 changed files with 261 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/ActivityPub/lib/models/Activitypub_delete.php
View File

@@ -39,22 +39,13 @@ class Activitypub_delete
/**
* Generates an ActivityPub representation of a Delete
*
* @param string $actor actor URI
* @param string $object object URI
* @param Notice $notice
* @return array pretty array to be used in a response
* @author Diogo Cordeiro <diogo@fc.up.pt>
*/
public static function delete_to_array(string $actor, string $object): array
public static function delete_to_array(Notice $notice): array
{
$res = [
'@context' => 'https://www.w3.org/ns/activitystreams',
'id' => $object . '#delete',
'type' => 'Delete',
'to' => ['https://www.w3.org/ns/activitystreams#Public'],
'actor' => $actor,
'object' => $object
];
return $res;
return Activitypub_notice::notice_to_array($notice);
}
/**

5
plugins/ActivityPub/lib/models/Activitypub_error.php
View File

@@ -43,11 +43,10 @@ class Activitypub_error
* @param string $m
* @return array pretty array to be used in a response
*/
public static function error_message_to_array($m)
public static function error_message_to_array(string $m): array
{
$res = [
return [
'error'=> $m
];
return $res;
}
}

2
plugins/ActivityPub/lib/models/Activitypub_like.php
View File

@@ -27,7 +27,7 @@
defined('GNUSOCIAL') || die();
/**
* ActivityPub error representation
* ActivityPub Like representation
*
* @category Plugin
* @package GNUsocial

51
plugins/ActivityPub/lib/models/Activitypub_notice.php
View File

@@ -79,21 +79,42 @@ class Activitypub_notice
$tags[] = Activitypub_mention_tag::mention_tag_to_array_from_values($href, $to_profile->getNickname() . '@' . parse_url($href, PHP_URL_HOST));
}
$item = [
'@context' => 'https://www.w3.org/ns/activitystreams',
'id' => self::getUri($notice),
'type' => 'Note',
'published' => str_replace(' ', 'T', $notice->getCreated()) . 'Z',
'url' => $notice->getUrl(),
'attributedTo' => $profile->getUri(),
'to' => $to,
'cc' => $cc,
'conversation' => $notice->getConversationUrl(),
'content' => $notice->getRendered(),
'isLocal' => $notice->isLocal(),
'attachment' => $attachments,
'tag' => $tags
];
if (ActivityUtils::compareVerbs($notice->getVerb(), ActivityVerb::DELETE)) {
$item = [
'@context' => 'https://www.w3.org/ns/activitystreams',
'id' => self::getUri($notice),
'type' => 'Delete',
// XXX: A bit of ugly code here
'object' => array_merge(Activitypub_tombstone::tombstone_to_array(common_local_url('apNotice', ['id' => (int)substr(explode(':', $notice->getUri())[2],9)])), ['deleted' => str_replace(' ', 'T', $notice->getCreated()) . 'Z']),
'url' => $notice->getUrl(),
'actor' => $profile->getUri(),
'to' => $to,
'cc' => $cc,
'conversationId' => $notice->getConversationUrl(false),
'conversationUrl' => $notice->getConversationUrl(),
'content' => $notice->getRendered(),
'isLocal' => $notice->isLocal(),
'attachment' => $attachments,
'tag' => $tags
];
} else { // Note
$item = [
'@context' => 'https://www.w3.org/ns/activitystreams',
'id' => self::getUri($notice),
'type' => 'Note',
'published' => str_replace(' ', 'T', $notice->getCreated()) . 'Z',
'url' => $notice->getUrl(),
'attributedTo' => $profile->getUri(),
'to' => $to,
'cc' => $cc,
'conversationId' => $notice->getConversationUrl(false),
'conversationUrl' => $notice->getConversationUrl(),
'content' => $notice->getRendered(),
'isLocal' => $notice->isLocal(),
'attachment' => $attachments,
'tag' => $tags
];
}
// Is this a reply?
if (!empty($notice->reply_to)) {

55
plugins/ActivityPub/lib/models/Activitypub_tombstone.php Normal file
View File

@@ -0,0 +1,55 @@
<?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// GNU social is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with GNU social. If not, see <http://www.gnu.org/licenses/>.
/**
* ActivityPub implementation for GNU social
*
* @package GNUsocial
* @author Diogo Cordeiro <diogo@fc.up.pt>
* @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://www.gnu.org/software/social/
*/
defined('GNUSOCIAL') || die();
/**
* ActivityPub Tombstone representation
*
* @category Plugin
* @package GNUsocial
* @author Diogo Cordeiro <diogo@fc.up.pt>
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/
class Activitypub_tombstone
{
/**
* Generates an ActivityPub representation of a Tombstone
*
* @param string $id Activity id
* @return array pretty array to be used in a response
* @author Diogo Cordeiro <diogo@fc.up.pt>
*/
public static function tombstone_to_array(string $id): array
{
$res = [
'@context' => 'https://www.w3.org/ns/activitystreams',
'id' => $id,
'type' => 'Tombstone'
];
return $res;
}
}