Fixed routing for direct messages and favorites in the API

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

diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index d352b933b9d320713f79f65f4d16b907ee70afd9..c50c5e84a9dcc948682e80d55c0a26641a726dd6 100644 (file)
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -21,13 +21,15 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class TwitapifriendshipsAction extends TwitterapiAction {
+class TwitapifriendshipsAction extends TwitterapiAction
+{
 
-    function create($args, $apidata) {
+    function create($args, $apidata)
+    {
         parent::handle($args);
 
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-            $this->client_error(_('This method requires a POST.'), 400, $apidata['content-type']);
+            $this->clientError(_('This method requires a POST.'), 400, $apidata['content-type']);
             return;
         }
 
@@ -36,7 +38,7 @@ class TwitapifriendshipsAction extends TwitterapiAction {
         $other = $this->get_user($id);
 
         if (!$other) {
-            $this->client_error(_('Could not follow user: User not found.'), 403, $apidata['content-type']);
+            $this->clientError(_('Could not follow user: User not found.'), 403, $apidata['content-type']);
             return;
         }
 
@@ -44,7 +46,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']);
+            $this->clientError($errmsg, 403, $apidata['content-type']);
             return;
         }
 
@@ -60,7 +62,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']);
+            $this->clientError($errmsg, 400, $apidata['content-type']);
             return;
         }
 
@@ -75,11 +77,12 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 
     }
 
-    function destroy($args, $apidata) {
+    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']);
+            $this->clientError(_('This method requires a POST or DELETE.'), 400, $apidata['content-type']);
             return;
         }
 
@@ -94,12 +97,12 @@ class TwitapifriendshipsAction extends TwitterapiAction {
         $sub->subscriber = $user->id;
         $sub->subscribed = $other->id;
 
-        if ($sub->find(TRUE)) {
+        if ($sub->find(true)) {
             $sub->query('BEGIN');
             $sub->delete();
             $sub->query('COMMIT');
         } else {
-            $this->client_error(_('You are not friends with the specified user.'), 403, $apidata['content-type']);
+            $this->clientError(_('You are not friends with the specified user.'), 403, $apidata['content-type']);
             return;
         }
 
@@ -110,11 +113,12 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 
     }
 
-    function exists($args, $apidata) {
+    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);
+            $this->clientError(_('API method not found!'), $code = 404);
             return;
         }
 
@@ -125,7 +129,7 @@ class TwitapifriendshipsAction extends TwitterapiAction {
         $user_b = $this->get_user($user_b_id);
 
         if (!$user_a || !$user_b) {
-            $this->client_error(_('Two user ids or screen_names must be supplied.'), 400, $apidata['content-type']);
+            $this->clientError(_('Two user ids or screen_names must be supplied.'), 400, $apidata['content-type']);
             return;
         }
 
@@ -138,7 +142,7 @@ class TwitapifriendshipsAction extends TwitterapiAction {
         switch ($apidata['content-type']) {
          case 'xml':
             $this->init_document('xml');
-            common_element('friends', NULL, $result);
+            $this->element('friends', null, $result);
             $this->end_document('xml');
             break;
          case 'json':