From bc2058e21a5f89e2316f31ef178e6c6ec5629edb Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 21 Nov 2020 18:55:32 +0000 Subject: [PATCH] Twitter: Fix display of reshared posts --- statusnet/statusnet.php | 12 +++++++----- twitter/twitter.php | 16 ++++++++++------ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 80579173..89f6f0e8 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -1106,11 +1106,13 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex if (!empty($content->in_reply_to_status_id)) { $thr_parent = $hostname . "::" . $content->in_reply_to_status_id; - if ( - Item::exists(['uri' => $thr_parent, 'uid' => $uid]) - || Item::exists(['extid' => $thr_parent, 'uid' => $uid]) - ) { - $postarray['thr-parent'] = $thr_parent; + $item = Item::selectFirst(['uri'], ['uri' => $thr_parent, 'uid' => $uid]); + if (!DBA::isResult($item)) { + $item = Item::selectFirst(['uri'], ['extid' => $thr_parent, 'uid' => $uid]); + } + + if (DBA::isResult($item)) { + $postarray['thr-parent'] = $item['uri']; $postarray['object-type'] = Activity\ObjectType::COMMENT; } else { $postarray['object-type'] = Activity\ObjectType::NOTE; diff --git a/twitter/twitter.php b/twitter/twitter.php index f70aa141..9a3ce38e 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -1584,11 +1584,13 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl if ($post->in_reply_to_status_id_str != "") { $thr_parent = "twitter::" . $post->in_reply_to_status_id_str; - if ( - Item::exists(['uri' => $thr_parent, 'uid' => $uid]) - || Item::exists(['extid' => $thr_parent, 'uid' => $uid]) - ) { - $postarray['thr-parent'] = $thr_parent; + $item = Item::selectFirst(['uri'], ['uri' => $thr_parent, 'uid' => $uid]); + if (!DBA::isResult($item)) { + $item = Item::selectFirst(['uri'], ['extid' => $thr_parent, 'uid' => $uid]); + } + + if (DBA::isResult($item)) { + $postarray['thr-parent'] = $item['uri']; $postarray['object-type'] = Activity\ObjectType::COMMENT; } else { $postarray['object-type'] = Activity\ObjectType::NOTE; @@ -1702,6 +1704,8 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl $postarray['verb'] = Activity::ANNOUNCE; $postarray['gravity'] = GRAVITY_ACTIVITY; $postarray['object-type'] = Activity\ObjectType::NOTE; + + $postarray['thr-parent'] = $retweet['uri']; } else { $retweet['source'] = $postarray['source']; $retweet['private'] = $postarray['private']; @@ -1919,7 +1923,7 @@ function twitter_fetchhometimeline(App $a, $uid) $notify = false; - if (($postarray['uri'] == $postarray['thr-parent']) && ($postarray['author-link'] == $postarray['owner-link'])) { + if (empty($postarray['thr-parent'])) { $contact = DBA::selectFirst('contact', [], ['id' => $postarray['contact-id'], 'self' => false]); if (DBA::isResult($contact)) { $notify = Item::isRemoteSelf($contact, $postarray); -- 2.39.5