Merge pull request #33606 from peppy/add-confirmation-for-block

Add confirmation step before blocking a user

Author: bdach

osu.Game/Localisation/ContextMenuStrings.cs

@@ -29,6 +29,16 @@ public static class ContextMenuStrings
         /// </summary>
         public static LocalisableString SpectatePlayer => new TranslatableString(getKey(@"spectate_player"), @"Spectate");
 
+        /// <summary>
+        /// "Are you sure you want to block {0}?"
+        /// </summary>
+        public static LocalisableString ConfirmBlockUser(string username) => new TranslatableString(getKey(@"confirm_block_user"), @"Are you sure you want to block {0}?", username);
+
+        /// <summary>
+        /// "Are you sure you want to unblock {0}?"
+        /// </summary>
+        public static LocalisableString ConfirmUnblockUser(string username) => new TranslatableString(getKey(@"confirm_unblock_user"), @"Are you sure you want to unblock {0}?", username);
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }

osu.Game/Users/UserPanel.cs

@@ -26,6 +26,7 @@
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.Metadata;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Overlays.Dialog;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Screens;
 using osu.Game.Screens.Play;
@@ -68,6 +69,9 @@ protected UserPanel(APIUser user)
         [Resolved]
         private ChatOverlay? chatOverlay { get; set; }
 
+        [Resolved]
+        private IDialogOverlay? dialogOverlay { get; set; }
+
         [Resolved]
         protected OverlayColourProvider? ColourProvider { get; private set; }
 
@@ -163,9 +167,15 @@ public MenuItem[] ContextMenuItems
                     chatOverlay?.Show();
                 }));
 
-                items.Add(isUserBlocked()
-                    ? new OsuMenuItem(UsersStrings.BlocksButtonUnblock, MenuItemType.Standard, () => toggleBlock(false))
-                    : new OsuMenuItem(UsersStrings.BlocksButtonBlock, MenuItemType.Destructive, () => toggleBlock(true)));
+                items.Add(!isUserBlocked()
+                    ? new OsuMenuItem(UsersStrings.BlocksButtonBlock, MenuItemType.Destructive, () =>
+                    {
+                        dialogOverlay?.Push(new ConfirmBlockActionDialog(ContextMenuStrings.ConfirmBlockUser(User.Username), () => toggleBlock(true)));
+                    })
+                    : new OsuMenuItem(UsersStrings.BlocksButtonUnblock, MenuItemType.Standard, () =>
+                    {
+                        dialogOverlay?.Push(new ConfirmBlockActionDialog(ContextMenuStrings.ConfirmUnblockUser(User.Username), () => toggleBlock(false)));
+                    }));
 
                 if (isUserOnline())
                 {
@@ -228,5 +238,14 @@ public bool MatchingFilter
         }
 
         public bool FilteringActive { get; set; }
+
+        private partial class ConfirmBlockActionDialog : DangerousActionDialog
+        {
+            public ConfirmBlockActionDialog(LocalisableString text, Action? action = null)
+            {
+                BodyText = text;
+                DangerousAction = action;
+            }
+        }
     }
 }