<?php
/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, 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
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+ exit(1);
+}
require_once(INSTALLDIR.'/lib/twitterapi.php');
function show_messages($args, $apidata, $type)
{
+ $user = $apidata['user']; // Always the auth user
- $user = $apidata['user'];
-
- $count = $this->arg('count');
- $since = $this->arg('since');
- $since_id = $this->arg('since_id');
- $before_id = $this->arg('before_id');
-
- $page = $this->arg('page');
-
- if (!$page) {
- $page = 1;
- }
-
- if (!$count) {
- $count = 20;
- }
-
- $message = new Message();
-
- $title = null;
+ $message = new Message();
+ $title = null;
$subtitle = null;
- $link = null;
- $server = common_root_url();
+ $link = null;
+ $server = common_root_url();
if ($type == 'received') {
$message->to_profile = $user->id;
$title = sprintf(_("Direct messages to %s"), $user->nickname);
- $subtitle = sprintf(_("All the direct messages sent to %s"), $user->nickname);
+ $subtitle = sprintf(_("All the direct messages sent to %s"),
+ $user->nickname);
$link = $server . $user->nickname . '/inbox';
} else {
$message->from_profile = $user->id;
$title = _('Direct Messages You\'ve Sent');
- $subtitle = sprintf(_("All the direct messages sent from %s"), $user->nickname);
+ $subtitle = sprintf(_("All the direct messages sent from %s"),
+ $user->nickname);
$link = $server . $user->nickname . '/outbox';
}
- if ($before_id) {
- $message->whereAdd("id < $before_id");
+ $page = (int)$this->arg('page', 1);
+ $count = (int)$this->arg('count', 20);
+ $max_id = (int)$this->arg('max_id', 0);
+ $since_id = (int)$this->arg('since_id', 0);
+ $since = $this->arg('since');
+
+ if ($max_id) {
+ $message->whereAdd("id <= $max_id");
}
if ($since_id) {
$message->whereAdd("id > $since_id");
}
- $since = strtotime($this->arg('since'));
-
if ($since) {
$d = date('Y-m-d H:i:s', $since);
$message->whereAdd("created > '$d'");
}
$message->orderBy('created DESC, id DESC');
- $message->limit((($page-1)*20), $count);
+ $message->limit((($page-1)*$count), $count);
$message->find();
switch($apidata['content-type']) {
- case 'xml':
+ case 'xml':
$this->show_xml_dmsgs($message);
break;
- case 'rss':
+ case 'rss':
$this->show_rss_dmsgs($message, $title, $link, $subtitle);
break;
- case 'atom':
- $this->show_atom_dmsgs($message, $title, $link, $subtitle);
+ case 'atom':
+ $selfuri = common_root_url() . 'api/direct_messages';
+ $selfuri .= ($type == 'received') ? '.atom' : '/sent.atom';
+ $taguribase = common_config('integration', 'taguri');
+
+ if ($type == 'sent') {
+ $id = "tag:$taguribase:SentDirectMessages:" . $user->id;
+ } else {
+ $id = "tag:$taguribase:DirectMessages:" . $user->id;
+ }
+
+ $this->show_atom_dmsgs($message, $title, $link, $subtitle,
+ $selfuri, $id);
break;
- case 'json':
+ case 'json':
$this->show_json_dmsgs($message);
break;
- default:
- common_user_error(_('API method not found!'), $code = 404);
+ default:
+ $this->clientError(_('API method not found!'), $code = 404);
}
}
parent::handle($args);
if ($_SERVER['REQUEST_METHOD'] != 'POST') {
- $this->client_error(_('This method requires a POST.'), 400, $apidata['content-type']);
+ $this->clientError(_('This method requires a POST.'),
+ 400, $apidata['content-type']);
return;
}
$user = $apidata['user'];
- $source = $this->trimmed('source'); // Not supported by Twitter.
+ $source = $this->trimmed('source'); // Not supported by Twitter.
$reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api');
- if (!$source || in_array($source, $reserved_sources)) {
+ if (empty($source) || in_array($source, $reserved_sources)) {
$source = 'api';
}
$content = $this->trimmed('text');
- if (!$content) {
- $this->client_error(_('No message text!'), $code = 406, $apidata['content-type']);
+ if (empty($content)) {
+ $this->clientError(_('No message text!'),
+ $code = 406, $apidata['content-type']);
} else {
$content_shortened = common_shorten_links($content);
if (mb_strlen($content_shortened) > 140) {
- $this->client_error(_('That\'s too long. Max message size is 140 chars.'),
+ $this->clientError(_('That\'s too long. Max message size is 140 chars.'),
$code = 406, $apidata['content-type']);
return;
}
$other = $this->get_user($this->trimmed('user'));
- if (!$other) {
- $this->client_error(_('Recipient user not found.'), $code = 403, $apidata['content-type']);
+ if (empty($other)) {
+ $this->clientError(_('Recipient user not found.'),
+ $code = 403, $apidata['content-type']);
return;
} else if (!$user->mutuallySubscribed($other)) {
- $this->client_error(_('Can\'t send direct messages to users who aren\'t your friend.'),
+ $this->clientError(_('Can\'t send direct messages to users who aren\'t your friend.'),
$code = 403, $apidata['content-type']);
return;
} else if ($user->id == $other->id) {
// Sending msgs to yourself is allowed by Twitter
- $this->client_error(_('Don\'t send a message to yourself; just say it to yourself quietly instead.'),
+ $this->clientError(_('Don\'t send a message to yourself; just say it to yourself quietly instead.'),
$code = 403, $apidata['content-type']);
return;
}
html_entity_decode($content, ENT_NOQUOTES, 'UTF-8'), $source);
if (is_string($message)) {
- $this->server_error($message);
+ $this->serverError($message);
return;
}
function destroy($args, $apidata)
{
parent::handle($args);
- common_server_error(_('API method under construction.'), $code=501);
+ $this->serverError(_('API method under construction.'), $code=501);
}
function show_xml_dmsgs($message)
{
$this->init_document('xml');
- common_element_start('direct-messages', array('type' => 'array'));
+ $this->elementStart('direct-messages', array('type' => 'array'));
- if (is_array($messages)) {
+ if (is_array($message)) {
foreach ($message as $m) {
$twitter_dm = $this->twitter_dmsg_array($m);
$this->show_twitter_xml_dmsg($twitter_dm);
}
}
- common_element_end('direct-messages');
+ $this->elementEnd('direct-messages');
$this->end_document('xml');
}
$this->init_document('rss');
- common_element_start('channel');
- common_element('title', null, $title);
+ $this->elementStart('channel');
+ $this->element('title', null, $title);
- common_element('link', null, $link);
- common_element('description', null, $subtitle);
- common_element('language', null, 'en-us');
- common_element('ttl', null, '40');
+ $this->element('link', null, $link);
+ $this->element('description', null, $subtitle);
+ $this->element('language', null, 'en-us');
+ $this->element('ttl', null, '40');
if (is_array($message)) {
foreach ($message as $m) {
}
}
- common_element_end('channel');
+ $this->elementEnd('channel');
$this->end_twitter_rss();
}
- function show_atom_dmsgs($message, $title, $link, $subtitle)
+ function show_atom_dmsgs($message, $title, $link, $subtitle, $selfuri, $id)
{
$this->init_document('atom');
- common_element('title', null, $title);
- $siteserver = common_config('site', 'server');
- common_element('id', null, "tag:$siteserver,2008:DirectMessage");
- common_element('link', array('href' => $link, 'rel' => 'alternate', 'type' => 'text/html'), null);
- common_element('updated', null, common_date_iso8601(strftime('%c')));
- common_element('subtitle', null, $subtitle);
+ $this->element('title', null, $title);
+ $this->element('id', null, $id);
+ $this->element('link', array('href' => $link, 'rel' => 'alternate', 'type' => 'text/html'), null);
+ $this->element('link', array('href' => $selfuri, 'rel' => 'self',
+ 'type' => 'application/atom+xml'), null);
+ $this->element('updated', null, common_date_iso8601('now'));
+ $this->element('subtitle', null, $subtitle);
if (is_array($message)) {
foreach ($message as $m) {
projects / quix0rs-gnu-social.git / blobdiff