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