whitespace changes to make phpcs happy for PuSH plugin

This commit is contained in:
Evan Prodromou 2010-01-20 16:29:11 -05:00
parent 1d37a6c428
commit 0167ff6d27

View File

@ -33,7 +33,7 @@ if (!defined('STATUSNET')) {
define('DEFAULT_HUB', 'http://pubsubhubbub.appspot.com'); define('DEFAULT_HUB', 'http://pubsubhubbub.appspot.com');
require_once(INSTALLDIR.'/plugins/PubSubHubBub/publisher.php'); require_once INSTALLDIR.'/plugins/PubSubHubBub/publisher.php';
class PubSubHubBubPlugin extends Plugin class PubSubHubBubPlugin extends Plugin
{ {
@ -44,15 +44,20 @@ class PubSubHubBubPlugin extends Plugin
parent::__construct(); parent::__construct();
} }
function onStartApiAtom($action){ function onStartApiAtom($action)
{
$action->element('link', array('rel' => 'hub', 'href' => $this->hub), null); $action->element('link', array('rel' => 'hub', 'href' => $this->hub), null);
} }
function onStartApiRss($action){ function onStartApiRss($action)
$action->element('atom:link',array('rel'=>'hub','href'=>$this->hub),null); {
$action->element('atom:link', array('rel' => 'hub',
'href' => $this->hub),
null);
} }
function onHandleQueuedNotice($notice){ function onHandleQueuedNotice($notice)
{
$publisher = new Publisher($this->hub); $publisher = new Publisher($this->hub);
$feeds = array(); $feeds = array();
@ -63,27 +68,43 @@ class PubSubHubBubPlugin extends Plugin
//author's own feeds //author's own feeds
$user = User::staticGet('id', $notice->profile_id); $user = User::staticGet('id', $notice->profile_id);
$feeds[]=common_local_url('ApiTimelineUser',array('id' => $user->nickname, 'format'=>'rss'));
$feeds[]=common_local_url('ApiTimelineUser',array('id' => $user->nickname, 'format'=>'atom')); $feeds[] = common_local_url('ApiTimelineUser',
array('id' => $user->nickname,
'format' => 'rss'));
$feeds[] = common_local_url('ApiTimelineUser',
array('id' => $user->nickname,
'format' => 'atom'));
//tag feeds //tag feeds
$tag = new Notice_tag(); $tag = new Notice_tag();
$tag->notice_id = $notice->id; $tag->notice_id = $notice->id;
if ($tag->find()) { if ($tag->find()) {
while ($tag->fetch()) { while ($tag->fetch()) {
$feeds[]=common_local_url('ApiTimelineTag',array('tag'=>$tag->tag, 'format'=>'rss')); $feeds[] = common_local_url('ApiTimelineTag',
$feeds[]=common_local_url('ApiTimelineTag',array('tag'=>$tag->tag, 'format'=>'atom')); array('tag' => $tag->tag,
'format' => 'rss'));
$feeds[] = common_local_url('ApiTimelineTag',
array('tag' => $tag->tag,
'format' => 'atom'));
} }
} }
//group feeds //group feeds
$group_inbox = new Group_inbox(); $group_inbox = new Group_inbox();
$group_inbox->notice_id = $notice->id; $group_inbox->notice_id = $notice->id;
if ($group_inbox->find()) { if ($group_inbox->find()) {
while ($group_inbox->fetch()) { while ($group_inbox->fetch()) {
$group = User_group::staticGet('id', $group_inbox->group_id); $group = User_group::staticGet('id', $group_inbox->group_id);
$feeds[]=common_local_url('ApiTimelineGroup',array('id' => $group->nickname,'format'=>'rss'));
$feeds[]=common_local_url('ApiTimelineGroup',array('id' => $group->nickname,'format'=>'atom')); $feeds[] = common_local_url('ApiTimelineGroup',
array('id' => $group->nickname,
'format' => 'rss'));
$feeds[] = common_local_url('ApiTimelineGroup',
array('id' => $group->nickname,
'format' => 'atom'));
} }
} }
@ -96,8 +117,12 @@ class PubSubHubBubPlugin extends Plugin
if (empty($user)) { if (empty($user)) {
continue; continue;
} }
$feeds[]=common_local_url('ApiTimelineFriends', array('id' => $user->nickname, 'format'=>'rss')); $feeds[] = common_local_url('ApiTimelineFriends',
$feeds[]=common_local_url('ApiTimelineFriends', array('id' => $user->nickname, 'format'=>'atom')); array('id' => $user->nickname,
'format' => 'rss'));
$feeds[] = common_local_url('ApiTimelineFriends',
array('id' => $user->nickname,
'format' => 'atom'));
} }
$replies = $notice->getReplies(); $replies = $notice->getReplies();
@ -106,14 +131,20 @@ class PubSubHubBubPlugin extends Plugin
foreach ($replies as $recipient) { foreach ($replies as $recipient) {
$user = User::staticGet('id', $recipient); $user = User::staticGet('id', $recipient);
if (!empty($user)) { if (!empty($user)) {
$feeds[]=common_local_url('ApiTimelineMentions',array('id' => $user->nickname,'format'=>'rss')); $feeds[] = common_local_url('ApiTimelineMentions',
$feeds[]=common_local_url('ApiTimelineMentions',array('id' => $user->nickname,'format'=>'atom')); array('id' => $user->nickname,
'format' => 'rss'));
$feeds[] = common_local_url('ApiTimelineMentions',
array('id' => $user->nickname,
'format' => 'atom'));
} }
} }
foreach (array_unique($feeds) as $feed) { foreach (array_unique($feeds) as $feed) {
if (!$publisher->publish_update($feed)) { if (!$publisher->publish_update($feed)) {
common_log_line(LOG_WARNING,$feed.' was not published to hub at '.$this->hub.':'.$publisher->last_response()); common_log_line(LOG_WARNING,
$feed.' was not published to hub at '.
$this->hub.':'.$publisher->last_response());
} }
} }
} }
@ -123,9 +154,13 @@ class PubSubHubBubPlugin extends Plugin
$versions[] = array('name' => 'PubSubHubBub', $versions[] = array('name' => 'PubSubHubBub',
'version' => STATUSNET_VERSION, 'version' => STATUSNET_VERSION,
'author' => 'Craig Andrews', 'author' => 'Craig Andrews',
'homepage' => 'http://status.net/wiki/Plugin:PubSubHubBub', 'homepage' =>
'http://status.net/wiki/Plugin:PubSubHubBub',
'rawdescription' => 'rawdescription' =>
_m('The PubSubHubBub plugin pushes RSS/Atom updates to a <a href="http://pubsubhubbub.googlecode.com/">PubSubHubBub</a> hub.')); _m('The PubSubHubBub plugin pushes RSS/Atom updates '.
'to a <a href = "'.
'http://pubsubhubbub.googlecode.com/'.
'">PubSubHubBub</a> hub.'));
return true; return true;
} }