From cefc36a8d7b83a90ab20f182a8d17a11431b831b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Wed, 10 Mar 2021 12:26:08 +0100
Subject: [PATCH] Remove 'block' button from 'userInformationButtons'

It still uses the legacy jQuery based JavaScript which does not work well with
the new `type` parameter. Additionally it distracts from more useful buttons.
It's not like users are going to ignore other users en masse.
---
 com.woltlab.wcf/templates/groupedUserList.tpl         | 3 ---
 com.woltlab.wcf/templates/groupedUserReactionList.tpl | 3 ---
 com.woltlab.wcf/templates/membersList.tpl             | 3 ---
 com.woltlab.wcf/templates/team.tpl                    | 3 ---
 com.woltlab.wcf/templates/userBirthdayList.tpl        | 3 ---
 com.woltlab.wcf/templates/userInformationButtons.tpl  | 6 ------
 com.woltlab.wcf/templates/userProfilePreview.tpl      | 6 ------
 com.woltlab.wcf/templates/usersOnlineList.tpl         | 3 ---
 8 files changed, 30 deletions(-)

diff --git a/com.woltlab.wcf/templates/groupedUserList.tpl b/com.woltlab.wcf/templates/groupedUserList.tpl
index 89c21e9941..284fbf8355 100644
--- a/com.woltlab.wcf/templates/groupedUserList.tpl
+++ b/com.woltlab.wcf/templates/groupedUserList.tpl
@@ -25,12 +25,9 @@
 		$(function() {
 			WCF.Language.addObject({
 				'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
-				'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
 				'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
-				'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
 			});
 			
 			new WCF.User.Action.Follow($('.jsGroupedUserList > li'));
-			new WCF.User.Action.Ignore($('.jsGroupedUserList > li'));
 		});
 </script>
diff --git a/com.woltlab.wcf/templates/groupedUserReactionList.tpl b/com.woltlab.wcf/templates/groupedUserReactionList.tpl
index e55095362c..315123e10e 100644
--- a/com.woltlab.wcf/templates/groupedUserReactionList.tpl
+++ b/com.woltlab.wcf/templates/groupedUserReactionList.tpl
@@ -25,12 +25,9 @@
 		$(function() {
 			WCF.Language.addObject({
 				'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
-				'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
 				'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
-				'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
 			});
 			
 			new WCF.User.Action.Follow($('.jsGroupedUserList > li'));
-			new WCF.User.Action.Ignore($('.jsGroupedUserList > li'));
 		});
 </script>
diff --git a/com.woltlab.wcf/templates/membersList.tpl b/com.woltlab.wcf/templates/membersList.tpl
index 2ef674f4b5..3465f5634c 100644
--- a/com.woltlab.wcf/templates/membersList.tpl
+++ b/com.woltlab.wcf/templates/membersList.tpl
@@ -134,13 +134,10 @@
 	$(function() {
 		WCF.Language.addObject({
 			'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
-			'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
 			'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
-			'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
 		});
 		
 		new WCF.User.Action.Follow($('.userList > li'));
-		new WCF.User.Action.Ignore($('.userList > li'));
 	});
 	
 	require(['WoltLabSuite/Core/Ui/User/Search/Input'], (UiUserSearchInput) => {
diff --git a/com.woltlab.wcf/templates/team.tpl b/com.woltlab.wcf/templates/team.tpl
index e8b47c96de..2bef480345 100644
--- a/com.woltlab.wcf/templates/team.tpl
+++ b/com.woltlab.wcf/templates/team.tpl
@@ -29,13 +29,10 @@
 	$(function() {
 		WCF.Language.addObject({
 			'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
-			'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
 			'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
-			'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
 		});
 		
 		new WCF.User.Action.Follow($('.userList > li'));
-		new WCF.User.Action.Ignore($('.userList > li'));
 	});
 </script>
 
diff --git a/com.woltlab.wcf/templates/userBirthdayList.tpl b/com.woltlab.wcf/templates/userBirthdayList.tpl
index 6951a1b657..dc042f6fe3 100644
--- a/com.woltlab.wcf/templates/userBirthdayList.tpl
+++ b/com.woltlab.wcf/templates/userBirthdayList.tpl
@@ -40,12 +40,9 @@
 	$(function() {
 		WCF.Language.addObject({
 			'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
-			'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
 			'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
-			'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
 		});
 		
 		new WCF.User.Action.Follow($('.jsGroupedUserList > li'));
-		new WCF.User.Action.Ignore($('.jsGroupedUserList > li'));
 	});
 </script>
diff --git a/com.woltlab.wcf/templates/userInformationButtons.tpl b/com.woltlab.wcf/templates/userInformationButtons.tpl
index 066564ce60..63bdbfd205 100644
--- a/com.woltlab.wcf/templates/userInformationButtons.tpl
+++ b/com.woltlab.wcf/templates/userInformationButtons.tpl
@@ -20,12 +20,6 @@
 							<li class="jsOnly"><a href="#" data-following="0" data-object-id="{@$user->userID}" class="jsFollowButton jsTooltip" title="{lang}wcf.user.button.follow{/lang}"><span class="icon icon16 fa-plus"></span> <span class="invisible">{lang}wcf.user.button.follow{/lang}</span></a></li>
 						{/if}
 					{/if}
-					
-					{if $__wcf->getUserProfileHandler()->isIgnoredUser($user->userID)}
-						<li class="jsOnly"><a href="#" data-ignored="1" data-object-id="{@$user->userID}" class="jsIgnoreButton jsTooltip" title="{lang}wcf.user.button.unignore{/lang}"><span class="icon icon16 fa-circle-o"></span> <span class="invisible">{lang}wcf.user.button.unignore{/lang}</span></a></li>
-					{else}
-						<li class="jsOnly"><a href="#" data-ignored="0" data-object-id="{@$user->userID}" class="jsIgnoreButton jsTooltip" title="{lang}wcf.user.button.ignore{/lang}"><span class="icon icon16 fa-ban"></span> <span class="invisible">{lang}wcf.user.button.ignore{/lang}</span></a></li>
-					{/if}
 				{/if}
 				
 				{event name='buttons'}
diff --git a/com.woltlab.wcf/templates/userProfilePreview.tpl b/com.woltlab.wcf/templates/userProfilePreview.tpl
index 217ac915df..f34f805f07 100644
--- a/com.woltlab.wcf/templates/userProfilePreview.tpl
+++ b/com.woltlab.wcf/templates/userProfilePreview.tpl
@@ -52,16 +52,10 @@
 				$(function() {
 					WCF.Language.addObject({
 						'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
-						'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
 						'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
-						'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
 					});
 					
 					new WCF.User.Action.Follow($('.userInformation'));
-					
-					{if !$user->getPermission('user.profile.cannotBeIgnored')}
-						new WCF.User.Action.Ignore($('.userInformation'));
-					{/if}
 				});
 			</script>
 		{/if}
diff --git a/com.woltlab.wcf/templates/usersOnlineList.tpl b/com.woltlab.wcf/templates/usersOnlineList.tpl
index 943e39f42a..06cde2e020 100644
--- a/com.woltlab.wcf/templates/usersOnlineList.tpl
+++ b/com.woltlab.wcf/templates/usersOnlineList.tpl
@@ -228,13 +228,10 @@
 	$(function() {
 		WCF.Language.addObject({
 			'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
-			'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
 			'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
-			'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
 		});
 		
 		new WCF.User.Action.Follow($('.userList > li'));
-		new WCF.User.Action.Ignore($('.userList > li'));
 	});
 </script>
 
-- 
2.20.1