Store foreign ID for synch info, not user ID

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

diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
index c5c2752212d8d4c4d2af3b4df6f660e159abba77..79c9155035cda2ad6a09d36b21e9ae2a580b0620 100755 (executable)
--- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
+++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
@@ -182,7 +182,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon
 
         $timeline = null;
 
-        $lastId = Twitter_synch_status::getLastId($flink->user_id, 'home_timeline');
+        $lastId = Twitter_synch_status::getLastId($flink->foreign_id, 'home_timeline');
 
         try {
             $timeline = $client->statusesHomeTimeline($lastId);
@@ -200,8 +200,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon
 
         common_debug(LOG_INFO, $this->name() . ' - Retrieved ' . sizeof($timeline) . ' statuses from Twitter.');
 
-        $lastSeenId = null;
-
         // Reverse to preserve order
 
         foreach (array_reverse($timeline) as $status) {
@@ -232,9 +230,11 @@ class TwitterStatusFetcher extends ParallelizingDaemon
             }
         }
 
-        if (!empty($lastSeenId)) {
-            Twitter_synch_status::setLastId($flink->user_id, 'home_timeline', $lastSeenId);
-        }
+        assert(!empty($timeline)); // checked above
+
+        // First status is last in time
+
+        Twitter_synch_status::setLastId($flink->foreign_id, 'home_timeline', $timeline[0]->id);
 
         // Okay, record the time we synced with Twitter for posterity