From d6159523373b4073cf77412d0dd85cae9c85bd64 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 17 Sep 2021 16:02:12 +0100
Subject: [PATCH] Add fallback warning

---
 .../views/dialogs/ConfirmSpaceUserActionDialog.tsx  |  6 ++++++
 src/components/views/right_panel/UserInfo.tsx       | 13 +++++++++++++
 src/i18n/strings/en_EN.json                         |  3 +++
 3 files changed, 22 insertions(+)

diff --git a/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx b/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx
index 4059682ade..9e014b86fd 100644
--- a/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx
+++ b/src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx
@@ -27,6 +27,7 @@ interface IProps extends Omit<BaseProps, "groupMember" | "matrixClient" | "child
     allLabel: string;
     specificLabel: string;
     noneLabel?: string;
+    warningMessage?: string;
     onFinished(success: boolean, reason?: string, rooms?: Room[]): void;
     spaceChildFilter?(child: Room): boolean;
 }
@@ -37,6 +38,7 @@ const ConfirmSpaceUserActionDialog: React.FC<IProps> = ({
     allLabel,
     specificLabel,
     noneLabel,
+    warningMessage,
     onFinished,
     ...props
 }) => {
@@ -59,6 +61,10 @@ const ConfirmSpaceUserActionDialog: React.FC<IProps> = ({
                 SpaceName: () => <b>{ space.name }</b>,
             }) }
         </div>;
+    } else if (warningMessage) {
+        warning = <div className="mx_ConfirmSpaceUserActionDialog_warning">
+            { warningMessage }
+        </div>;
     }
 
     return (
diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
index 3a12c6478f..9b394fea39 100644
--- a/src/components/views/right_panel/UserInfo.tsx
+++ b/src/components/views/right_panel/UserInfo.tsx
@@ -561,6 +561,10 @@ const RoomKickButton = ({ room, member, startUpdating, stopUpdating }: Omit<IBas
                 },
                 allLabel: _t("Kick them from everything I'm able to"),
                 specificLabel: _t("Kick them from specific things I'm able to"),
+                warningMessage: _t("If you're not an admin of a room or space in <SpaceName/>, " +
+                    "they'll still be able to access it after you kick them.", {}, {
+                    SpaceName: () => <b>{ room.name }</b>,
+                }),
             },
             room.isSpaceRoom() ? "mx_ConfirmSpaceUserActionDialog_wrapper" : undefined,
         );
@@ -710,6 +714,15 @@ const BanToggleButton = ({ room, member, startUpdating, stopUpdating }: Omit<IBa
                 specificLabel: isBanned
                     ? _t("Unban them from specific things I'm able to")
                     : _t("Ban them from specific things I'm able to"),
+                warningMessage: isBanned
+                    ? _t("If you’re not an admin of a room or space in <SpaceName/>, " +
+                        "they won’t be unbanned from it.", {}, {
+                        SpaceName: () => <b>{ room.name }</b>,
+                    })
+                    : _t("If you're not an admin of a room or space in <SpaceName/>, " +
+                        "they'll still be able to access it after you ban them.", {}, {
+                        SpaceName: () => <b>{ room.name }</b>,
+                    }),
             },
             room.isSpaceRoom() ? "mx_ConfirmSpaceUserActionDialog_wrapper" : undefined,
         );
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5195b08f56..d0bb4366fd 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1851,6 +1851,7 @@
     "Kick this user?": "Kick this user?",
     "Kick them from everything I'm able to": "Kick them from everything I'm able to",
     "Kick them from specific things I'm able to": "Kick them from specific things I'm able to",
+    "If you're not an admin of a room or space in <SpaceName/>, they'll still be able to access it after you kick them.": "If you're not an admin of a room or space in <SpaceName/>, they'll still be able to access it after you kick them.",
     "Failed to kick": "Failed to kick",
     "No recent messages by %(user)s found": "No recent messages by %(user)s found",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Try scrolling up in the timeline to see if there are any earlier ones.",
@@ -1868,6 +1869,8 @@
     "Ban them from everything I'm able to": "Ban them from everything I'm able to",
     "Unban them from specific things I'm able to": "Unban them from specific things I'm able to",
     "Ban them from specific things I'm able to": "Ban them from specific things I'm able to",
+    "If you’re not an admin of a room or space in <SpaceName/>, they won’t be unbanned from it.": "If you’re not an admin of a room or space in <SpaceName/>, they won’t be unbanned from it.",
+    "If you're not an admin of a room or space in <SpaceName/>, they'll still be able to access it after you ban them.": "If you're not an admin of a room or space in <SpaceName/>, they'll still be able to access it after you ban them.",
     "Failed to ban user": "Failed to ban user",
     "Failed to mute user": "Failed to mute user",
     "Unmute": "Unmute",