Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / plugins / TwitterBridge / twitter.php

diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php
index b607fe605275e49fba5837207b6e9b87e4eb60bd..6b7e2179e66d6c4657710df326388a5f3e8b5bf5 100644 (file)
--- a/plugins/TwitterBridge/twitter.php
+++ b/plugins/TwitterBridge/twitter.php
@@ -28,16 +28,17 @@ function add_twitter_user($twitter_id, $screen_name)
     // Clear out any bad old foreign_users with the new user's legit URL
     // This can happen when users move around or fakester accounts get
     // repoed, and things like that.
-    $luser = Foreign_user::getForeignUser($twitter_id, TWITTER_SERVICE);
-
-    if (!empty($luser)) {
-        $result = $luser->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();
@@ -49,9 +50,8 @@ function add_twitter_user($twitter_id, $screen_name)
     $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,
@@ -66,11 +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);
+    try {
+        $fuser = Foreign_user::getForeignUser($twitter_id, TWITTER_SERVICE);
 
-    if (!empty($fuser)) {
         // Delete old record if Twitter user changed screen name
-
         if ($fuser->nickname != $screen_name) {
             $oldname = $fuser->nickname;
             $fuser->delete();
@@ -80,11 +79,13 @@ function save_twitter_user($twitter_id, $screen_name)
                                          $screen_name,
                                          $oldname));
         }
-    } else {
+    } catch (NoResultException $e) {
+        // No old users exist for this id
+    
         // 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,
@@ -95,6 +96,8 @@ function save_twitter_user($twitter_id, $screen_name)
                     $fuser->id
                 )
             );
+        } catch (NoResultException $e) {
+            // No old users exist for this screen_name
         }
     }
 
@@ -121,8 +124,7 @@ function is_twitter_bound($notice, $flink) {
         // 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 ( (($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)) ||
+               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;
         }
@@ -178,11 +180,15 @@ 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 (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));
@@ -270,8 +276,13 @@ function twitter_update_params($notice)
     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);