diff options
| author | Brion Vibber <brion@pobox.com> | 2010-06-26 10:17:36 -0400 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-06-26 10:17:36 -0400 |
| commit | 696e4ba393c658d5b2e1fe46e1389bd7b2cfdb34 (patch) | |
| tree | 45c4f1512599175afea67f8a68e1b3ad66cace97 /lib/apiaction.php | |
| parent | 72e486a3226c9101f33bd86f953dbb9650c19fd1 (diff) | |
| parent | d9e56e15cc3174093fc994e524d1d9cf402ae8a3 (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
plugins/OpenID/openidserver.php (cleaned up mismatched comment)
Diffstat (limited to 'lib/apiaction.php')
| -rw-r--r-- | lib/apiaction.php | 42 |
1 files changed, 28 insertions, 14 deletions
diff --git a/lib/apiaction.php b/lib/apiaction.php index 27df55892..89a487102 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -271,11 +271,13 @@ class ApiAction extends Action // Is the requesting user following this user? $twitter_user['following'] = 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); // Notifications on? $sub = Subscription::pkeyGet(array('subscriber' => @@ -409,20 +411,32 @@ class ApiAction extends Action function twitterGroupArray($group) { - $twitter_group=array(); - $twitter_group['id']=$group->id; - $twitter_group['url']=$group->permalink(); - $twitter_group['nickname']=$group->nickname; - $twitter_group['fullname']=$group->fullname; - $twitter_group['original_logo']=$group->original_logo; - $twitter_group['homepage_logo']=$group->homepage_logo; - $twitter_group['stream_logo']=$group->stream_logo; - $twitter_group['mini_logo']=$group->mini_logo; - $twitter_group['homepage']=$group->homepage; - $twitter_group['description']=$group->description; - $twitter_group['location']=$group->location; - $twitter_group['created']=$this->dateTwitter($group->created); - $twitter_group['modified']=$this->dateTwitter($group->modified); + $twitter_group = array(); + + $twitter_group['id'] = $group->id; + $twitter_group['url'] = $group->permalink(); + $twitter_group['nickname'] = $group->nickname; + $twitter_group['fullname'] = $group->fullname; + + if (isset($this->auth_user)) { + $twitter_group['member'] = $this->auth_user->isMember($group); + $twitter_group['blocked'] = Group_block::isBlocked( + $group, + $this->auth_user->getProfile() + ); + } + + $twitter_group['member_count'] = $group->getMemberCount(); + $twitter_group['original_logo'] = $group->original_logo; + $twitter_group['homepage_logo'] = $group->homepage_logo; + $twitter_group['stream_logo'] = $group->stream_logo; + $twitter_group['mini_logo'] = $group->mini_logo; + $twitter_group['homepage'] = $group->homepage; + $twitter_group['description'] = $group->description; + $twitter_group['location'] = $group->location; + $twitter_group['created'] = $this->dateTwitter($group->created); + $twitter_group['modified'] = $this->dateTwitter($group->modified); + return $twitter_group; } |