Merge branch 'subscribers_as_addressees' into 'nightly'

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

diff --git a/plugins/Activity/ActivityPlugin.php b/plugins/Activity/ActivityPlugin.php
index 91d2867c23c27d7b5c8b3f6c23de667315f45c99..5144eb46662f3f86a4c1c25969b008aef3da4c99 100644 (file)
--- a/plugins/Activity/ActivityPlugin.php
+++ b/plugins/Activity/ActivityPlugin.php
@@ -283,7 +283,7 @@ class ActivityPlugin extends Plugin
             $adapter = new JoinListItem($nli);
             break;
         case ActivityVerb::LEAVE:
-            $adapter = new JoinListItem($nli);
+            $adapter = new LeaveListItem($nli);
             break;
         case ActivityVerb::FOLLOW:
             $adapter = new FollowListItem($nli);
@@ -311,9 +311,10 @@ class ActivityPlugin extends Plugin
             // FIXME: do something here
             break;
         case ActivityVerb::JOIN:
-            $mem = Group_member::getKV('uri', $stored->uri);
-            if (!empty($mem)) {
+            $mem = Group_member::getKV('uri', $stored->getUri());
+            if ($mem instanceof Group_member) {
                 $group = $mem->getGroup();
+                $act->title = $stored->getTitle();
                 $act->objects = array(ActivityObject::fromGroup($group));
             }
             break;
@@ -322,9 +323,10 @@ class ActivityPlugin extends Plugin
             break;
         case ActivityVerb::FOLLOW:
             $sub = Subscription::getKV('uri', $stored->uri);
-            if (!empty($sub)) {
+            if ($sub instanceof Subscription) {
                 $profile = Profile::getKV('id', $sub->subscribed);
-                if (!empty($profile)) {
+                if ($profile instanceof Profile) {
+                    $act->title = $stored->getTitle();
                     $act->objects = array($profile->asActivityObject());
                 }
             }
@@ -337,7 +339,7 @@ class ActivityPlugin extends Plugin
         return true;
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Activity',
                             'version' => self::VERSION,