friendica
/
friendica-addons
7
2
Fork 13
Code Issues 3 Pull Requests 2 Releases 16 Wiki Activity

Merge pull request #987 from MrPetovan/bug/8744-twitter-add-link-suppressed-quote 

[twitter] Add a link to the quoted tweet when we don't add a share block
This commit is contained in:
Michael Vogel 2020-06-07 07:18:54 +02:00 committed by GitHub
parent ed67e2cd6e 03c2a30991
commit 318e351860
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
twitter/twitter.php
View File

@ -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;
}
}
}