OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Inject sender into pinned messages (#7904) 

* Inject sender into pinned messages

Signed-off-by: Robin Townsend <robin@robin.town>

* Remove unused prop

Signed-off-by: Robin Townsend <robin@robin.town>
pull/21833/head
Robin 2022-02-28 09:47:14 -05:00 committed by GitHub
parent 75e41b4c1c
commit 33657947d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/views/right_panel/PinnedMessagesCard.tsx
View File

@ -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) {
@ -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}
/>

7
src/components/views/rooms/PinnedEventTile.tsx
View File

@ -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";
@ -33,7 +32,6 @@ import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
interface IProps {
room: Room;
event: MatrixEvent;
onUnpinClicked?(): void;
}
@ -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) {
@ -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 }