X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Factivitymover.php;h=74c5c68ad688d8d824394f2d414e66ae2e0dc72c;hb=refs%2Fheads%2Fupstream-changes%2Fgoogle-analytics-removal;hp=fe33e9081ec1236c3670a6226ffb8466a6c79183;hpb=1ee79dc3791162f7ef9b92befaef597328266ce1;p=quix0rs-gnu-social.git diff --git a/lib/activitymover.php b/lib/activitymover.php index fe33e9081e..74c5c68ad6 100644 --- a/lib/activitymover.php +++ b/lib/activitymover.php @@ -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,