GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Fix feed links which were broken when the API was restructured

Browse Source
This commit is contained in:
Craig Andrews 2009-10-29 19:09:42 -04:00
parent de7c12baef
commit 35ace5562d
7 changed files with 69 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
actions/all.php
View File

@ -99,19 +99,17 @@ class AllAction extends ProfileAction
sprintf(_('Feed for friends of %s (RSS 1.0)'), $this->user->nickname)),
new Feed(Feed::RSS2,
common_local_url(
'api', array(
'apiaction' => 'statuses',
'method' => 'friends_timeline',
'argument' => $this->user->nickname.'.rss'
'ApiTimelineFriends', array(
'format' => 'rss',
'id' => $this->user->nickname
)
),
sprintf(_('Feed for friends of %s (RSS 2.0)'), $this->user->nickname)),
new Feed(Feed::ATOM,
common_local_url(
'api', array(
'apiaction' => 'statuses',
'method' => 'friends_timeline',
'argument' => $this->user->nickname.'.atom'
'ApiTimelineFriends', array(
'format' => 'atom',
'id' => $this->user->nickname
)
),
sprintf(_('Feed for friends of %s (Atom)'), $this->user->nickname))

10
actions/public.php
View File

@ -150,14 +150,12 @@ class PublicAction extends Action
return array(new Feed(Feed::RSS1, common_local_url('publicrss'),
_('Public Stream Feed (RSS 1.0)')),
new Feed(Feed::RSS2,
common_local_url('api',
array('apiaction' => 'statuses',
'method' => 'public_timeline.rss')),
common_local_url('ApiTimelinePublic',
array('format' => 'rss')),
_('Public Stream Feed (RSS 2.0)')),
new Feed(Feed::ATOM,
common_local_url('api',
array('apiaction' => 'statuses',
'method' => 'public_timeline.atom')),
common_local_url('ApiTimelinePublic',
array('format' => 'atom')),
_('Public Stream Feed (Atom)')));
}

24
actions/replies.php
View File

@ -138,11 +138,25 @@ class RepliesAction extends OwnerDesignAction
function getFeeds()
{
$rssurl = common_local_url('repliesrss',
array('nickname' => $this->user->nickname));
$rsstitle = sprintf(_('Feed for replies to %s'), $this->user->nickname);
return array(new Feed(Feed::RSS1, $rssurl, $rsstitle));
return array(new Feed(Feed::RSS1,
common_local_url('repliesrss',
array('nickname' => $this->user->nickname)),
sprintf(_('Replies feed for %s (RSS 1.0)'),
$this->user->nickname)),
new Feed(Feed::RSS2,
common_local_url('ApiTimelineMentions',
array(
'id' => $this->user->nickname,
'format' => 'rss')),
sprintf(_('Replies feed for %s (RSS 2.0)'),
$this->user->nickname)),
new Feed(Feed::ATOM,
common_local_url('ApiTimelineMentions',
array(
'id' => $this->user->nickname,
'format' => 'atom')),
sprintf(_('Replies feed for %s (Atom)'),
$this->user->nickname)));
}
/**

26
actions/showfavorites.php
View File

@ -164,13 +164,25 @@ class ShowfavoritesAction extends OwnerDesignAction
function getFeeds()
{
$feedurl = common_local_url('favoritesrss',
array('nickname' =>
$this->user->nickname));
$feedtitle = sprintf(_('Feed for favorites of %s'),
$this->user->nickname);
return array(new Feed(Feed::RSS1, $feedurl, $feedtitle));
return array(new Feed(Feed::RSS1,
common_local_url('favoritesrss',
array('nickname' => $this->user->nickname)),
sprintf(_('Feed for favorites of %s (RSS 1.0)'),
$this->user->nickname)),
new Feed(Feed::RSS2,
common_local_url('ApiTimelineFavorites',
array(
'id' => $this->user->nickname,
'format' => 'rss')),
sprintf(_('Feed for favorites of %s (RSS 2.0)'),
$this->user->nickname)),
new Feed(Feed::ATOM,
common_local_url('ApiTimelineFavorites',
array(
'id' => $this->user->nickname,
'format' => 'atom')),
sprintf(_('Feed for favorites of %s (Atom)'),
$this->user->nickname)));
}
/**

14
actions/showgroup.php
View File

@ -328,17 +328,15 @@ class ShowgroupAction extends GroupDesignAction
sprintf(_('Notice feed for %s group (RSS 1.0)'),
$this->group->nickname)),
new Feed(Feed::RSS2,
common_local_url('api',
array('apiaction' => 'groups',
'method' => 'timeline',
'argument' => $this->group->nickname.'.rss')),
common_local_url('ApiTimelineGroup',
array('format' => 'rss',
'id' => $this->group->nickname)),
sprintf(_('Notice feed for %s group (RSS 2.0)'),
$this->group->nickname)),
new Feed(Feed::ATOM,
common_local_url('api',
array('apiaction' => 'groups',
'method' => 'timeline',
'argument' => $this->group->nickname.'.atom')),
common_local_url('ApiTimelineGroup',
array('format' => 'atom',
'id' => $this->group->nickname)),
sprintf(_('Notice feed for %s group (Atom)'),
$this->group->nickname)),
new Feed(Feed::FOAF,

16
actions/showstream.php
View File

@ -128,17 +128,17 @@ class ShowstreamAction extends ProfileAction
sprintf(_('Notice feed for %s (RSS 1.0)'),
$this->user->nickname)),
new Feed(Feed::RSS2,
common_local_url('api',
array('apiaction' => 'statuses',
'method' => 'user_timeline',
'argument' => $this->user->nickname.'.rss')),
common_local_url('ApiTimelineUser',
array(
'id' => $this->user->nickname,
'format' => 'rss')),
sprintf(_('Notice feed for %s (RSS 2.0)'),
$this->user->nickname)),
new Feed(Feed::ATOM,
common_local_url('api',
array('apiaction' => 'statuses',
'method' => 'user_timeline',
'argument' => $this->user->nickname.'.atom')),
common_local_url('ApiTimelineUser',
array(
'id' => $this->user->nickname,
'format' => 'atom')),
sprintf(_('Notice feed for %s (Atom)'),
$this->user->nickname)),
new Feed(Feed::FOAF,

16
actions/tag.php
View File

@ -86,17 +86,15 @@ class TagAction extends Action
sprintf(_('Notice feed for tag %s (RSS 1.0)'),
$this->tag)),
new Feed(Feed::RSS2,
common_local_url('api',
array('apiaction' => 'tags',
'method' => 'timeline',
'argument' => $this->tag.'.rss')),
sprintf(_('Notice feed for %s group (RSS 2.0)'),
common_local_url('ApiTimelineTag',
array('format' => 'rss',
'tag' => $this->tag)),
sprintf(_('Notice feed for tag %s (RSS 2.0)'),
$this->tag)),
new Feed(Feed::ATOM,
common_local_url('api',
array('apiaction' => 'tags',
'method' => 'timeline',
'argument' => $this->tag.'.atom')),
common_local_url('ApiTimelineTag',
array('format' => 'atom',
'tag' => $this->tag)),
sprintf(_('Notice feed for tag %s (Atom)'),
$this->tag)));
}