imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix invisible power levels tile when showing hidden events (#9162)

Browse source 
* Fix invisible power levels tile when showing hidden events

* Add regression test
This commit is contained in:
Michael Telatynski 2022-08-10 14:33:13 +01:00 • committed by GitHub
parent 28ed87bffe
commit 2e32a4d4b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 57 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/TextForEvent.tsx
View file

@ -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 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 = [];
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;
}

4
src/events/EventTileFactory.tsx
View file

@ -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();
}