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

Number parameters in messages that have multiple parameters

Browse Source 
Trim trailing whitespace
Leading tabs to spaces
Remove superfluous whitespace
This commit is contained in:
Siebrand Mazeland 2011-08-30 10:56:00 +02:00
parent 0e2d9432b5
commit 3e60d4cb3f
6 changed files with 146 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

212
plugins/Activity/ActivityPlugin.php
View File

@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
class ActivityPlugin extends Plugin
{
const VERSION = '0.1';
@ -82,18 +81,18 @@ class ActivityPlugin extends Plugin
if(!$this->StartFollowUser) return true;
$user = $subscriber->getUser();
if (!empty($user)) {
$sub = Subscription::pkeyGet(array('subscriber' => $subscriber->id,
'subscribed' => $other->id));
$rendered = sprintf(_m('<a href="%s">%s</a> started following <a href="%s">%s</a>.'),
$subscriber->profileurl,
$subscriber->getBestName(),
$sub = Subscription::pkeyGet(array('subscriber' => $subscriber->id,
'subscribed' => $other->id));
$rendered = sprintf(_m('<a href="%1$s">%2$s</a> started following <a href="%2$s">%4$s</a>.'),
$subscriber->profileurl,
$subscriber->getBestName(),
$other->profileurl,
$other->getBestName());
$content = sprintf(_m('%s (%s) started following %s (%s).'),
$subscriber->getBestName(),
$subscriber->profileurl,
$content = sprintf(_m('%1$s (%2$s) started following %3$s (%4$s).'),
$subscriber->getBestName(),
$subscriber->profileurl,
$other->getBestName(),
$other->profileurl);
$other->profileurl);
$notice = Notice::saveNew($user->id,
$content,
@ -101,9 +100,9 @@ class ActivityPlugin extends Plugin
array('rendered' => $rendered,
'urls' => array(),
'replies' => array($other->getUri()),
'verb' => ActivityVerb::FOLLOW,
'object_type' => ActivityObject::PERSON,
'uri' => $sub->uri));
'verb' => ActivityVerb::FOLLOW,
'object_type' => ActivityObject::PERSON,
'uri' => $sub->uri));
}
return true;
}
@ -114,21 +113,21 @@ class ActivityPlugin extends Plugin
if(!$this->StopFollowUser) return true;
$user = $subscriber->getUser();
if (!empty($user)) {
$rendered = sprintf(_m('<a href="%s">%s</a> stopped following <a href="%s">%s</a>.'),
$subscriber->profileurl,
$subscriber->getBestName(),
$rendered = sprintf(_m('<a href="%1$s">%2$s</a> stopped following <a href="%3$s">%4$s</a>.'),
$subscriber->profileurl,
$subscriber->getBestName(),
$other->profileurl,
$other->getBestName());
$content = sprintf(_m('%s (%s) stopped following %s (%s).'),
$subscriber->getBestName(),
$subscriber->profileurl,
$content = sprintf(_m('%1$s (%2$s) stopped following %3$s (%4$s).'),
$subscriber->getBestName(),
$subscriber->profileurl,
$other->getBestName(),
$other->profileurl);
$other->profileurl);
$uri = TagURI::mint('stop-following:%d:%d:%s',
$subscriber->id,
$other->id,
common_date_iso8601(common_sql_now()));
$uri = TagURI::mint('stop-following:%d:%d:%s',
$subscriber->id,
$other->id,
common_date_iso8601(common_sql_now()));
$notice = Notice::saveNew($user->id,
$content,
@ -136,9 +135,9 @@ class ActivityPlugin extends Plugin
array('rendered' => $rendered,
'urls' => array(),
'replies' => array($other->getUri()),
'uri' => $uri,
'verb' => ActivityVerb::UNFOLLOW,
'object_type' => ActivityObject::PERSON));
'uri' => $uri,
'verb' => ActivityVerb::UNFOLLOW,
'object_type' => ActivityObject::PERSON));
}
return true;
}
@ -154,18 +153,18 @@ class ActivityPlugin extends Plugin
$author = $notice->getProfile();
$fave = Fave::pkeyGet(array('user_id' => $user->id,
'notice_id' => $notice->id));
'notice_id' => $notice->id));
$rendered = sprintf(_m('<a href="%s">%s</a> liked <a href="%s">%s\'s update</a>.'),
$profile->profileurl,
$profile->getBestName(),
$rendered = sprintf(_m('<a href="%1$s">%2$s</a> liked <a href="%3$s">%4$s\'s update</a>.'),
$profile->profileurl,
$profile->getBestName(),
$notice->bestUrl(),
$author->getBestName());
$content = sprintf(_m('%s (%s) liked %s\'s status (%s)'),
$profile->getBestName(),
$profile->profileurl,
$content = sprintf(_m('%1$s (%2$s) liked %3$s\'s status (%4$s)'),
$profile->getBestName(),
$profile->profileurl,
$author->getBestName(),
$notice->bestUrl());
$notice->bestUrl());
$notice = Notice::saveNew($user->id,
$content,
@ -173,10 +172,10 @@ class ActivityPlugin extends Plugin
array('rendered' => $rendered,
'urls' => array(),
'replies' => array($author->getUri()),
'uri' => $fave->getURI(),
'verb' => ActivityVerb::FAVORITE,
'object_type' => (($notice->verb == ActivityVerb::POST) ?
$notice->object_type : ActivityObject::ACTIVITY)));
'uri' => $fave->getURI(),
'verb' => ActivityVerb::FAVORITE,
'object_type' => (($notice->verb == ActivityVerb::POST) ?
$notice->object_type : ActivityObject::ACTIVITY)));
}
return true;
}
@ -189,21 +188,21 @@ class ActivityPlugin extends Plugin
if (!empty($user)) {
$author = Profile::staticGet('id', $notice->profile_id);
$rendered = sprintf(_m('<a href="%s">%s</a> stopped liking <a href="%s">%s\'s update</a>.'),
$profile->profileurl,
$profile->getBestName(),
$rendered = sprintf(_m('<a href="%1$s">%2$s</a> stopped liking <a href="%3$s">%4$s\'s update</a>.'),
$profile->profileurl,
$profile->getBestName(),
$notice->bestUrl(),
$author->getBestName());
$content = sprintf(_m('%s (%s) stopped liking %s\'s status (%s)'),
$profile->getBestName(),
$profile->profileurl,
$content = sprintf(_m('%1$s (%2$s) stopped liking %3$s\'s status (%4$s)'),
$profile->getBestName(),
$profile->profileurl,
$author->getBestName(),
$notice->bestUrl());
$notice->bestUrl());
$uri = TagURI::mint('unlike:%d:%d:%s',
$profile->id,
$notice->id,
common_date_iso8601(common_sql_now()));
$uri = TagURI::mint('unlike:%d:%d:%s',
$profile->id,
$notice->id,
common_date_iso8601(common_sql_now()));
$notice = Notice::saveNew($user->id,
$content,
@ -211,10 +210,10 @@ class ActivityPlugin extends Plugin
array('rendered' => $rendered,
'urls' => array(),
'replies' => array($author->getUri()),
'uri' => $uri,
'verb' => ActivityVerb::UNFAVORITE,
'object_type' => (($notice->verb == ActivityVerb::POST) ?
$notice->object_type : ActivityObject::ACTIVITY)));
'uri' => $uri,
'verb' => ActivityVerb::UNFAVORITE,
'object_type' => (($notice->verb == ActivityVerb::POST) ?
$notice->object_type : ActivityObject::ACTIVITY)));
}
return true;
}
@ -230,19 +229,19 @@ class ActivityPlugin extends Plugin
return true;
}
$rendered = sprintf(_m('<a href="%s">%s</a> joined the group <a href="%s">%s</a>.'),
$profile->profileurl,
$profile->getBestName(),
$rendered = sprintf(_m('<a href="%1$s">%2$s</a> joined the group <a href="%3$s">%4$s</a>.'),
$profile->profileurl,
$profile->getBestName(),
$group->homeUrl(),
$group->getBestName());
$content = sprintf(_m('%s (%s) joined the group %s (%s).'),
$profile->getBestName(),
$profile->profileurl,
$content = sprintf(_m('%1$s (%2$s) joined the group %3$s (%4$s).'),
$profile->getBestName(),
$profile->profileurl,
$group->getBestName(),
$group->homeUrl());
$group->homeUrl());
$mem = Group_member::pkeyGet(array('group_id' => $group->id,
'profile_id' => $profile->id));
$mem = Group_member::pkeyGet(array('group_id' => $group->id,
'profile_id' => $profile->id));
$notice = Notice::saveNew($user->id,
$content,
@ -250,9 +249,9 @@ class ActivityPlugin extends Plugin
array('rendered' => $rendered,
'urls' => array(),
'groups' => array($group->id),
'uri' => $mem->getURI(),
'verb' => ActivityVerb::JOIN,
'object_type' => ActivityObject::GROUP));
'uri' => $mem->getURI(),
'verb' => ActivityVerb::JOIN,
'object_type' => ActivityObject::GROUP));
return true;
}
@ -267,18 +266,18 @@ class ActivityPlugin extends Plugin
return true;
}
$rendered = sprintf(_m('<a href="%s">%s</a> left the group <a href="%s">%s</a>.'),
$profile->profileurl,
$profile->getBestName(),
$rendered = sprintf(_m('<a href="%1$s">%2$s</a> left the group <a href="%3$s">%4$s</a>.'),
$profile->profileurl,
$profile->getBestName(),
$group->homeUrl(),
$group->getBestName());
$content = sprintf(_m('%s (%s) left the group %s (%s)'),
$profile->getBestName(),
$profile->profileurl,
$content = sprintf(_m('%1$s (%2$s) left the group %3$s (%4$s)'),
$profile->getBestName(),
$profile->profileurl,
$group->getBestName(),
$group->homeUrl());
$group->homeUrl());
$uri = TagURI::mint('leave:%d:%d:%s',
$uri = TagURI::mint('leave:%d:%d:%s',
$user->id,
$group->id,
common_date_iso8601(common_sql_now()));
@ -289,36 +288,36 @@ class ActivityPlugin extends Plugin
array('rendered' => $rendered,
'urls' => array(),
'groups' => array($group->id),
'uri' => $uri,
'verb' => ActivityVerb::LEAVE,
'object_type' => ActivityObject::GROUP));
'uri' => $uri,
'verb' => ActivityVerb::LEAVE,
'object_type' => ActivityObject::GROUP));
return true;
}
function onStartShowNoticeItem($nli)
{
$notice = $nli->notice;
$notice = $nli->notice;
$adapter = null;
$adapter = null;
switch ($notice->verb) {
switch ($notice->verb) {
case ActivityVerb::FAVORITE:
case ActivityVerb::UNFAVORITE:
$adapter = new SystemListItem($nli);
break;
case ActivityVerb::JOIN:
$adapter = new JoinListItem($nli);
break;
case ActivityVerb::LEAVE:
$adapter = new JoinListItem($nli);
break;
case ActivityVerb::FOLLOW:
$adapter = new FollowListItem($nli);
break;
case ActivityVerb::UNFOLLOW:
$adapter = new UnfollowListItem($nli);
break;
}
$adapter = new SystemListItem($nli);
break;
case ActivityVerb::JOIN:
$adapter = new JoinListItem($nli);
break;
case ActivityVerb::LEAVE:
$adapter = new JoinListItem($nli);
break;
case ActivityVerb::FOLLOW:
$adapter = new FollowListItem($nli);
break;
case ActivityVerb::UNFOLLOW:
$adapter = new UnfollowListItem($nli);
break;
}
if (!empty($adapter)) {
$adapter->showNotice();
@ -333,7 +332,7 @@ class ActivityPlugin extends Plugin
function onEndNoticeAsActivity($notice, &$activity)
{
switch ($notice->verb) {
switch ($notice->verb) {
case ActivityVerb::FAVORITE:
$fave = Fave::staticGet('uri', $notice->uri);
if (!empty($fave)) {
@ -352,18 +351,18 @@ class ActivityPlugin extends Plugin
break;
case ActivityVerb::UNFAVORITE:
// FIXME: do something here
break;
case ActivityVerb::JOIN:
break;
case ActivityVerb::JOIN:
$mem = Group_member::staticGet('uri', $notice->uri);
if (!empty($mem)) {
$group = $mem->getGroup();
$activity->objects = array(ActivityObject::fromGroup($group));
}
break;
case ActivityVerb::LEAVE:
case ActivityVerb::LEAVE:
// FIXME: ????
break;
case ActivityVerb::FOLLOW:
break;
case ActivityVerb::FOLLOW:
$sub = Subscription::staticGet('uri', $notice->uri);
if (!empty($sub)) {
$profile = Profile::staticGet('id', $sub->subscribed);
@ -371,13 +370,13 @@ class ActivityPlugin extends Plugin
$activity->objects = array(ActivityObject::fromProfile($profile));
}
}
break;
case ActivityVerb::UNFOLLOW:
break;
case ActivityVerb::UNFOLLOW:
// FIXME: ????
break;
}
break;
}
return true;
return true;
}
function onPluginVersion(&$versions)
@ -387,6 +386,7 @@ class ActivityPlugin extends Plugin
'author' => 'Evan Prodromou',
'homepage' => 'http://status.net/wiki/Plugin:Activity',
'rawdescription' =>
// TRANS: Plugin description.
_m('Emits notices when social activities happen.'));
return true;
}

2
plugins/Activity/followlistitem.php
View File

@ -44,8 +44,6 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
class FollowListItem extends SystemListItem
{
}

4
plugins/Activity/joinlistitem.php
View File

@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
class JoinListItem extends SystemListItem
{
function showContent()
@ -58,7 +57,7 @@ class JoinListItem extends SystemListItem
$out->elementStart('div', 'join-activity');
$profile = $mem->getMember();
$group = $mem->getGroup();
$out->raw(sprintf(_m('<a href="%s">%s</a> joined the group <a href="%s">%s</a>.'),
$out->raw(sprintf(_m('<a href="%1$s">%2$s</a> joined the group <a href="%3$s">%4$s</a>.'),
$profile->profileurl,
$profile->getBestName(),
$group->homeUrl(),
@ -70,4 +69,3 @@ class JoinListItem extends SystemListItem
}
}
}

2
plugins/Activity/leavelistitem.php
View File

@ -44,8 +44,6 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
class LeaveListItem extends SystemListItem
{
}

4
plugins/Activity/systemlistitem.php
View File

@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
class SystemListItem extends NoticeListItemAdapter
{
/**
@ -52,7 +51,6 @@ class SystemListItem extends NoticeListItemAdapter
*
* @return void
*/
function showNotice()
{
$out = $this->nli->out;
@ -66,7 +64,7 @@ class SystemListItem extends NoticeListItemAdapter
$notice = $this->nli->notice;
$out = $this->nli->out;
// FIXME: get the actual data on the leave
// FIXME: get the actual data on the leave
$out->elementStart('div', 'system-activity');

3
plugins/Activity/unfollowlistitem.php
View File

@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
class UnfollowListItem extends SystemListItem
{
/**
@ -52,7 +51,6 @@ class UnfollowListItem extends SystemListItem
*
* @return void
*/
function showNotice()
{
$out = $this->nli->out;
@ -75,4 +73,3 @@ class UnfollowListItem extends SystemListItem
$out->elementEnd('div');
}
}