Merge branch 'develop' into fayed/decryption-error-ui

Author: duxovni

package.json

@@ -72,9 +72,9 @@
  "counterpart": "^0.18.6",
  "diff-dom": "^4.2.2",
  "diff-match-patch": "^1.0.5",
- "emojibase": "6.0.2",
- "emojibase-data": "7.0.0",
- "emojibase-regex": "6.0.0",
+ "emojibase": "6.1.0",
+ "emojibase-data": "7.0.1",
+ "emojibase-regex": "6.0.1",
  "escape-html": "^1.0.3",
  "file-saver": "^2.0.5",
  "filesize": "6.1.0",
@@ -161,7 +161,7 @@
  "@types/lodash": "^4.14.168",
  "@types/modernizr": "^3.5.3",
  "@types/node": "^16",
- "@types/pako": "^1.0.1",
+ "@types/pako": "^2.0.0",
  "@types/parse5": "^6.0.0",
  "@types/qrcode": "^1.3.5",
  "@types/react": "17.0.49",
@@ -176,7 +176,7 @@
  "@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
  "allchange": "^1.1.0",
  "axe-core": "4.4.3",
- "babel-jest": "^26.6.3",
+ "babel-jest": "^29.0.0",
  "blob-polyfill": "^6.0.20211015",
  "chokidar": "^3.5.1",
  "cypress": "^10.3.0",
@@ -195,7 +195,7 @@
  "eslint-plugin-unicorn": "^44.0.2",
  "fetch-mock-jest": "^1.5.1",
  "fs-extra": "^11.0.0",
- "glob": "^7.1.6",
+ "glob": "^8.0.0",
  "jest": "^29.2.2",
  "jest-canvas-mock": "^2.3.0",
  "jest-environment-jsdom": "^29.2.2",

src/Notifier.ts

@@ -27,6 +27,7 @@ import {
  PermissionChanged as PermissionChangedEvent,
 } from "@matrix-org/analytics-events/types/typescript/PermissionChanged";
 import { ISyncStateData, SyncState } from "matrix-js-sdk/src/sync";
+import { IRoomTimelineData } from "matrix-js-sdk/src/matrix";
 
 import { MatrixClientPeg } from './MatrixClientPeg';
 import { PosthogAnalytics } from "./PosthogAnalytics";
@@ -217,7 +218,7 @@ export const Notifier = {
  this.boundOnRoomReceipt = this.boundOnRoomReceipt || this.onRoomReceipt.bind(this);
  this.boundOnEventDecrypted = this.boundOnEventDecrypted || this.onEventDecrypted.bind(this);
 
- MatrixClientPeg.get().on(ClientEvent.Event, this.boundOnEvent);
+ MatrixClientPeg.get().on(RoomEvent.Timeline, this.boundOnEvent);
  MatrixClientPeg.get().on(RoomEvent.Receipt, this.boundOnRoomReceipt);
  MatrixClientPeg.get().on(MatrixEventEvent.Decrypted, this.boundOnEventDecrypted);
  MatrixClientPeg.get().on(ClientEvent.Sync, this.boundOnSyncStateChange);
@@ -227,7 +228,7 @@ export const Notifier = {
 
  stop: function(this: typeof Notifier) {
  if (MatrixClientPeg.get()) {
- MatrixClientPeg.get().removeListener(ClientEvent.Event, this.boundOnEvent);
+ MatrixClientPeg.get().removeListener(RoomEvent.Timeline, this.boundOnEvent);
  MatrixClientPeg.get().removeListener(RoomEvent.Receipt, this.boundOnRoomReceipt);
  MatrixClientPeg.get().removeListener(MatrixEventEvent.Decrypted, this.boundOnEventDecrypted);
  MatrixClientPeg.get().removeListener(ClientEvent.Sync, this.boundOnSyncStateChange);
@@ -368,7 +369,15 @@ export const Notifier = {
  }
  },
 
- onEvent: function(this: typeof Notifier, ev: MatrixEvent) {
+ onEvent: function(
+ this: typeof Notifier,
+ ev: MatrixEvent,
+ room: Room | undefined,
+ toStartOfTimeline: boolean | undefined,
+ removed: boolean,
+ data: IRoomTimelineData,
+ ) {
+ if (!data.liveEvent) return; // only notify for new things, not old.
  if (!this.isSyncing) return; // don't alert for any messages initially
  if (ev.getSender() === MatrixClientPeg.get().getUserId()) return;
 
@@ -428,6 +437,11 @@ export const Notifier = {
  }
  }
  const room = MatrixClientPeg.get().getRoom(roomId);
+ if (!room) {
+ // e.g we are in the process of joining a room.
+ // Seen in the cypress lazy-loading test.
+ return;
+ }
 
  const actions = MatrixClientPeg.get().getPushActionsForEvent(ev);
 

src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx

@@ -324,12 +324,13 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
  let privilegedUsersSection = <div>{ _t('No users have specific privileges in this room') }</div>;
  let mutedUsersSection;
  if (Object.keys(userLevels).length) {
- const privilegedUsers = [];
- const mutedUsers = [];
+ const privilegedUsers: JSX.Element[] = [];
+ const mutedUsers: JSX.Element[] = [];
 
  Object.keys(userLevels).forEach((user) => {
- if (!Number.isInteger(userLevels[user])) { return; }
- const canChange = userLevels[user] < currentUserLevel && canChangeLevels;
+ if (!Number.isInteger(userLevels[user])) return;
+ const isMe = user === client.getUserId();
+ const canChange = canChangeLevels && (userLevels[user] < currentUserLevel || isMe);
  if (userLevels[user] > defaultUserLevel) { // privileged
  privilegedUsers.push(
  <PowerSelector

test/Notifier-test.ts

@@ -16,8 +16,8 @@ limitations under the License.
 
 import { mocked, MockedObject } from "jest-mock";
 import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client";
-import { Room } from "matrix-js-sdk/src/models/room";
-import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room, RoomEvent } from "matrix-js-sdk/src/models/room";
+import { IContent, MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { SyncState } from "matrix-js-sdk/src/sync";
 import { waitFor } from "@testing-library/react";
 
@@ -60,12 +60,19 @@ describe("Notifier", () => {
  let mockClient: MockedObject<MatrixClient>;
  let testRoom: Room;
  let accountDataEventKey: string;
- let accountDataStore = {};
+ let accountDataStore: Record<string, MatrixEvent | undefined> = {};
 
  let mockSettings: Record<string, boolean> = {};
 
  const userId = "@bob:example.org";
 
+ const emitLiveEvent = (event: MatrixEvent): void => {
+ mockClient!.emit(RoomEvent.Timeline, event, testRoom, false, false, {
+ liveEvent: true,
+ timeline: testRoom.getLiveTimeline(),
+ });
+ };
+
  beforeEach(() => {
  accountDataStore = {};
  mockClient = getMockClientWithEventEmitter({
@@ -150,7 +157,7 @@ describe("Notifier", () => {
  });
 
  it('does not create notifications before syncing has started', () => {
- mockClient!.emit(ClientEvent.Event, event);
+ emitLiveEvent(event);
 
  expect(MockPlatform.displayNotification).not.toHaveBeenCalled();
  expect(MockPlatform.loudNotification).not.toHaveBeenCalled();
@@ -160,7 +167,30 @@ describe("Notifier", () => {
  const ownEvent = new MatrixEvent({ sender: userId });
 
  mockClient!.emit(ClientEvent.Sync, SyncState.Syncing, null);
- mockClient!.emit(ClientEvent.Event, ownEvent);
+ emitLiveEvent(ownEvent);
+
+ expect(MockPlatform.displayNotification).not.toHaveBeenCalled();
+ expect(MockPlatform.loudNotification).not.toHaveBeenCalled();
+ });
+
+ it('does not create notifications for non-live events (scrollback)', () => {
+ mockClient!.emit(ClientEvent.Sync, SyncState.Syncing, null);
+ mockClient!.emit(RoomEvent.Timeline, event, testRoom, false, false, {
+ liveEvent: false,
+ timeline: testRoom.getLiveTimeline(),
+ });
+
+ expect(MockPlatform.displayNotification).not.toHaveBeenCalled();
+ expect(MockPlatform.loudNotification).not.toHaveBeenCalled();
+ });
+
+ it('does not create notifications for rooms which cannot be obtained via client.getRoom', () => {
+ mockClient!.emit(ClientEvent.Sync, SyncState.Syncing, null);
+ mockClient.getRoom.mockReturnValue(null);
+ mockClient!.emit(RoomEvent.Timeline, event, testRoom, false, false, {
+ liveEvent: true,
+ timeline: testRoom.getLiveTimeline(),
+ });
 
  expect(MockPlatform.displayNotification).not.toHaveBeenCalled();
  expect(MockPlatform.loudNotification).not.toHaveBeenCalled();
@@ -175,15 +205,15 @@ describe("Notifier", () => {
  });
 
  mockClient!.emit(ClientEvent.Sync, SyncState.Syncing, null);
- mockClient!.emit(ClientEvent.Event, event);
+ emitLiveEvent(event);
 
  expect(MockPlatform.displayNotification).not.toHaveBeenCalled();
  expect(MockPlatform.loudNotification).not.toHaveBeenCalled();
  });
 
  it('creates desktop notification when enabled', () => {
  mockClient!.emit(ClientEvent.Sync, SyncState.Syncing, null);
- mockClient!.emit(ClientEvent.Event, event);
+ emitLiveEvent(event);
 
  expect(MockPlatform.displayNotification).toHaveBeenCalledWith(
  testRoom.name,
@@ -196,7 +226,7 @@ describe("Notifier", () => {
 
  it('creates a loud notification when enabled', () => {
  mockClient!.emit(ClientEvent.Sync, SyncState.Syncing, null);
- mockClient!.emit(ClientEvent.Event, event);
+ emitLiveEvent(event);
 
  expect(MockPlatform.loudNotification).toHaveBeenCalledWith(
  event, testRoom,
@@ -212,7 +242,7 @@ describe("Notifier", () => {
  });
 
  mockClient!.emit(ClientEvent.Sync, SyncState.Syncing, null);
- mockClient!.emit(ClientEvent.Event, event);
+ emitLiveEvent(event);
 
  // desktop notification created
  expect(MockPlatform.displayNotification).toHaveBeenCalled();
@@ -222,12 +252,13 @@ describe("Notifier", () => {
  });
 
  describe("_displayPopupNotification", () => {
- it.each([
+ const testCases: {event: IContent | undefined, count: number}[] = [
  { event: { is_silenced: true }, count: 0 },
  { event: { is_silenced: false }, count: 1 },
  { event: undefined, count: 1 },
- ])("does not dispatch when notifications are silenced", ({ event, count }) => {
- mockClient.setAccountData(accountDataEventKey, event);
+ ];
+ it.each(testCases)("does not dispatch when notifications are silenced", ({ event, count }) => {
+ mockClient.setAccountData(accountDataEventKey, event!);
  Notifier._displayPopupNotification(testEvent, testRoom);
  expect(MockPlatform.displayNotification).toHaveBeenCalledTimes(count);
  });
@@ -243,16 +274,17 @@ describe("Notifier", () => {
  });
 
  describe("_playAudioNotification", () => {
- it.each([
+ const testCases: {event: IContent | undefined, count: number}[] = [
  { event: { is_silenced: true }, count: 0 },
  { event: { is_silenced: false }, count: 1 },
  { event: undefined, count: 1 },
- ])("does not dispatch when notifications are silenced", ({ event, count }) => {
+ ];
+ it.each(testCases)("does not dispatch when notifications are silenced", ({ event, count }) => {
  // It's not ideal to only look at whether this function has been called
  // but avoids starting to look into DOM stuff
  Notifier.getSoundForRoom = jest.fn();
 
- mockClient.setAccountData(accountDataEventKey, event);
+ mockClient.setAccountData(accountDataEventKey, event!);
  Notifier._playAudioNotification(testEvent, testRoom);
  expect(Notifier.getSoundForRoom).toHaveBeenCalledTimes(count);
  });
@@ -267,7 +299,7 @@ describe("Notifier", () => {
  notify: true,
  tweaks: {},
  });
-
+ Notifier.start();
  Notifier.onSyncStateChange(SyncState.Syncing);
  });
 
@@ -283,7 +315,7 @@ describe("Notifier", () => {
  content: {},
  event: true,
  });
- Notifier.onEvent(callEvent);
+ emitLiveEvent(callEvent);
  return callEvent;
  };
 

test/components/views/settings/tabs/room/RolesRoomSettingsTab-test.tsx

@@ -18,6 +18,9 @@ import React from "react";
 import { fireEvent, render, RenderResult } from "@testing-library/react";
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { EventType } from "matrix-js-sdk/src/@types/event";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { mocked } from "jest-mock";
 
 import RolesRoomSettingsTab from "../../../../../../src/components/views/settings/tabs/room/RolesRoomSettingsTab";
 import { mkStubRoom, stubClient } from "../../../../../test-utils";
@@ -29,23 +32,52 @@ import { ElementCall } from "../../../../../../src/models/Call";
 describe("RolesRoomSettingsTab", () => {
  const roomId = "!room:example.com";
  let cli: MatrixClient;
+ let room: Room;
 
  const renderTab = (): RenderResult => {
  return render(<RolesRoomSettingsTab roomId={roomId} />);
  };
 
- const getVoiceBroadcastsSelect = () => {
+ const getVoiceBroadcastsSelect = (): HTMLElement => {
  return renderTab().container.querySelector("select[label='Voice broadcasts']");
  };
 
- const getVoiceBroadcastsSelectedOption = () => {
+ const getVoiceBroadcastsSelectedOption = (): HTMLElement => {
  return renderTab().container.querySelector("select[label='Voice broadcasts'] option:checked");
  };
 
  beforeEach(() => {
  stubClient();
  cli = MatrixClientPeg.get();
- mkStubRoom(roomId, "test room", cli);
+ room = mkStubRoom(roomId, "test room", cli);
+ });
+
+ it("should allow an Admin to demote themselves but not others", () => {
+ mocked(cli.getRoom).mockReturnValue(room);
+ // @ts-ignore - mocked doesn't support overloads properly
+ mocked(room.currentState.getStateEvents).mockImplementation((type, key) => {
+ if (key === undefined) return [] as MatrixEvent[];
+ if (type === "m.room.power_levels") {
+ return new MatrixEvent({
+ sender: "@sender:server",
+ room_id: roomId,
+ type: "m.room.power_levels",
+ state_key: "",
+ content: {
+ users: {
+ [cli.getUserId()]: 100,
+ "@admin:server": 100,
+ },
+ },
+ });
+ }
+ return null;
+ });
+ mocked(room.currentState.mayClientSendStateEvent).mockReturnValue(true);
+ const { container } = renderTab();
+
+ expect(container.querySelector(`[placeholder="${cli.getUserId()}"]`)).not.toBeDisabled();
+ expect(container.querySelector(`[placeholder="@admin:server"]`)).toBeDisabled();
  });
 
  it("should initially show »Moderator« permission for »Voice broadcasts«", () => {
@@ -79,19 +111,19 @@ describe("RolesRoomSettingsTab", () => {
  });
  };
 
- const getStartCallSelect = (tab: RenderResult) => {
+ const getStartCallSelect = (tab: RenderResult): HTMLElement => {
  return tab.container.querySelector("select[label='Start Element Call calls']");
  };
 
- const getStartCallSelectedOption = (tab: RenderResult) => {
+ const getStartCallSelectedOption = (tab: RenderResult): HTMLElement => {
  return tab.container.querySelector("select[label='Start Element Call calls'] option:checked");
  };
 
- const getJoinCallSelect = (tab: RenderResult) => {
+ const getJoinCallSelect = (tab: RenderResult): HTMLElement => {
  return tab.container.querySelector("select[label='Join Element Call calls']");
  };
 
- const getJoinCallSelectedOption = (tab: RenderResult) => {
+ const getJoinCallSelectedOption = (tab: RenderResult): HTMLElement => {
  return tab.container.querySelector("select[label='Join Element Call calls'] option:checked");
  };