X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Ftwitapifriendships.php;h=3cc925c3690bcd2ef29c00961e70e93418b877fd;hb=adeb19f1f7a82b17cee85ade1ac06fcd48e0d4cb;hp=89b60e505583a54b1cb89fc8a94774354d2229f0;hpb=566d9ad20d2c2d9ac3ed11a27c7f09cdd46ee742;p=quix0rs-gnu-social.git

diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index 89b60e5055..3cc925c369 100644
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -23,39 +23,69 @@ require_once(INSTALLDIR.'/lib/twitterapi.php');
 
 class TwitapifriendshipsAction extends TwitterapiAction {
 
+	function is_readonly() {
+		
+		static $write_methods = array(	'create',
+										'destroy');
+		
+		$cmdtext = explode('.', $this->arg('method'));		
+		
+		if (in_array($cmdtext[0], $write_methods)) {			
+			return false;
+		}
+				
+		return true;
+	}
+
 	function create($args, $apidata) {
 		parent::handle($args);
 
+		if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+			$this->client_error(_('This method requires a POST.'), 400, $apidata['content-type']);
+			exit();
+		}
+
 		$id = $apidata['api_arg'];
 
 		$other = $this->get_user($id);
 
 		if (!$other) {
-			$this->client_error(_('No such user'));
-			return;
+			$this->client_error(_('Could not follow user: User not found.'), 403, $apidata['content-type']);
+			exit();
 		}
 		
 		$user = $apidata['user'];
 		
 		if ($user->isSubscribed($other)) {
-			$this->client_error(_('Already subscribed.'));
-			return;
+			$errmsg = sprintf(_('Could not follow user: %s is already on your list.'), $other->nickname);
+			$this->client_error($errmsg, 403, $apidata['content-type']);
+			exit();
 		}
 		
 		$sub = new Subscription();
+		
+		$sub->query('BEGIN');
+		
 		$sub->subscriber = $user->id;
 		$sub->subscribed = $other->id;
-
+		$sub->created = DB_DataObject_Cast::dateTime(); # current time
+		  
 		$result = $sub->insert();
 
 		if (!$result) {
-			$this->server_error(_('Could not subscribe'));
-			return;
+			$errmsg = sprintf(_('Could not follow user: %s is already on your list.'), $other->nickname);
+			$this->client_error($errmsg, 400, $apidata['content-type']);			
+			exit();
 		}
 		
+		$sub->query('COMMIT');
+		
 		mail_subscribe_notify($other, $user);
 
-		$this->show_profile($other);
+		$type = $apidata['content-type'];
+		$this->init_document($type);
+		$this->show_profile($other, $type);
+		$this->end_document($type);
 		exit();
 	}
 	
@@ -73,6 +103,12 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 	
 	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']);
+			exit();
+		}
+		
 		$id = $apidata['api_arg'];
 
 		# We can't subscribe to a remote person, but we can unsub
@@ -84,11 +120,19 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 		$sub->subscriber = $user->id;
 		$sub->subscribed = $other->id;
 		
-		if ($sub->fetch(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']);			
+			exit();
 		}
 
-		$this->show_profile($other);
+		$type = $apidata['content-type'];
+		$this->init_document($type);	
+		$this->show_profile($other, $type);
+		$this->end_document($type);
 		exit();
 	}
 
@@ -107,14 +151,17 @@ 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);
+		
+		$user_a = $this->get_user($user_a_id);
+		$user_b = $this->get_user($user_b_id);
 		
 		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)) {
@@ -125,26 +172,28 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 		
 		switch ($apidata['content-type']) {
 		 case 'xml':
-			common_start_xml();
+			$this->init_document('xml');
 			common_element('friends', NULL, $result);
-			common_end_xml();
+			$this->end_document('xml');
 			break;
 		 case 'json':
+			$this->init_document('json');
 			print json_encode($result);
-			print "\n";
+			$this->end_document('json');
 			break;
 		 default:
-			print $result;
+			print $result;  // Really? --Zach
 			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 {