From 7ffd6d0bc74af167d5aa14c2befe5380b06d0143 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 28 Nov 2019 06:34:35 +0000 Subject: [PATCH] Attached photos from pixelfed are now added to the body again --- src/Protocol/ActivityPub/Processor.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index f2b277e44e..ad1b9d8bdf 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -93,22 +93,21 @@ class Processor /** * Add attachment data to the item array * - * @param array $attachments + * @param array $activity * @param array $item - * @param boolean $no_images * * @return array array */ - private static function constructAttachList($attachments, $item, $no_images) + private static function constructAttachList($activity, $item) { - if (empty($attachments)) { + if (empty($activity['attachments'])) { return $item; } - foreach ($attachments as $attach) { + foreach ($activity['attachments'] as $attach) { $filetype = strtolower(substr($attach['mediaType'], 0, strpos($attach['mediaType'], '/'))); if ($filetype == 'image') { - if ($no_images) { + if (!empty($activity['source']) && strpos($activity['source'], $attach['url'])) { continue; } @@ -407,7 +406,7 @@ class Processor $item['plink'] = $activity['alternate-url'] ?? $item['uri']; - $item = self::constructAttachList($activity['attachments'], $item, !empty($activity['source'])); + $item = self::constructAttachList($activity, $item); $stored = false; -- 2.39.5