remove inaccurate and unnecessary display name calculation
This commit is contained in:
1 parent
6e03305442
commit
e2d6f3b49f
2 files changed
+10
-9
No files matched your search
@@ -1141,6 +1141,7 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
|
||||
onReplyClick={handleReplyClick}
|
||||
onReactionToggle={handleReactionToggle}
|
||||
senderId={senderId}
|
||||
senderDisplayName={senderDisplayName}
|
||||
onEditId={handleEdit}
|
||||
reply={
|
||||
replyEventId && (
|
||||
@@ -1197,6 +1198,9 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
|
||||
const { replyEventId, threadRootId } = mEvent;
|
||||
const highlighted = focusItem?.index === item && focusItem.highlight;
|
||||
const senderId = mEvent.getSender() ?? '';
|
||||
const senderDisplayName =
|
||||
getMemberDisplayName(room, senderId, nicknames) ?? getMxIdLocalPart(senderId) ?? senderId;
|
||||
|
||||
|
||||
return (
|
||||
<Message
|
||||
@@ -1221,6 +1225,7 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
|
||||
onReactionToggle={handleReactionToggle}
|
||||
onEditId={handleEdit}
|
||||
senderId={senderId}
|
||||
senderDisplayName={senderDisplayName}
|
||||
reply={
|
||||
replyEventId && (
|
||||
<Reply
|
||||
@@ -1273,8 +1278,6 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
|
||||
editedEvent?.getContent()['m.new_content'] ??
|
||||
mEvent.getContent()) as GetContentCallback;
|
||||
|
||||
const senderDisplayName =
|
||||
getMemberDisplayName(room, senderId, nicknames) ?? getMxIdLocalPart(senderId) ?? senderId;
|
||||
return (
|
||||
<RenderMessageContent
|
||||
displayName={senderDisplayName}
|
||||
@@ -1312,6 +1315,8 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
|
||||
const hasReactions = reactions && reactions.length > 0;
|
||||
const highlighted = focusItem?.index === item && focusItem.highlight;
|
||||
const senderId = mEvent.getSender() ?? '';
|
||||
const senderDisplayName =
|
||||
getMemberDisplayName(room, senderId, nicknames) ?? getMxIdLocalPart(senderId) ?? senderId;
|
||||
|
||||
return (
|
||||
<Message
|
||||
@@ -1334,6 +1339,7 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
|
||||
onReplyClick={handleReplyClick}
|
||||
onReactionToggle={handleReactionToggle}
|
||||
senderId={senderId}
|
||||
senderDisplayName={senderDisplayName}
|
||||
reactions={
|
||||
reactionRelations && (
|
||||
<Reactions
|
||||
|
||||
@@ -697,6 +697,7 @@ export type MessageProps = {
|
||||
hour24Clock: boolean;
|
||||
dateFormatString: string;
|
||||
senderId: string;
|
||||
senderDisplayName: string;
|
||||
content?: string;
|
||||
};
|
||||
|
||||
@@ -779,6 +780,7 @@ function MessageInternal(
|
||||
dateFormatString,
|
||||
children,
|
||||
senderId,
|
||||
senderDisplayName,
|
||||
...props
|
||||
}: MessageProps & { className?: string; children?: ReactNode },
|
||||
ref: any
|
||||
@@ -815,13 +817,6 @@ function MessageInternal(
|
||||
const nicknames = useAtomValue(nicknamesAtom);
|
||||
const setNickname = useSetAtom(setNicknameAtom);
|
||||
|
||||
const senderDisplayName =
|
||||
nicknames[senderId] ??
|
||||
profile.displayName ??
|
||||
getMemberDisplayName(room, senderId) ??
|
||||
getMxIdLocalPart(senderId) ??
|
||||
senderId;
|
||||
|
||||
const tagIconSrc = memberPowerTag?.icon
|
||||
? getPowerTagIconSrc(mx, useAuthentication, memberPowerTag.icon)
|
||||
: undefined;
|
||||
|
||||
Reference in new issue
Block a user