Move Unfollow command

Author: BurntimeX

wcfsetup/install/files/lib/action/UserFollowAction.class.php

@@ -12,7 +12,7 @@
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\PermissionDeniedException;
 use wcf\command\user\Follow;
-use wcf\system\user\command\Unfollow;
+use wcf\command\user\Unfollow;
 use wcf\system\WCF;
 
 /**

wcfsetup/install/files/lib/command/user/Unfollow.class.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace wcf\system\user\command;
+namespace wcf\command\user;
 
 use wcf\data\user\follow\UserFollow;
 use wcf\data\user\follow\UserFollowEditor;
@@ -14,13 +14,14 @@
  * @author      Marcel Werk
  * @copyright   2001-2024 WoltLab GmbH
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @since       6.1
+ * @since       6.2
  */
 final class Unfollow
 {
-    public function __construct(private readonly User $user, private readonly User $target)
-    {
-    }
+    public function __construct(
+        private readonly User $user,
+        private readonly User $target
+    ) {}
 
     public function __invoke(): void
     {

wcfsetup/install/files/lib/data/user/follow/UserFollowAction.class.php

@@ -11,7 +11,7 @@
 use wcf\system\exception\UserInputException;
 use wcf\system\user\activity\event\UserActivityEventHandler;
 use wcf\command\user\Follow;
-use wcf\system\user\command\Unfollow;
+use wcf\command\user\Unfollow;
 use wcf\system\user\GroupedUserList;
 use wcf\system\user\storage\UserStorageHandler;
 use wcf\system\WCF;

wcfsetup/install/files/lib/system/user/command/Unfollow.class.php

@@ -2,11 +2,7 @@
 
 namespace wcf\system\user\command;
 
-use wcf\data\user\follow\UserFollow;
-use wcf\data\user\follow\UserFollowEditor;
 use wcf\data\user\User;
-use wcf\system\user\activity\event\UserActivityEventHandler;
-use wcf\system\user\storage\UserStorageHandler;
 
 /**
  * Saves that a user is unfollowing another user.
@@ -15,38 +11,20 @@
  * @copyright   2001-2024 WoltLab GmbH
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.1
+ * @deprecated  6.2 Use `\wcf\command\user\Unfollow` instead.
  */
 final class Unfollow
 {
-    public function __construct(private readonly User $user, private readonly User $target)
-    {
-    }
+    public function __construct(
+        private readonly User $user,
+        private readonly User $target
+    ) {}
 
     public function __invoke(): void
     {
-        $follow = UserFollow::getFollow($this->user->userID, $this->target->userID);
-
-        if ($follow->followID) {
-            $followEditor = new UserFollowEditor($follow);
-            $followEditor->delete();
-
-            $this->removeActivityEvent();
-        }
-
-        $this->resetUserStorage();
-    }
-
-    private function removeActivityEvent(): void
-    {
-        UserActivityEventHandler::getInstance()->removeEvent(
-            'com.woltlab.wcf.user.recentActivityEvent.follow',
-            $this->target->userID
-        );
-    }
-
-    private function resetUserStorage(): void
-    {
-        UserStorageHandler::getInstance()->reset([$this->target->userID], 'followerUserIDs');
-        UserStorageHandler::getInstance()->reset([$this->user->userID], 'followingUserIDs');
+        (new \wcf\command\user\Unfollow(
+            $this->user,
+            $this->target
+        ))();
     }
 }