Fixed routing for direct messages and favorites in the API

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

diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index 6dad5381842cb2be001924d53cb26b1e9007bc0e..8f16e56131e87f3ec2f2173fa4bd275d8dda0980 100644 (file)
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -10,77 +10,50 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.     If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
 if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class TwitapiusersAction extends TwitterapiAction {
+class TwitapiusersAction extends TwitterapiAction
+{
 
-       function is_readonly() {                        
-               return true;
-       }
-
-/*     
-       Returns extended information of a given user, specified by ID or
-       screen name as per the required id parameter below.      This information
-       includes design settings, so third party developers can theme their
-       widgets according to a given user's preferences. You must be properly
-       authenticated to request the page of a protected user.
-
-       URL: http://twitter.com/users/show/id.format
-
-       Formats: xml, json
-
-       Parameters:
-
-       * id.  Required.  The ID or screen name of a user.
-       Ex: http://twitter.com/users/show/12345.json or
-       http://twitter.com/users/show/bob.xml
+    function show($args, $apidata)
+    {
+        parent::handle($args);
 
-       * email. Optional.      The email address of a user.  Ex:
-       http://twitter.com/users/show.xml?email=test@example.com
+        if (!in_array($apidata['content-type'], array('xml', 'json'))) {
+            $this->clientError(_('API method not found!'), $code = 404);
+            return;
+        }
 
-*/     
-       function show($args, $apidata) {
-               parent::handle($args);
-               
+ $this->auth_user = $apidata['user'];
                $user = null;
                $email = $this->arg('email');
-               
-               if (isset($apidata['api_arg'])) {
-                       if (is_numeric($apidata['api_arg'])) {
-                               // by user id
-                               $user = User::staticGet($apidata['api_arg']);                   
-                       } else {
-                               // by nickname
-                               $nickname = common_canonical_nickname($apidata['api_arg']);
-                               $user = User::staticGet('nickname', $nickname);
-                       } 
-               } elseif ($email) {
-                       // or, find user by email address
-                       // XXX: The Twitter API spec say an id is *required*, but you can actually
-                       // pull up a user with just an email address. -- Zach
-                       $user = User::staticGet('email', $email);                       
-               } 
+
+               if ($email) {
+                       $user = User::staticGet('email', $email);
+               } elseif (isset($apidata['api_arg'])) {
+                       $user = $this->get_user($apidata['api_arg']);
+               }
 
                if (!$user) {
                        // XXX: Twitter returns a random(?) user instead of throwing and err! -- Zach
-                       $this->client_error(_('User not found.'), 404, $apidata['content-type']);
-                       exit();
+                       $this->client_error(_('Not found.'), 404, $apidata['content-type']);
+                       return;
                }
-               
+
                $profile = $user->getProfile();
 
                if (!$profile) {
                        common_server_error(_('User has no profile.'));
-                       exit();
+                       return;
                }
 
                $twitter_user = $this->twitter_user_array($profile, true);
@@ -104,24 +77,44 @@ class TwitapiusersAction extends TwitterapiAction {
                $twitter_user['profile_text_color'] = '';
                $twitter_user['profile_link_color'] = '';
                $twitter_user['profile_sidebar_fill_color'] = '';
-               $twitter_user['favourites_count'] = 0;
-               $twitter_user['utc_offset'] = '';
-               $twitter_user['time_zone'] = '';
-               $twitter_user['following'] = '';
-               $twitter_user['notifications'] = '';
 
-               if ($apidata['content-type'] == 'xml') { 
+               $faves = DB_DataObject::factory('fave');
+               $faves->user_id = $user->id;
+               $faves_count = (int) $faves->count();
+               $twitter_user['favourites_count'] = $faves_count;
+
+               $timezone = 'UTC';
+
+               if ($user->timezone) {
+                       $timezone = $user->timezone;
+               }
+
+               $t = new DateTime;
+               $t->setTimezone(new DateTimeZone($timezone));
+               $twitter_user['utc_offset'] = $t->format('Z');
+               $twitter_user['time_zone'] = $timezone;
+
+               if (isset($this->auth_user)) {
+
+                       if ($this->auth_user->isSubscribed($profile)) {
+                               $twitter_user['following'] = 'true';
+                       } else {
+                               $twitter_user['following'] = 'false';
+                       }
+
+                       // Not implemented yet
+                       $twitter_user['notifications'] = 'false';
+               }
+
+               if ($apidata['content-type'] == 'xml') {
                        $this->init_document('xml');
                        $this->show_twitter_xml_user($twitter_user);
                        $this->end_document('xml');
                } elseif ($apidata['content-type'] == 'json') {
                        $this->init_document('json');
-                       $this->show_twitter_json_users($twitter_user);
+                       $this->show_json_objects($twitter_user);
                        $this->end_document('json');
-               } else {
-                       common_user_error(_('API method not found!'), $code = 404);
                }
-                       
-               exit();
+
        }
 }