show friendship stuff

darcs-hash:20080718041323-84dde-2cc93bd2ced792797db634c4c4cd2a72a6ae61be.gz

2 files changed, 170 insertions, 28 deletions

diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index e4888008b..c8fe95029 100644
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -23,23 +23,146 @@ require_once(INSTALLDIR.'/lib/twitterapi.php');
 
 class TwitapifriendshipsAction extends TwitterapiAction {
 
-
 	function create($args, $apidata) {
 		parent::handle($args);
-		common_server_error("API method under construction.", $code=501);
+
+		$id = $this->trimmed('id');
+
+		$other = $this->get_user($id);
+
+		if (!$other) {
+			$this->client_error(_('No such user'));
+			return;
+		}
+		
+		$user = $apidata['user'];
+		
+		if ($user->isSubscribed($other)) {
+			$this->client_error(_('Already subscribed.'));
+			return;
+		}
+		
+		$sub = new Subscription();
+		$sub->subscriber = $user->id;
+		$sub->subscribed = $other->id;
+
+		$result = $sub->insert();
+
+		if (!$result) {
+			$this->server_error(_('Could not subscribe'));
+			return;
+		}
+		
+		mail_subscribe_notify($other, $user);
+
+		$this->show_profile($other);
 		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);
-		common_server_error("API method under construction.", $code=501);
+		$id = $this->trimmed('id');
+
+		# We can't subscribe to a remote person, but we can unsub
+		
+		$other = $this->get_profile($id);
+		$user = $apidata['user'];
+		
+		$sub = new Subscription();
+		$sub->subscriber = $user->id;
+		$sub->subscribed = $other->id;
+		
+		if ($sub->fetch(TRUE)) {
+			$sub->delete();
+		}
+
+		$this->show_profile($other);
 		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);
-		common_server_error("API method under construction.", $code=501);
-		exit();
+		$user_a_id = $this->trimmed('user_a');
+		$user_b_id = $this->trimmed('user_b');
+		$user_a = $this->get_profile($user_a_id);
+		$user_b = $this->get_profile($user_b_id);
+		
+		if (!$user_a || !$user_b) {
+			$this->client_error(_('No such user'));
+			return;
+		}
+		
+		if ($user_a->isSubscribed($user_b)) {
+			$result = 'true';
+		} else {
+			$result = 'false';
+		}
+		
+		switch ($apidata['content-type']) {
+		 case 'xml':
+			common_start_xml();
+			common_element('friends', NULL, $result);
+			common_end_xml();
+			break;
+		 case 'json':
+			print json_encode($result);
+			print "\n";
+			break;
+		 default:
+			print $result;
+			break;
+		}
+		
+	}
+
+	function get_profile($id) {
+		if (is_numeric($id)) {
+			return Profile::staticGet($id);
+		} else {
+			$user = User::staticGet('nickname', $id);
+			return $user->getProfile();
+		}
+	}
+	
+	function get_user($id) {
+		if (is_numeric($id)) {
+			return User::staticGet($id);
+		} else {
+			$user = User::staticGet('nickname', $id);
+			return $user->getProfile();
+		}
 	}
 	
+	function show_profile($profile) {
+		$profile_array = $this->user_array($profile);
+		$notice = $profile->getCurrentStatus();
+		if ($notice) {
+			$status_array = $this->status_array($notice):
+		}
+	}
 }
\ No newline at end of file
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index ff46a28f6..b8640fa59 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -25,7 +25,7 @@ class TwitterapiAction extends Action {
 		parent::handle($args);
 	}
 	
-	function twitter_user_array($profile) {
+	function twitter_user_array($profile, $get_notice=false) {
 		
 		$twitter_user = array();
 
@@ -41,11 +41,19 @@ class TwitterapiAction extends Action {
 		$twitter_user['profile_image_url'] = ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE);
 		$twitter_user['protected'] = false; # not supported by Laconica yet
 		$twitter_user['url'] = ($profile->homepage) ? $profile->homepage : NULL;
+
+		if ($get_notice) {
+			$notice = $profile->getCurrentNotice();
+			if ($notice) {
+				# don't get user!
+				$twitter_user['status'] = $this->twitter_status_array($notice, false);
+			} 
+		}
 		
 		return $twitter_user;		
 	}
 
-	function twitter_status_array($notice) {
+	function twitter_status_array($notice, $get_user=true) {
 		
 		$twitter_status = array();
 
@@ -57,10 +65,13 @@ class TwitterapiAction extends Action {
 		$twitter_status['id'] = intval($notice->id);
 		$twitter_status['in_reply_to_user_id'] = ($notice->reply_to) ? $this->replier_by_reply($notice->reply_to) : NULL;
 		$twitter_status['favorited'] = NULL; # XXX: Not implemented on Laconica yet.
-		
-		$profile = $notice->getProfile();
-		$twitter_user = $this->twitter_user_array($profile);
-		$twitter_status['user'] = $twitter_user;
+
+		if ($get_user) {
+			$profile = $notice->getProfile();
+			# Don't get notice (recursive!)
+			$twitter_user = $this->twitter_user_array($profile, false);
+			$twitter_status['user'] = $twitter_user;
+		}
 				
 		return $twitter_status;
 	}
@@ -98,7 +109,9 @@ class TwitterapiAction extends Action {
 		common_element('in_reply_to_user_id', NULL, $twitter_status['in_reply_to_user_id']);
 		common_element('favorited', Null, $twitter_status['favorited']);  
 
-		$this->show_twitter_xml_user($twitter_status['user']);
+		if ($twitter_status['user']) {
+			$this->show_twitter_xml_user($twitter_status['user']);
+		}
 		
 		common_element_end('status');
 	}	
@@ -114,6 +127,9 @@ class TwitterapiAction extends Action {
 		common_element('url', NULL, $twitter_user['url']);
 		common_element('protected', NULL, $twitter_user['protected']);
 		common_element('followers_count', NULL, $twitter_user['followers_count']);
+		if ($twitter_user['status']) {
+			$this->show_twitter_xml_status($twitter_user['status']);
+		}
 		common_element_end('user');
 	}
 
@@ -141,9 +157,11 @@ class TwitterapiAction extends Action {
 	function show_twitter_json_statuses($twitter_statuses) {
 		print(json_encode($twitter_statuses));
 	}
+
+	function show_twitter_json_users($twitter_users) {
+		print(json_encode($twitter_users));
+	}
 	
-	
-		
 	// Anyone know what date format this is? 
 	// Twitter's dates look like this: "Mon Jul 14 23:52:38 +0000 2008" -- Zach 
 	function date_twitter($dt) {
@@ -176,20 +194,7 @@ class TwitterapiAction extends Action {
 		$sub = new Subscription();
 		$sub->subscribed = $profile->id;
 
-		if ($sub->find()) {
-			while ($sub->fetch()) {
-				if ($sub->token) {
-					$other = Remote_profile::staticGet('id', $sub->subscriber);
-				} else {
-					$other = User::staticGet('id', $sub->subscriber);
-				}
-				if (!$other) {
-					common_debug('Got a bad subscription: '.print_r($sub,TRUE));
-					continue;
-				}		
-				$count++;
-			}
-		}
+		$count = $sub->find();
 		
 		if ($count > 0) {
 			return $count;
@@ -218,4 +223,18 @@ class TwitterapiAction extends Action {
 		common_element_end('feed');
 	}
 
+	function show_profile($profile, $content_type='xml', $notice=NULL) {
+		$profile_array = $this->twitter_user_array($profile, true);
+		switch ($content_type) {
+		 case 'xml':
+			$this->show_twitter_xml_user($profile_array);
+			break;
+		 case 'json':
+			$this->show_twitter_json_users($profile_array);
+			break;
+		 default:
+			$this->client_error(_('not a supported data format'));
+			return;
+		}
+	}
 }
\ No newline at end of file