X-Git-Url: https://git.mxchange.org/?p=quix0rs-gnu-social.git;a=blobdiff_plain;f=plugins%2FActivity%2FActivityPlugin.php;h=7a2d9517302458d1b01c5e186e94d732dc79c9d1;hp=c9f0bfa25b3e28cb1661d0e83bd89b17141da2c6;hb=d6b28c64830f632bb2f4b6f3c9369b9e56ad217a;hpb=838c3988eed2085905ffa27434daad14994916f9
diff --git a/plugins/Activity/ActivityPlugin.php b/plugins/Activity/ActivityPlugin.php
index c9f0bfa25b..7a2d951730 100644
--- a/plugins/Activity/ActivityPlugin.php
+++ b/plugins/Activity/ActivityPlugin.php
@@ -57,144 +57,88 @@ class ActivityPlugin extends Plugin
public $StartLike = false;
public $StopLike = false;
- function onAutoload($cls)
- {
- $dir = dirname(__FILE__);
-
- switch ($cls)
- {
- case 'JoinListItem':
- case 'LeaveListItem':
- case 'FollowListItem':
- case 'UnfollowListItem':
- case 'SystemListItem':
- include_once $dir . '/'.strtolower($cls).'.php';
- return false;
- default:
- return true;
- }
- }
-
- function onEndSubscribe($subscriber, $other)
+ function onEndSubscribe(Profile $profile, Profile $other)
{
// Only do this if config is enabled
if(!$this->StartFollowUser) return true;
- $user = $subscriber->getUser();
- if (!empty($user)) {
- $sub = Subscription::pkeyGet(array('subscriber' => $subscriber->id,
- 'subscribed' => $other->id));
- // TRANS: Text for "started following" item in activity plugin.
- // TRANS: %1$s is a profile URL, %2$s is a profile name,
- // TRANS: %3$s is a profile URL, %4$s is a profile name.
- $rendered = sprintf(_m('%2$s started following %4$s.'),
- $subscriber->profileurl,
- $subscriber->getBestName(),
- $other->profileurl,
- $other->getBestName());
- // TRANS: Text for "started following" item in activity plugin.
- // TRANS: %1$s is a profile name, %2$s is a profile URL,
- // TRANS: %3$s is a profile name, %4$s is a profile URL.
- $content = sprintf(_m('%1$s (%2$s) started following %3$s (%4$s).'),
- $subscriber->getBestName(),
- $subscriber->profileurl,
- $other->getBestName(),
- $other->profileurl);
-
- $notice = Notice::saveNew($user->id,
- $content,
- ActivityPlugin::SOURCE,
- array('rendered' => $rendered,
- 'urls' => array(),
- 'replies' => array($other->getUri()),
- 'verb' => ActivityVerb::FOLLOW,
- 'object_type' => ActivityObject::PERSON,
- 'uri' => $sub->uri));
+
+ if (!$profile->isLocal()) {
+ // can't do anything with remote user anyway
+ return true;
}
+
+ $sub = Subscription::pkeyGet(array('subscriber' => $profile->id,
+ 'subscribed' => $other->id));
+ // TRANS: Text for "started following" item in activity plugin.
+ // TRANS: %1$s is a profile URL, %2$s is a profile name,
+ // TRANS: %3$s is a profile URL, %4$s is a profile name.
+ $rendered = html_sprintf(_m('%2$s started following %4$s.'),
+ $profile->getUrl(),
+ $profile->getBestName(),
+ $other->getUrl(),
+ $other->getBestName());
+ // TRANS: Text for "started following" item in activity plugin.
+ // TRANS: %1$s is a profile name, %2$s is a profile URL,
+ // TRANS: %3$s is a profile name, %4$s is a profile URL.
+ $content = sprintf(_m('%1$s (%2$s) started following %3$s (%4$s).'),
+ $profile->getBestName(),
+ $profile->getUrl(),
+ $other->getBestName(),
+ $other->getUrl());
+
+ $notice = Notice::saveNew($profile->id,
+ $content,
+ ActivityPlugin::SOURCE,
+ array('rendered' => $rendered,
+ 'urls' => array(),
+ 'replies' => array($other->getUri()),
+ 'verb' => ActivityVerb::FOLLOW,
+ 'object_type' => ActivityObject::PERSON,
+ 'uri' => $sub->uri));
return true;
}
- function onEndUnsubscribe($subscriber, $other)
+ function onEndUnsubscribe(Profile $profile, Profile $other)
{
// Only do this if config is enabled
if(!$this->StopFollowUser) return true;
- $user = $subscriber->getUser();
- if (!empty($user)) {
- // TRANS: Text for "stopped following" item in activity plugin.
- // TRANS: %1$s is a profile URL, %2$s is a profile name,
- // TRANS: %3$s is a profile URL, %4$s is a profile name.
- $rendered = sprintf(_m('%2$s stopped following %4$s.'),
- $subscriber->profileurl,
- $subscriber->getBestName(),
- $other->profileurl,
- $other->getBestName());
- // TRANS: Text for "stopped following" item in activity plugin.
- // TRANS: %1$s is a profile name, %2$s is a profile URL,
- // TRANS: %3$s is a profile name, %4$s is a profile URL.
- $content = sprintf(_m('%1$s (%2$s) stopped following %3$s (%4$s).'),
- $subscriber->getBestName(),
- $subscriber->profileurl,
- $other->getBestName(),
- $other->profileurl);
-
- $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));
- }
- return true;
- }
- function onEndFavorNotice($profile, $notice)
- {
- // 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));
-
- // TRANS: Text for "liked" item in activity plugin.
- // TRANS: %1$s is a profile URL, %2$s is a profile name,
- // TRANS: %3$s is a notice URL, %4$s is an author name.
- $rendered = sprintf(_m('%2$s liked %4$s\'s update.'),
- $profile->profileurl,
- $profile->getBestName(),
- $notice->bestUrl(),
- $author->getBestName());
- // TRANS: Text for "liked" item in activity plugin.
- // TRANS: %1$s is a profile name, %2$s is a profile URL,
- // TRANS: %3$s is an author name, %4$s is a notice URL.
- $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,
- ActivityPlugin::SOURCE,
- 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)));
+ if (!$profile->isLocal()) {
+ return true;
}
+
+ // TRANS: Text for "stopped following" item in activity plugin.
+ // TRANS: %1$s is a profile URL, %2$s is a profile name,
+ // TRANS: %3$s is a profile URL, %4$s is a profile name.
+ $rendered = html_sprintf(_m('%2$s stopped following %4$s.'),
+ $profile->getUrl(),
+ $profile->getBestName(),
+ $other->getUrl(),
+ $other->getBestName());
+ // TRANS: Text for "stopped following" item in activity plugin.
+ // TRANS: %1$s is a profile name, %2$s is a profile URL,
+ // TRANS: %3$s is a profile name, %4$s is a profile URL.
+ $content = sprintf(_m('%1$s (%2$s) stopped following %3$s (%4$s).'),
+ $profile->getBestName(),
+ $profile->getUrl(),
+ $other->getBestName(),
+ $other->getUrl());
+
+ $uri = TagURI::mint('stop-following:%d:%d:%s',
+ $profile->id,
+ $other->id,
+ common_date_iso8601(common_sql_now()));
+
+ $notice = Notice::saveNew($profile->id,
+ $content,
+ ActivityPlugin::SOURCE,
+ array('rendered' => $rendered,
+ 'urls' => array(),
+ 'replies' => array($other->getUri()),
+ 'uri' => $uri,
+ 'verb' => ActivityVerb::UNFOLLOW,
+ 'object_type' => ActivityObject::PERSON));
+
return true;
}
@@ -202,43 +146,45 @@ class ActivityPlugin extends Plugin
{
// Only do this if config is enabled
if(!$this->StopLike) return true;
- $user = User::staticGet('id', $profile->id);
-
- if (!empty($user)) {
- $author = Profile::staticGet('id', $notice->profile_id);
- // TRANS: Text for "stopped liking" item in activity plugin.
- // TRANS: %1$s is a profile URL, %2$s is a profile name,
- // TRANS: %3$s is a notice URL, %4$s is an author name.
- $rendered = sprintf(_m('%2$s stopped liking %4$s\'s update.'),
- $profile->profileurl,
- $profile->getBestName(),
- $notice->bestUrl(),
- $author->getBestName());
- // TRANS: Text for "stopped liking" item in activity plugin.
- // TRANS: %1$s is a profile name, %2$s is a profile URL,
- // TRANS: %3$s is an author name, %4$s is a notice URL.
- $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)));
+
+ if (!$profile->isLocal()) {
+ return true;
}
+
+ $author = Profile::getKV('id', $notice->profile_id);
+ // TRANS: Text for "stopped liking" item in activity plugin.
+ // TRANS: %1$s is a profile URL, %2$s is a profile name,
+ // TRANS: %3$s is a notice URL, %4$s is an author name.
+ $rendered = html_sprintf(_m('%2$s stopped liking %4$s\'s update.'),
+ $profile->getUrl(),
+ $profile->getBestName(),
+ $notice->getUrl(),
+ $author->getBestName());
+ // TRANS: Text for "stopped liking" item in activity plugin.
+ // TRANS: %1$s is a profile name, %2$s is a profile URL,
+ // TRANS: %3$s is an author name, %4$s is a notice URL.
+ $content = sprintf(_m('%1$s (%2$s) stopped liking %3$s\'s status (%4$s).'),
+ $profile->getBestName(),
+ $profile->getUrl(),
+ $author->getBestName(),
+ $notice->getUrl());
+
+ $uri = TagURI::mint('unlike:%d:%d:%s',
+ $profile->id,
+ $notice->id,
+ common_date_iso8601(common_sql_now()));
+
+ $notice = Notice::saveNew($profile->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 : null)));
+
return true;
}
@@ -247,17 +193,15 @@ class ActivityPlugin extends Plugin
// Only do this if config is enabled
if(!$this->JoinGroup) return true;
- $user = $profile->getUser();
-
- if (empty($user)) {
+ if (!$profile->isLocal()) {
return true;
}
// TRANS: Text for "joined group" item in activity plugin.
// TRANS: %1$s is a profile URL, %2$s is a profile name,
// TRANS: %3$s is a group URL, %4$s is a group name.
- $rendered = sprintf(_m('%2$s joined the group %4$s.'),
- $profile->profileurl,
+ $rendered = html_sprintf(_m('%2$s joined the group %4$s.'),
+ $profile->getUrl(),
$profile->getBestName(),
$group->homeUrl(),
$group->getBestName());
@@ -266,14 +210,14 @@ class ActivityPlugin extends Plugin
// TRANS: %3$s is a group name, %4$s is a group URL.
$content = sprintf(_m('%1$s (%2$s) joined the group %3$s (%4$s).'),
$profile->getBestName(),
- $profile->profileurl,
+ $profile->getUrl(),
$group->getBestName(),
$group->homeUrl());
$mem = Group_member::pkeyGet(array('group_id' => $group->id,
'profile_id' => $profile->id));
- $notice = Notice::saveNew($user->id,
+ $notice = Notice::saveNew($profile->id,
$content,
ActivityPlugin::SOURCE,
array('rendered' => $rendered,
@@ -290,17 +234,15 @@ class ActivityPlugin extends Plugin
// Only do this if config is enabled
if(!$this->LeaveGroup) return true;
- $user = $profile->getUser();
-
- if (empty($user)) {
+ if (!$profile->isLocal()) {
return true;
}
// TRANS: Text for "left group" item in activity plugin.
// TRANS: %1$s is a profile URL, %2$s is a profile name,
// TRANS: %3$s is a group URL, %4$s is a group name.
- $rendered = sprintf(_m('%2$s left the group %4$s.'),
- $profile->profileurl,
+ $rendered = html_sprintf(_m('%2$s left the group %4$s.'),
+ $profile->getUrl(),
$profile->getBestName(),
$group->homeUrl(),
$group->getBestName());
@@ -309,16 +251,16 @@ class ActivityPlugin extends Plugin
// TRANS: %3$s is a group name, %4$s is a group URL.
$content = sprintf(_m('%1$s (%2$s) left the group %3$s (%4$s).'),
$profile->getBestName(),
- $profile->profileurl,
+ $profile->getUrl(),
$group->getBestName(),
$group->homeUrl());
$uri = TagURI::mint('leave:%d:%d:%s',
- $user->id,
+ $profile->id,
$group->id,
common_date_iso8601(common_sql_now()));
- $notice = Notice::saveNew($user->id,
+ $notice = Notice::saveNew($profile->id,
$content,
ActivityPlugin::SOURCE,
array('rendered' => $rendered,
@@ -330,22 +272,18 @@ class ActivityPlugin extends Plugin
return true;
}
- function onStartShowNoticeItem($nli)
+ function onStartShowNoticeItem(NoticeListItem $nli)
{
$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);
+ $adapter = new LeaveListItem($nli);
break;
case ActivityVerb::FOLLOW:
$adapter = new FollowListItem($nli);
@@ -366,45 +304,30 @@ class ActivityPlugin extends Plugin
return true;
}
- function onEndNoticeAsActivity($notice, &$activity)
+ public function onEndNoticeAsActivity(Notice $stored, Activity $act, Profile $scoped=null)
{
- switch ($notice->verb) {
- case ActivityVerb::FAVORITE:
- $fave = Fave::staticGet('uri', $notice->uri);
- if (!empty($fave)) {
- $notice = Notice::staticGet('id', $fave->notice_id);
- if (!empty($notice)) {
- $cur = common_current_user();
- $target = $notice->asActivity($cur);
- if ($target->verb == ActivityVerb::POST) {
- // "I like the thing you posted"
- $activity->objects = $target->objects;
- } else {
- // "I like that you did whatever you did"
- $activity->objects = array($target);
- }
- }
- }
- break;
+ switch ($stored->verb) {
case ActivityVerb::UNFAVORITE:
// FIXME: do something here
break;
case ActivityVerb::JOIN:
- $mem = Group_member::staticGet('uri', $notice->uri);
- if (!empty($mem)) {
+ $mem = Group_member::getKV('uri', $stored->getUri());
+ if ($mem instanceof Group_member) {
$group = $mem->getGroup();
- $activity->objects = array(ActivityObject::fromGroup($group));
+ $act->title = $stored->getTitle();
+ $act->objects = array(ActivityObject::fromGroup($group));
}
break;
case ActivityVerb::LEAVE:
// FIXME: ????
break;
case ActivityVerb::FOLLOW:
- $sub = Subscription::staticGet('uri', $notice->uri);
- if (!empty($sub)) {
- $profile = Profile::staticGet('id', $sub->subscribed);
- if (!empty($profile)) {
- $activity->objects = array(ActivityObject::fromProfile($profile));
+ $sub = Subscription::getKV('uri', $stored->uri);
+ if ($sub instanceof Subscription) {
+ $profile = Profile::getKV('id', $sub->subscribed);
+ if ($profile instanceof Profile) {
+ $act->title = $stored->getTitle();
+ $act->objects = array($profile->asActivityObject());
}
}
break;
@@ -416,7 +339,7 @@ class ActivityPlugin extends Plugin
return true;
}
- function onPluginVersion(&$versions)
+ function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Activity',
'version' => self::VERSION,