Removed plugin Google-Analytics as this is free/libre and decentralized

[quix0rs-gnu-social.git] / lib / activitymover.php

diff --git a/lib/activitymover.php b/lib/activitymover.php
index 66ae7e5074e2045ea4c706d39501e75c3ce386a0..74c5c68ad688d8d824394f2d414e66ae2e0dc72c 100644 (file)
--- a/lib/activitymover.php
+++ b/lib/activitymover.php
@@ -93,7 +93,7 @@ class ActivityMover extends QueueHandler
         }
 
         switch ($act->verb) {
-        case ActivityVerb::FAVORITE:
+/*        case ActivityVerb::FAVORITE:
             $this->log(LOG_INFO,
                        "Moving favorite of {$act->objects[0]->id} by ".
                        "{$act->actor->id} to {$remote->nickname}.");
@@ -105,7 +105,7 @@ class ActivityMover extends QueueHandler
                                             'notice_id' => $notice->id));
                 $fave->delete();
             }
-            break;
+            break;*/
         case ActivityVerb::POST:
             $this->log(LOG_INFO,
                        "Moving notice {$act->objects[0]->id} by ".
@@ -114,7 +114,7 @@ class ActivityMover extends QueueHandler
             $sink->postActivity($act);
             $notice = Notice::getKV('uri', $act->objects[0]->id);
             if (!empty($notice)) {
-                $notice->delete();
+                $notice->deleteAs($user->getProfile(), false);
             }
             break;
         case ActivityVerb::JOIN:
@@ -146,7 +146,7 @@ class ActivityMover extends QueueHandler
                                "Changing sub to {$act->objects[0]->id}".
                                "by {$act->actor->id} to {$remote->nickname}.");
                     $otherProfile = $otherUser->getProfile();
-                    Subscription::start($otherProfile, $remote);
+                    Subscription::ensureStart($otherProfile, $remote);
                     Subscription::cancel($otherProfile, $user->getProfile());
                 } else {
                     $this->log(LOG_NOTICE,