Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / Activity / ActivityPlugin.php

diff --git a/plugins/Activity/ActivityPlugin.php b/plugins/Activity/ActivityPlugin.php
index 99c0a246c6daaa66bae1974bbd2f9e7360a6c776..5144eb46662f3f86a4c1c25969b008aef3da4c99 100644 (file)
--- a/plugins/Activity/ActivityPlugin.php
+++ b/plugins/Activity/ActivityPlugin.php
@@ -279,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);
@@ -308,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($profile->asActivityObject());
+                if ($profile instanceof Profile) {
+                    $act->title = $stored->getTitle();
+                    $act->objects = array($profile->asActivityObject());
                 }
             }
             break;
@@ -358,7 +339,7 @@ class ActivityPlugin extends Plugin
         return true;
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Activity',
                             'version' => self::VERSION,