Use static class method for looking up Twitter user

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

diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php
index de30d9ebf1d8999fcc7a23967e3e091ca3aaded6..e5afde62ca728771af2432038681a42d0e0704ab 100644 (file)
--- a/plugins/TwitterBridge/twitter.php
+++ b/plugins/TwitterBridge/twitter.php
@@ -28,28 +28,18 @@ require_once INSTALLDIR . '/plugins/TwitterBridge/twitteroauthclient.php';
 
 function add_twitter_user($twitter_id, $screen_name)
 {
-
-    $new_uri = 'http://twitter.com/' . $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 = new Foreign_user();
-    $luser->uri = $new_uri;
-    $luser->service = TWITTER_SERVICE;
+    $luser = Foreign_user::getForeignUser($twitter_id, TWITTER_SERVICE);
     $result = $luser->delete();
 
-    if (empty($result)) {
-        common_log(LOG_WARNING,
-            "Twitter bridge - removed invalid Twitter user squatting on uri: $new_uri");
+    if ($result != false) {
+        common_log(LOG_INFO,
+            "Twitter bridge - removed old Twitter user: $screen_name ($twitter_id).");
     }
 
-    $luser->free();
-    unset($luser);
-
-    // Otherwise, create a new Twitter user
-
     $fuser = new Foreign_user();
 
     $fuser->nickname = $screen_name;
@@ -64,7 +54,8 @@ function add_twitter_user($twitter_id, $screen_name)
             "Twitter bridge - failed to add new Twitter user: $twitter_id - $screen_name.");
         common_log_db_error($fuser, 'INSERT', __FILE__);
     } else {
-        common_debug("Twitter bridge - Added new Twitter user: $screen_name ($twitter_id).");
+        common_log(LOG_INFO,
+                   "Twitter bridge - Added new Twitter user: $screen_name ($twitter_id).");
     }
 
     return $result;
@@ -93,9 +84,9 @@ function save_twitter_user($twitter_id, $screen_name)
                                          $screen_name,
                                          $oldname));
         }
-
-        return add_twitter_user($twitter_id, $screen_name);
     }
+
+    return add_twitter_user($twitter_id, $screen_name);
 }
 
 function is_twitter_bound($notice, $flink) {