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

Inject sender into pinned messages #7904

Merged
merged 2 commits into from
Feb 28, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 2 additions & 0 deletions src/components/views/right_panel/PinnedMessagesCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ const PinnedMessagesCard = ({ room, onClose }: IProps) => {
await cli.decryptEventIfNeeded(event); // TODO await?
}
if (event && PinningUtils.isPinnable(event)) {
// Inject sender information
event.sender = room.getMember(event.getSender());
return event;
}
} catch (err) {
Expand Down
5 changes: 2 additions & 3 deletions src/components/views/rooms/PinnedEventTile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ export default class PinnedEventTile extends React.Component<IProps> {

render() {
const sender = this.props.event.getSender();
const senderProfile = this.props.room.getMember(sender);

let unpinButton = null;
if (this.props.onUnpinClicked) {
Expand All @@ -72,14 +71,14 @@ export default class PinnedEventTile extends React.Component<IProps> {
return <div className="mx_PinnedEventTile">
<MemberAvatar
className="mx_PinnedEventTile_senderAvatar"
member={senderProfile}
member={this.props.event.sender}
width={AVATAR_SIZE}
height={AVATAR_SIZE}
fallbackUserId={sender}
/>

<span className={"mx_PinnedEventTile_sender " + getUserNameColorClass(sender)}>
{ senderProfile?.name || sender }
{ this.props.event.sender?.name || sender }
</span>

{ unpinButton }
Expand Down