Skip to content

Commit

Permalink
Simplify
Browse files Browse the repository at this point in the history
  • Loading branch information
t3chguy committed Jul 14, 2023
1 parent c284a92 commit 69c785c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 30 deletions.
15 changes: 1 addition & 14 deletions src/components/views/right_panel/UserInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -879,6 +879,7 @@ interface IBaseRoomProps extends IBaseProps {
children?: ReactNode;
}

// We do not show a Mute button for ourselves so it doesn't need to handle warning self demotion
const MuteToggleButton: React.FC<IBaseRoomProps> = ({
member,
room,
Expand All @@ -900,20 +901,6 @@ const MuteToggleButton: React.FC<IBaseRoomProps> = ({
const roomId = member.roomId;
const target = member.userId;

// if muting self, warn as it may be irreversible
if (target === cli.getUserId()) {
try {
if (!(await warnSelfDemote(room?.isSpaceRoom()))) {
stopUpdating();
return;
}
} catch (e) {
logger.error("Failed to warn about self demotion: ", e);
stopUpdating();
return;
}
}

const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
if (!powerLevelEvent) {
stopUpdating();
Expand Down
20 changes: 4 additions & 16 deletions test/components/views/right_panel/UserInfo-test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ import { E2EStatus } from "../../../../src/utils/ShieldUtils";
import { DirectoryMember, startDmOnFirstMessage } from "../../../../src/utils/direct-messages";
import { clearAllModals, flushPromises } from "../../../test-utils";
import ErrorDialog from "../../../../src/components/views/dialogs/ErrorDialog";
import QuestionDialog from "../../../../src/components/views/dialogs/QuestionDialog";

jest.mock("../../../../src/utils/direct-messages", () => ({
...jest.requireActual("../../../../src/utils/direct-messages"),
Expand Down Expand Up @@ -1231,29 +1230,18 @@ describe("<RoomAdminToolsContainer />", () => {
expect(button).toHaveAttribute("aria-disabled", "true");
});

it("should warn when muting self", () => {
const spy = jest.spyOn(Modal, "createDialog").mockImplementation(() => ({
finished: Promise.resolve([false]),
close: jest.fn(),
}));

it("should not show mute button for one's own member", () => {
const mockMeMember = new RoomMember(mockRoom.roomId, mockClient.getSafeUserId());
mockMeMember.powerLevel = 51; // defaults to 50
mockRoom.getMember.mockReturnValueOnce(mockMeMember);

renderComponent({
member: mockMeMember,
powerLevels: { events: { "m.room.power_levels": 1 } },
powerLevels: { events: { "m.room.power_levels": 100 } },
});

const button = screen.getByText(/mute/i);
fireEvent.click(button);
expect(spy).toHaveBeenCalledWith(
QuestionDialog,
expect.objectContaining({
title: "Demote yourself?",
}),
);
const button = screen.queryByText(/mute/i);
expect(button).not.toBeInTheDocument();
});
});

Expand Down

0 comments on commit 69c785c

Please sign in to comment.