diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-06-23 16:44:31 -0700 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-06-23 16:44:31 -0700 |
commit | d98ecc760dd8ed3b4d2366aad1c5a36ddf11c710 (patch) | |
tree | 082641f053aecbec79aa9a8cbba3c74db633b193 /actions/twitapistatuses.php | |
parent | f88d767f493c5780476450d92ddb8f27a6ea6caa (diff) | |
parent | 57903bf2acafdc4d15bb9af4fba183b37ec47efe (diff) |
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
Diffstat (limited to 'actions/twitapistatuses.php')
-rw-r--r-- | actions/twitapistatuses.php | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php index 2bc404063..e1fbc5c76 100644 --- a/actions/twitapistatuses.php +++ b/actions/twitapistatuses.php @@ -75,8 +75,10 @@ class TwitapistatusesAction extends TwitterapiAction { parent::handle($args); + $this->auth_user = $apidata['user']; $user = $this->get_user($apidata['api_arg'], $apidata); - $this->auth_user = $user; + + common_debug("auth user = " . $this->auth_user->nickname); if (empty($user)) { $this->clientError(_('No such user!'), 404, @@ -100,8 +102,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': |