From 2f4fac0f37752023e71a7dae47f640729670e2a5 Mon Sep 17 00:00:00 2001
From: Arnei <arnewilken@yahoo.de>
Date: Wed, 19 Oct 2022 12:51:31 +0200
Subject: [PATCH 1/5] Add leave room warning for last admin
If the last room administrator leaves a room, other users cannot
gain admin privilges anymore, leaving the room in an unmoderable
state. To help in avoiding this scenario without actually preventing
an admin from leaving the room if they really want, this commit
adds a new warning message.
Attempts to help with: https://github.com/vector-im/element-web/issues/2855
Signed-off-by: Arne Wilken arnepokemon@yahoo.de
---
src/components/structures/MatrixChat.tsx | 24 ++++++++++++++++++++++++
src/i18n/strings/en_EN.json | 1 +
src/utils/TypeUtils.ts | 11 +++++++++++
3 files changed, 36 insertions(+)
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 515355b63d..368a0492a5 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -138,6 +138,7 @@ import { UseCaseSelection } from '../views/elements/UseCaseSelection';
import { ValidatedServerConfig } from '../../utils/ValidatedServerConfig';
import { isLocalRoom } from '../../utils/localRoom/isLocalRoom';
import { viewUserDeviceSettings } from '../../actions/handlers/viewUserDeviceSettings';
+import { isNumberArray } from '../../utils/TypeUtils';
// legacy export
export { default as Views } from "../../Views";
@@ -1125,6 +1126,29 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
));
}
}
+
+ const client = MatrixClientPeg.get();
+ const plEvent = roomToLeave.currentState.getStateEvents(EventType.RoomPowerLevels, '');
+ const plContent = plEvent ? (plEvent.getContent() || {}) : {};
+ const userLevels = plContent.users || {};
+ const currentUserLevel = userLevels[client.getUserId()];
+ const userLevelValues = Object.values(userLevels);
+ if (isNumberArray(userLevelValues)) {
+ const maxUserLevel = Math.max(...userLevelValues);
+ // If the user is the only user with highest power level
+ if (maxUserLevel === currentUserLevel &&
+ userLevelValues.lastIndexOf(maxUserLevel) == userLevelValues.indexOf(maxUserLevel)) {
+ warnings.push((
+ <span className="warning" key="last_admin_warning">
+ { ' '/* Whitespace, otherwise the sentences get smashed together */ }
+ { _t("You are the sole person with the highest role in this room. " +
+ "If you leave, the room could become unmoderable. Consider giving " +
+ "another user your role.") }
+ </span>
+ ));
+ }
+ }
+
return warnings;
}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index fa0b1690dc..661aae2c7a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -3232,6 +3232,7 @@
"You are the only person here. If you leave, no one will be able to join in the future, including you.": "You are the only person here. If you leave, no one will be able to join in the future, including you.",
"This space is not public. You will not be able to rejoin without an invite.": "This space is not public. You will not be able to rejoin without an invite.",
"This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.",
+ "You are the sole person with the highest role in this room. If you leave, the room could become unmoderable. Consider giving another user your role.": "You are the sole person with the highest role in this room. If you leave, the room could become unmoderable. Consider giving another user your role.",
"Are you sure you want to leave the space '%(spaceName)s'?": "Are you sure you want to leave the space '%(spaceName)s'?",
"Are you sure you want to leave the room '%(roomName)s'?": "Are you sure you want to leave the room '%(roomName)s'?",
"Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
diff --git a/src/utils/TypeUtils.ts b/src/utils/TypeUtils.ts
index abdd0eb2a0..286d844e9e 100644
--- a/src/utils/TypeUtils.ts
+++ b/src/utils/TypeUtils.ts
@@ -28,3 +28,14 @@ export function makeType(Type: any, opts: any) {
Object.assign(c, opts);
return c;
}
+
+/**
+ * Typeguard that checks if an unknown variable is an array of numbers
+ * @param value the variable to check
+ * @returns true if the variable is an array of numbers, false otherwise
+ */
+export function isNumberArray(value: unknown): value is number[] {
+ return (
+ Array.isArray(value) && value.every(element => typeof element === "number")
+ );
+}
From 0c0706db2261dfd0af7f6e085d13c2ff67619eae Mon Sep 17 00:00:00 2001
From: Arne Wilken <Arnei@users.noreply.github.com>
Date: Fri, 28 Oct 2022 10:51:54 +0200
Subject: [PATCH 2/5] Update src/components/structures/MatrixChat.tsx
getContent already does the || {} step
Co-authored-by: Robin <robin@robin.town>
---
src/components/structures/MatrixChat.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 847b495f51..ad7c499773 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -1136,7 +1136,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
const client = MatrixClientPeg.get();
const plEvent = roomToLeave.currentState.getStateEvents(EventType.RoomPowerLevels, '');
- const plContent = plEvent ? (plEvent.getContent() || {}) : {};
+ const plContent = plEvent ? plEvent.getContent() : {};
const userLevels = plContent.users || {};
const currentUserLevel = userLevels[client.getUserId()];
const userLevelValues = Object.values(userLevels);
From 626f187177f2aad533555b835474d3c6ccabc86d Mon Sep 17 00:00:00 2001
From: Arnei <arnewilken@yahoo.de>
Date: Mon, 20 Feb 2023 17:38:00 +0100
Subject: [PATCH 3/5] Update warning message for last_admin_warning
Switches out a made-up word for a real phrase.
---
src/components/structures/MatrixChat.tsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index ad7c499773..006e435a5d 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -1149,8 +1149,8 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
<span className="warning" key="last_admin_warning">
{ ' '/* Whitespace, otherwise the sentences get smashed together */ }
{ _t("You are the sole person with the highest role in this room. " +
- "If you leave, the room could become unmoderable. Consider giving " +
- "another user your role.") }
+ "If you leave, the room might not be able to be moderated anymore. " +
+ "Consider giving another user your role.") }
</span>
));
}
From 23bd96cddec5c088ebf5aa4a5e39759146de8c12 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Thu, 21 Mar 2024 11:54:02 +0000
Subject: [PATCH 4/5] Copy from PR feedback + use strong tags
---
src/components/structures/MatrixChat.tsx | 11 ++++++++---
src/i18n/strings/en_EN.json | 3 ++-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index eedf6ccbe9..4ce1b3e7d6 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -1214,11 +1214,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
maxUserLevel === currentUserLevel &&
userLevelValues.lastIndexOf(maxUserLevel) == userLevelValues.indexOf(maxUserLevel)
) {
+ const warning =
+ maxUserLevel >= 100
+ ? _t("leave_room_dialog|room_leave_admin_warning")
+ : _t("leave_room_dialog|room_leave_mod_warning");
warnings.push(
- <span className="warning" key="last_admin_warning">
+ <strong className="warning" key="last_admin_warning">
{" " /* Whitespace, otherwise the sentences get smashed together */}
- {_t("leave_room_dialog|room_leave_admin_warning")}
- </span>,
+ {warning}
+ </strong>,
);
}
}
@@ -1248,6 +1252,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
</span>
),
button: _t("action|leave"),
+ danger: warnings.length > 0,
onFinished: async (shouldLeave) => {
if (shouldLeave) {
await leaveRoomBehaviour(cli, roomId);
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index be9c4279a9..7ee1e351bc 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1524,7 +1524,8 @@
"leave_room_question": "Are you sure you want to leave the room '%(roomName)s'?",
"leave_space_question": "Are you sure you want to leave the space '%(spaceName)s'?",
"room_rejoin_warning": "This room is not public. You will not be able to rejoin without an invite.",
- "room_leave_admin_warning": "You are the sole person with the highest role in this room. If you leave, the room could become unmoderable. Consider giving another user your role.",
+ "room_leave_admin_warning": "You're the only administrator in this room. If you leave, nobody will be able to change room settings or take other important actions.",
+ "room_leave_mod_warning": "You're the only moderator in this room. If you leave, nobody will be able to change room settings or take other important actions.",
"space_rejoin_warning": "This space is not public. You will not be able to rejoin without an invite."
},
"left_panel": {
From 1a1699d1f98c20763bfa0e66a5d930f9ab35f5ee Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Thu, 21 Mar 2024 11:56:38 +0000
Subject: [PATCH 5/5] yarn i18n
---
src/i18n/strings/en_EN.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7ee1e351bc..fd34a613b8 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1523,9 +1523,9 @@
"last_person_warning": "You are the only person here. If you leave, no one will be able to join in the future, including you.",
"leave_room_question": "Are you sure you want to leave the room '%(roomName)s'?",
"leave_space_question": "Are you sure you want to leave the space '%(spaceName)s'?",
- "room_rejoin_warning": "This room is not public. You will not be able to rejoin without an invite.",
"room_leave_admin_warning": "You're the only administrator in this room. If you leave, nobody will be able to change room settings or take other important actions.",
"room_leave_mod_warning": "You're the only moderator in this room. If you leave, nobody will be able to change room settings or take other important actions.",
+ "room_rejoin_warning": "This room is not public. You will not be able to rejoin without an invite.",
"space_rejoin_warning": "This space is not public. You will not be able to rejoin without an invite."
},
"left_panel": {