fix calls to show_rss_timeline

[quix0rs-gnu-social.git] / actions / twitapifriendships.php

diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index f9ff251d67f2a995c589ff4d2a1ff01accb68221..e4b49cbe4a92529cc2c470b2779ec68dfa8b96f4 100644 (file)
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -23,26 +23,12 @@ require_once(INSTALLDIR.'/lib/twitterapi.php');
 
 class TwitapifriendshipsAction extends TwitterapiAction {
 
-       function is_readonly() {
-
-               static $write_methods = array(  'create',
-                                                                               'destroy');
-
-               $cmdtext = explode('.', $this->arg('method'));
-
-               if (in_array($cmdtext[0], $write_methods)) {
-                       return false;
-               }
-
-               return true;
-       }
-
        function create($args, $apidata) {
                parent::handle($args);
 
                if ($_SERVER['REQUEST_METHOD'] != 'POST') {
                        $this->client_error(_('This method requires a POST.'), 400, $apidata['content-type']);
-                       exit();
+                       return;
                }
 
                $id = $apidata['api_arg'];
@@ -51,7 +37,7 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 
                if (!$other) {
                        $this->client_error(_('Could not follow user: User not found.'), 403, $apidata['content-type']);
-                       exit();
+                       return;
                }
 
                $user = $apidata['user'];
@@ -59,7 +45,7 @@ class TwitapifriendshipsAction extends TwitterapiAction {
                if ($user->isSubscribed($other)) {
                        $errmsg = sprintf(_('Could not follow user: %s is already on your list.'), $other->nickname);
                        $this->client_error($errmsg, 403, $apidata['content-type']);
-                       exit();
+                       return;
                }
 
                $sub = new Subscription();
@@ -75,7 +61,7 @@ class TwitapifriendshipsAction extends TwitterapiAction {
                if (!$result) {
                        $errmsg = sprintf(_('Could not follow user: %s is already on your list.'), $other->nickname);
                        $this->client_error($errmsg, 400, $apidata['content-type']);
-                       exit();
+                       return;
                }
 
                $sub->query('COMMIT');
@@ -86,27 +72,15 @@ class TwitapifriendshipsAction extends TwitterapiAction {
                $this->init_document($type);
                $this->show_profile($other, $type);
                $this->end_document($type);
-               exit();
-       }
 
-       //destroy
-       //
-       //Discontinues friendship with the user specified in the ID parameter as the authenticating user.  Returns the un-friended user in the requested format when successful.  Returns a string describing the failure condition when unsuccessful.
-       //
-       //URL: http://twitter.com/friendships/destroy/id.format
-       //
-       //Formats: xml, json
-       //
-       //Parameters:
-       //
-       //* id.  Required.  The ID or screen name of the user with whom to discontinue friendship.  Ex: http://twitter.com/friendships/destroy/12345.json or http://twitter.com/friendships/destroy/bob.xml
+       }
 
        function destroy($args, $apidata) {
                parent::handle($args);
 
                if (!in_array($_SERVER['REQUEST_METHOD'], array('POST', 'DELETE'))) {
                        $this->client_error(_('This method requires a POST or DELETE.'), 400, $apidata['content-type']);
-                       exit();
+                       return;
                }
 
                $id = $apidata['api_arg'];
@@ -126,35 +100,22 @@ class TwitapifriendshipsAction extends TwitterapiAction {
                        $sub->query('COMMIT');
                } else {
                        $this->client_error(_('You are not friends with the specified user.'), 403, $apidata['content-type']);
-                       exit();
+                       return;
                }
 
                $type = $apidata['content-type'];
                $this->init_document($type);
                $this->show_profile($other, $type);
                $this->end_document($type);
-               exit();
-       }
 
-       //      Tests if a friendship exists between two users.
-       //
-       //
-       //        URL: http://twitter.com/friendships/exists.format
-       //
-       //      Formats: xml, json, none
-       //
-       //        Parameters:
-       //
-       //          * user_a.  Required.  The ID or screen_name of the first user to test friendship for.
-       //            * user_b.  Required.  The ID or screen_name of the second user to test friendship for.
-       //        * Ex: http://twitter.com/friendships/exists.xml?user_a=alice&user_b=bob
+       }
 
        function exists($args, $apidata) {
                parent::handle($args);
 
                if (!in_array($apidata['content-type'], array('xml', 'json'))) {
                        common_user_error(_('API method not found!'), $code = 404);
-                       exit;
+                       return;
                }
 
                $user_a_id = $this->trimmed('user_a');
@@ -165,7 +126,7 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 
                if (!$user_a || !$user_b) {
                        $this->client_error(_('Two user ids or screen_names must be supplied.'), 400, $apidata['content-type']);
-                       exit();
+                       return;
                }
 
                if ($user_a->isSubscribed($user_b)) {
@@ -189,7 +150,6 @@ class TwitapifriendshipsAction extends TwitterapiAction {
                        break;
                }
 
-               exit();
        }
 
 }
\ No newline at end of file