Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/plugins/TwitterBridge/scripts/fakestream.php b/plugins/TwitterBridge/scripts/fakestream.php
index 369688816229ac1d86eafc89c88cf747d4f75669..7e192cf8b44623b59fc96b5081e7e8022a554b25 100644 (file)
--- a/plugins/TwitterBridge/scripts/fakestream.php
+++ b/plugins/TwitterBridge/scripts/fakestream.php
@@ -42,7 +42,7 @@ data as it comes.
 
 ENDOFHELP;
 
-require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 
 if (have_option('n')) {
     $nickname = get_option_value('n');
@@ -62,12 +62,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.");
@@ -109,13 +104,13 @@ if (have_option('all')) {
         }
     }
 } else {
-    $user = User::staticGet('nickname', $nickname);
+    $user = User::getKV('nickname', $nickname);
     $users = array($user->id);
 }
 
 $output = array();
 foreach ($users as $id) {
-    $user = User::staticGet('id', $id);
+    $user = User::getKV('id', $id);
     if (!$user) {
         throw new Exception("No user for id $id");
     }