mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Transmit shared attachments via ActivityPub

Browse source
This commit is contained in:
Michael 2021-04-29 20:22:38 +00:00
parent b88c9f9d67
commit 7c80f513d5
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Protocol/ActivityPub/Transmitter.php
View file

@ -1291,23 +1291,36 @@ class Transmitter
$attachments[] = $attachment; $attachments[] = $attachment;
} }
*/ */
foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::DOCUMENT, Post\Media::TORRENT, Post\Media::UNKNOWN]) as $attachment) { $uriids = [$item['uri-id']];
$shared = BBCode::fetchShareAttributes($item['body']);
if (!empty($shared['guid'])) {
$shared_item = Post::selectFirst(['uri-id'], ['guid' => $shared['guid']]);
if (!empty($shared_item['uri-id'])) {
$uriids[] = $shared_item['uri-id'];
}
}
foreach ($uriids as $uriid) {
foreach (Post\Media::getByURIId($uriid, [Post\Media::DOCUMENT, Post\Media::TORRENT, Post\Media::UNKNOWN]) as $attachment) {
$attachments[] = ['type' => 'Document', $attachments[] = ['type' => 'Document',
'mediaType' => $attachment['mimetype'], 'mediaType' => $attachment['mimetype'],
'url' => $attachment['url'], 'url' => $attachment['url'],
'name' => $attachment['description']]; 'name' => $attachment['description']];
} }
}
if ($type != 'Note') { if ($type != 'Note') {
return $attachments; return $attachments;
} }
foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::AUDIO, Post\Media::IMAGE, Post\Media::VIDEO]) as $attachment) { foreach ($uriids as $uriid) {
foreach (Post\Media::getByURIId($uriid, [Post\Media::AUDIO, Post\Media::IMAGE, Post\Media::VIDEO]) as $attachment) {
$attachments[] = ['type' => 'Document', $attachments[] = ['type' => 'Document',
'mediaType' => $attachment['mimetype'], 'mediaType' => $attachment['mimetype'],
'url' => $attachment['url'], 'url' => $attachment['url'],
'name' => $attachment['description']]; 'name' => $attachment['description']];
} }
}
return $attachments; return $attachments;
} }