Merge branch 'master' into nightly

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

diff --git a/plugins/TwitterBridge/lib/tweetinqueuehandler.php b/plugins/TwitterBridge/lib/tweetinqueuehandler.php
index 4315f0f81b5df383020d4ce4d75a66b57f7029cf..69ce5a61e97302518ee4011b8b15749adb34c414 100644 (file)
--- a/plugins/TwitterBridge/lib/tweetinqueuehandler.php
+++ b/plugins/TwitterBridge/lib/tweetinqueuehandler.php
@@ -19,7 +19,7 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
-require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
+require_once dirname(__DIR__) . '/twitter.php';
 
 /**
  * Queue handler to deal with incoming Twitter status updates, as retrieved by
@@ -51,12 +51,19 @@ class TweetInQueueHandler extends QueueHandler
         $importer = new TwitterImport();
         $notice = $importer->importStatus($status);
         if ($notice instanceof Notice) {
-            $flink = Foreign_link::getByForeignID($receiver, TWITTER_SERVICE);
-            if ($flink instanceof Foreign_link) {
+            try {
+                $flink = Foreign_link::getByForeignID($receiver, TWITTER_SERVICE);
                 common_log(LOG_DEBUG, "TweetInQueueHandler - Got flink so add notice ".
-                           $notice->id." to inbox ".$flink->user_id);
-                Attention::saveNew($notice, $flink->getProfile());
-            } else {
+                           $notice->id." to attentions for user ".$flink->user_id);
+                try {
+                    Attention::saveNew($notice, $flink->getProfile());
+                } catch (Exception $e) {
+                    // Log the exception, but make sure we don't bail out, we
+                    // still have a queue item to remove here-after.
+                    common_log(LOG_ERR, "Failed adding notice {$notice->id} to attentions for user {$flink->user_id}: " .
+                                        $e->getMessage());
+                }
+            } catch (NoResultException $e) {
                common_log(LOG_DEBUG, "TweetInQueueHandler - No flink found for foreign user ".$receiver);
             }
         }