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 #886 from MrPetovan/bug/7212-add-unavailable-tweet-url 

[twitter] Add quoted tweet URL if its body is unavailable (blocked, muted, deleted)
pull/887/head
Tobias Diekershoff 2019-09-13 06:07:04 +02:00 committed by GitHub
parent a97eeb8e8b e7d054c6d5
commit 3152513af7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
twitter/twitter.php
View File

@ -1162,7 +1162,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
if ($url->url && $url->expanded_url && $url->display_url) { if ($url->url && $url->expanded_url && $url->display_url) {
// Quote tweet, we just remove the quoted tweet URL from the body, the share block will be added later. // Quote tweet, we just remove the quoted tweet URL from the body, the share block will be added later.
if (isset($item->quoted_status_id_str) if (!empty($item->quoted_status) && isset($item->quoted_status_id_str)
&& substr($url->expanded_url, -strlen($item->quoted_status_id_str)) == $item->quoted_status_id_str ) { && substr($url->expanded_url, -strlen($item->quoted_status_id_str)) == $item->quoted_status_id_str ) {
$body = str_replace($url->url, '', $body); $body = str_replace($url->url, '', $body);
continue; continue;
@ -1539,20 +1539,21 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl
if (!empty($post->quoted_status) && !$noquote) { if (!empty($post->quoted_status) && !$noquote) {
$quoted = twitter_createpost($a, $uid, $post->quoted_status, $self, false, false, true); $quoted = twitter_createpost($a, $uid, $post->quoted_status, $self, false, false, true);
if (empty($quoted['body'])) { if (!empty($quoted['body'])) {
return []; $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;
} }
$postarray['body'] .= "\n" . share_header(
$quoted['author-name'],
$quoted['author-link'],
$quoted['author-avatar'],
"",
$quoted['created'],
$quoted['plink']
);
$postarray['body'] .= $quoted['body'] . '[/share]';
} }
return $postarray; return $postarray;