Skip to content
This repository has been 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

Inject sender into pinned messages #7904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a860c9a
Inject sender into pinned messages
robintown Feb 25, 2022
a92faf7
Remove unused prop
robintown Feb 28, 2022
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
3 changes: 2 additions & 1 deletion src/components/views/right_panel/PinnedMessagesCard.tsx
View file
Open in desktop
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 Expand Up @@ -140,7 +142,6 @@ const PinnedMessagesCard = ({ room, onClose }: IProps) => {
content = pinnedEvents.filter(Boolean).reverse().map(ev => (
<PinnedEventTile
key={ev.getId()}
room={room}
event={ev}
onUnpinClicked={canUnpin ? () => onUnpinClicked(ev) : undefined}
/>
Expand Down
7 changes: 2 additions & 5 deletions src/components/views/rooms/PinnedEventTile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ limitations under the License.
*/

import React from "react";
import { Room } from "matrix-js-sdk/src/models/room";
import { MatrixEvent } from "matrix-js-sdk/src/models/event";

import dis from "../../../dispatcher/dispatcher";
Expand All @@ -33,7 +32,6 @@ import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";

interface IProps {
room: Room;
event: MatrixEvent;
onUnpinClicked?(): void;
}
Expand All @@ -56,7 +54,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 +69,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