* Add conversation ID to Twitter compatible API

* Fix formatting of blocking info in JSON API output

diff --git a/lib/apiaction.php b/lib/apiaction.php
index 64b4284f6aa1e2eb4e57ddc00efa3e0e88ea7d2b..7b2f70c07cef0bf5449189a15774d4d29163b05c 100644 (file)
--- 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;