Make it clearer that we're handling group IDs

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

diff --git a/plugins/TwitterBridge/scripts/streamtest.php b/plugins/TwitterBridge/scripts/streamtest.php
index aad15fdeab95a02c0a30851c73dc90dcd9ba267a..a642920cee908e09b0363c03a0c9cc52c4958dd2 100644 (file)
--- a/plugins/TwitterBridge/scripts/streamtest.php
+++ b/plugins/TwitterBridge/scripts/streamtest.php
@@ -44,8 +44,8 @@ data as it comes.
 ENDOFHELP;
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
-require_once dirname(dirname(__FILE__)) . '/jsonstreamreader.php';
-require_once dirname(dirname(__FILE__)) . '/twitterstreamreader.php';
+require_once dirname(dirname(__FILE__)) . '/lib/jsonstreamreader.php';
+require_once dirname(dirname(__FILE__)) . '/lib/twitterstreamreader.php';
 
 if (have_option('n')) {
     $nickname = get_option_value('n');
@@ -63,12 +63,7 @@ if (have_option('n')) {
  */
 function twitterAuthForUser(User $user)
 {
-    $flink = Foreign_link::getByUserID($user->id,
-                                       TWITTER_SERVICE);
-    if (!$flink) {
-        throw new ServerException("No Twitter config for this user.");
-    }
-
+    $flink = Foreign_link::getByUserID($user->id, TWITTER_SERVICE);
     $token = TwitterOAuthClient::unpackToken($flink->credentials);
     if (!$token) {
         throw new ServerException("No Twitter OAuth credentials for this user.");
@@ -113,7 +108,7 @@ function siteStreamForOwner(User $user)
 }
 
 
-$user = User::staticGet('nickname', $nickname);
+$user = User::getKV('nickname', $nickname);
 global $myuser;
 $myuser = $user;
 
@@ -170,11 +165,7 @@ $stream->hookEvent('status', function($data, $context) {
         $importer = new TwitterImport();
         printf("\timporting...");
         $notice = $importer->importStatus($data);
-        if ($notice) {
-            global $myuser;
-            Inbox::insertNotice($myuser->id, $notice->id);
-            printf(" %s\n", $notice->id);
-        } else {
+        if (!$notice instanceof Notice) {
             printf(" FAIL\n");
         }
     }