heluecht/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Issues Pull requests Packages Projects Releases Wiki Activity

[twitter] Extract statuses/show in separate function

Browse source
This commit is contained in:
Hypolite Petovan 2021-02-08 02:22:47 -05:00
parent 5bd67d0d46
commit 644418bc4d
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
twitter/twitter.php
View file

@ -910,6 +910,24 @@ function twitter_prepare_body(App $a, array &$b)
} }
} }
function twitter_statuses_show(string $id, TwitterOAuth $twitterOAuth = null)
{
if ($twitterOAuth === null) {
$ckey = DI::config()->get('twitter', 'consumerkey');
$csecret = DI::config()->get('twitter', 'consumersecret');
if (empty($ckey) || empty($csecret)) {
return new stdClass();
}
$twitterOAuth = new TwitterOAuth($ckey, $csecret);
}
$parameters = ['trim_user' => false, 'tweet_mode' => 'extended', 'id' => $id, 'include_ext_alt_text' => true];
return $twitterOAuth->get('statuses/show', $parameters);
}
/** /**
* Parse Twitter status URLs since Twitter removed OEmbed * Parse Twitter status URLs since Twitter removed OEmbed
* *
@ -929,18 +947,7 @@ function twitter_parse_link(App $a, array &$b)
return; return;
} }
$ckey = DI::config()->get('twitter', 'consumerkey'); $status = twitter_statuses_show($matches[1]);
$csecret = DI::config()->get('twitter', 'consumersecret');
if (empty($ckey) || empty($csecret)) {
return;
}
$connection = new TwitterOAuth($ckey, $csecret);
$parameters = ['trim_user' => false, 'tweet_mode' => 'extended', 'id' => $matches[1], 'include_ext_alt_text' => true];
$status = $connection->get('statuses/show', $parameters);
if (empty($status->id)) { if (empty($status->id)) {
return; return;
@ -1782,17 +1789,15 @@ function twitter_fetchparentposts(App $a, $uid, $post, TwitterOAuth $connection,
$posts = []; $posts = [];
while (!empty($post->in_reply_to_status_id_str)) { while (!empty($post->in_reply_to_status_id_str)) {
$parameters = ["trim_user" => false, "tweet_mode" => "extended", "id" => $post->in_reply_to_status_id_str, "include_ext_alt_text" => true];
try { try {
$post = $connection->get('statuses/show', $parameters); $post = twitter_statuses_show($post->in_reply_to_status_id_str, $connection);
} catch (TwitterOAuthException $e) { } catch (TwitterOAuthException $e) {
Logger::warning('Error fetching parent post', ['uid' => $uid, 'post' => $post->id_str, 'message' => $e->getMessage()]); Logger::warning('Error fetching parent post', ['uid' => $uid, 'post' => $post->id_str, 'message' => $e->getMessage()]);
break; break;
} }
if (empty($post)) { if (empty($post)) {
Logger::log("twitter_fetchparentposts: Can't fetch post " . $parameters['id'], Logger::DEBUG); Logger::log("twitter_fetchparentposts: Can't fetch post " . $post->in_reply_to_status_id_str, Logger::DEBUG);
break; break;
} }