From 90fb7be99a74689de0d0e2409230d8bd515ac5c3 Mon Sep 17 00:00:00 2001
From: Dan Moore <dan@moore.cx>
Date: Sat, 18 Apr 2009 15:33:36 -0400
Subject: Bringing the presentation of boolean variables (favorited, truncated,
 profile_background_tile) and the result from friendships/exist in JSON
 results from the Twitter Compatible API in line with what the real Twitter
 API does.

Currently, laconica returns text strings enclosed in quotes instead of bare Javascript booleans.  This change fixes that.

See http://laconi.ca/trac/ticket/1326 for one open issue related to this.
---
 actions/twitapifriendships.php | 6 +-----
 actions/twitapiusers.php       | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'actions')

diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index c50c5e84a..2f8250e0d 100644
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -133,11 +133,7 @@ class TwitapifriendshipsAction extends TwitterapiAction
             return;
         }
 
-        if ($user_a->isSubscribed($user_b)) {
-            $result = 'true';
-        } else {
-            $result = 'false';
-        }
+        $result = $user_a->isSubscribed($user_b);
 
         switch ($apidata['content-type']) {
          case 'xml':
diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index 2894b7486..41d0d955b 100644
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -83,7 +83,7 @@ class TwitapiusersAction extends TwitterapiAction
 		$twitter_user['profile_link_color'] = '';
 		$twitter_user['profile_sidebar_fill_color'] = '';
         $twitter_user['profile_sidebar_border_color'] = '';
-        $twitter_user['profile_background_tile'] = 'false';
+        $twitter_user['profile_background_tile'] = false;
 
 		$faves = DB_DataObject::factory('fave');
 		$faves->user_id = $user->id;
-- 
cgit v1.2.3-54-g00ecf


From b764c3be78aef4305b75b14d7f3e8c9f1c552f9e Mon Sep 17 00:00:00 2001
From: Dan Moore <dan@moore.cx>
Date: Sat, 18 Apr 2009 15:42:44 -0400
Subject: This should change the JSON representation of the booleans
 'following' and 'notifications', but unlike the previous change, I was unable
 to test this.

---
 actions/twitapiusers.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'actions')

diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index 41d0d955b..92d67454c 100644
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -103,22 +103,14 @@ class TwitapiusersAction extends TwitterapiAction
 
 		if (isset($apidata['user'])) {
 
-			if ($apidata['user']->isSubscribed($profile)) {
-				$twitter_user['following'] = 'true';
-			} else {
-				$twitter_user['following'] = 'false';
-			}
+            $twitter_user['following'] = $apidata['user']->isSubscribed($profile);
             
             // Notifications on?
 		    $sub = Subscription::pkeyGet(array('subscriber' =>
 		        $apidata['user']->id, 'subscribed' => $profile->id));
             
             if ($sub) {
-                if ($sub->jabber || $sub->sms) {
-                    $twitter_user['notifications'] = 'true';
-                } else {
-                    $twitter_user['notifications'] = 'false';
-                }
+                $twitter_user['notifications'] = ($sub->jabber || $sub->sms);
             }
         }
         
-- 
cgit v1.2.3-54-g00ecf


From 48846c38057b20bb51814c22456d6907cc2a99e8 Mon Sep 17 00:00:00 2001
From: Dan Moore <dan@moore.cx>
Date: Sat, 18 Apr 2009 15:54:23 -0400
Subject: Fixing spaces/tabs.

---
 actions/twitapiusers.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'actions')

diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index 92d67454c..1542cfb33 100644
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -82,8 +82,8 @@ class TwitapiusersAction extends TwitterapiAction
 		$twitter_user['profile_text_color'] = '';
 		$twitter_user['profile_link_color'] = '';
 		$twitter_user['profile_sidebar_fill_color'] = '';
-        $twitter_user['profile_sidebar_border_color'] = '';
-        $twitter_user['profile_background_tile'] = false;
+		$twitter_user['profile_sidebar_border_color'] = '';
+		$twitter_user['profile_background_tile'] = false;
 
 		$faves = DB_DataObject::factory('fave');
 		$faves->user_id = $user->id;
@@ -103,16 +103,16 @@ class TwitapiusersAction extends TwitterapiAction
 
 		if (isset($apidata['user'])) {
 
-            $twitter_user['following'] = $apidata['user']->isSubscribed($profile);
+			$twitter_user['following'] = $apidata['user']->isSubscribed($profile);
             
-            // Notifications on?
-		    $sub = Subscription::pkeyGet(array('subscriber' =>
-		        $apidata['user']->id, 'subscribed' => $profile->id));
+			// Notifications on?
+			$sub = Subscription::pkeyGet(array('subscriber' =>
+				$apidata['user']->id, 'subscribed' => $profile->id));
             
-            if ($sub) {
-                $twitter_user['notifications'] = ($sub->jabber || $sub->sms);
-            }
-        }
+			if ($sub) {
+				$twitter_user['notifications'] = ($sub->jabber || $sub->sms);
+			}
+		}
         
 		if ($apidata['content-type'] == 'xml') {
 			$this->init_document('xml');
-- 
cgit v1.2.3-54-g00ecf