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 #565 from annando/twitter-exception 

Improved timeout values/Posting local files
pull/567/head
Hypolite Petovan 2018-03-31 17:31:00 -04:00 committed by GitHub
parent 0dfe67ca3e 34ee3b9a28
commit 35628d9229
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
twitter/twitter.php
View File

@ -528,6 +528,9 @@ function twitter_post_hook(App $a, &$b)
$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret); $connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
// Set the timeout for upload to 15 seconds
$connection->setTimeouts(10, 15);
$max_char = 280; $max_char = 280;
$msgarr = BBCode::toPlaintext($b, $max_char, true, 8); $msgarr = BBCode::toPlaintext($b, $max_char, true, 8);
$msg = $msgarr["text"]; $msg = $msgarr["text"];
@ -549,7 +552,14 @@ function twitter_post_hook(App $a, &$b)
// and now tweet it :-) // and now tweet it :-)
if (strlen($msg) && ($image != "")) { if (strlen($msg) && ($image != "")) {
try { try {
$media = $connection->upload('media/upload', ['media' => $image]); $img_str = Network::fetchUrl($image);
$tempfile = tempnam(get_temppath(), 'cache');
file_put_contents($tempfile, $img_str);
$media = $connection->upload('media/upload', ['media' => $tempfile]);
unlink($tempfile);
$post = ['status' => $msg, 'media_ids' => $media->media_id_string]; $post = ['status' => $msg, 'media_ids' => $media->media_id_string];