X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FTwitterBridge%2Ftwitter.php;h=99389a759f3e28a377c39d479702d654d37f4573;hb=2a8ab1c6cae572d324339b211625c4d219db0c89;hp=a993f8ff8fcd1d3e67f5e2513988620949bde046;hpb=8eb66467165e107d0c80c64f6c429fed1d1101d5;p=quix0rs-gnu-social.git diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php index a993f8ff8f..99389a759f 100644 --- a/plugins/TwitterBridge/twitter.php +++ b/plugins/TwitterBridge/twitter.php @@ -1,7 +1,7 @@ delete(); + try { + $fuser = Foreign_user::getForeignUser($twitter_id, TWITTER_SERVICE); + $result = $fuser->delete(); if ($result != false) { common_log( LOG_INFO, "Twitter bridge - removed old Twitter user: $screen_name ($twitter_id)." ); } + } catch (NoResultException $e) { + // no old foreign users exist for this id } $fuser = new Foreign_user(); $fuser->nickname = $screen_name; - $fuser->uri = 'http://twitter.com/#!/' . $screen_name; + $fuser->uri = 'http://twitter.com/' . $screen_name; $fuser->id = $twitter_id; $fuser->service = TWITTER_SERVICE; $fuser->created = common_sql_now(); $result = $fuser->insert(); - if (empty($result)) { - common_log(LOG_WARNING, - "Twitter bridge - failed to add new Twitter user: $twitter_id - $screen_name."); + if ($result === false) { + common_log(LOG_WARNING, "Twitter bridge - failed to add new Twitter user: $twitter_id - $screen_name."); common_log_db_error($fuser, 'INSERT', __FILE__); } else { common_log(LOG_INFO, @@ -68,12 +66,10 @@ function save_twitter_user($twitter_id, $screen_name) { // Check to see whether the Twitter user is already in the system, // and update its screen name and uri if so. - $fuser = Foreign_user::getForeignUser($twitter_id, TWITTER_SERVICE); - - if (!empty($fuser)) { + try { + $fuser = Foreign_user::getForeignUser($twitter_id, TWITTER_SERVICE); // Delete old record if Twitter user changed screen name - if ($fuser->nickname != $screen_name) { $oldname = $fuser->nickname; $fuser->delete(); @@ -83,12 +79,13 @@ function save_twitter_user($twitter_id, $screen_name) $screen_name, $oldname)); } + } catch (NoResultException $e) { + // No old users exist for this id - } else { // Kill any old, invalid records for this screen name - $fuser = Foreign_user::getByNickname($screen_name, TWITTER_SERVICE); - - if (!empty($fuser)) { + // XXX: Is this really only supposed to be run if the above getForeignUser fails? + try { + $fuser = Foreign_user::getByNickname($screen_name, TWITTER_SERVICE); $fuser->delete(); common_log( LOG_INFO, @@ -99,6 +96,8 @@ function save_twitter_user($twitter_id, $screen_name) $fuser->id ) ); + } catch (NoResultException $e) { + // No old users exist for this screen_name } } @@ -106,14 +105,27 @@ function save_twitter_user($twitter_id, $screen_name) } function is_twitter_bound($notice, $flink) { + + // Don't send activity activities (at least for now) + if ($notice->object_type == ActivityObject::ACTIVITY) { + return false; + } + + $allowedVerbs = array(ActivityVerb::POST, ActivityVerb::SHARE); + + // Don't send things that aren't posts or repeats (at least for now) + if (!in_array($notice->verb, $allowedVerbs)) { + return false; + } + // Check to see if notice should go to Twitter - if (!empty($flink) && ($flink->noticesync & FOREIGN_NOTICE_SEND)) { + if (!empty($flink) && (($flink->noticesync & FOREIGN_NOTICE_SEND) == FOREIGN_NOTICE_SEND)) { // If it's not a Twitter-style reply, or if the user WANTS to send replies, // or if it's in reply to a twitter notice - if (!preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content) || - ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) || - is_twitter_notice($notice->reply_to)) { + if ( (($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY) || + is_twitter_notice($notice->reply_to) || is_twitter_notice($notice->repeat_of) || + (empty($notice->reply_to) && !preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content)) ){ return true; } } @@ -123,7 +135,7 @@ function is_twitter_bound($notice, $flink) { function is_twitter_notice($id) { - $n2s = Notice_to_status::staticGet('notice_id', $id); + $n2s = Notice_to_status::getKV('notice_id', $id); return (!empty($n2s)); } @@ -168,23 +180,29 @@ function twitter_id($status, $field='id') */ function broadcast_twitter($notice) { - $flink = Foreign_link::getByUserID($notice->profile_id, - TWITTER_SERVICE); + try { + $flink = Foreign_link::getByUserID($notice->profile_id, TWITTER_SERVICE); + } catch (NoResultException $e) { + // Alright so don't broadcast it then! (since there's no foreign link) + return true; + } // Don't bother with basic auth, since it's no longer allowed - if (!empty($flink) && TwitterOAuthClient::isPackedToken($flink->credentials)) { - if (!empty($notice->repeat_of) && is_twitter_notice($notice->repeat_of)) { - $retweet = retweet_notice($flink, Notice::staticGet('id', $notice->repeat_of)); - if (is_object($retweet)) { - Notice_to_status::saveNew($notice->id, twitter_id($retweet)); - return true; + if (TwitterOAuthClient::isPackedToken($flink->credentials)) { + if (is_twitter_bound($notice, $flink)) { + if (!empty($notice->repeat_of) && is_twitter_notice($notice->repeat_of)) { + $retweet = retweet_notice($flink, Notice::getKV('id', $notice->repeat_of)); + if (is_object($retweet)) { + Notice_to_status::saveNew($notice->id, twitter_id($retweet)); + return true; + } else { + // Our error processing will have decided if we need to requeue + // this or can discard safely. + return $retweet; + } } else { - // Our error processing will have decided if we need to requeue - // this or can discard safely. - return $retweet; + return broadcast_oauth($notice, $flink); } - } else if (is_twitter_bound($notice, $flink)) { - return broadcast_oauth($notice, $flink); } } @@ -228,7 +246,7 @@ function retweet_notice($flink, $notice) function twitter_status_id($notice) { - $n2s = Notice_to_status::staticGet('notice_id', $notice->id); + $n2s = Notice_to_status::getKV('notice_id', $notice->id); if (empty($n2s)) { return null; } else { @@ -252,14 +270,19 @@ function twitter_update_params($notice) $params['long'] = $notice->lon; } if (!empty($notice->reply_to) && is_twitter_notice($notice->reply_to)) { - $reply = Notice::staticGet('id', $notice->reply_to); + $reply = Notice::getKV('id', $notice->reply_to); $params['in_reply_to_status_id'] = twitter_status_id($reply); } return $params; } -function broadcast_oauth($notice, $flink) { - $user = $flink->getUser(); +function broadcast_oauth($notice, Foreign_link $flink) { + try { + $user = $flink->getUser(); + } catch (ServerException $e) { + common_log(LOG_WARNING, 'Discarding broadcast_oauth for notice '.$notice->id.' because of exception: '.$e->getMessage()); + return true; + } $statustxt = format_status($notice); $params = twitter_update_params($notice); @@ -277,7 +300,6 @@ function broadcast_oauth($notice, $flink) { } if (empty($status)) { - // This could represent a failure posting, // or the Twitter API might just be behaving flakey. $errmsg = sprintf('Twitter bridge - No data returned by Twitter API when ' . @@ -318,7 +340,20 @@ function process_error($e, $flink, $notice) common_log(LOG_WARNING, $logmsg); + // http://dev.twitter.com/pages/responses_errors switch($code) { + case 400: + // Probably invalid data (bad Unicode chars or coords) that + // cannot be resolved by just sending again. + // + // It could also be rate limiting, but retrying immediately + // won't help much with that, so we'll discard for now. + // If a facility for retrying things later comes up in future, + // we can detect the rate-limiting headers and use that. + // + // Discard the message permanently. + return true; + break; case 401: // Probably a revoked or otherwise bad access token - nuke! remove_twitter_link($flink); @@ -328,6 +363,13 @@ function process_error($e, $flink, $notice) // User has exceeder her rate limit -- toss the notice return true; break; + case 404: + // Resource not found. Shouldn't happen much on posting, + // but just in case! + // + // Consider it a matter for tossing the notice. + return true; + break; default: // For every other case, it's probably some flakiness so try @@ -347,11 +389,16 @@ function format_status($notice) // XXX: Make this an optional setting? $statustxt = preg_replace('/(^|\s)!([A-Za-z0-9]{1,64})/', "\\1#\\2", $statustxt); + // detect links, each link uses 23 characters on twitter + $numberOfLinks = preg_match_all('`((http|https|ftp)://[^\s<]+[^\s<\.)])`i', $statustxt); + $statusWithoutLinks = preg_replace('`((http|https|ftp)://[^\s<]+[^\s<\.)])`i', '', $statustxt); + $statusLength = mb_strlen($statusWithoutLinks) + $numberOfLinks * 23; + // Twitter still has a 140-char hardcoded max. - if (mb_strlen($statustxt) > 140) { - $noticeUrl = common_shorten_url($notice->uri); - $urlLen = mb_strlen($noticeUrl); - $statustxt = mb_substr($statustxt, 0, 140 - ($urlLen + 3)) . ' … ' . $noticeUrl; + if ($statusLength > 140) { + $noticeUrl = common_shorten_url($notice->getUrl()); + // each link uses 23 chars on twitter + 3 for the ' … ' => 26 + $statustxt = mb_substr($statustxt, 0, 140 - 26) . ' … ' . $noticeUrl; } return $statustxt; @@ -404,10 +451,14 @@ function mail_twitter_bridge_removed($user) common_switch_locale($user->language); - $subject = sprintf(_m('Your Twitter bridge has been disabled.')); + // TRANS: Mail subject after forwarding notices to Twitter has stopped working. + $subject = sprintf(_m('Your Twitter bridge has been disabled')); $site_name = common_config('site', 'name'); + // TRANS: Mail body after forwarding notices to Twitter has stopped working. + // TRANS: %1$ is the name of the user the mail is sent to, %2$s is a URL to the + // TRANS: Twitter settings, %3$s is the StatusNet sitename. $body = sprintf(_m('Hi, %1$s. We\'re sorry to inform you that your ' . 'link to Twitter has been disabled. We no longer seem to have ' . 'permission to update your Twitter status. Did you maybe revoke ' .