Merge pull request #564 from annando/twitter-exception

Handle exception when posting pictures to twitter
pull/567/head
Tobias Diekershoff 2018-03-31 14:37:19 +02:00 committed by GitHub
commit 0dfe67ca3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 16 deletions

View File

@ -548,7 +548,7 @@ function twitter_post_hook(App $a, &$b)
// and now tweet it :-) // and now tweet it :-)
if (strlen($msg) && ($image != "")) { if (strlen($msg) && ($image != "")) {
$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret); try {
$media = $connection->upload('media/upload', ['media' => $image]); $media = $connection->upload('media/upload', ['media' => $image]);
$post = ['status' => $msg, 'media_ids' => $media->media_id_string]; $post = ['status' => $msg, 'media_ids' => $media->media_id_string];
@ -575,6 +575,13 @@ function twitter_post_hook(App $a, &$b)
logger('twitter_post: Update extid ' . $result->id_str . " for post id " . $b['id']); logger('twitter_post: Update extid ' . $result->id_str . " for post id " . $b['id']);
Item::update(['extid' => "twitter::" . $result->id_str, 'body' => $result->text], ['id' => $b['id']]); Item::update(['extid' => "twitter::" . $result->id_str, 'body' => $result->text], ['id' => $b['id']]);
} }
} catch (Exception $e) {
logger('Exception when trying to send to Twitter: ' . $e->getMessage());
// Workaround: Remove the picture link so that the post can be reposted without it
$msg .= " " . $image;
$image = "";
}
} }
if (strlen($msg) && ($image == "")) { if (strlen($msg) && ($image == "")) {