Merge branch 'master' into 0.9.x

diff --combined plugins/TwitterBridge/TwitterBridgePlugin.php
index f5c3612506c6627410dc4b48842bdd20b915cb89,b520a4544fa9455196ad497edbf522c208cba621..b2dce6f1c092148c7b2502fb6370bc1676723762
--- 1/plugins/TwitterBridge/TwitterBridgePlugin.php
--- 2/plugins/TwitterBridge/TwitterBridgePlugin.php
+++ b/plugins/TwitterBridge/TwitterBridgePlugin.php
@@@ -200,15 -200,8 +200,15 @@@ class TwitterBridgePlugin extends Plugi
              return false;
          case 'TwitterOAuthClient':
          case 'TwitterQueueHandler':
 +        case 'TwitterImport':
 +        case 'JsonStreamReader':
 +        case 'TwitterStreamReader':
              include_once $dir . '/' . strtolower($cls) . '.php';
              return false;
 +        case 'TwitterSiteStream':
 +        case 'TwitterUserStream':
 +            include_once $dir . '/twitterstreamreader.php';
 +            return false;
          case 'Notice_to_status':
          case 'Twitter_synch_status':
              include_once $dir . '/' . $cls . '.php';
@@@ -274,11 -267,7 +274,11 @@@
      function onEndInitializeQueueManager($manager)
      {
          if (self::hasKeys()) {
 +            // Outgoing notices -> twitter
              $manager->connect('twitter', 'TwitterQueueHandler');
 +
 +            // Incoming statuses <- twitter
 +            $manager->connect('tweetin', 'TweetInQueueHandler');
          }
          return true;
      }
@@@ -438,10 -427,14 +438,14 @@@
                  return true;
              }
  
-             $token = TwitterOAuthClient::unpackToken($flink->credentials);
-             $client = new TwitterOAuthClient($token->key, $token->secret);
+             try {
+                 $token = TwitterOAuthClient::unpackToken($flink->credentials);
+                 $client = new TwitterOAuthClient($token->key, $token->secret);
  
-             $client->statusesDestroy($n2s->status_id);
+                 $client->statusesDestroy($n2s->status_id);
+             } catch (Exception $e) {
+                 common_log(LOG_ERR, "Error attempting to delete bridged notice from Twitter: " . $e->getMessage());
+             }
  
              $n2s->delete();
          }
@@@ -475,10 -468,14 +479,14 @@@
              return true;
          }
  
-         $token = TwitterOAuthClient::unpackToken($flink->credentials);
-         $client = new TwitterOAuthClient($token->key, $token->secret);
+         try {
+             $token = TwitterOAuthClient::unpackToken($flink->credentials);
+             $client = new TwitterOAuthClient($token->key, $token->secret);
  
-         $client->favoritesCreate($status_id);
+             $client->favoritesCreate($status_id);
+         } catch (Exception $e) {
+             common_log(LOG_ERR, "Error attempting to favorite bridged notice on Twitter: " . $e->getMessage());
+         }
  
          return true;
      }
@@@ -511,10 -508,14 +519,14 @@@
              return true;
          }
  
-         $token = TwitterOAuthClient::unpackToken($flink->credentials);
-         $client = new TwitterOAuthClient($token->key, $token->secret);
+         try {
+             $token = TwitterOAuthClient::unpackToken($flink->credentials);
+             $client = new TwitterOAuthClient($token->key, $token->secret);
  
-         $client->favoritesDestroy($status_id);
+             $client->favoritesDestroy($status_id);
+         } catch (Exception $e) {
+             common_log(LOG_ERR, "Error attempting to unfavorite bridged notice on Twitter: " . $e->getMessage());
+         }
  
          return true;
      }