[PLUGIN][ActivityPub][Note] Support inReplyTo
This commit is contained in:
Diogo Peralta Cordeiro
parent
b05106e7f9
commit
3c79d82b80
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
declare(strict_types = 1);
|
||||
|
||||
// {{{ License
|
||||
// This file is part of GNU social - https://www.gnu.org/software/social
|
||||
|
|
@ -24,6 +24,7 @@ declare(strict_types=1);
|
|||
*
|
||||
* @package GNUsocial
|
||||
* @category ActivityPub
|
||||
*
|
||||
* @author Diogo Peralta Cordeiro <@diogo.site>
|
||||
* @copyright 2021 Free Software Foundation, Inc http://www.fsf.org
|
||||
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
|
||||
|
|
@ -31,11 +32,14 @@ declare(strict_types=1);
|
|||
|
||||
namespace Plugin\ActivityPub\Util\Model;
|
||||
|
||||
use ActivityPhp\Type;
|
||||
use ActivityPhp\Type\AbstractObject;
|
||||
use App\Core\DB\DB;
|
||||
use App\Core\Event;
|
||||
use App\Core\GSFile;
|
||||
use App\Core\HTTPClient;
|
||||
use function App\Core\I18n\_m;
|
||||
use App\Core\Log;
|
||||
use App\Core\Router\Router;
|
||||
use App\Entity\Language;
|
||||
use App\Entity\Note as GSNote;
|
||||
|
|
@ -48,6 +52,7 @@ use App\Util\Formatting;
|
|||
use App\Util\TemporaryFile;
|
||||
use Component\Attachment\Entity\ActorToAttachment;
|
||||
use Component\Attachment\Entity\AttachmentToNote;
|
||||
use Component\Conversation\Conversation;
|
||||
use DateTime;
|
||||
use DateTimeInterface;
|
||||
use Exception;
|
||||
|
|
@ -59,9 +64,6 @@ use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
|
|||
use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
|
||||
use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
|
||||
use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
|
||||
use function App\Core\I18n\_m;
|
||||
use function is_null;
|
||||
use function is_string;
|
||||
|
||||
/**
|
||||
* This class handles translation between JSON and GSNotes
|
||||
|
|
@ -71,33 +73,48 @@ use function is_string;
|
|||
*/
|
||||
class Note extends Model
|
||||
{
|
||||
|
||||
/**
|
||||
* Create an Entity from an ActivityStreams 2.0 JSON string
|
||||
* This will persist a new GSNote
|
||||
*
|
||||
* @param string|AbstractObject $json
|
||||
* @param array $options
|
||||
* @return GSNote
|
||||
* @throws ClientException
|
||||
* @throws ClientExceptionInterface
|
||||
* @throws DuplicateFoundException
|
||||
* @throws NoSuchActorException
|
||||
* @throws ServerException
|
||||
* @throws ClientExceptionInterface
|
||||
* @throws RedirectionExceptionInterface
|
||||
* @throws ServerException
|
||||
* @throws ServerExceptionInterface
|
||||
* @throws TransportExceptionInterface
|
||||
*/
|
||||
public static function fromJson(string|AbstractObject $json, array $options = []): GSNote
|
||||
{
|
||||
$handleInReplyTo = function (AbstractObject|string $type_note): ?int {
|
||||
try {
|
||||
$parent_note = is_null($type_note->get('inReplyTo')) ? null : ActivityPub::getObjectByUri($type_note->get('inReplyTo'), try_online: true);
|
||||
if ($parent_note instanceof \App\Entity\Note) {
|
||||
return $parent_note->getId();
|
||||
} elseif ($parent_note instanceof Type\AbstractObject && $parent_note->get('type') === 'Note') {
|
||||
return self::fromJson($parent_note)->getId();
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
} catch (Exception $e) {
|
||||
Log::debug('ActivityStreams:Model:Note-> An error occurred retrieving parent note.', [$e]);
|
||||
// Sadly we won't be able to have this note inside the correct conversation for now.
|
||||
// TODO: Create an entity that registers notes falsely without parent so, when the parent is retrieved,
|
||||
// we can update the child with the correct parent.
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
$source = $options['source'] ?? 'ActivityPub';
|
||||
$type_note = is_string($json) ? self::jsonToType($json) : $json;
|
||||
$type_note = \is_string($json) ? self::jsonToType($json) : $json;
|
||||
$actor = null;
|
||||
$actor_id = null;
|
||||
if ($json instanceof AbstractObject
|
||||
&& array_key_exists('test_authority', $options)
|
||||
&& \array_key_exists('test_authority', $options)
|
||||
&& $options['test_authority']
|
||||
&& array_key_exists('actor_uri', $options)
|
||||
&& \array_key_exists('actor_uri', $options)
|
||||
) {
|
||||
$actor_uri = $options['actor_uri'];
|
||||
if ($actor_uri !== $type_note->get('attributedTo')) {
|
||||
|
|
@ -110,7 +127,7 @@ class Note extends Model
|
|||
}
|
||||
}
|
||||
|
||||
if (is_null($actor_id)) {
|
||||
if (\is_null($actor_id)) {
|
||||
$actor = ActivityPub::getActorByUri($type_note->get('attributedTo'));
|
||||
$actor_id = $actor->getId();
|
||||
}
|
||||
|
|
@ -123,6 +140,7 @@ class Note extends Model
|
|||
'language_id' => $type_note->get('contentLang') ?? null,
|
||||
'url' => $type_note->get('url') ?? $type_note->get('id'),
|
||||
'actor_id' => $actor_id,
|
||||
'reply_to' => $reply_to = $handleInReplyTo($type_note),
|
||||
'modified' => new DateTime(),
|
||||
'source' => $source,
|
||||
];
|
||||
|
|
@ -140,7 +158,7 @@ class Note extends Model
|
|||
|
||||
$obj = new GSNote();
|
||||
|
||||
if (!is_null($map['language_id'])) {
|
||||
if (!\is_null($map['language_id'])) {
|
||||
$map['language_id'] = Language::getByLocale($map['language_id'])->getId();
|
||||
} else {
|
||||
$map['language_id'] = null;
|
||||
|
|
@ -168,7 +186,7 @@ class Note extends Model
|
|||
$max_file_size = Common::getUploadLimit();
|
||||
if ($max_file_size < $filesize) {
|
||||
throw new ClientException(_m('No file may be larger than {quota} bytes and the file you sent was {size} bytes. '
|
||||
. 'Try to upload a smaller version.', ['quota' => $max_file_size, 'size' => $filesize],));
|
||||
. 'Try to upload a smaller version.', ['quota' => $max_file_size, 'size' => $filesize], ));
|
||||
}
|
||||
Event::handle('EnforceUserFileQuota', [$filesize, $actor_id]);
|
||||
|
||||
|
|
@ -179,6 +197,9 @@ class Note extends Model
|
|||
|
||||
DB::persist($obj);
|
||||
|
||||
// Assign conversation to this note
|
||||
Conversation::assignLocalConversation($obj, $reply_to);
|
||||
|
||||
// Need file and note ids for the next step
|
||||
Event::handle('ProcessNoteContent', [$obj, $obj->getContent(), $obj->getContentType(), $process_note_content_extra_args = []]);
|
||||
|
||||
|
|
@ -211,9 +232,6 @@ class Note extends Model
|
|||
/**
|
||||
* Get a JSON
|
||||
*
|
||||
* @param mixed $object
|
||||
* @param int|null $options
|
||||
* @return string
|
||||
* @throws Exception
|
||||
*/
|
||||
public static function toJson(mixed $object, ?int $options = null): string
|
||||
|
|
@ -233,7 +251,8 @@ class Note extends Model
|
|||
'content' => $object->getRendered(),
|
||||
'attachment' => [],
|
||||
'tag' => [],
|
||||
'directMessage' => false, // // TODO: implement proper scope address
|
||||
'conversation' => $object->getConversationUri(),
|
||||
'directMessage' => false, // TODO: implement proper scope address
|
||||
];
|
||||
|
||||
// Mentions
|
||||
|
|
@ -241,7 +260,7 @@ class Note extends Model
|
|||
$attr['tag'][] = [
|
||||
'type' => 'Mention',
|
||||
'href' => ($href = $mention->getUri()),
|
||||
'name' => '@'.$mention->getNickname().'@'.parse_url($href, PHP_URL_HOST)
|
||||
'name' => '@' . $mention->getNickname() . '@' . parse_url($href, \PHP_URL_HOST),
|
||||
];
|
||||
$attr['cc'][] = $href;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user