diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2009-06-26 15:31:42 +0800 |
|---|---|---|
| committer | Jeffery To <jeffery.to@gmail.com> | 2009-06-26 15:31:42 +0800 |
| commit | 6328add622641e5f5721cc34d27d4d872c86a561 (patch) | |
| tree | 31be2d91646bc3deed194f7c7e8ad64c9ee17971 /actions/twitapistatuses.php | |
| parent | 6d308f6ffe3f894c60fafaea3ceaef86d30dfe1d (diff) | |
| parent | 97ee517680979bf12e82eab99ecf943712fe97c9 (diff) | |
Merge branch '0.8.x' into invite-enabled
Diffstat (limited to 'actions/twitapistatuses.php')
| -rw-r--r-- | actions/twitapistatuses.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php index 94f624afb..555c746cb 100644 --- a/actions/twitapistatuses.php +++ b/actions/twitapistatuses.php @@ -1,7 +1,7 @@ <?php /* * Laconica - a distributed open-source microblogging tool - * Copyright (C) 2008, Controlez-Vous, Inc. + * Copyright (C) 2008, 2009, Control Yourself, Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -75,8 +75,8 @@ class TwitapistatusesAction extends TwitterapiAction { parent::handle($args); + $this->auth_user = $apidata['user']; $user = $this->get_user($apidata['api_arg'], $apidata); - $this->auth_user = $user; if (empty($user)) { $this->clientError(_('No such user!'), 404, @@ -100,8 +100,13 @@ class TwitapistatusesAction extends TwitterapiAction $since_id = (int)$this->arg('since_id', 0); $since = $this->arg('since'); - $notice = $user->noticesWithFriends(($page-1)*$count, - $count, $since_id, $max_id,$since); + if (!empty($this->auth_user) && $this->auth_user->id == $user->id) { + $notice = $user->noticeInbox(($page-1)*$count, + $count, $since_id, $max_id, $since); + } else { + $notice = $user->noticesWithFriends(($page-1)*$count, + $count, $since_id, $max_id, $since); + } switch($apidata['content-type']) { case 'xml': |