diff --git a/plugins/Activity/ActivityPlugin.php b/plugins/Activity/ActivityPlugin.php
index b21fa90653..21f1cf9ab8 100644
--- a/plugins/Activity/ActivityPlugin.php
+++ b/plugins/Activity/ActivityPlugin.php
@@ -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('%s started following %s.'),
- $subscriber->profileurl,
- $subscriber->getBestName(),
+ $sub = Subscription::pkeyGet(array('subscriber' => $subscriber->id,
+ 'subscribed' => $other->id));
+ $rendered = sprintf(_m('%2$s started following %4$s.'),
+ $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,31 +113,31 @@ class ActivityPlugin extends Plugin
if(!$this->StopFollowUser) return true;
$user = $subscriber->getUser();
if (!empty($user)) {
- $rendered = sprintf(_m('%s stopped following %s.'),
- $subscriber->profileurl,
- $subscriber->getBestName(),
+ $rendered = sprintf(_m('%2$s stopped following %4$s.'),
+ $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,
ActivityPlugin::SOURCE,
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;
}
@@ -147,25 +146,25 @@ class ActivityPlugin extends Plugin
{
// Only do this if config is enabled
if(!$this->StartLike) return true;
-
+
$user = $profile->getUser();
-
+
if (!empty($user)) {
-
+
$author = $notice->getProfile();
$fave = Fave::pkeyGet(array('user_id' => $user->id,
- 'notice_id' => $notice->id));
-
- $rendered = sprintf(_m('%s liked %s\'s update.'),
- $profile->profileurl,
- $profile->getBestName(),
+ 'notice_id' => $notice->id));
+
+ $rendered = sprintf(_m('%2$s liked %4$s\'s update.'),
+ $profile->profileurl,
+ $profile->getBestName(),
$notice->bestUrl(),
$author->getBestName());
- $content = sprintf(_m('%s (%s) liked %s\'s status (%s)'),
- $profile->getBestName(),
- $profile->profileurl,
- $author->getBestName(),
- $notice->bestUrl());
+ $content = sprintf(_m('%1$s (%2$s) liked %3$s\'s status (%4$s)'),
+ $profile->getBestName(),
+ $profile->profileurl,
+ $author->getBestName(),
+ $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,32 +188,32 @@ class ActivityPlugin extends Plugin
if (!empty($user)) {
$author = Profile::staticGet('id', $notice->profile_id);
- $rendered = sprintf(_m('%s stopped liking %s\'s update.'),
- $profile->profileurl,
- $profile->getBestName(),
+ $rendered = sprintf(_m('%2$s stopped liking %4$s\'s update.'),
+ $profile->profileurl,
+ $profile->getBestName(),
$notice->bestUrl(),
$author->getBestName());
- $content = sprintf(_m('%s (%s) stopped liking %s\'s status (%s)'),
- $profile->getBestName(),
- $profile->profileurl,
- $author->getBestName(),
- $notice->bestUrl());
-
- $uri = TagURI::mint('unlike:%d:%d:%s',
- $profile->id,
- $notice->id,
- common_date_iso8601(common_sql_now()));
-
+ $content = sprintf(_m('%1$s (%2$s) stopped liking %3$s\'s status (%4$s)'),
+ $profile->getBestName(),
+ $profile->profileurl,
+ $author->getBestName(),
+ $notice->bestUrl());
+
+ $uri = TagURI::mint('unlike:%d:%d:%s',
+ $profile->id,
+ $notice->id,
+ common_date_iso8601(common_sql_now()));
+
$notice = Notice::saveNew($user->id,
$content,
ActivityPlugin::SOURCE,
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;
}
@@ -223,36 +222,36 @@ class ActivityPlugin extends Plugin
{
// Only do this if config is enabled
if(!$this->JoinGroup) return true;
-
+
$user = $profile->getUser();
-
+
if (empty($user)) {
return true;
}
-
- $rendered = sprintf(_m('%s joined the group %s.'),
- $profile->profileurl,
- $profile->getBestName(),
+
+ $rendered = sprintf(_m('%2$s joined the group %4$s.'),
+ $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,
ActivityPlugin::SOURCE,
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;
}
@@ -260,25 +259,25 @@ class ActivityPlugin extends Plugin
{
// Only do this if config is enabled
if(!$this->LeaveGroup) return true;
-
+
$user = $profile->getUser();
-
+
if (empty($user)) {
return true;
}
-
- $rendered = sprintf(_m('%s left the group %s.'),
- $profile->profileurl,
- $profile->getBestName(),
+
+ $rendered = sprintf(_m('%2$s left the group %4$s.'),
+ $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());
-
- $uri = TagURI::mint('leave:%d:%d:%s',
+ $group->homeUrl());
+
+ $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;
-
- $adapter = null;
-
- switch ($notice->verb) {
+ $notice = $nli->notice;
+
+ $adapter = null;
+
+ 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();
@@ -327,13 +326,13 @@ class ActivityPlugin extends Plugin
$adapter->showNoticeOptions();
return false;
}
-
+
return true;
}
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;
}
diff --git a/plugins/Activity/followlistitem.php b/plugins/Activity/followlistitem.php
index ddbbc45cc0..d8b9819cab 100644
--- a/plugins/Activity/followlistitem.php
+++ b/plugins/Activity/followlistitem.php
@@ -4,7 +4,7 @@
* Copyright (C) 2011, StatusNet, Inc.
*
* Title of module
- *
+ *
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
@@ -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
{
}
-
diff --git a/plugins/Activity/joinlistitem.php b/plugins/Activity/joinlistitem.php
index 5764f1d2e6..8c11ff74ca 100644
--- a/plugins/Activity/joinlistitem.php
+++ b/plugins/Activity/joinlistitem.php
@@ -4,7 +4,7 @@
* Copyright (C) 2011, StatusNet, Inc.
*
* List item for when you join a group
- *
+ *
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
@@ -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()
@@ -53,21 +52,20 @@ class JoinListItem extends SystemListItem
$out = $this->nli->out;
$mem = Group_member::staticGet('uri', $notice->uri);
-
+
if (!empty($mem)) {
$out->elementStart('div', 'join-activity');
$profile = $mem->getMember();
$group = $mem->getGroup();
- $out->raw(sprintf(_m('%s joined the group %s.'),
+ $out->raw(sprintf(_m('%2$s joined the group %4$s.'),
$profile->profileurl,
$profile->getBestName(),
$group->homeUrl(),
$group->getBestName()));
-
+
$out->elementEnd('div');
} else {
parent::showContent();
}
- }
+ }
}
-
diff --git a/plugins/Activity/leavelistitem.php b/plugins/Activity/leavelistitem.php
index 64845f9018..8448d703d8 100644
--- a/plugins/Activity/leavelistitem.php
+++ b/plugins/Activity/leavelistitem.php
@@ -4,7 +4,7 @@
* Copyright (C) 2011, StatusNet, Inc.
*
* List item for when you leave a group
- *
+ *
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
@@ -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
{
}
-
diff --git a/plugins/Activity/systemlistitem.php b/plugins/Activity/systemlistitem.php
index 0b8d2f4c02..c6753e5ff1 100644
--- a/plugins/Activity/systemlistitem.php
+++ b/plugins/Activity/systemlistitem.php
@@ -4,7 +4,7 @@
* Copyright (C) 2011, StatusNet, Inc.
*
* Superclass for system event items
- *
+ *
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
@@ -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;
@@ -65,15 +63,15 @@ 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');
$out->raw($notice->rendered);
-
+
$out->elementEnd('div');
- }
+ }
function showNoticeOptions()
{
diff --git a/plugins/Activity/unfollowlistitem.php b/plugins/Activity/unfollowlistitem.php
index b8c0d670fa..0ecb8bef5a 100644
--- a/plugins/Activity/unfollowlistitem.php
+++ b/plugins/Activity/unfollowlistitem.php
@@ -4,7 +4,7 @@
* Copyright (C) 2011, StatusNet, Inc.
*
* Unfollow list item
- *
+ *
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
@@ -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;
@@ -65,14 +63,13 @@ class UnfollowListItem extends SystemListItem
{
$notice = $this->nli->notice;
$out = $this->nli->out;
-
+
// FIXME: get the actual data on the leave
-
+
$out->elementStart('div', 'unfollow-activity');
$out->raw($notice->rendered);
-
- $out->elementEnd('div');
- }
-}
+ $out->elementEnd('div');
+ }
+}