Move follow button into the interaction drop down

BurntimeX · BurntimeX · commit 78a86b1ce965 · 2026-05-02T19:38:26.000+02:00
diff --git a/com.woltlab.wcf/templates/reactionSummaryDetailsListItems.tpl b/com.woltlab.wcf/templates/reactionSummaryDetailsListItems.tpl
@@ -23,28 +23,6 @@
 			{unsafe:$reaction->render()}
 			
 			<div class="simpleUserList__item__interactions">
-				{if $__wcf->user->userID && $user->userID != $__wcf->user->userID}
-					{if !$__wcf->getUserProfileHandler()->isIgnoredByUser($user->userID)}
-						{if $__wcf->getUserProfileHandler()->isFollowing($user->userID)}
-							<button
-								type="button"
-								data-following="1"
-								data-follow-user="{link controller='UserFollow' id=$user->userID}{/link}"
-								class="button small jsTooltip"
-								title="{lang}wcf.user.button.unfollow{/lang}"
-							>{icon name='user-minus' type='solid'}</button>
-						{else}
-							<button
-								type="button"
-								data-following="0"
-								data-follow-user="{link controller='UserFollow' id=$user->userID}{/link}"
-								class="button small jsTooltip"
-								title="{lang}wcf.user.button.follow{/lang}"
-							>{icon name='user-plus' type='solid'}</button>
-						{/if}
-					{/if}
-				{/if}
-				
 				{unsafe:$view->renderInteractionContextMenuButton($reaction)}
 			</div>
 		</div>
diff --git a/wcfsetup/install/files/lib/system/interaction/user/UserProfileInteractions.class.php b/wcfsetup/install/files/lib/system/interaction/user/UserProfileInteractions.class.php
@@ -22,7 +22,7 @@
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.2
  */
-final class UserProfileInteractions extends AbstractInteractionProvider
+class UserProfileInteractions extends AbstractInteractionProvider
 {
     public function __construct()
     {
diff --git a/wcfsetup/install/files/lib/system/interaction/user/UserProfileInteractionsWithFollow.class.php b/wcfsetup/install/files/lib/system/interaction/user/UserProfileInteractionsWithFollow.class.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace wcf\system\interaction\user;
+
+use wcf\action\UserFollowAction;
+use wcf\data\DatabaseObject;
+use wcf\data\user\UserProfile;
+use wcf\system\interaction\AbstractInteraction;
+use wcf\system\request\LinkHandler;
+use wcf\system\user\UserProfileHandler;
+use wcf\system\WCF;
+use wcf\util\StringUtil;
+
+/**
+ * Extended interaction provider for the context menu of user profiles with the option to follow users.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class UserProfileInteractionsWithFollow extends UserProfileInteractions
+{
+    public function __construct()
+    {
+        $this->addInteractions([
+            new class(
+                'follow',
+                static fn(UserProfile $user) => !WCF::getUser()->isGuest()
+                    && WCF::getUser()->userID !== $user->userID
+                    && !UserProfileHandler::getInstance()->isIgnoredByUser($user->userID)
+            ) extends AbstractInteraction {
+                #[\Override]
+                public function render(DatabaseObject $object): string
+                {
+                    \assert($object instanceof UserProfile);
+
+                    $endpoint = StringUtil::encodeHTML(
+                        LinkHandler::getInstance()->getControllerLink(UserFollowAction::class, ['id' => $object->userID])
+                    );
+
+                    if (UserProfileHandler::getInstance()->isFollowing($object->userID)) {
+                        $title = WCF::getLanguage()->get('wcf.user.button.unfollow');
+
+                        return <<<HTML
+                            <button
+                                type="button"
+                                data-following="1"
+                                data-follow-user="{$endpoint}"
+                                data-type="button"
+                            >{$title}</button>
+                            HTML;
+                    } else {
+                        $title = WCF::getLanguage()->get('wcf.user.button.follow');
+
+                        return <<<HTML
+                            <button
+                                type="button"
+                                data-following="0"
+                                data-follow-user="{$endpoint}"
+                                data-type="button"
+                            >{$title}</button>
+                            HTML;
+                    }
+                }
+            },
+        ]);
+
+        parent::__construct();
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/listView/user/ReactionSummaryDetailsListView.class.php b/wcfsetup/install/files/lib/system/listView/user/ReactionSummaryDetailsListView.class.php
@@ -9,7 +9,7 @@
 use wcf\data\like\ViewableLike;
 use wcf\data\like\ViewableLikeList;
 use wcf\event\listView\user\ReactionSummaryDetailsListViewInitialized;
-use wcf\system\interaction\user\UserProfileInteractions;
+use wcf\system\interaction\user\UserProfileInteractionsWithFollow;
 use wcf\system\listView\AbstractListView;
 use wcf\system\listView\ListViewSortField;
 use wcf\system\reaction\ReactionHandler;
@@ -41,7 +41,7 @@ public function __construct(
         ]);
 
         $this->setAllowSorting(false);
-        $this->setInteractionProvider(new UserProfileInteractions());
+        $this->setInteractionProvider(new UserProfileInteractionsWithFollow());
         $this->setDefaultSortField('username');
         $this->setItemsPerPage(100);
         $this->setCssClassName('simpleUserList');

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`* @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>`
`23`	`23`	`* @since 6.2`
`24`	`24`	`*/`
`25`		`-final class UserProfileInteractions extends AbstractInteractionProvider`
	`25`	`+class UserProfileInteractions extends AbstractInteractionProvider`
`26`	`26`	`{`
`27`	`27`	`public function __construct()`
`28`	`28`	`{`