eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch '0.8.x' into userdesign

Browse Source 
Conflicts:

	actions/showfavorites.php
	lib/action.php
This commit is contained in:
Zach Copley 2009-06-14 00:23:48 +00:00
commit d0eb2058a5
36 changed files with 564 additions and 709 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
actions/all.php
View File

@ -69,17 +69,6 @@ class AllAction extends ProfileAction
sprintf(_('Feed for friends of %s (Atom)'), $this->user->nickname))); sprintf(_('Feed for friends of %s (Atom)'), $this->user->nickname)));
} }
/**
* Output document relationship links
*
* @return void
*/
function showRelationshipLinks()
{
$this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
$this->page, 'all', array('nickname' => $this->user->nickname));
}
function showLocalNav() function showLocalNav()
{ {
$nav = new PersonalGroupNav($this); $nav = new PersonalGroupNav($this);

2
actions/conversation.php
View File

@ -207,7 +207,7 @@ class ConversationTree extends NoticeList
// We take responsibility for doing the li // We take responsibility for doing the li
$this->out->elementStart('li', array('class' => 'hentry notice', $this->out->elementStart('li', array('class' => 'hentry notice',
'id' => 'notice-' . $this->notice->id)); 'id' => 'notice-' . $id));
$item = $this->newListItem($notice); $item = $this->newListItem($notice);
$item->show(); $item->show();

11
actions/favorited.php
View File

@ -221,15 +221,4 @@ class FavoritedAction extends Action
$this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE, $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
$this->page, 'favorited'); $this->page, 'favorited');
} }
/**
* Output document relationship links
*
* @return void
*/
function showRelationshipLinks()
{
$this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
$this->page, 'favorited');
}
} }

127
actions/foaf.php
View File

@ -82,14 +82,18 @@ class FoafAction extends Action
'http://www.w3.org/2000/01/rdf-schema#', 'http://www.w3.org/2000/01/rdf-schema#',
'xmlns:geo' => 'xmlns:geo' =>
'http://www.w3.org/2003/01/geo/wgs84_pos#', 'http://www.w3.org/2003/01/geo/wgs84_pos#',
'xmlns:bio' =>
'http://purl.org/vocab/bio/0.1/',
'xmlns:sioc' =>
'http://rdfs.org/sioc/ns#',
'xmlns' => 'http://xmlns.com/foaf/0.1/')); 'xmlns' => 'http://xmlns.com/foaf/0.1/'));
// This is the document about the user // This is the document about the user
$this->showPpd('', $this->user->uri); $this->showPpd('', $this->user->uri);
// XXX: might not be a person // Would be nice to tell if they were a Person or not (e.g. a #person usertag?)
$this->elementStart('Person', array('rdf:about' => $this->elementStart('Agent', array('rdf:about' =>
$this->user->uri)); $this->user->uri));
$this->element('mbox_sha1sum', null, sha1('mailto:' . $this->user->email)); $this->element('mbox_sha1sum', null, sha1('mailto:' . $this->user->email));
if ($this->profile->fullname) { if ($this->profile->fullname) {
@ -98,8 +102,11 @@ class FoafAction extends Action
if ($this->profile->homepage) { if ($this->profile->homepage) {
$this->element('homepage', array('rdf:resource' => $this->profile->homepage)); $this->element('homepage', array('rdf:resource' => $this->profile->homepage));
} }
if ($this->profile->profileurl) {
$this->element('weblog', array('rdf:resource' => $this->profile->profileurl));
}
if ($this->profile->bio) { if ($this->profile->bio) {
$this->element('rdfs:comment', null, $this->profile->bio); $this->element('bio:olb', null, $this->profile->bio);
} }
// XXX: more structured location data // XXX: more structured location data
if ($this->profile->location) { if ($this->profile->location) {
@ -110,10 +117,7 @@ class FoafAction extends Action
$this->elementEnd('based_near'); $this->elementEnd('based_near');
} }
$this->showMicrobloggingAccount($this->profile, common_root_url());
$avatar = $this->profile->getOriginalAvatar(); $avatar = $this->profile->getOriginalAvatar();
if ($avatar) { if ($avatar) {
$this->elementStart('img'); $this->elementStart('img');
$this->elementStart('Image', array('rdf:about' => $avatar->url)); $this->elementStart('Image', array('rdf:about' => $avatar->url));
@ -129,39 +133,8 @@ class FoafAction extends Action
$this->elementEnd('img'); $this->elementEnd('img');
} }
// Get people user is subscribed to $person = $this->showMicrobloggingAccount($this->profile,
common_root_url(), $this->user->uri, false);
$person = array();
$sub = new Subscription();
$sub->subscriber = $this->profile->id;
$sub->whereAdd('subscriber != subscribed');
if ($sub->find()) {
while ($sub->fetch()) {
if (!empty($sub->token)) {
$other = Remote_profile::staticGet('id', $sub->subscribed);
} else {
$other = User::staticGet('id', $sub->subscribed);
}
if (empty($other)) {
common_debug('Got a bad subscription: '.print_r($sub,true));
continue;
}
$this->element('knows', array('rdf:resource' => $other->uri));
$person[$other->uri] = array(LISTENEE,
$other->id,
$other->nickname,
(empty($sub->token)) ? 'User' : 'Remote_profile');
$other->free();
$other = null;
unset($other);
}
}
$sub->free();
$sub = null;
unset($sub);
// Get people who subscribe to user // Get people who subscribe to user
@ -198,7 +171,15 @@ class FoafAction extends Action
$sub = null; $sub = null;
unset($sub); unset($sub);
$this->elementEnd('Person'); foreach ($person as $uri => $p) {
list($type, $id, $nickname, $cls) = $p;
if ($type == BOTH) {
$this->element('knows', array('rdf:resource' => $uri));
}
}
$this->elementEnd('Agent');
foreach ($person as $uri => $p) { foreach ($person as $uri => $p) {
$foaf_url = null; $foaf_url = null;
@ -207,16 +188,18 @@ class FoafAction extends Action
$foaf_url = common_local_url('foaf', array('nickname' => $nickname)); $foaf_url = common_local_url('foaf', array('nickname' => $nickname));
} }
$profile = Profile::staticGet($id); $profile = Profile::staticGet($id);
$this->elementStart('Person', array('rdf:about' => $uri)); $this->elementStart('Agent', array('rdf:about' => $uri));
if ($type == LISTENER || $type == BOTH) { if ($type == BOTH) {
$this->element('knows', array('rdf:resource' => $this->user->uri)); $this->element('knows', array('rdf:resource' => $this->user->uri));
} }
$this->showMicrobloggingAccount($profile, ($cls == 'User') ? $this->showMicrobloggingAccount($profile,
common_root_url() : null); ($cls == 'User') ? common_root_url() : null,
$uri,
true);
if ($foaf_url) { if ($foaf_url) {
$this->element('rdfs:seeAlso', array('rdf:resource' => $foaf_url)); $this->element('rdfs:seeAlso', array('rdf:resource' => $foaf_url));
} }
$this->elementEnd('Person'); $this->elementEnd('Agent');
if ($foaf_url) { if ($foaf_url) {
$this->showPpd($foaf_url, $uri); $this->showPpd($foaf_url, $uri);
} }
@ -237,18 +220,66 @@ class FoafAction extends Action
$this->elementEnd('PersonalProfileDocument'); $this->elementEnd('PersonalProfileDocument');
} }
function showMicrobloggingAccount($profile, $service=null) function showMicrobloggingAccount($profile, $service=null, $useruri=null, $isSubscriber=false)
{ {
$attr = array();
if ($useruri) {
$attr['rdf:about'] = $useruri . '#acct';
}
// Their account // Their account
$this->elementStart('holdsAccount'); $this->elementStart('holdsAccount');
$this->elementStart('OnlineAccount'); $this->elementStart('OnlineAccount', $attr);
if ($service) { if ($service) {
$this->element('accountServiceHomepage', array('rdf:resource' => $this->element('accountServiceHomepage', array('rdf:resource' =>
$service)); $service));
} }
$this->element('accountName', null, $profile->nickname); $this->element('accountName', null, $profile->nickname);
$this->element('homepage', array('rdf:resource' => $profile->profileurl)); $this->element('accountProfilePage', array('rdf:resource' => $profile->profileurl));
if ($useruri) {
$this->element('sioc:account_of', array('rdf:resource'=>$useruri));
}
$person = array();
if ($isSubscriber) {
$this->element('sioc:follows', array('rdf:resource'=>$this->user->uri . '#acct'));
} else {
// Get people user is subscribed to
$sub = new Subscription();
$sub->subscriber = $profile->id;
$sub->whereAdd('subscriber != subscribed');
if ($sub->find()) {
while ($sub->fetch()) {
if (!empty($sub->token)) {
$other = Remote_profile::staticGet('id', $sub->subscribed);
} else {
$other = User::staticGet('id', $sub->subscribed);
}
if (empty($other)) {
common_debug('Got a bad subscription: '.print_r($sub,true));
continue;
}
$this->element('sioc:follows', array('rdf:resource' => $other->uri.'#acct'));
$person[$other->uri] = array(LISTENEE,
$other->id,
$other->nickname,
(empty($sub->token)) ? 'User' : 'Remote_profile');
$other->free();
$other = null;
unset($other);
}
}
$sub->free();
$sub = null;
unset($sub);
}
$this->elementEnd('OnlineAccount'); $this->elementEnd('OnlineAccount');
$this->elementEnd('holdsAccount'); $this->elementEnd('holdsAccount');
return $person;
} }
} }

11
actions/groupmembers.php
View File

@ -137,15 +137,4 @@ class GroupmembersAction extends Action
$this->page, 'groupmembers', $this->page, 'groupmembers',
array('nickname' => $this->group->nickname)); array('nickname' => $this->group->nickname));
} }
/**
* Output document relationship links
*
* @return void
*/
function showRelationshipLinks()
{
$this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
$this->page, 'groupmembers', array('nickname' => $this->group->nickname));
}
} }

11
actions/groups.php
View File

@ -129,15 +129,4 @@ class GroupsAction extends Action
$gbm = new GroupsByMembersSection($this); $gbm = new GroupsByMembersSection($this);
$gbm->show(); $gbm->show();
} }
/**
* Output document relationship links
*
* @return void
*/
function showRelationshipLinks()
{
$this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
$this->page, 'groups', array('nickname' => $this->group->nickname));
}
} }

11
actions/inbox.php
View File

@ -63,17 +63,6 @@ class InboxAction extends MailboxAction
} }
} }
/**
* Output document relationship links
*
* @return void
*/
function showRelationshipLinks()
{
$this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
$this->page, 'inbox', array('nickname' => $this->user->nickname));
}
/** /**
* Retrieve the messages for this user and this page * Retrieve the messages for this user and this page
* *

11
actions/outbox.php
View File

@ -62,17 +62,6 @@ class OutboxAction extends MailboxAction
} }
} }
/**
* Output document relationship links
*
* @return void
*/
function showRelationshipLinks()
{
$this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
$this->page, 'outbox', array('nickname' => $this->user->nickname));
}
/** /**
* retrieve the messages for this user and this page * retrieve the messages for this user and this page
* *

11
actions/public.php
View File

@ -135,17 +135,6 @@ class PublicAction extends Action
_('Public Stream Feed (Atom)'))); _('Public Stream Feed (Atom)')));
} }
/**
* Output document relationship links
*
* @return void
*/
function showRelationshipLinks()
{
$this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
$this->page, 'public');
}
/** /**
* Extra head elements * Extra head elements
* *

11
actions/replies.php
View File

@ -137,17 +137,6 @@ class RepliesAction extends OwnerDesignAction
return array(new Feed(Feed::RSS1, $rssurl, $rsstitle)); return array(new Feed(Feed::RSS1, $rssurl, $rsstitle));
} }
/**
* Output document relationship links
*
* @return void
*/
function showRelationshipLinks()
{
$this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
$this->page, 'replies', array('nickname' => $this->user->nickname));
}
/** /**
* show the personal group nav * show the personal group nav
* *

15
actions/showfavorites.php
View File

@ -45,8 +45,10 @@ require_once INSTALLDIR.'/lib/feedlist.php';
* @link http://laconi.ca/ * @link http://laconi.ca/
*/ */
class ShowfavoritesAction extends OwnerDesignAction class ShowfavoritesAction extends Action
{ {
/** User we're getting the faves of */
var $user = null;
/** Page of the faves we're on */ /** Page of the faves we're on */
var $page = null; var $page = null;
@ -148,17 +150,6 @@ class ShowfavoritesAction extends OwnerDesignAction
return array(new Feed(Feed::RSS1, $feedurl, $feedtitle)); return array(new Feed(Feed::RSS1, $feedurl, $feedtitle));
} }
/**
* Output document relationship links
*
* @return void
*/
function showRelationshipLinks()
{
$this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
$this->page, 'showfavorites', array('nickname' => $this->user->nickname));
}
/** /**
* show the personal group nav * show the personal group nav
* *

11
actions/showgroup.php
View File

@ -311,17 +311,6 @@ class ShowgroupAction extends Action
$this->group->nickname))); $this->group->nickname)));
} }
/**
* Output document relationship links
*
* @return void
*/
function showRelationshipLinks()
{
$this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
$this->page, 'showgroup', array('nickname' => $this->group->nickname));
}
/** /**
* Fill in the sidebar. * Fill in the sidebar.
* *

11
actions/showstream.php
View File

@ -147,17 +147,6 @@ class ShowstreamAction extends ProfileAction
sprintf(_('FOAF for %s'), $this->user->nickname))); sprintf(_('FOAF for %s'), $this->user->nickname)));
} }
/**
* Output document relationship links
*
* @return void
*/
function showRelationshipLinks()
{
$this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
$this->page, 'showstream', array('nickname' => $this->user->nickname));
}
function extraHead() function extraHead()
{ {
// for remote subscriptions etc. // for remote subscriptions etc.

16
actions/tag.php
View File

@ -76,22 +76,6 @@ class TagAction extends Action
sprintf(_('Feed for tag %s'), $this->tag))); sprintf(_('Feed for tag %s'), $this->tag)));
} }
/**
* Output document relationship links
*
* @return void
*/
function showRelationshipLinks()
{
$this->sequenceRelationships($this->page > 1, $this->count > NOTICES_PER_PAGE, // FIXME
$this->page, 'tag', array('tag' => $this->tag));
}
function showPageNotice()
{
return sprintf(_('Messages tagged "%s", most recent first'), $this->tag);
}
function showContent() function showContent()
{ {
$notice = Notice_tag::getStream($this->tag, (($this->page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1); $notice = Notice_tag::getStream($this->tag, (($this->page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);

19
actions/twitapiaccount.php
View File

@ -17,7 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) {
exit(1);
}
require_once(INSTALLDIR.'/lib/twitterapi.php'); require_once(INSTALLDIR.'/lib/twitterapi.php');
@ -51,7 +53,8 @@ class TwitapiaccountAction extends TwitterapiAction
parent::handle($args); parent::handle($args);
if ($_SERVER['REQUEST_METHOD'] != 'POST') { if ($_SERVER['REQUEST_METHOD'] != 'POST') {
$this->clientError(_('This method requires a POST.'), 400, $apidata['content-type']); $this->clientError(_('This method requires a POST.'),
400, $apidata['content-type']);
return; return;
} }
@ -60,24 +63,20 @@ class TwitapiaccountAction extends TwitterapiAction
if (!is_null($location) && mb_strlen($location) > 255) { if (!is_null($location) && mb_strlen($location) > 255) {
// XXX: But Twitter just truncates and runs with it. -- Zach // XXX: But Twitter just truncates and runs with it. -- Zach
$this->clientError(_('That\'s too long. Max notice size is 255 chars.'), 406, $apidate['content-type']); $this->clientError(_('That\'s too long. Max notice size is 255 chars.'),
406, $apidate['content-type']);
return; return;
} }
$user = $apidata['user']; $user = $apidata['user']; // Always the auth user
$profile = $user->getProfile(); $profile = $user->getProfile();
if (!$profile) {
$this->serverError(_('User has no profile.'));
return;
}
$orig_profile = clone($profile); $orig_profile = clone($profile);
$profile->location = $location; $profile->location = $location;
$result = $profile->update($orig_profile); $result = $profile->update($orig_profile);
if (!$result) { if (empty($result)) {
common_log_db_error($profile, 'UPDATE', __FILE__); common_log_db_error($profile, 'UPDATE', __FILE__);
$this->serverError(_('Couldn\'t save profile.')); $this->serverError(_('Couldn\'t save profile.'));
return; return;

10
actions/twitapiblocks.php
View File

@ -17,7 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) {
exit(1);
}
require_once(INSTALLDIR.'/lib/twitterapi.php'); require_once(INSTALLDIR.'/lib/twitterapi.php');
@ -31,12 +33,12 @@ class TwitapiblocksAction extends TwitterapiAction
$blockee = $this->get_user($apidata['api_arg'], $apidata); $blockee = $this->get_user($apidata['api_arg'], $apidata);
if (!$blockee) { if (empty($blockee)) {
$this->clientError('Not Found', 404, $apidata['content-type']); $this->clientError('Not Found', 404, $apidata['content-type']);
return; return;
} }
$user = $apidata['user']; $user = $apidata['user']; // Always the auth user
if ($user->hasBlocked($blockee) || $user->block($blockee)) { if ($user->hasBlocked($blockee) || $user->block($blockee)) {
$type = $apidata['content-type']; $type = $apidata['content-type'];
@ -53,7 +55,7 @@ class TwitapiblocksAction extends TwitterapiAction
parent::handle($args); parent::handle($args);
$blockee = $this->get_user($apidata['api_arg'], $apidata); $blockee = $this->get_user($apidata['api_arg'], $apidata);
if (!$blockee) { if (empty($blockee)) {
$this->clientError('Not Found', 404, $apidata['content-type']); $this->clientError('Not Found', 404, $apidata['content-type']);
return; return;
} }

76
actions/twitapidirect_messages.php
View File

@ -17,7 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) {
exit(1);
}
require_once(INSTALLDIR.'/lib/twitterapi.php'); require_once(INSTALLDIR.'/lib/twitterapi.php');
@ -38,42 +40,34 @@ class Twitapidirect_messagesAction extends TwitterapiAction
function show_messages($args, $apidata, $type) function show_messages($args, $apidata, $type)
{ {
$user = $apidata['user']; $user = $apidata['user']; // Always the auth user
$count = $this->arg('count'); $message = new Message();
$since = $this->arg('since'); $title = null;
$since_id = $this->arg('since_id');
$max_id = $this->arg('max_id');
$page = $this->arg('page');
if (!$page) {
$page = 1;
}
if (!$count) {
$count = 20;
}
$message = new Message();
$title = null;
$subtitle = null; $subtitle = null;
$link = null; $link = null;
$server = common_root_url(); $server = common_root_url();
if ($type == 'received') { if ($type == 'received') {
$message->to_profile = $user->id; $message->to_profile = $user->id;
$title = sprintf(_("Direct messages to %s"), $user->nickname); $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'; $link = $server . $user->nickname . '/inbox';
} else { } else {
$message->from_profile = $user->id; $message->from_profile = $user->id;
$title = _('Direct Messages You\'ve Sent'); $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'; $link = $server . $user->nickname . '/outbox';
} }
$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) { if ($max_id) {
$message->whereAdd("id <= $max_id"); $message->whereAdd("id <= $max_id");
} }
@ -82,25 +76,23 @@ class Twitapidirect_messagesAction extends TwitterapiAction
$message->whereAdd("id > $since_id"); $message->whereAdd("id > $since_id");
} }
$since = strtotime($this->arg('since'));
if ($since) { if ($since) {
$d = date('Y-m-d H:i:s', $since); $d = date('Y-m-d H:i:s', $since);
$message->whereAdd("created > '$d'"); $message->whereAdd("created > '$d'");
} }
$message->orderBy('created DESC, id DESC'); $message->orderBy('created DESC, id DESC');
$message->limit((($page-1)*20), $count); $message->limit((($page-1)*$count), $count);
$message->find(); $message->find();
switch($apidata['content-type']) { switch($apidata['content-type']) {
case 'xml': case 'xml':
$this->show_xml_dmsgs($message); $this->show_xml_dmsgs($message);
break; break;
case 'rss': case 'rss':
$this->show_rss_dmsgs($message, $title, $link, $subtitle); $this->show_rss_dmsgs($message, $title, $link, $subtitle);
break; break;
case 'atom': case 'atom':
$selfuri = common_root_url() . 'api/direct_messages'; $selfuri = common_root_url() . 'api/direct_messages';
$selfuri .= ($type == 'received') ? '.atom' : '/sent.atom'; $selfuri .= ($type == 'received') ? '.atom' : '/sent.atom';
$taguribase = common_config('integration', 'taguri'); $taguribase = common_config('integration', 'taguri');
@ -111,12 +103,13 @@ class Twitapidirect_messagesAction extends TwitterapiAction
$id = "tag:$taguribase:DirectMessages:" . $user->id; $id = "tag:$taguribase:DirectMessages:" . $user->id;
} }
$this->show_atom_dmsgs($message, $title, $link, $subtitle, $selfuri, $id); $this->show_atom_dmsgs($message, $title, $link, $subtitle,
$selfuri, $id);
break; break;
case 'json': case 'json':
$this->show_json_dmsgs($message); $this->show_json_dmsgs($message);
break; break;
default: default:
$this->clientError(_('API method not found!'), $code = 404); $this->clientError(_('API method not found!'), $code = 404);
} }
@ -128,22 +121,24 @@ class Twitapidirect_messagesAction extends TwitterapiAction
parent::handle($args); parent::handle($args);
if ($_SERVER['REQUEST_METHOD'] != 'POST') { if ($_SERVER['REQUEST_METHOD'] != 'POST') {
$this->clientError(_('This method requires a POST.'), 400, $apidata['content-type']); $this->clientError(_('This method requires a POST.'),
400, $apidata['content-type']);
return; return;
} }
$user = $apidata['user']; $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'); $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'; $source = 'api';
} }
$content = $this->trimmed('text'); $content = $this->trimmed('text');
if (!$content) { if (empty($content)) {
$this->clientError(_('No message text!'), $code = 406, $apidata['content-type']); $this->clientError(_('No message text!'),
$code = 406, $apidata['content-type']);
} else { } else {
$content_shortened = common_shorten_links($content); $content_shortened = common_shorten_links($content);
if (mb_strlen($content_shortened) > 140) { if (mb_strlen($content_shortened) > 140) {
@ -155,8 +150,9 @@ class Twitapidirect_messagesAction extends TwitterapiAction
$other = $this->get_user($this->trimmed('user')); $other = $this->get_user($this->trimmed('user'));
if (!$other) { if (empty($other)) {
$this->clientError(_('Recipient user not found.'), $code = 403, $apidata['content-type']); $this->clientError(_('Recipient user not found.'),
$code = 403, $apidata['content-type']);
return; return;
} else if (!$user->mutuallySubscribed($other)) { } else if (!$user->mutuallySubscribed($other)) {
$this->clientError(_('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.'),

82
actions/twitapifavorites.php
View File

@ -17,7 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) {
exit(1);
}
require_once(INSTALLDIR.'/lib/twitterapi.php'); require_once(INSTALLDIR.'/lib/twitterapi.php');
@ -31,50 +33,39 @@ class TwitapifavoritesAction extends TwitterapiAction
$this->auth_user = $apidata['user']; $this->auth_user = $apidata['user'];
$user = $this->get_user($apidata['api_arg'], $apidata); $user = $this->get_user($apidata['api_arg'], $apidata);
if (!$user) { if (empty($user)) {
$this->clientError('Not Found', 404, $apidata['content-type']); $this->clientError('Not Found', 404, $apidata['content-type']);
return; return;
} }
$profile = $user->getProfile(); $profile = $user->getProfile();
if (!$profile) { $sitename = common_config('site', 'name');
$this->serverError(_('User has no profile.')); $title = sprintf(_('%s / Favorites from %s'), $sitename,
return; $user->nickname);
}
$page = $this->arg('page');
if (!$page) {
$page = 1;
}
if (!$count) {
$count = 20;
}
$notice = $user->favoriteNotices((($page-1)*20), $count);
if (!$notice) {
$this->serverError(_('Could not retrieve favorite notices.'));
return;
}
$sitename = common_config('site', 'name');
$title = sprintf(_('%s / Favorites from %s'), $sitename, $user->nickname);
$taguribase = common_config('integration', 'taguri'); $taguribase = common_config('integration', 'taguri');
$id = "tag:$taguribase:Favorites:".$user->id; $id = "tag:$taguribase:Favorites:".$user->id;
$link = common_local_url('favorites', array('nickname' => $user->nickname)); $link = common_local_url('favorites',
$subtitle = sprintf(_('%s updates favorited by %s / %s.'), $sitename, $profile->getBestName(), $user->nickname); array('nickname' => $user->nickname));
$subtitle = sprintf(_('%s updates favorited by %s / %s.'), $sitename,
$profile->getBestName(), $user->nickname);
$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');
$notice = $user->favoriteNotices(($page-1)*$count, $count);
switch($apidata['content-type']) { switch($apidata['content-type']) {
case 'xml': case 'xml':
$this->show_xml_timeline($notice); $this->show_xml_timeline($notice);
break; break;
case 'rss': case 'rss':
$this->show_rss_timeline($notice, $title, $link, $subtitle); $this->show_rss_timeline($notice, $title, $link, $subtitle);
break; break;
case 'atom': case 'atom':
if (isset($apidata['api_arg'])) { if (isset($apidata['api_arg'])) {
$selfuri = $selfuri = common_root_url() . $selfuri = $selfuri = common_root_url() .
'api/favorites/' . $apidata['api_arg'] . '.atom'; 'api/favorites/' . $apidata['api_arg'] . '.atom';
@ -82,12 +73,13 @@ class TwitapifavoritesAction extends TwitterapiAction
$selfuri = $selfuri = common_root_url() . $selfuri = $selfuri = common_root_url() .
'api/favorites.atom'; 'api/favorites.atom';
} }
$this->show_atom_timeline($notice, $title, $id, $link, $subtitle, null, $selfuri); $this->show_atom_timeline($notice, $title, $id, $link,
$subtitle, null, $selfuri);
break; break;
case 'json': case 'json':
$this->show_json_timeline($notice); $this->show_json_timeline($notice);
break; break;
default: default:
$this->clientError(_('API method not found!'), $code = 404); $this->clientError(_('API method not found!'), $code = 404);
} }
@ -100,7 +92,8 @@ class TwitapifavoritesAction extends TwitterapiAction
// Check for RESTfulness // Check for RESTfulness
if (!in_array($_SERVER['REQUEST_METHOD'], array('POST', 'DELETE'))) { if (!in_array($_SERVER['REQUEST_METHOD'], array('POST', 'DELETE'))) {
// XXX: Twitter just prints the err msg, no XML / JSON. // XXX: Twitter just prints the err msg, no XML / JSON.
$this->clientError(_('This method requires a POST or DELETE.'), 400, $apidata['content-type']); $this->clientError(_('This method requires a POST or DELETE.'),
400, $apidata['content-type']);
return; return;
} }
@ -109,25 +102,27 @@ class TwitapifavoritesAction extends TwitterapiAction
return; return;
} }
$this->auth_user = $apidata['user']; $user = $apidata['user']; // Always the auth user
$user = $this->auth_user;
$notice_id = $apidata['api_arg']; $notice_id = $apidata['api_arg'];
$notice = Notice::staticGet($notice_id); $notice = Notice::staticGet($notice_id);
if (!$notice) { if (empty($notice)) {
$this->clientError(_('No status found with that ID.'), 404, $apidata['content-type']); $this->clientError(_('No status found with that ID.'),
404, $apidata['content-type']);
return; return;
} }
// XXX: Twitter lets you fave things repeatedly via api. // XXX: Twitter lets you fave things repeatedly via api.
if ($user->hasFave($notice)) { if ($user->hasFave($notice)) {
$this->clientError(_('This notice is already a favorite!'), 403, $apidata['content-type']); $this->clientError(_('This notice is already a favorite!'),
403, $apidata['content-type']);
return; return;
} }
$fave = Fave::addNew($user, $notice); $fave = Fave::addNew($user, $notice);
if (!$fave) { if (empty($fave)) {
$this->serverError(_('Could not create favorite.')); $this->serverError(_('Could not create favorite.'));
return; return;
} }
@ -149,7 +144,8 @@ class TwitapifavoritesAction extends TwitterapiAction
$this->serverError(_('API method under construction.'), $code=501); $this->serverError(_('API method under construction.'), $code=501);
} }
// XXX: these two funcs swiped from faves. Maybe put in util.php, or some common base class? // XXX: these two funcs swiped from faves.
// Maybe put in util.php, or some common base class?
function notify($fave, $notice, $user) function notify($fave, $notice, $user)
{ {

36
actions/twitapifriendships.php
View File

@ -17,7 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) {
exit(1);
}
require_once(INSTALLDIR.'/lib/twitterapi.php'); require_once(INSTALLDIR.'/lib/twitterapi.php');
@ -29,23 +31,25 @@ class TwitapifriendshipsAction extends TwitterapiAction
parent::handle($args); parent::handle($args);
if ($_SERVER['REQUEST_METHOD'] != 'POST') { if ($_SERVER['REQUEST_METHOD'] != 'POST') {
$this->clientError(_('This method requires a POST.'), 400, $apidata['content-type']); $this->clientError(_('This method requires a POST.'),
400, $apidata['content-type']);
return; return;
} }
$id = $apidata['api_arg']; $id = $apidata['api_arg'];
$other = $this->get_user($id); $other = $this->get_user($id);
if (!$other) { if (empty($other)) {
$this->clientError(_('Could not follow user: User not found.'), 403, $apidata['content-type']); $this->clientError(_('Could not follow user: User not found.'),
403, $apidata['content-type']);
return; return;
} }
$user = $apidata['user']; $user = $apidata['user'];
if ($user->isSubscribed($other)) { if ($user->isSubscribed($other)) {
$errmsg = sprintf(_('Could not follow user: %s is already on your list.'), $other->nickname); $errmsg = sprintf(_('Could not follow user: %s is already on your list.'),
$other->nickname);
$this->clientError($errmsg, 403, $apidata['content-type']); $this->clientError($errmsg, 403, $apidata['content-type']);
return; return;
} }
@ -60,8 +64,9 @@ class TwitapifriendshipsAction extends TwitterapiAction
$result = $sub->insert(); $result = $sub->insert();
if (!$result) { if (empty($result)) {
$errmsg = sprintf(_('Could not follow user: %s is already on your list.'), $other->nickname); $errmsg = sprintf(_('Could not follow user: %s is already on your list.'),
$other->nickname);
$this->clientError($errmsg, 400, $apidata['content-type']); $this->clientError($errmsg, 400, $apidata['content-type']);
return; return;
} }
@ -82,7 +87,8 @@ class TwitapifriendshipsAction extends TwitterapiAction
parent::handle($args); parent::handle($args);
if (!in_array($_SERVER['REQUEST_METHOD'], array('POST', 'DELETE'))) { if (!in_array($_SERVER['REQUEST_METHOD'], array('POST', 'DELETE'))) {
$this->clientError(_('This method requires a POST or DELETE.'), 400, $apidata['content-type']); $this->clientError(_('This method requires a POST or DELETE.'),
400, $apidata['content-type']);
return; return;
} }
@ -91,7 +97,7 @@ class TwitapifriendshipsAction extends TwitterapiAction
# We can't subscribe to a remote person, but we can unsub # We can't subscribe to a remote person, but we can unsub
$other = $this->get_profile($id); $other = $this->get_profile($id);
$user = $apidata['user']; $user = $apidata['user']; // Alwyas the auth user
$sub = new Subscription(); $sub = new Subscription();
$sub->subscriber = $user->id; $sub->subscriber = $user->id;
@ -102,7 +108,8 @@ class TwitapifriendshipsAction extends TwitterapiAction
$sub->delete(); $sub->delete();
$sub->query('COMMIT'); $sub->query('COMMIT');
} else { } else {
$this->clientError(_('You are not friends with the specified user.'), 403, $apidata['content-type']); $this->clientError(_('You are not friends with the specified user.'),
403, $apidata['content-type']);
return; return;
} }
@ -128,8 +135,9 @@ class TwitapifriendshipsAction extends TwitterapiAction
$user_a = $this->get_user($user_a_id); $user_a = $this->get_user($user_a_id);
$user_b = $this->get_user($user_b_id); $user_b = $this->get_user($user_b_id);
if (!$user_a || !$user_b) { if (empty($user_a) || empty($user_b)) {
$this->clientError(_('Two user ids or screen_names must be supplied.'), 400, $apidata['content-type']); $this->clientError(_('Two user ids or screen_names must be supplied.'),
400, $apidata['content-type']);
return; return;
} }

4
actions/twitapihelp.php
View File

@ -17,7 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) {
exit(1);
}
require_once(INSTALLDIR.'/lib/twitterapi.php'); require_once(INSTALLDIR.'/lib/twitterapi.php');

399
actions/twitapistatuses.php
View File

@ -17,7 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) {
exit(1);
}
require_once(INSTALLDIR.'/lib/twitterapi.php'); require_once(INSTALLDIR.'/lib/twitterapi.php');
@ -26,64 +28,45 @@ class TwitapistatusesAction extends TwitterapiAction
function public_timeline($args, $apidata) function public_timeline($args, $apidata)
{ {
parent::handle($args); // XXX: To really live up to the spec we need to build a list
$sitename = common_config('site', 'name');
$title = sprintf(_("%s public timeline"), $sitename);
$taguribase = common_config('integration', 'taguri');
$id = "tag:$taguribase:PublicTimeline";
$link = common_root_url();
$subtitle = sprintf(_("%s updates from everyone!"), $sitename);
// Number of public statuses to return by default -- Twitter sends 20
$MAX_PUBSTATUSES = 20;
// FIXME: To really live up to the spec we need to build a list
// of notices by users who have custom avatars, so fix this SQL -- Zach // of notices by users who have custom avatars, so fix this SQL -- Zach
$page = $this->arg('page'); parent::handle($args);
$since_id = $this->arg('since_id');
$max_id = $this->arg('max_id');
if (!$page) { $sitename = common_config('site', 'name');
$page = 1; $title = sprintf(_("%s public timeline"), $sitename);
} $taguribase = common_config('integration', 'taguri');
if (!$since_id) { $id = "tag:$taguribase:PublicTimeline";
$since_id = 0; $link = common_root_url();
} $subtitle = sprintf(_("%s updates from everyone!"), $sitename);
if (!$max_id) {
$max_id = 0;
}
$since = strtotime($this->arg('since')); $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');
$notice = Notice::publicStream((($page-1)*$MAX_PUBSTATUSES), $MAX_PUBSTATUSES, $since_id, $max_id, $since); $notice = Notice::publicStream(($page-1)*$count, $count, $since_id,
$max_id, $since);
if ($notice) { switch($apidata['content-type']) {
case 'xml':
switch($apidata['content-type']) { $this->show_xml_timeline($notice);
case 'xml': break;
$this->show_xml_timeline($notice); case 'rss':
break; $this->show_rss_timeline($notice, $title, $link, $subtitle);
case 'rss': break;
$this->show_rss_timeline($notice, $title, $link, $subtitle); case 'atom':
break; $selfuri = common_root_url() . 'api/statuses/public_timeline.atom';
case 'atom': $this->show_atom_timeline($notice, $title, $id, $link,
$selfuri = common_root_url() . 'api/statuses/public_timeline.atom'; $subtitle, null, $selfuri);
$this->show_atom_timeline($notice, $title, $id, $link, $subtitle, null, $selfuri); break;
break; case 'json':
case 'json': $this->show_json_timeline($notice);
$this->show_json_timeline($notice); break;
break; default:
default: $this->clientError(_('API method not found!'), $code = 404);
$this->clientError(_('API method not found!'), $code = 404); break;
break;
}
} else {
$this->serverError(_('Couldn\'t find any statuses.'), $code = 503);
} }
} }
@ -92,68 +75,57 @@ class TwitapistatusesAction extends TwitterapiAction
{ {
parent::handle($args); parent::handle($args);
$since = $this->arg('since');
$since_id = $this->arg('since_id');
$count = $this->arg('count');
$page = $this->arg('page');
$max_id = $this->arg('max_id');
if (!$page) {
$page = 1;
}
if (!$count) {
$count = 20;
}
if (!$since_id) {
$since_id = 0;
}
if (!$max_id) {
$max_id = 0;
}
$since = strtotime($this->arg('since'));
$user = $this->get_user($apidata['api_arg'], $apidata); $user = $this->get_user($apidata['api_arg'], $apidata);
$this->auth_user = $user; $this->auth_user = $user;
if (empty($user)) { if (empty($user)) {
$this->clientError(_('No such user!'), 404, $apidata['content-type']); $this->clientError(_('No such user!'), 404,
$apidata['content-type']);
return; return;
} }
$profile = $user->getProfile(); $profile = $user->getProfile();
$sitename = common_config('site', 'name'); $sitename = common_config('site', 'name');
$title = sprintf(_("%s and friends"), $user->nickname); $title = sprintf(_("%s and friends"), $user->nickname);
$taguribase = common_config('integration', 'taguri'); $taguribase = common_config('integration', 'taguri');
$id = "tag:$taguribase:FriendsTimeline:" . $user->id; $id = "tag:$taguribase:FriendsTimeline:" . $user->id;
$link = common_local_url('all', array('nickname' => $user->nickname)); $link = common_local_url('all',
$subtitle = sprintf(_('Updates from %1$s and friends on %2$s!'), $user->nickname, $sitename); array('nickname' => $user->nickname));
$subtitle = sprintf(_('Updates from %1$s and friends on %2$s!'),
$user->nickname, $sitename);
$notice = $user->noticesWithFriends(($page-1)*20, $count, $since_id, $max_id, $since); $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');
$notice = $user->noticesWithFriends(($page-1)*$count,
$count, $since_id, $max_id,$since);
switch($apidata['content-type']) { switch($apidata['content-type']) {
case 'xml': case 'xml':
$this->show_xml_timeline($notice); $this->show_xml_timeline($notice);
break; break;
case 'rss': case 'rss':
$this->show_rss_timeline($notice, $title, $link, $subtitle); $this->show_rss_timeline($notice, $title, $link, $subtitle);
break; break;
case 'atom': case 'atom':
if (isset($apidata['api_arg'])) { if (isset($apidata['api_arg'])) {
$selfuri = common_root_url() . $selfuri = common_root_url() .
'api/statuses/friends_timeline/' . $apidata['api_arg'] . '.atom'; 'api/statuses/friends_timeline/' .
$apidata['api_arg'] . '.atom';
} else { } else {
$selfuri = common_root_url() . $selfuri = common_root_url() .
'api/statuses/friends_timeline.atom'; 'api/statuses/friends_timeline.atom';
} }
$this->show_atom_timeline($notice, $title, $id, $link, $subtitle, null, $selfuri); $this->show_atom_timeline($notice, $title, $id, $link,
$subtitle, null, $selfuri);
break; break;
case 'json': case 'json':
$this->show_json_timeline($notice); $this->show_json_timeline($notice);
break; break;
default: default:
$this->clientError(_('API method not found!'), $code = 404); $this->clientError(_('API method not found!'), $code = 404);
} }
@ -166,48 +138,21 @@ class TwitapistatusesAction extends TwitterapiAction
$this->auth_user = $apidata['user']; $this->auth_user = $apidata['user'];
$user = $this->get_user($apidata['api_arg'], $apidata); $user = $this->get_user($apidata['api_arg'], $apidata);
if (!$user) { if (empty($user)) {
$this->clientError('Not Found', 404, $apidata['content-type']); $this->clientError('Not Found', 404, $apidata['content-type']);
return; return;
} }
$profile = $user->getProfile(); $profile = $user->getProfile();
if (!$profile) { $sitename = common_config('site', 'name');
$this->serverError(_('User has no profile.')); $title = sprintf(_("%s timeline"), $user->nickname);
return;
}
$count = $this->arg('count');
$since = $this->arg('since');
$since_id = $this->arg('since_id');
$page = $this->arg('page');
$max_id = $this->arg('max_id');
if (!$page) {
$page = 1;
}
if (!$count) {
$count = 20;
}
if (!$since_id) {
$since_id = 0;
}
if (!$max_id) {
$max_id = 0;
}
$since = strtotime($this->arg('since'));
$sitename = common_config('site', 'name');
$title = sprintf(_("%s timeline"), $user->nickname);
$taguribase = common_config('integration', 'taguri'); $taguribase = common_config('integration', 'taguri');
$id = "tag:$taguribase:UserTimeline:".$user->id; $id = "tag:$taguribase:UserTimeline:".$user->id;
$link = common_local_url('showstream', array('nickname' => $user->nickname)); $link = common_local_url('showstream',
$subtitle = sprintf(_('Updates from %1$s on %2$s!'), $user->nickname, $sitename); array('nickname' => $user->nickname));
$subtitle = sprintf(_('Updates from %1$s on %2$s!'),
$user->nickname, $sitename);
# FriendFeed's SUP protocol # FriendFeed's SUP protocol
# Also added RSS and Atom feeds # Also added RSS and Atom feeds
@ -215,26 +160,34 @@ class TwitapistatusesAction extends TwitterapiAction
$suplink = common_local_url('sup', null, null, $user->id); $suplink = common_local_url('sup', null, null, $user->id);
header('X-SUP-ID: '.$suplink); header('X-SUP-ID: '.$suplink);
# XXX: since $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');
$notice = $user->getNotices((($page-1)*20), $count, $since_id, $max_id, $since); $notice = $user->getNotices(($page-1)*$count,
$count, $since_id, $max_id, $since);
switch($apidata['content-type']) { switch($apidata['content-type']) {
case 'xml': case 'xml':
$this->show_xml_timeline($notice); $this->show_xml_timeline($notice);
break; break;
case 'rss': case 'rss':
$this->show_rss_timeline($notice, $title, $link, $subtitle, $suplink); $this->show_rss_timeline($notice, $title, $link,
$subtitle, $suplink);
break; break;
case 'atom': case 'atom':
if (isset($apidata['api_arg'])) { if (isset($apidata['api_arg'])) {
$selfuri = common_root_url() . $selfuri = common_root_url() .
'api/statuses/user_timeline/' . $apidata['api_arg'] . '.atom'; 'api/statuses/user_timeline/' .
$apidata['api_arg'] . '.atom';
} else { } else {
$selfuri = common_root_url() . $selfuri = common_root_url() .
'api/statuses/user_timeline.atom'; 'api/statuses/user_timeline.atom';
} }
$this->show_atom_timeline($notice, $title, $id, $link, $subtitle, $suplink, $selfuri); $this->show_atom_timeline($notice, $title, $id, $link,
$subtitle, $suplink, $selfuri);
break; break;
case 'json': case 'json':
$this->show_json_timeline($notice); $this->show_json_timeline($notice);
@ -247,7 +200,6 @@ class TwitapistatusesAction extends TwitterapiAction
function update($args, $apidata) function update($args, $apidata)
{ {
parent::handle($args); parent::handle($args);
if (!in_array($apidata['content-type'], array('xml', 'json'))) { if (!in_array($apidata['content-type'], array('xml', 'json'))) {
@ -256,21 +208,24 @@ class TwitapistatusesAction extends TwitterapiAction
} }
if ($_SERVER['REQUEST_METHOD'] != 'POST') { if ($_SERVER['REQUEST_METHOD'] != 'POST') {
$this->clientError(_('This method requires a POST.'), 400, $apidata['content-type']); $this->clientError(_('This method requires a POST.'),
400, $apidata['content-type']);
return; return;
} }
$this->auth_user = $apidata['user']; $user = $apidata['user']; // Always the auth user
$user = $this->auth_user;
$status = $this->trimmed('status'); $status = $this->trimmed('status');
$source = $this->trimmed('source'); $source = $this->trimmed('source');
$in_reply_to_status_id = intval($this->trimmed('in_reply_to_status_id')); $in_reply_to_status_id =
intval($this->trimmed('in_reply_to_status_id'));
$reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api'); $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'; $source = 'api';
} }
if (!$status) { if (empty($status)) {
// XXX: Note: In this case, Twitter simply returns '200 OK' // XXX: Note: In this case, Twitter simply returns '200 OK'
// No error is given, but the status is not posted to the // No error is given, but the status is not posted to the
@ -288,9 +243,9 @@ class TwitapistatusesAction extends TwitterapiAction
// as "truncated." Sending this error may screw up some clients // as "truncated." Sending this error may screw up some clients
// that assume Twitter will truncate for them. Should we just // that assume Twitter will truncate for them. Should we just
// truncate too? -- Zach // truncate too? -- Zach
$this->clientError(_('That\'s too long. Max notice size is 140 chars.'), $code = 406, $apidata['content-type']); $this->clientError(_('That\'s too long. Max notice size is 140 chars.'),
$code = 406, $apidata['content-type']);
return; return;
} }
} }
@ -321,13 +276,15 @@ class TwitapistatusesAction extends TwitterapiAction
if ($reply) { if ($reply) {
$reply_to = $in_reply_to_status_id; $reply_to = $in_reply_to_status_id;
} else { } else {
$this->clientError(_('Not found'), $code = 404, $apidata['content-type']); $this->clientError(_('Not found'), $code = 404,
$apidata['content-type']);
return; return;
} }
} }
$notice = Notice::saveNew($user->id, html_entity_decode($status, ENT_NOQUOTES, 'UTF-8'), $notice = Notice::saveNew($user->id,
$source, 1, $reply_to); html_entity_decode($status, ENT_NOQUOTES, 'UTF-8'),
$source, 1, $reply_to);
if (is_string($notice)) { if (is_string($notice)) {
$this->serverError($notice); $this->serverError($notice);
@ -343,71 +300,55 @@ class TwitapistatusesAction extends TwitterapiAction
function mentions($args, $apidata) function mentions($args, $apidata)
{ {
parent::handle($args); parent::handle($args);
$since = $this->arg('since');
$count = $this->arg('count');
$page = $this->arg('page');
$since_id = $this->arg('since_id');
$max_id = $this->arg('max_id');
$user = $this->get_user($apidata['api_arg'], $apidata); $user = $this->get_user($apidata['api_arg'], $apidata);
$this->auth_user = $apidata['user']; $this->auth_user = $apidata['user'];
if (empty($user)) {
$this->clientError(_('No such user!'), 404,
$apidata['content-type']);
return;
}
$profile = $user->getProfile(); $profile = $user->getProfile();
$sitename = common_config('site', 'name'); $sitename = common_config('site', 'name');
$title = sprintf(_('%1$s / Updates mentioning %2$s'), $title = sprintf(_('%1$s / Updates mentioning %2$s'),
$sitename, $user->nickname); $sitename, $user->nickname);
$taguribase = common_config('integration', 'taguri'); $taguribase = common_config('integration', 'taguri');
$id = "tag:$taguribase:Mentions:".$user->id; $id = "tag:$taguribase:Mentions:".$user->id;
$link = common_local_url('replies', array('nickname' => $user->nickname)); $link = common_local_url('replies',
$subtitle = sprintf(_('%1$s updates that reply to updates from %2$s / %3$s.'), array('nickname' => $user->nickname));
$subtitle = sprintf(_('%1$s updates that reply to updates from %2$s / %3$s.'),
$sitename, $user->nickname, $profile->getBestName()); $sitename, $user->nickname, $profile->getBestName());
if (!$page) { $page = (int)$this->arg('page', 1);
$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 (!$count) { $notice = $user->getReplies(($page-1)*$count,
$count = 20;
}
if (!$since_id) {
$since_id = 0;
}
if (!$max_id) {
$max_id = 0;
}
$since = strtotime($this->arg('since'));
$notice = $user->getReplies((($page-1)*20),
$count, $since_id, $max_id, $since); $count, $since_id, $max_id, $since);
$notices = array();
while ($notice->fetch()) {
$notices[] = clone($notice);
}
switch($apidata['content-type']) { switch($apidata['content-type']) {
case 'xml': case 'xml':
$this->show_xml_timeline($notices); $this->show_xml_timeline($notice);
break; break;
case 'rss': case 'rss':
$this->show_rss_timeline($notices, $title, $link, $subtitle); $this->show_rss_timeline($notice, $title, $link, $subtitle);
break; break;
case 'atom': case 'atom':
$selfuri = common_root_url() . $selfuri = common_root_url() .
ltrim($_SERVER['QUERY_STRING'], 'p='); ltrim($_SERVER['QUERY_STRING'], 'p=');
$this->show_atom_timeline($notices, $title, $id, $link, $subtitle, $this->show_atom_timeline($notice, $title, $id, $link, $subtitle,
null, $selfuri); null, $selfuri);
break; break;
case 'json': case 'json':
$this->show_json_timeline($notices); $this->show_json_timeline($notice);
break; break;
default: default:
$this->clientError(_('API method not found!'), $code = 404); $this->clientError(_('API method not found!'), $code = 404);
} }
@ -428,8 +369,8 @@ class TwitapistatusesAction extends TwitterapiAction
} }
$this->auth_user = $apidata['user']; $this->auth_user = $apidata['user'];
$notice_id = $apidata['api_arg']; $notice_id = $apidata['api_arg'];
$notice = Notice::staticGet($notice_id); $notice = Notice::staticGet($notice_id);
if ($notice) { if ($notice) {
if ($apidata['content-type'] == 'xml') { if ($apidata['content-type'] == 'xml') {
@ -438,15 +379,16 @@ class TwitapistatusesAction extends TwitterapiAction
$this->show_single_json_status($notice); $this->show_single_json_status($notice);
} }
} else { } else {
// XXX: Twitter just sets a 404 header and doens't bother to return an err msg // XXX: Twitter just sets a 404 header and doens't bother
$this->clientError(_('No status with that ID found.'), 404, $apidata['content-type']); // to return an err msg
$this->clientError(_('No status with that ID found.'),
404, $apidata['content-type']);
} }
} }
function destroy($args, $apidata) function destroy($args, $apidata)
{ {
parent::handle($args); parent::handle($args);
if (!in_array($apidata['content-type'], array('xml', 'json'))) { if (!in_array($apidata['content-type'], array('xml', 'json'))) {
@ -457,17 +399,18 @@ class TwitapistatusesAction extends TwitterapiAction
// Check for RESTfulness // Check for RESTfulness
if (!in_array($_SERVER['REQUEST_METHOD'], array('POST', 'DELETE'))) { if (!in_array($_SERVER['REQUEST_METHOD'], array('POST', 'DELETE'))) {
// XXX: Twitter just prints the err msg, no XML / JSON. // XXX: Twitter just prints the err msg, no XML / JSON.
$this->clientError(_('This method requires a POST or DELETE.'), 400, $apidata['content-type']); $this->clientError(_('This method requires a POST or DELETE.'),
400, $apidata['content-type']);
return; return;
} }
$this->auth_user = $apidata['user']; $user = $apidata['user']; // Always the auth user
$user = $this->auth_user;
$notice_id = $apidata['api_arg']; $notice_id = $apidata['api_arg'];
$notice = Notice::staticGet($notice_id); $notice = Notice::staticGet($notice_id);
if (!$notice) { if (empty($notice)) {
$this->clientError(_('No status found with that ID.'), 404, $apidata['content-type']); $this->clientError(_('No status found with that ID.'),
404, $apidata['content-type']);
return; return;
} }
@ -483,7 +426,8 @@ class TwitapistatusesAction extends TwitterapiAction
$this->show_single_json_status($notice); $this->show_single_json_status($notice);
} }
} else { } else {
$this->clientError(_('You may not delete another user\'s status.'), 403, $apidata['content-type']); $this->clientError(_('You may not delete another user\'s status.'),
403, $apidata['content-type']);
} }
} }
@ -514,42 +458,41 @@ class TwitapistatusesAction extends TwitterapiAction
function subscriptions($apidata, $other_attr, $user_attr, $onlyIDs=false) function subscriptions($apidata, $other_attr, $user_attr, $onlyIDs=false)
{ {
$this->auth_user = $apidata['user']; $this->auth_user = $apidata['user'];
$user = $this->get_user($apidata['api_arg'], $apidata); $user = $this->get_user($apidata['api_arg'], $apidata);
if (!$user) { if (empty($user)) {
$this->clientError('Not Found', 404, $apidata['content-type']); $this->clientError('Not Found', 404, $apidata['content-type']);
return; return;
} }
$page = $this->trimmed('page');
if (!$page || !is_numeric($page)) {
$page = 1;
}
$profile = $user->getProfile(); $profile = $user->getProfile();
if (!$profile) {
$this->serverError(_('User has no profile.'));
return;
}
$sub = new Subscription(); $sub = new Subscription();
$sub->$user_attr = $profile->id; $sub->$user_attr = $profile->id;
$since = strtotime($this->trimmed('since'));
if ($since) {
$d = date('Y-m-d H:i:s', $since);
$sub->whereAdd("created > '$d'");
}
$sub->orderBy('created DESC'); $sub->orderBy('created DESC');
// Normally, page 100 friends at a time
if (!$onlyIDs) { if (!$onlyIDs) {
$sub->limit(($page-1)*100, 100); $page = $this->arg('page', 1);
$count = $this->arg('count', 100);
$sub->limit(($page-1)*$count, $count);
} else {
// If we're just looking at IDs, return
// ALL of them, unless the user specifies a page,
// in which case, return 500 per page.
$page = $this->arg('page');
if (!empty($page)) {
if ($page < 1) {
$page = 1;
}
$count = 500;
$sub->limit(($page-1)*$count, $count);
}
} }
$others = array(); $others = array();
@ -578,21 +521,21 @@ class TwitapistatusesAction extends TwitterapiAction
function show_profiles($profiles, $type) function show_profiles($profiles, $type)
{ {
switch ($type) { switch ($type) {
case 'xml': case 'xml':
$this->elementStart('users', array('type' => 'array')); $this->elementStart('users', array('type' => 'array'));
foreach ($profiles as $profile) { foreach ($profiles as $profile) {
$this->show_profile($profile); $this->show_profile($profile);
} }
$this->elementEnd('users'); $this->elementEnd('users');
break; break;
case 'json': case 'json':
$arrays = array(); $arrays = array();
foreach ($profiles as $profile) { foreach ($profiles as $profile) {
$arrays[] = $this->twitter_user_array($profile, true); $arrays[] = $this->twitter_user_array($profile, true);
} }
print json_encode($arrays); print json_encode($arrays);
break; break;
default: default:
$this->clientError(_('unsupported file type')); $this->clientError(_('unsupported file type'));
} }
} }
@ -600,21 +543,21 @@ class TwitapistatusesAction extends TwitterapiAction
function showIDs($profiles, $type) function showIDs($profiles, $type)
{ {
switch ($type) { switch ($type) {
case 'xml': case 'xml':
$this->elementStart('ids'); $this->elementStart('ids');
foreach ($profiles as $profile) { foreach ($profiles as $profile) {
$this->element('id', null, $profile->id); $this->element('id', null, $profile->id);
} }
$this->elementEnd('ids'); $this->elementEnd('ids');
break; break;
case 'json': case 'json':
$ids = array(); $ids = array();
foreach ($profiles as $profile) { foreach ($profiles as $profile) {
$ids[] = (int)$profile->id; $ids[] = (int)$profile->id;
} }
print json_encode($ids); print json_encode($ids);
break; break;
default: default:
$this->clientError(_('unsupported file type')); $this->clientError(_('unsupported file type'));
} }
} }
@ -627,8 +570,8 @@ class TwitapistatusesAction extends TwitterapiAction
function supported($cmd) function supported($cmd)
{ {
$cmdlist = array('MessageCommand', 'SubCommand', 'UnsubCommand',
$cmdlist = array('MessageCommand', 'SubCommand', 'UnsubCommand', 'FavCommand', 'OnCommand', 'OffCommand'); 'FavCommand', 'OnCommand', 'OffCommand');
if (in_array(get_class($cmd), $cmdlist)) { if (in_array(get_class($cmd), $cmdlist)) {
return true; return true;

13
actions/twitapiusers.php
View File

@ -17,7 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) {
exit(1);
}
require_once(INSTALLDIR.'/lib/twitterapi.php'); require_once(INSTALLDIR.'/lib/twitterapi.php');
@ -51,18 +53,11 @@ class TwitapiusersAction extends TwitterapiAction
$user = $apidata['user']; $user = $apidata['user'];
} }
if (!$user) { if (empty($user)) {
$this->client_error(_('Not found.'), 404, $apidata['content-type']); $this->client_error(_('Not found.'), 404, $apidata['content-type']);
return; return;
} }
$profile = $user->getProfile();
if (!$profile) {
common_server_error(_('User has no profile.'));
return;
}
$twitter_user = $this->twitter_user_array($profile, true); $twitter_user = $this->twitter_user_array($profile, true);
if ($apidata['content-type'] == 'xml') { if ($apidata['content-type'] == 'xml') {

19
classes/Notice.php
View File

@ -120,7 +120,8 @@ class Notice extends Memcached_DataObject
} }
} }
static function saveNew($profile_id, $content, $source=null, $is_local=1, $reply_to=null, $uri=null) { static function saveNew($profile_id, $content, $source=null,
$is_local=1, $reply_to=null, $uri=null, $created=null) {
$profile = Profile::staticGet($profile_id); $profile = Profile::staticGet($profile_id);
@ -166,7 +167,11 @@ class Notice extends Memcached_DataObject
$notice->query('BEGIN'); $notice->query('BEGIN');
$notice->reply_to = $reply_to; $notice->reply_to = $reply_to;
$notice->created = common_sql_now(); if (!empty($created)) {
$notice->created = $created;
} else {
$notice->created = common_sql_now();
}
$notice->content = $final; $notice->content = $final;
$notice->rendered = common_render_content($final, $notice); $notice->rendered = common_render_content($final, $notice);
$notice->source = $source; $notice->source = $source;
@ -271,13 +276,15 @@ class Notice extends Memcached_DataObject
function getUploadedAttachment() { function getUploadedAttachment() {
$post = clone $this; $post = clone $this;
$query = 'select file.url as uploaded from file join file_to_post on file.id = file_id where post_id=' . $post->escape($post->id) . ' and url like "%/notice/%/file"'; $query = 'select file.url as up, file.id as i from file join file_to_post on file.id = file_id where post_id=' . $post->escape($post->id) . ' and url like "%/notice/%/file"';
$post->query($query); $post->query($query);
$post->fetch(); $post->fetch();
$ret = $post->uploaded; if (empty($post->up) || empty($post->i)) {
// var_dump($post); $ret = false;
} else {
$ret = array($post->up, $post->i);
}
$post->free(); $post->free();
// die();
return $ret; return $ret;
} }

5
classes/Notice_inbox.php
View File

@ -85,4 +85,9 @@ class Notice_inbox extends Memcached_DataObject
return $ids; return $ids;
} }
function &pkeyGet($kv)
{
return Memcached_DataObject::pkeyGet('Notice_inbox', $kv);
}
} }

28
js/util.js
View File

@ -178,7 +178,14 @@ $(document).ready(function(){
$('#form_notice').append(document._importNode($(".error", xhr.responseXML).get(0), true)); $('#form_notice').append(document._importNode($(".error", xhr.responseXML).get(0), true));
} }
else { else {
alert("Sorry! We had trouble sending your notice ("+xhr.status+" "+xhr.statusText+"). Please report the problem to the site administrator if this happens again."); var HTTP20x30x = [200, 201, 202, 203, 204, 205, 206, 300, 301, 302, 303, 304, 305, 306, 307];
if(jQuery.inArray(parseInt(xhr.status), HTTP20x30x) < 0) {
alert("Sorry! We had trouble sending your notice ("+xhr.status+" "+xhr.statusText+"). Please report the problem to the site administrator if this happens again.");
}
else {
$("#notice_data-text").val("");
counter();
}
} }
} }
}, },
@ -196,10 +203,20 @@ $(document).ready(function(){
else { else {
li = $("li", xml).get(0); li = $("li", xml).get(0);
if ($("#"+li.id).length == 0) { if ($("#"+li.id).length == 0) {
$("#notices_primary .notices").prepend(document._importNode(li, true)); var notice_irt_value = $('#notice_in-reply-to').val();
$("#notices_primary .notice:first").css({display:"none"}); var notice_irt = '#notices_primary #notice-'+notice_irt_value;
$("#notices_primary .notice:first").fadeIn(2500); if($('body')[0].id == 'conversation') {
NoticeReply(); if(notice_irt_value.length > 0 && $(notice_irt+' .notices').length < 1) {
$(notice_irt).append('<ul class="notices"></ul>');
}
$($(notice_irt+' .notices')[0]).append(document._importNode(li, true));
}
else {
$("#notices_primary .notices").prepend(document._importNode(li, true));
}
$('#'+li.id).css({display:'none'});
$('#'+li.id).fadeIn(2500);
NoticeReply();
} }
} }
$("#notice_data-text").val(""); $("#notice_data-text").val("");
@ -303,4 +320,3 @@ function NoticeAttachments() {
} }
); );
} }

102
lib/action.php
View File

@ -124,7 +124,6 @@ class Action extends HTMLOutputter // lawsuit
$this->showShortcutIcon(); $this->showShortcutIcon();
$this->showStylesheets(); $this->showStylesheets();
$this->showScripts(); $this->showScripts();
$this->showRelationshipLinks();
$this->showOpenSearch(); $this->showOpenSearch();
$this->showFeeds(); $this->showFeeds();
$this->showDescription(); $this->showDescription();
@ -224,16 +223,6 @@ class Action extends HTMLOutputter // lawsuit
'href="'.theme_path('css/ie.css', null).'?version='.LACONICA_VERSION.'" /><![endif]'); 'href="'.theme_path('css/ie.css', null).'?version='.LACONICA_VERSION.'" /><![endif]');
Event::handle('EndShowUAStyles', array($this)); Event::handle('EndShowUAStyles', array($this));
} }
if (Event::handle('StartShowDesign', array($this))) {
$design = $this->getDesign();
if (!empty($design)) {
$cur = common_current_user();
if (empty($cur) || $cur->viewdesigns) {
$design->showCSS($this);
}
}
Event::handle('EndShowDesign', array($this, $design));
}
Event::handle('EndShowStyles', array($this)); Event::handle('EndShowStyles', array($this));
} }
} }
@ -258,6 +247,7 @@ class Action extends HTMLOutputter // lawsuit
'src' => common_path('js/jquery.joverlay.min.js')), 'src' => common_path('js/jquery.joverlay.min.js')),
' '); ' ');
Event::handle('EndShowJQueryScripts', array($this)); Event::handle('EndShowJQueryScripts', array($this));
} }
if (Event::handle('StartShowLaconicaScripts', array($this))) { if (Event::handle('StartShowLaconicaScripts', array($this))) {
@ -276,19 +266,6 @@ class Action extends HTMLOutputter // lawsuit
} }
} }
/**
* Show document relationship links
*
* SHOULD overload
*
* @return nothing
*/
function showRelationshipLinks()
{
// output <link> elements with appropriate HTML4.01 link types:
// http://www.w3.org/TR/html401/types.html#type-links
}
/** /**
* Show OpenSearch headers * Show OpenSearch headers
* *
@ -598,20 +575,32 @@ class Action extends HTMLOutputter // lawsuit
/** /**
* Show page notice block. * Show page notice block.
* *
* Only show the block if a subclassed action has overrided
* Action::showPageNotice(), or an event handler is registered for
* the StartShowPageNotice event, in which case we assume the
* 'page_notice' definition list is desired. This is to prevent
* empty 'page_notice' definition lists from being output everywhere.
*
* @return nothing * @return nothing
*/ */
function showPageNoticeBlock() function showPageNoticeBlock()
{ {
$this->elementStart('dl', array('id' => 'page_notice', $rmethod = new ReflectionMethod($this, 'showPageNotice');
'class' => 'system_notice')); $dclass = $rmethod->getDeclaringClass()->getName();
$this->element('dt', null, _('Page notice'));
$this->elementStart('dd'); if ($dclass != 'Action' || Event::hasHandler('StartShowPageNotice')) {
if (Event::handle('StartShowPageNotice', array($this))) {
$this->showPageNotice(); $this->elementStart('dl', array('id' => 'page_notice',
Event::handle('EndShowPageNotice', array($this)); 'class' => 'system_notice'));
$this->element('dt', null, _('Page notice'));
$this->elementStart('dd');
if (Event::handle('StartShowPageNotice', array($this))) {
$this->showPageNotice();
Event::handle('EndShowPageNotice', array($this));
}
$this->elementEnd('dd');
$this->elementEnd('dl');
} }
$this->elementEnd('dd');
$this->elementEnd('dl');
} }
/** /**
@ -1072,51 +1061,4 @@ class Action extends HTMLOutputter // lawsuit
{ {
return null; return null;
} }
/**
* Generate document metadata for sequential navigation
*
* @param boolean $have_before is there something before?
* @param boolean $have_after is there something after?
* @param integer $page current page
* @param string $action current action
* @param array $args rest of query arguments
*
* @return nothing
*/
function sequenceRelationships($have_next, $have_previous, $page, $action, $args=null)
{
// Outputs machine-readable pagination in <link> elements.
// Pattern taken from $this->pagination() method.
// "next" is equivalent to "after"
if ($have_next) {
$pargs = array('page' => $page-1);
$this->element('link', array('rel' => 'next',
'href' => common_local_url($action, $args, $pargs),
'title' => _('Next')));
}
// "previous" is equivalent to "before"
if ($have_previous=true) { // FIXME
$pargs = array('page' => $page+1);
$this->element('link', array('rel' => 'prev',
'href' => common_local_url($action, $args, $pargs),
'title' => _('Previous')));
}
}
/**
* A design for this action
*
* A design (colors and background) for the current page. May be
* the user's design, or a group's design, or a site design.
*
* @return Design a design object to use
*/
function getDesign()
{
// XXX: return site design by default
return null;
}
} }

28
lib/event.php
View File

@ -110,4 +110,32 @@ class Event {
} }
return ($result !== false); return ($result !== false);
} }
/**
* Check to see if an event handler exists
*
* Look to see if there's any handler for a given event, or narrow
* by providing the name of a specific plugin class.
*
* @param string $name Name of the event to look for
* @param string $plugin Optional name of the plugin class to look for
*
* @return boolean flag saying whether such a handler exists
*
*/
public static function hasHandler($name, $plugin=null) {
if (array_key_exists($name, Event::$_handlers)) {
if (isset($plugin)) {
foreach (Event::$_handlers[$name] as $handler) {
if (get_class($handler[0]) == $plugin) {
return true;
}
}
} else {
return true;
}
}
return false;
}
} }

2
lib/noticeform.php
View File

@ -148,6 +148,7 @@ class NoticeForm extends Form
$this->out->element('dd', array('id' => 'notice_text-count'), $this->out->element('dd', array('id' => 'notice_text-count'),
'140'); '140');
$this->out->elementEnd('dl'); $this->out->elementEnd('dl');
$this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
$this->out->element('label', array('for' => 'notice_data-attach'), _('Attach')); $this->out->element('label', array('for' => 'notice_data-attach'), _('Attach'));
$this->out->element('input', array('id' => 'notice_data-attach', $this->out->element('input', array('id' => 'notice_data-attach',
'type' => 'file', 'type' => 'file',
@ -157,7 +158,6 @@ class NoticeForm extends Form
$this->out->hidden('notice_return-to', $this->action, 'returnto'); $this->out->hidden('notice_return-to', $this->action, 'returnto');
} }
$this->out->hidden('notice_in-reply-to', $this->action, 'inreplyto'); $this->out->hidden('notice_in-reply-to', $this->action, 'inreplyto');
$this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
} }
/** /**

2
lib/noticelist.php
View File

@ -365,7 +365,7 @@ class NoticeListItem extends Widget
} }
$uploaded = $this->notice->getUploadedAttachment(); $uploaded = $this->notice->getUploadedAttachment();
if ($uploaded) { if ($uploaded) {
$this->out->element('a', array('href' => $uploaded, 'class' => 'attachment'), $uploaded); $this->out->element('a', array('href' => $uploaded[0], 'class' => 'attachment', 'id' => 'attachment-' . $uploaded[1]), $uploaded[0]);
} }
$this->out->elementEnd('p'); $this->out->elementEnd('p');
} }

25
lib/rssaction.php
View File

@ -170,7 +170,7 @@ class Rss10Action extends Action
$this->elementStart('rdf:Seq'); $this->elementStart('rdf:Seq');
foreach ($this->notices as $notice) { foreach ($this->notices as $notice) {
$this->element('sioct:MicroblogPost', array('rdf:resource' => $notice->uri)); $this->element('rdf:li', array('rdf:resource' => $notice->uri));
} }
$this->elementEnd('rdf:Seq'); $this->elementEnd('rdf:Seq');
@ -197,14 +197,19 @@ class Rss10Action extends Action
$profile = Profile::staticGet($notice->profile_id); $profile = Profile::staticGet($notice->profile_id);
$nurl = common_local_url('shownotice', array('notice' => $notice->id)); $nurl = common_local_url('shownotice', array('notice' => $notice->id));
$creator_uri = common_profile_uri($profile); $creator_uri = common_profile_uri($profile);
$this->elementStart('item', array('rdf:about' => $notice->uri)); $this->elementStart('item', array('rdf:about' => $notice->uri,
'rdf:type' => 'http://rdfs.org/sioc/types#MicroblogPost'));
$title = $profile->nickname . ': ' . common_xml_safe_str(trim($notice->content)); $title = $profile->nickname . ': ' . common_xml_safe_str(trim($notice->content));
$this->element('title', null, $title); $this->element('title', null, $title);
$this->element('link', null, $nurl); $this->element('link', null, $nurl);
$this->element('description', null, $profile->nickname."'s status on ".common_exact_date($notice->created)); $this->element('description', null, $profile->nickname."'s status on ".common_exact_date($notice->created));
if ($notice->rendered) {
$this->element('content:encoded', null, common_xml_safe_str($notice->rendered));
}
$this->element('dc:date', null, common_date_w3dtf($notice->created)); $this->element('dc:date', null, common_date_w3dtf($notice->created));
$this->element('dc:creator', null, ($profile->fullname) ? $profile->fullname : $profile->nickname); $this->element('dc:creator', null, ($profile->fullname) ? $profile->fullname : $profile->nickname);
$this->element('sioc:has_creator', array('rdf:resource' => $creator_uri)); $this->element('foaf:maker', array('rdf:resource' => $creator_uri));
$this->element('sioc:has_creator', array('rdf:resource' => $creator_uri.'#acct'));
$this->element('laconica:postIcon', array('rdf:resource' => $profile->avatarUrl())); $this->element('laconica:postIcon', array('rdf:resource' => $profile->avatarUrl()));
$this->element('cc:licence', array('rdf:resource' => common_config('license', 'url'))); $this->element('cc:licence', array('rdf:resource' => common_config('license', 'url')));
$this->elementEnd('item'); $this->elementEnd('item');
@ -216,15 +221,15 @@ class Rss10Action extends Action
foreach ($this->creators as $uri => $profile) { foreach ($this->creators as $uri => $profile) {
$id = $profile->id; $id = $profile->id;
$nickname = $profile->nickname; $nickname = $profile->nickname;
$this->elementStart('sioc:User', array('rdf:about' => $uri)); $this->elementStart('foaf:Agent', array('rdf:about' => $uri));
$this->element('foaf:nick', null, $nickname); $this->element('foaf:nick', null, $nickname);
if ($profile->fullname) { if ($profile->fullname) {
$this->element('foaf:name', null, $profile->fullname); $this->element('foaf:name', null, $profile->fullname);
} }
$this->element('sioc:id', null, $id); $this->element('foaf:holdsAccount', array('rdf:resource' => $uri.'#acct'));
$avatar = $profile->avatarUrl(); $avatar = $profile->avatarUrl();
$this->element('sioc:avatar', array('rdf:resource' => $avatar)); $this->element('foaf:depiction', array('rdf:resource' => $avatar));
$this->elementEnd('sioc:User'); $this->elementEnd('foaf:Agent');
} }
} }
@ -239,7 +244,7 @@ class Rss10Action extends Action
'xmlns:dc' => 'xmlns:dc' =>
'http://purl.org/dc/elements/1.1/', 'http://purl.org/dc/elements/1.1/',
'xmlns:cc' => 'xmlns:cc' =>
'http://web.resource.org/cc/', 'http://creativecommons.org/ns#',
'xmlns:content' => 'xmlns:content' =>
'http://purl.org/rss/1.0/modules/content/', 'http://purl.org/rss/1.0/modules/content/',
'xmlns:foaf' => 'xmlns:foaf' =>
@ -253,10 +258,10 @@ class Rss10Action extends Action
'xmlns' => 'http://purl.org/rss/1.0/')); 'xmlns' => 'http://purl.org/rss/1.0/'));
$this->elementStart('sioc:Site', array('rdf:about' => common_root_url())); $this->elementStart('sioc:Site', array('rdf:about' => common_root_url()));
$this->element('sioc:name', null, common_config('site', 'name')); $this->element('sioc:name', null, common_config('site', 'name'));
$this->elementStart('sioc:container_of'); $this->elementStart('sioc:space_of');
$this->element('sioc:Container', array('rdf:about' => $this->element('sioc:Container', array('rdf:about' =>
$channel['url'])); $channel['url']));
$this->elementEnd('sioc:container_of'); $this->elementEnd('sioc:space_of');
$this->elementEnd('sioc:Site'); $this->elementEnd('sioc:Site');
} }

89
lib/twitterapi.php
View File

@ -17,7 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) {
exit(1);
}
class TwitterapiAction extends Action class TwitterapiAction extends Action
{ {
@ -521,11 +523,11 @@ class TwitterapiAction extends Action
function init_document($type='xml') function init_document($type='xml')
{ {
switch ($type) { switch ($type) {
case 'xml': case 'xml':
header('Content-Type: application/xml; charset=utf-8'); header('Content-Type: application/xml; charset=utf-8');
$this->startXML(); $this->startXML();
break; break;
case 'json': case 'json':
header('Content-Type: application/json; charset=utf-8'); header('Content-Type: application/json; charset=utf-8');
// Check for JSONP callback // Check for JSONP callback
@ -534,15 +536,15 @@ class TwitterapiAction extends Action
print $callback . '('; print $callback . '(';
} }
break; break;
case 'rss': case 'rss':
header("Content-Type: application/rss+xml; charset=utf-8"); header("Content-Type: application/rss+xml; charset=utf-8");
$this->init_twitter_rss(); $this->init_twitter_rss();
break; break;
case 'atom': case 'atom':
header('Content-Type: application/atom+xml; charset=utf-8'); header('Content-Type: application/atom+xml; charset=utf-8');
$this->init_twitter_atom(); $this->init_twitter_atom();
break; break;
default: default:
$this->client_error(_('Not a supported data format.')); $this->client_error(_('Not a supported data format.'));
break; break;
} }
@ -553,10 +555,10 @@ class TwitterapiAction extends Action
function end_document($type='xml') function end_document($type='xml')
{ {
switch ($type) { switch ($type) {
case 'xml': case 'xml':
$this->endXML(); $this->endXML();
break; break;
case 'json': case 'json':
// Check for JSONP callback // Check for JSONP callback
$callback = $this->arg('callback'); $callback = $this->arg('callback');
@ -564,13 +566,13 @@ class TwitterapiAction extends Action
print ')'; print ')';
} }
break; break;
case 'rss': case 'rss':
$this->end_twitter_rss(); $this->end_twitter_rss();
break; break;
case 'atom': case 'atom':
$this->end_twitter_rss(); $this->end_twitter_rss();
break; break;
default: default:
$this->client_error(_('Not a supported data format.')); $this->client_error(_('Not a supported data format.'));
break; break;
} }
@ -657,13 +659,13 @@ class TwitterapiAction extends Action
{ {
$profile_array = $this->twitter_user_array($profile, true); $profile_array = $this->twitter_user_array($profile, true);
switch ($content_type) { switch ($content_type) {
case 'xml': case 'xml':
$this->show_twitter_xml_user($profile_array); $this->show_twitter_xml_user($profile_array);
break; break;
case 'json': case 'json':
$this->show_json_objects($profile_array); $this->show_json_objects($profile_array);
break; break;
default: default:
$this->client_error(_('Not a supported data format.')); $this->client_error(_('Not a supported data format.'));
return; return;
} }
@ -672,7 +674,7 @@ class TwitterapiAction extends Action
function get_user($id, $apidata=null) function get_user($id, $apidata=null)
{ {
if (!$id) { if (empty($id)) {
// Twitter supports these other ways of passing the user ID // Twitter supports these other ways of passing the user ID
if (is_numeric($this->arg('id'))) { if (is_numeric($this->arg('id'))) {
@ -720,13 +722,13 @@ class TwitterapiAction extends Action
{ {
$source_name = _($source); $source_name = _($source);
switch ($source) { switch ($source) {
case 'web': case 'web':
case 'xmpp': case 'xmpp':
case 'mail': case 'mail':
case 'omb': case 'omb':
case 'api': case 'api':
break; break;
default: default:
$ns = Notice_source::staticGet($source); $ns = Notice_source::staticGet($source);
if ($ns) { if ($ns) {
$source_name = '<a href="' . $ns->url . '">' . $ns->name . '</a>'; $source_name = '<a href="' . $ns->url . '">' . $ns->name . '</a>';
@ -736,4 +738,49 @@ class TwitterapiAction extends Action
return $source_name; return $source_name;
} }
/**
* Returns query argument or default value if not found. Certain
* parameters used throughout the API are lightly scrubbed and
* bounds checked. This overrides Action::arg().
*
* @param string $key requested argument
* @param string $def default value to return if $key is not provided
*
* @return var $var
*/
function arg($key, $def=null)
{
// XXX: Do even more input validation/scrubbing?
if (array_key_exists($key, $this->args)) {
switch($key) {
case 'page':
$page = (int)$this->args['page'];
return ($page < 1) ? 1 : $page;
case 'count':
$count = (int)$this->args['count'];
if ($count < 1) {
return 20;
} elseif ($count > 200) {
return 200;
} else {
return $count;
}
case 'since_id':
$since_id = (int)$this->args['since_id'];
return ($since_id < 1) ? 0 : $since_id;
case 'max_id':
$max_id = (int)$this->args['max_id'];
return ($max_id < 1) ? 0 : $max_id;
case 'since':
return strtotime($this->args['since']);
default:
return parent::arg($key, $def);
}
} else {
return $def;
}
}
} }

1
lib/util.php
View File

@ -922,7 +922,6 @@ function common_enqueue_notice_transport($notice, $transport)
$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError'); $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
common_log(LOG_ERR, 'DB error inserting queue item: ' . $last_error->message); common_log(LOG_ERR, 'DB error inserting queue item: ' . $last_error->message);
throw new ServerException('DB error inserting queue item: ' . $last_error->message); throw new ServerException('DB error inserting queue item: ' . $last_error->message);
>>>>>>> 0.7.x:lib/util.php
} }
common_log(LOG_DEBUG, 'complete queueing notice ID = ' . $notice->id . ' for ' . $transport); common_log(LOG_DEBUG, 'complete queueing notice ID = ' . $notice->id . ' for ' . $transport);
return true; return true;

45
scripts/twitterstatusfetcher.php
View File

@ -255,42 +255,11 @@ class TwitterStatusFetcher extends Daemon
// check to see if we've already imported the status // check to see if we've already imported the status
if (!$notice) { if (!$notice) {
$notice = new Notice(); $created = strftime('%Y-%m-%d %H:%M:%S',
$notice->profile_id = $id; strtotime($status->created_at));;
$notice->query('BEGIN'); $notice = Notice::saveNew($id, $status->text, 'twitter',
-2, null, $uri, $created);
// XXX: figure out reply_to
$notice->reply_to = null;
// XXX: Should this be common_sql_now() instead of status create date?
$notice->created = strftime('%Y-%m-%d %H:%M:%S',
strtotime($status->created_at));
$notice->content = $status->text;
$notice->rendered = common_render_content($status->text, $notice);
$notice->source = 'twitter';
$notice->is_local = 0;
$notice->uri = $uri;
$notice_id = $notice->insert();
if (!$notice_id) {
common_log_db_error($notice, 'INSERT', __FILE__);
if (defined('SCRIPT_DEBUG')) {
common_debug('Could not save notice!');
}
}
// XXX: Figure out a better way to link Twitter replies?
$notice->saveReplies();
// XXX: Do we want to pollute our tag cloud with
// hashtags from Twitter?
$notice->saveTags();
$notice->saveGroups();
$notice->query('COMMIT');
if (defined('SCRIPT_DEBUG')) { if (defined('SCRIPT_DEBUG')) {
common_debug("Saved status $status->id" . common_debug("Saved status $status->id" .
@ -298,13 +267,13 @@ class TwitterStatusFetcher extends Daemon
} }
} }
if (!Notice_inbox::staticGet('notice_id', $notice->id)) { if (!Notice_inbox::pkeyGet(array('notice_id' => $notice->id,
'user_id' => $flink->user_id))) {
// Add to inbox // Add to inbox
$inbox = new Notice_inbox(); $inbox = new Notice_inbox();
$inbox->user_id = $flink->user_id; $inbox->user_id = $flink->user_id;
$inbox->notice_id = $notice->id; $inbox->notice_id = $notice->id;
$inbox->created = common_sql_now(); $inbox->created = $notice->created;
$inbox->insert(); $inbox->insert();
} }

BIN
theme/base/images/icons/clip-big.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

BIN
theme/base/images/icons/clip-inline.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
theme/base/images/icons/clip.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB