From 03c2a3099176669658875d5ab66508f432d170da Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 6 Jun 2020 19:27:50 -0400 Subject: [PATCH] [twitter] Add a link to the quoted tweet when we don't add a share block --- twitter/twitter.php | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index 7500b90aa..d07021a83 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -84,7 +84,6 @@ use Friendica\Model\Item; use Friendica\Model\ItemContent; use Friendica\Model\ItemURI; use Friendica\Model\Tag; -use Friendica\Model\Term; use Friendica\Model\User; use Friendica\Protocol\Activity; use Friendica\Util\ConfigFileLoader; @@ -1609,23 +1608,27 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl } } - if (!empty($post->quoted_status) && !$noquote) { - $quoted = twitter_createpost($a, $uid, $post->quoted_status, $self, false, false, true, $uriid); - - if (!empty($quoted['body'])) { - $postarray['body'] .= "\n" . share_header( - $quoted['author-name'], - $quoted['author-link'], - $quoted['author-avatar'], - "", - $quoted['created'], - $quoted['plink'] - ); - - $postarray['body'] .= $quoted['body'] . '[/share]'; - } else { - // Quoted post author is blocked/ignored, so we just provide the link to avoid removing quote context. + if (!empty($post->quoted_status)) { + if ($noquote) { + // To avoid recursive share blocks we just provide the link to avoid removing quote context. $postarray['body'] .= "\n\nhttps://twitter.com/" . $post->quoted_status->user->screen_name . "/status/" . $post->quoted_status->id_str; + } else { + $quoted = twitter_createpost($a, $uid, $post->quoted_status, $self, false, false, true, $uriid); + if (!empty($quoted['body'])) { + $postarray['body'] .= "\n" . share_header( + $quoted['author-name'], + $quoted['author-link'], + $quoted['author-avatar'], + "", + $quoted['created'], + $quoted['plink'] + ); + + $postarray['body'] .= $quoted['body'] . '[/share]'; + } else { + // Quoted post author is blocked/ignored, so we just provide the link to avoid removing quote context. + $postarray['body'] .= "\n\nhttps://twitter.com/" . $post->quoted_status->user->screen_name . "/status/" . $post->quoted_status->id_str; + } } }