friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1046 from annando/twitter-fix-reshare 

Twitter: Fix display of reshared posts
pull/1047/head
Hypolite Petovan 2020-11-21 15:58:52 -05:00 committed by GitHub
parent ac42c70579 bc2058e21a
commit b3f7952be3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
statusnet/statusnet.php
View File

@ -1106,11 +1106,13 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex
if (!empty($content->in_reply_to_status_id)) { if (!empty($content->in_reply_to_status_id)) {
$thr_parent = $hostname . "::" . $content->in_reply_to_status_id; $thr_parent = $hostname . "::" . $content->in_reply_to_status_id;
if ( $item = Item::selectFirst(['uri'], ['uri' => $thr_parent, 'uid' => $uid]);
Item::exists(['uri' => $thr_parent, 'uid' => $uid]) if (!DBA::isResult($item)) {
|| Item::exists(['extid' => $thr_parent, 'uid' => $uid]) $item = Item::selectFirst(['uri'], ['extid' => $thr_parent, 'uid' => $uid]);
) { }
$postarray['thr-parent'] = $thr_parent;
if (DBA::isResult($item)) {
$postarray['thr-parent'] = $item['uri'];
$postarray['object-type'] = Activity\ObjectType::COMMENT; $postarray['object-type'] = Activity\ObjectType::COMMENT;
} else { } else {
$postarray['object-type'] = Activity\ObjectType::NOTE; $postarray['object-type'] = Activity\ObjectType::NOTE;

14
twitter/twitter.php
View File

@ -1584,11 +1584,13 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl
if ($post->in_reply_to_status_id_str != "") { if ($post->in_reply_to_status_id_str != "") {
$thr_parent = "twitter::" . $post->in_reply_to_status_id_str; $thr_parent = "twitter::" . $post->in_reply_to_status_id_str;
if ( $item = Item::selectFirst(['uri'], ['uri' => $thr_parent, 'uid' => $uid]);
Item::exists(['uri' => $thr_parent, 'uid' => $uid]) if (!DBA::isResult($item)) {
|| Item::exists(['extid' => $thr_parent, 'uid' => $uid]) $item = Item::selectFirst(['uri'], ['extid' => $thr_parent, 'uid' => $uid]);
) { }
$postarray['thr-parent'] = $thr_parent;
if (DBA::isResult($item)) {
$postarray['thr-parent'] = $item['uri'];
$postarray['object-type'] = Activity\ObjectType::COMMENT; $postarray['object-type'] = Activity\ObjectType::COMMENT;
} else { } else {
$postarray['object-type'] = Activity\ObjectType::NOTE; $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['verb'] = Activity::ANNOUNCE;
$postarray['gravity'] = GRAVITY_ACTIVITY; $postarray['gravity'] = GRAVITY_ACTIVITY;
$postarray['object-type'] = Activity\ObjectType::NOTE; $postarray['object-type'] = Activity\ObjectType::NOTE;
$postarray['thr-parent'] = $retweet['uri'];
} else { } else {
$retweet['source'] = $postarray['source']; $retweet['source'] = $postarray['source'];
$retweet['private'] = $postarray['private']; $retweet['private'] = $postarray['private'];