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

Fix invisible power levels tile when showing hidden events #9162

Merged
merged 2 commits into from
Aug 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
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
36 changes: 18 additions & 18 deletions src/TextForEvent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -434,29 +434,29 @@ function textForHistoryVisibilityEvent(event: MatrixEvent): () => string | null
// Currently will only display a change if a user's power level is changed
function textForPowerEvent(event: MatrixEvent): () => string | null {
const senderName = getSenderName(event);
if (!event.getPrevContent() || !event.getPrevContent().users ||
!event.getContent() || !event.getContent().users) {
if (!event.getPrevContent()?.users || !event.getContent()?.users) {
return null;
}
const previousUserDefault = event.getPrevContent().users_default || 0;
const currentUserDefault = event.getContent().users_default || 0;
const previousUserDefault: number = event.getPrevContent().users_default || 0;
const currentUserDefault: number = event.getContent().users_default || 0;
// Construct set of userIds
const users = [];
Object.keys(event.getContent().users).forEach(
(userId) => {
if (users.indexOf(userId) === -1) users.push(userId);
},
);
Object.keys(event.getPrevContent().users).forEach(
(userId) => {
if (users.indexOf(userId) === -1) users.push(userId);
},
);

const diffs = [];
const users: string[] = [];
Object.keys(event.getContent().users).forEach((userId) => {
if (users.indexOf(userId) === -1) users.push(userId);
});
Object.keys(event.getPrevContent().users).forEach((userId) => {
if (users.indexOf(userId) === -1) users.push(userId);
});

const diffs: {
userId: string;
name: string;
from: number;
to: number;
}[] = [];
users.forEach((userId) => {
// Previous power level
let from = event.getPrevContent().users[userId];
let from: number = event.getPrevContent().users[userId];
if (!Number.isInteger(from)) {
from = previousUserDefault;
}
Expand Down
4 changes: 4 additions & 0 deletions src/events/EventTileFactory.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,10 @@ export function pickFactory(
return noEventFactoryFactory(); // improper event type to render
}

if (STATE_EVENT_TILE_TYPES[evType] === TextualEventFactory && !hasText(mxEvent, showHiddenEvents)) {
return noEventFactoryFactory();
}

return STATE_EVENT_TILE_TYPES[evType] ?? noEventFactoryFactory();
}

Expand Down
36 changes: 36 additions & 0 deletions test/events/EventTileFactory-test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
Copyright 2022 The Matrix.org Foundation C.I.C.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

import { EventType, MatrixEvent } from "matrix-js-sdk/src/matrix";

import { JSONEventFactory, pickFactory } from "../../src/events/EventTileFactory";
import { createTestClient } from "../test-utils";

const roomId = "!room:example.com";

describe("pickFactory", () => {
it("should return JSONEventFactory for a no-op m.room.power_levels event", () => {
const cli = createTestClient();
const event = new MatrixEvent({
type: EventType.RoomPowerLevels,
state_key: "",
content: {},
sender: cli.getUserId(),
room_id: roomId,
});
expect(pickFactory(event, cli, true)).toBe(JSONEventFactory);
});
});