From 01eec529cdf5f8e916484cefce052c5268ebd616 Mon Sep 17 00:00:00 2001 From: chagai95 <31655082+chagai95@users.noreply.github.com> Date: Wed, 9 Feb 2022 23:26:12 +0100 Subject: [PATCH] replace userid with displayname and add type to diffs --- src/TextForEvent.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/TextForEvent.tsx b/src/TextForEvent.tsx index 5de61dabc23..15dac5c2b7f 100644 --- a/src/TextForEvent.tsx +++ b/src/TextForEvent.tsx @@ -486,7 +486,7 @@ function textForPowerEvent(event: MatrixEvent): () => string | null { }, ); - const diffs = []; + const diffs: {displayName: string, from: number, to: number}[] = []; users.forEach((userId) => { // Previous power level let from = event.getPrevContent().users[userId]; @@ -498,10 +498,10 @@ function textForPowerEvent(event: MatrixEvent): () => string | null { if (!Number.isInteger(to)) { to = currentUserDefault; } + const displayName = MatrixClientPeg.get().getUser(userId).displayName; if (from === previousUserDefault && to === currentUserDefault) { return; } if (to !== from) { - const name = UserIdentifierCustomisations.getDisplayUserIdentifier(userId, { roomId: event.getRoomId() }); - diffs.push({ userId, name, from, to }); + diffs.push({ displayName, from, to }); } }); if (!diffs.length) { @@ -512,8 +512,8 @@ function textForPowerEvent(event: MatrixEvent): () => string | null { return () => _t('%(senderName)s changed the power level of %(powerLevelDiffText)s.', { senderName, powerLevelDiffText: diffs.map(diff => - _t('%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s', { - userId: diff.name, + _t('%(displayName)s from %(fromPowerLevel)s to %(toPowerLevel)s', { + displayName: diff.displayName, fromPowerLevel: Roles.textualPowerLevel(diff.from, previousUserDefault), toPowerLevel: Roles.textualPowerLevel(diff.to, currentUserDefault), }),