X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FTwitterBridge%2Ftwitter.php;h=b607fe605275e49fba5837207b6e9b87e4eb60bd;hb=5c6b98e821b5ad30fc0aa2e92e57c7cd95730c2e;hp=b34488069aaa2e2e1255433f3dfa104b8c49bbe2;hpb=8a21b13ee93cf46626ba9e99a4fda44587e6d1a1;p=quix0rs-gnu-social.git diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php index b34488069a..b607fe6052 100644 --- a/plugins/TwitterBridge/twitter.php +++ b/plugins/TwitterBridge/twitter.php @@ -1,7 +1,7 @@ nickname != $screen_name) { @@ -83,7 +80,6 @@ function save_twitter_user($twitter_id, $screen_name) $screen_name, $oldname)); } - } else { // Kill any old, invalid records for this screen name $fuser = Foreign_user::getByNickname($screen_name, TWITTER_SERVICE); @@ -106,14 +102,28 @@ 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)) + && (($flink->noticesync & FOREIGN_NOTICE_RECV) == FOREIGN_NOTICE_RECV)) || + (empty($notice->reply_to) && !preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content)) ){ return true; } } @@ -123,11 +133,39 @@ 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)); } +/** + * Pull the formatted status ID number from a Twitter status object + * returned via JSON from Twitter API. + * + * Encapsulates checking for the id_str attribute, which is required + * to read 64-bit "Snowflake" ID numbers on a 32-bit system -- the + * integer id attribute gets corrupted into a double-precision float, + * losing a few digits of precision. + * + * Warning: avoid performing arithmetic or direct comparisons with + * this number, as it may get coerced back to a double on 32-bit. + * + * @param object $status + * @param string $field base field name if not 'id' + * @return mixed id number as int or string + */ +function twitter_id($status, $field='id') +{ + $field_str = "{$field}_str"; + if (isset($status->$field_str)) { + // String version of the id -- required on 32-bit systems + // since the 64-bit numbers get corrupted as ints. + return $status->$field_str; + } else { + return $status->$field; + } +} + /** * Check if we need to broadcast a notice over the Twitter bridge, and * do so if necessary. Will determine whether to do a straight post or @@ -145,18 +183,20 @@ function broadcast_twitter($notice) // 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, $retweet->id); - return true; + 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); } } @@ -200,7 +240,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 { @@ -224,7 +264,7 @@ 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; @@ -242,14 +282,13 @@ function broadcast_oauth($notice, $flink) { try { $status = $client->statusesUpdate($statustxt, $params); if (!empty($status)) { - Notice_to_status::saveNew($notice->id, $status->id); + Notice_to_status::saveNew($notice->id, twitter_id($status)); } } catch (OAuthClientException $e) { return process_error($e, $flink, $notice); } 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 ' . @@ -290,7 +329,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); @@ -300,6 +352,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 @@ -321,7 +380,7 @@ function format_status($notice) // Twitter still has a 140-char hardcoded max. if (mb_strlen($statustxt) > 140) { - $noticeUrl = common_shorten_url($notice->uri); + $noticeUrl = common_shorten_url($notice->getUrl()); $urlLen = mb_strlen($noticeUrl); $statustxt = mb_substr($statustxt, 0, 140 - ($urlLen + 3)) . ' … ' . $noticeUrl; } @@ -376,10 +435,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 ' .