X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FActivity%2FActivityPlugin.php;h=5144eb46662f3f86a4c1c25969b008aef3da4c99;hb=6267e7a9306c6e974789df56cf02b0050a9943c1;hp=1b36e11fd4c8419f1ccc12738846a4c3da0c2e42;hpb=7d191f8062e5d117ac234737bc7ab838859dc4d6;p=quix0rs-gnu-social.git

diff --git a/plugins/Activity/ActivityPlugin.php b/plugins/Activity/ActivityPlugin.php
index 1b36e11fd4..5144eb4666 100644
--- a/plugins/Activity/ActivityPlugin.php
+++ b/plugins/Activity/ActivityPlugin.php
@@ -142,50 +142,6 @@ class ActivityPlugin extends Plugin
         return true;
     }
 
-    function onEndFavorNotice($profile, $notice)
-    {
-        //  Only do this if config is enabled
-        if(!$this->StartLike) return true;
-
-        if (!$profile->isLocal()) {
-            return true;
-        }
-
-        $author = $notice->getProfile();
-        $fave   = Fave::pkeyGet(array('user_id' => $profile->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('<a href="%1$s">%2$s</a> liked <a href="%3$s">%4$s\'s update</a>.'),
-                            $profile->getUrl(),
-                            $profile->getBestName(),
-                            $notice->getUrl(),
-                            $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->getUrl(),
-                            $author->getBestName(),
-                            $notice->getUrl());
-
-        $notice = Notice::saveNew($profile->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)));
-
-        return true;
-    }
-
     function onEndDisfavorNotice($profile, $notice)
     {
         // Only do this if config is enabled
@@ -323,15 +279,11 @@ class ActivityPlugin extends Plugin
         $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);
@@ -352,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::getKV('uri', $notice->uri);
-            if (!empty($fave)) {
-                $notice = Notice::getKV('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::getKV('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::getKV('uri', $notice->uri);
-            if (!empty($sub)) {
+            $sub = Subscription::getKV('uri', $stored->uri);
+            if ($sub instanceof Subscription) {
                 $profile = Profile::getKV('id', $sub->subscribed);
-                if (!empty($profile)) {
-                    $activity->objects = array(ActivityObject::fromProfile($profile));
+                if ($profile instanceof Profile) {
+                    $act->title = $stored->getTitle();
+                    $act->objects = array($profile->asActivityObject());
                 }
             }
             break;
@@ -402,7 +339,7 @@ class ActivityPlugin extends Plugin
         return true;
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Activity',
                             'version' => self::VERSION,