From d1d1685e248d081a2e56e69643c38062f86c1f89 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 22 Apr 2023 10:40:58 +0000 Subject: [PATCH] Only share from federated posts --- src/Module/Post/Share.php | 2 +- src/Object/Post.php | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Module/Post/Share.php b/src/Module/Post/Share.php index 78ea1c631..db95c38c9 100644 --- a/src/Module/Post/Share.php +++ b/src/Module/Post/Share.php @@ -68,7 +68,7 @@ class Share extends \Friendica\BaseModule $shared = $this->contentItem->getSharedPost($item, ['uri']); if ($shared && empty($shared['comment'])) { $content = '[share]' . $shared['post']['uri'] . '[/share]'; - } elseif ($item['network'] == Protocol::FEED) { + } elseif (!empty($item['plink']) && !in_array($item['network'], Protocol::FEDERATED)) { $content = '[attachment]' . $item['plink'] . '[/attachment]'; } else { $content = '[share]' . $item['uri'] . '[/share]'; diff --git a/src/Object/Post.php b/src/Object/Post.php index 17c0c1f68..b34f51377 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -205,8 +205,9 @@ class Post $lock = ($item['private'] == Item::PRIVATE) ? $privacy : false; $connector = !in_array($item['network'], Protocol::NATIVE_SUPPORT) ? DI::l10n()->t('Connector Message') : false; - $shareable = in_array($conv->getProfileOwner(), [0, DI::userSession()->getLocalUserId()]) && $item['private'] != Item::PRIVATE; - $announceable = $shareable && in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER]); + $shareable = in_array($conv->getProfileOwner(), [0, DI::userSession()->getLocalUserId()]) && $item['private'] != Item::PRIVATE; + $announceable = $shareable && in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER, Protocol::TUMBLR]); + $commentable = ($item['network'] != Protocol::TUMBLR); // On Diaspora only toplevel posts can be reshared if ($announceable && ($item['network'] == Protocol::DIASPORA) && ($item['gravity'] != Item::GRAVITY_PARENT)) { @@ -392,7 +393,11 @@ class Post } } - $comment_html = $this->getCommentBox($indent); + if ($commentable) { + $comment_html = $this->getCommentBox($indent); + } else { + $comment_html = ''; + } if (strcmp(DateTimeFormat::utc($item['created']), DateTimeFormat::utc('now - 12 hours')) > 0) { $shiny = 'shiny';