Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Warn when demoting self via /op and /deop slash commands #11214

Merged
merged 7 commits into from
Jul 11, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 37 additions & 3 deletions src/SlashCommands.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ import { isLocalRoom } from "./utils/localRoom/isLocalRoom";
import { SdkContextClass } from "./contexts/SDKContext";
import { MatrixClientPeg } from "./MatrixClientPeg";
import { getDeviceCryptoInfo } from "./utils/crypto/deviceInfo";
import { warnSelfDemote } from "./components/views/right_panel/UserInfo";

// XXX: workaround for https://github.com/microsoft/TypeScript/issues/31816
interface HTMLInputEvent extends Event {
Expand Down Expand Up @@ -917,8 +918,24 @@ export const Commands = [
) {
return reject(new UserFriendlyError("Could not find user in room"));
}
const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
return success(cli.setPowerLevel(roomId, userId, powerLevel, powerLevelEvent));

const updatePowerlevel = (): Promise<unknown> => {
const powerLevelEvent = room!.currentState.getStateEvents("m.room.power_levels", "");
return cli.setPowerLevel(roomId, userId, powerLevel, powerLevelEvent);
};

let prom: Promise<unknown> = Promise.resolve();
if (member.userId === cli.getUserId() && member.powerLevel > powerLevel) {
const warningPromise = warnSelfDemote(room.isSpaceRoom());
prom = warningPromise.then((ok) => {
if (ok) {
prom = updatePowerlevel();
}
});
} else {
prom = updatePowerlevel();
}
return success(prom);
}
}
}
Expand Down Expand Up @@ -950,7 +967,24 @@ export const Commands = [
if (!powerLevelEvent?.getContent().users[args]) {
return reject(new UserFriendlyError("Could not find user in room"));
}
return success(cli.setPowerLevel(roomId, args, undefined, powerLevelEvent));

const updatePowerlevel = (): Promise<unknown> => {
const powerLevelEvent = room!.currentState.getStateEvents("m.room.power_levels", "");
return cli.setPowerLevel(roomId, args, undefined, powerLevelEvent);
};

let prom: Promise<unknown> = Promise.resolve();
if (args === cli.getUserId()) {
const warningPromise = warnSelfDemote(room.isSpaceRoom());
prom = warningPromise.then((ok) => {
if (ok) {
prom = updatePowerlevel();
}
});
} else {
prom = updatePowerlevel();
}
return success(prom);
t3chguy marked this conversation as resolved.
Show resolved Hide resolved
}
}
return reject(this.getUsage());
Expand Down
2 changes: 1 addition & 1 deletion src/components/views/right_panel/UserInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ export const UserOptionsSection: React.FC<{
);
};

const warnSelfDemote = async (isSpace: boolean): Promise<boolean> => {
export const warnSelfDemote = async (isSpace: boolean): Promise<boolean> => {
const { finished } = Modal.createDialog(QuestionDialog, {
title: _t("Demote yourself?"),
description: (
Expand Down
Loading