GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

* Add conversation ID to Twitter compatible API 

* Fix formatting of blocking info in JSON API output
This commit is contained in:
Zach Copley 2011-08-25 11:30:07 -07:00
parent 297d603feb
commit e8d45a4644
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/apiaction.php
View File

@ -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;