From 0f8b902004dc7245a56307ed69c766d949f06dc3 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <git@evanprodromou.name>
Date: Thu, 8 Jan 2009 16:15:08 -0500
Subject: Revert "Twitter-compatible API - update verify_credentials to return
 profile"

This reverts commit b801f73b1f4706f15783f91fd07508a03175592d.

Twhirl assumes we return the old kind of results, so we have to do that.
---
 actions/twitapiusers.php | 70 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 68 insertions(+), 2 deletions(-)

(limited to 'actions/twitapiusers.php')

diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index 9e06efa64..337ec91d1 100644
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -31,6 +31,7 @@ class TwitapiusersAction extends TwitterapiAction {
 			return;
 		}
 
+		$this->auth_user = $apidata['user'];
 		$user = null;
 		$email = $this->arg('email');
 
@@ -46,7 +47,72 @@ class TwitapiusersAction extends TwitterapiAction {
 			return;
 		}
 
-		$this->show_extended_profile($user, $apidata);
-	}
+		$profile = $user->getProfile();
+
+		if (!$profile) {
+			common_server_error(_('User has no profile.'));
+			return;
+		}
+
+		$twitter_user = $this->twitter_user_array($profile, true);
+
+		// Add in extended user fields offered up by this method
+		$twitter_user['created_at'] = $this->date_twitter($profile->created);
+
+		$subbed = DB_DataObject::factory('subscription');
+		$subbed->subscriber = $profile->id;
+		$subbed_count = (int) $subbed->count() - 1;
+
+		$notices = DB_DataObject::factory('notice');
+		$notices->profile_id = $profile->id;
+		$notice_count = (int) $notices->count();
+
+		$twitter_user['friends_count'] = (is_int($subbed_count)) ? $subbed_count : 0;
+		$twitter_user['statuses_count'] = (is_int($notice_count)) ? $notice_count : 0;
+
+		// Other fields Twitter sends...
+		$twitter_user['profile_background_color'] = '';
+		$twitter_user['profile_text_color'] = '';
+		$twitter_user['profile_link_color'] = '';
+		$twitter_user['profile_sidebar_fill_color'] = '';
+
+		$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_json_objects($twitter_user);
+			$this->end_document('json');
+		}
+
+	}
 }
-- 
cgit v1.2.3-54-g00ecf