X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FTwitterBridge%2Ftwitter.php;h=4ff1a344a124532ec3c2d063ce661a7e5bd0aaef;hb=2e6a32c7bee6a47ddfe6b80f5769359f6d0979d4;hp=f5a0b62588d7428062a65bed2edf51bd098a8fbc;hpb=b7d07466943a73e1c009467c8daa6e499810080f;p=quix0rs-gnu-social.git diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php index f5a0b62588..4ff1a344a1 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,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 +132,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)); } @@ -175,7 +184,7 @@ function broadcast_twitter($notice) if (!empty($flink) && 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::staticGet('id', $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; @@ -230,7 +239,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 { @@ -254,7 +263,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; @@ -279,7 +288,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 ' . @@ -320,7 +328,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); @@ -330,6 +351,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 @@ -351,7 +379,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; } @@ -406,10 +434,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 ' .