From 1dbc9bd472c1ed4048386f5d5c8ace5ef77af71b Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 24 Sep 2023 10:18:50 +0000 Subject: [PATCH] Avoid quoting the own post --- src/Content/Item.php | 6 +++--- src/Content/Text/Plaintext.php | 4 ++-- src/Model/Item.php | 7 ++++++- src/Model/Post/Media.php | 5 +++++ src/Model/Post/UserNotification.php | 2 +- src/Protocol/ActivityPub/Transmitter.php | 6 +++--- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/Content/Item.php b/src/Content/Item.php index 163db89aa..c94ec1299 100644 --- a/src/Content/Item.php +++ b/src/Content/Item.php @@ -638,7 +638,7 @@ class Item $body = $item['body']; } - if (empty($item['quote-uri-id'])) { + if (empty($item['quote-uri-id']) || ($item['quote-uri-id'] == $item['uri-id'])) { return $body; } @@ -729,7 +729,7 @@ class Item */ public function getSharedPost(array $item, array $fields = []): array { - if (!empty($item['quote-uri-id'])) { + if (!empty($item['quote-uri-id']) && ($item['quote-uri-id'] != $item['uri-id'])) { $shared = Post::selectFirst($fields, ['uri-id' => $item['quote-uri-id'], 'uid' => [0, $item['uid'] ?? 0]]); if (is_array($shared)) { return [ @@ -770,7 +770,7 @@ class Item return $attributes; } - if (!empty($item['quote-uri-id'])) { + if (!empty($item['quote-uri-id']) && ($item['quote-uri-id'] != $item['uri-id'])) { $shared = Post::selectFirst(['author-name', 'author-link', 'author-avatar', 'plink', 'created', 'guid', 'uri', 'body'], ['uri-id' => $item['quote-uri-id']]); if (!empty($shared)) { return [ diff --git a/src/Content/Text/Plaintext.php b/src/Content/Text/Plaintext.php index 86d720a02..3b531f01b 100644 --- a/src/Content/Text/Plaintext.php +++ b/src/Content/Text/Plaintext.php @@ -324,7 +324,7 @@ class Plaintext $post['text'] = Post\Media::removeFromBody($post['text']); $images = Post\Media::getByURIId($item['uri-id'], [Post\Media::IMAGE]); - if (!empty($item['quote-uri-id'])) { + if (!empty($item['quote-uri-id']) && ($item['quote-uri-id'] != $item['uri-id'])) { $images = array_merge($images, Post\Media::getByURIId($item['quote-uri-id'], [Post\Media::IMAGE])); } foreach ($images as $image) { @@ -355,7 +355,7 @@ class Plaintext // Look for audio or video links $media = Post\Media::getByURIId($item['uri-id'], [Post\Media::AUDIO, Post\Media::VIDEO]); - if (!empty($item['quote-uri-id'])) { + if (!empty($item['quote-uri-id']) && ($item['quote-uri-id'] != $item['uri-id'])) { $media = array_merge($media, Post\Media::getByURIId($item['quote-uri-id'], [Post\Media::AUDIO, Post\Media::VIDEO])); } diff --git a/src/Model/Item.php b/src/Model/Item.php index de8c2e6da..41aae0413 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -1184,6 +1184,11 @@ class Item } } + if (!empty($item['quote-uri-id']) && ($item['quote-uri-id'] == $item['uri-id'])) { + Logger::info('Quote-Uri-Id is identical to Uri-Id', ['uri-id' => $item['uri-id'], 'guid' => $item['guid']]); + unset($item['quote-uri-id']); + } + if (!empty($item['quote-uri-id'])) { $item['raw-body'] = BBCode::removeSharedData($item['raw-body']); $item['body'] = BBCode::removeSharedData($item['body']); @@ -3125,7 +3130,7 @@ class Item $item['body'] = BBCode::removeSharedData($item['body']); } elseif (empty($shared_item['uri-id']) && empty($item['quote-uri-id']) && ($item['network'] != Protocol::DIASPORA)) { $media = Post\Media::getByURIId($item['uri-id'], [Post\Media::ACTIVITY]); - if (!empty($media)) { + if (!empty($media) && ($media[0]['media-uri-id'] != $item['uri-id'])) { $shared_item = Post::selectFirst($fields, ['uri-id' => $media[0]['media-uri-id'], 'uid' => [$item['uid'], 0]]); if (empty($shared_item['uri-id'])) { $shared_item = Post::selectFirst($fields, ['plink' => $media[0]['url'], 'uid' => [$item['uid'], 0]]); diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php index a0d55b6e0..e0c8d3561 100644 --- a/src/Model/Post/Media.php +++ b/src/Model/Post/Media.php @@ -265,6 +265,11 @@ class Media return $media; } + if ($item['uri-id'] == $media['uri-id']) { + Logger::info('Media-Uri-Id is identical to Uri-Id', ['uri-id' => $media['uri-id']]); + return $media; + } + if ( !empty($item['plink']) && Strings::compareLink($item['plink'], $media['url']) && parse_url($item['plink'], PHP_URL_HOST) != parse_url($item['uri'], PHP_URL_HOST) diff --git a/src/Model/Post/UserNotification.php b/src/Model/Post/UserNotification.php index 726e82d7e..41c8b5031 100644 --- a/src/Model/Post/UserNotification.php +++ b/src/Model/Post/UserNotification.php @@ -602,7 +602,7 @@ class UserNotification */ private static function checkQuoted(array $item, array $contacts): bool { - if (empty($item['quote-uri-id'])) { + if (empty($item['quote-uri-id']) || ($item['quote-uri-id'] == $item['uri-id'])) { return false; } $condition = ['uri-id' => $item['quote-uri-id'], 'uid' => $item['uid'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => [item::GRAVITY_PARENT, Item::GRAVITY_COMMENT]]; diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index 4b0450a0c..72a9c929f 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -1752,7 +1752,7 @@ class Transmitter $body = BBCode::setMentionsToNicknames($body); - if (!empty($item['quote-uri-id'])) { + if (!empty($item['quote-uri-id']) && ($item['quote-uri-id'] != $item['uri-id'])) { if (Post::exists(['uri-id' => $item['quote-uri-id'], 'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN]])) { $real_quote = true; $data['quoteUrl'] = $item['quote-uri']; @@ -1772,7 +1772,7 @@ class Transmitter if (!empty($language)) { $richbody = BBCode::setMentionsToNicknames($item['body'] ?? ''); $richbody = Post\Media::removeFromEndOfBody($richbody); - if (!empty($item['quote-uri-id'])) { + if (!empty($item['quote-uri-id']) && ($item['quote-uri-id'] != $item['uri-id'])) { if ($real_quote) { $richbody = DI::contentItem()->addShareLink($richbody, $item['quote-uri-id']); } else { @@ -1784,7 +1784,7 @@ class Transmitter $data['contentMap'][$language] = BBCode::convertForUriId($item['uri-id'], $richbody, BBCode::EXTERNAL); } - if (!empty($item['quote-uri-id'])) { + if (!empty($item['quote-uri-id']) && ($item['quote-uri-id'] != $item['uri-id'])) { $source = DI::contentItem()->addSharedPost($item, $item['body']); } else { $source = $item['body'];