Merge branch 'master' into social-master

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

diff --git a/plugins/TwitterBridge/scripts/streamtest.php b/plugins/TwitterBridge/scripts/streamtest.php
index a175c1efa54e479ef2cb52cecec46adffbb55927..dc427a19fa1f73314676bb5dafba9812f83f8e42 100644 (file)
--- a/plugins/TwitterBridge/scripts/streamtest.php
+++ b/plugins/TwitterBridge/scripts/streamtest.php
@@ -28,7 +28,7 @@
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
 
 $shortoptions = 'n:';
-$longoptions = array('nick=','import','all');
+$longoptions = array('nick=','import','all','apiroot=');
 
 $helptext = <<<ENDOFHELP
 USAGE: streamtest.php -n <username>
@@ -36,15 +36,16 @@ USAGE: streamtest.php -n <username>
   -n --nick=<username> Local user whose Twitter timeline to watch
      --import          Experimental: run incoming messages through import
      --all             Experimental: run multiuser; requires nick be the app owner
+     --apiroot=<url>   Provide alternate streaming API root URL
 
 Attempts a User Stream connection to Twitter as the given user, dumping
 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 INSTALLDIR.'/scripts/commandline.inc.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');
@@ -86,7 +87,12 @@ function siteStreamForOwner(User $user)
 {
     // The user we auth as must be the owner of the application.
     $auth = twitterAuthForUser($user);
-    $stream = new TwitterSiteStream($auth);
+
+    if (have_option('apiroot')) {
+        $stream = new TwitterSiteStream($auth, get_option_value('apiroot'));
+    } else {
+        $stream = new TwitterSiteStream($auth);
+    }
 
     // Pull Twitter user IDs for all users we want to pull data for
     $userIds = array();
@@ -107,7 +113,7 @@ function siteStreamForOwner(User $user)
 }
 
 
-$user = User::staticGet('nickname', $nickname);
+$user = User::getKV('nickname', $nickname);
 global $myuser;
 $myuser = $user;
 
@@ -164,11 +170,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");
         }
     }