From fe2ebec732ecae97b0616cdf627cbaeaf53dab48 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 15 Feb 2010 21:10:45 +0000
Subject: [PATCH] Fix for regression introduced with my last update to the
 TwitterStatusFetcher: the Twitter bridge was not saving a foreign user record
 when making a foreign link.

---
 plugins/TwitterBridge/twitter.php              |  7 ++++---
 plugins/TwitterBridge/twitterauthorization.php | 14 +++++++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php
index 5761074c25..1d46aa2c91 100644
--- a/plugins/TwitterBridge/twitter.php
+++ b/plugins/TwitterBridge/twitter.php
@@ -28,6 +28,7 @@ require_once INSTALLDIR . '/plugins/TwitterBridge/twitteroauthclient.php';
 
 function add_twitter_user($twitter_id, $screen_name)
 {
+    common_debug("Add Twitter user");
 
     $new_uri = 'http://twitter.com/' . $screen_name;
 
@@ -40,7 +41,7 @@ function add_twitter_user($twitter_id, $screen_name)
     $luser->service = TWITTER_SERVICE;
     $result = $luser->delete();
 
-    if (empty($result)) {
+    if ($result != false) {
         common_log(LOG_WARNING,
             "Twitter bridge - removed invalid Twitter user squatting on uri: $new_uri");
     }
@@ -93,9 +94,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) {
diff --git a/plugins/TwitterBridge/twitterauthorization.php b/plugins/TwitterBridge/twitterauthorization.php
index dbef438a4b..6822d33dd1 100644
--- a/plugins/TwitterBridge/twitterauthorization.php
+++ b/plugins/TwitterBridge/twitterauthorization.php
@@ -89,11 +89,15 @@ class TwitterauthorizationAction extends Action
             $user  = common_current_user();
             $flink = Foreign_link::getByUserID($user->id, TWITTER_SERVICE);
 
-            // If there's already a foreign link record, it means we already
-            // have an access token, and this is unecessary. So go back.
+            // If there's already a foreign link record and a foreign user
+            // it means the accounts are already linked, and this is unecessary.
+            // So go back.
 
             if (isset($flink)) {
-                common_redirect(common_local_url('twittersettings'));
+                $fuser = $flink->getForeignUser();
+                if (!empty($fuser)) {
+                    common_redirect(common_local_url('twittersettings'));
+                }
             }
         }
 
@@ -254,6 +258,10 @@ class TwitterauthorizationAction extends Action
     {
         $flink = new Foreign_link();
 
+        $flink->user_id = $user_id;
+        $flink->service = TWITTER_SERVICE;
+        $flink->delete(); // delete stale flink, if any
+
         $flink->user_id     = $user_id;
         $flink->foreign_id  = $twuid;
         $flink->service     = TWITTER_SERVICE;