Twitter-compatible API - Error handling that better matches Twitter's

darcs-hash:20080720070905-ca946-dda57dd92210461361fd58b7a3244bf24c01e801.gz

2 files changed, 25 insertions, 13 deletions

diff --git a/actions/api.php b/actions/api.php
index a52570320..69fda2e22 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -45,9 +45,7 @@ class ApiAction extends Action {
 			$this->api_method = $cmdext[0];
 			$this->content_type = strtolower($cmdext[1]);
 		}
-		
-		# common_debug("apiaction = $this->api_action, method = $this->api_method, argument = $this->api_arg, ctype = $this->content_type");
-						
+								
 		# XXX Maybe check to see if the command actually exists first?
 		if($this->requires_auth()) {
 			if (!isset($_SERVER['PHP_AUTH_USER'])) {
@@ -56,7 +54,7 @@ class ApiAction extends Action {
 				header('WWW-Authenticate: Basic realm="Laconica API"');
 				
 				# if the user hits cancel -- bam!
-				common_show_basic_auth_error();		
+				$this->show_basic_auth_error();		
 			} else {
 				$nickname = $_SERVER['PHP_AUTH_USER'];
 				$password = $_SERVER['PHP_AUTH_PW'];
@@ -67,7 +65,7 @@ class ApiAction extends Action {
 					$this->process_command();
 				} else {
 					# basic authentication failed
-					common_show_basic_auth_error();		
+					$this->show_basic_auth_error();		
 				}			
 			}
 		} else {
@@ -123,5 +121,12 @@ class ApiAction extends Action {
 			return true;
 		}
 	}
+	
+	function show_basic_auth_error() {
+	  	header('HTTP/1.1 401 Unauthorized');
+		header('Content-type: text/plain');
+	   	print("Could not authenticate you."); # exactly what Twitter says - no \n
+		exit();
+	}
 		
 }
diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index 0253cb8e5..90e890e35 100644
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -31,7 +31,7 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 		$other = $this->get_user($id);
 
 		if (!$other) {
-			$this->client_error(_('No such user'));
+			$this->client_error(_('Could not follow user: User not found.'), 403, $apidata['content-type']);
 			exit();
 			return;
 		}
@@ -39,7 +39,7 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 		$user = $apidata['user'];
 		
 		if ($user->isSubscribed($other)) {
-			$this->client_error(_('Already subscribed.'));
+			$this->client_error("Could not follow user: $other->nickname is already on your list.", 403, $apidata['content-type']);
 			exit();
 			return;
 		}
@@ -55,7 +55,7 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 		$result = $sub->insert();
 
 		if (!$result) {
-			$this->server_error(_('Could not subscribe'));
+			$this->client_error("Could not follow user: $other->nickname.", 400, $apidata['content-type']);			
 			exit();
 			return;
 		}
@@ -101,7 +101,7 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 			$sub->delete();
 			$sub->query('COMMIT');
 		} else {
-			$this->client_error(_('Not subscribed'));
+			$this->client_error(_('You are not friends with the specified user.'), 403, $apidata['content-type']);			
 			exit();
 		}
 
@@ -127,14 +127,21 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 	
 	function exists($args, $apidata) {
 		parent::handle($args);
+		
+		
 		$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) { print "got user a profile";}
+		if($user_b) { print "got user b profile";}
+		
+		
 		if (!$user_a || !$user_b) {
-			$this->client_error(_('No such user'));
-			return;
+			$this->client_error(_('Two user ids or screen_names must be supplied.'), 400, $apidata['content-type']);
+			exit();
 		}
 		
 		if ($user_a->isSubscribed($user_b)) {
@@ -151,20 +158,20 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 			break;
 		 case 'json':
 			print json_encode($result);
-			print "\n";
 			break;
 		 default:
 			print $result;
 			break;
 		}
 		
+		exit();
 	}
 
 	function get_profile($id) {
 		if (is_numeric($id)) {
 			return Profile::staticGet($id);
 		} else {
-			$user = User::staticGet('nickname', $id);
+			$user = User::staticGet('nickname', $id);			
 			if ($user) {
 				return $user->getProfile();
 			} else {