summaryrefslogtreecommitdiff
path: root/actions/twitapistatuses.php
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-06-23 15:53:49 -0700
committerZach Copley <zach@controlyourself.ca>2009-06-23 15:53:49 -0700
commit57903bf2acafdc4d15bb9af4fba183b37ec47efe (patch)
tree06838bb628a2d520cf8201227bb094329147f07b /actions/twitapistatuses.php
parentf04a54ed2f70686d67ed50da21bde61c55b07696 (diff)
Make gateway notices available to the auth user in the API
Diffstat (limited to 'actions/twitapistatuses.php')
-rw-r--r--actions/twitapistatuses.php13
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':