From e8d45a4644f1435d6687a3a744a94c2d5a7acb9b Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 25 Aug 2011 11:30:07 -0700 Subject: [PATCH] * Add conversation ID to Twitter compatible API * Fix formatting of blocking info in JSON API output --- lib/apiaction.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/apiaction.php b/lib/apiaction.php index 64b4284f6a..7b2f70c07c 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -241,13 +241,13 @@ class ApiAction extends Action // Is the requesting user following this user? $twitter_user['following'] = false; - $twitter_user['statusnet:blocking'] = false; + $twitter_user['statusnet_blocking'] = false; $twitter_user['notifications'] = false; if (isset($this->auth_user)) { $twitter_user['following'] = $this->auth_user->isSubscribed($profile); - $twitter_user['statusnet:blocking'] = $this->auth_user->hasBlocked($profile); + $twitter_user['statusnet_blocking'] = $this->auth_user->hasBlocked($profile); // Notifications on? $sub = Subscription::pkeyGet(array('subscriber' => @@ -317,6 +317,7 @@ class ApiAction extends Action $twitter_status['source'] = $source; $twitter_status['id'] = intval($notice->id); + $twitter_status['statusnet_conversation_id'] = intval($notice->conversation); $replier_profile = null;