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

Commit 508d4d7

Browse files
authored
Fix wrongly showing unpin in pinned messages tile with no perms (#7197)
1 parent ea97c41 commit 508d4d7

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

Diff for: src/components/views/right_panel/PinnedMessagesCard.tsx

+16-14
Original file line numberDiff line numberDiff line change
@@ -122,24 +122,26 @@ const PinnedMessagesCard = ({ room, onClose }: IProps) => {
122122
if (!pinnedEvents) {
123123
content = <Spinner />;
124124
} else if (pinnedEvents.length > 0) {
125-
let onUnpinClicked;
126-
if (canUnpin) {
127-
onUnpinClicked = async (event: MatrixEvent) => {
128-
const pinnedEvents = room.currentState.getStateEvents(EventType.RoomPinnedEvents, "");
129-
if (pinnedEvents?.getContent()?.pinned) {
130-
const pinned = pinnedEvents.getContent().pinned;
131-
const index = pinned.indexOf(event.getId());
132-
if (index !== -1) {
133-
pinned.splice(index, 1);
134-
await cli.sendStateEvent(room.roomId, EventType.RoomPinnedEvents, { pinned }, "");
135-
}
125+
const onUnpinClicked = async (event: MatrixEvent) => {
126+
const pinnedEvents = room.currentState.getStateEvents(EventType.RoomPinnedEvents, "");
127+
if (pinnedEvents?.getContent()?.pinned) {
128+
const pinned = pinnedEvents.getContent().pinned;
129+
const index = pinned.indexOf(event.getId());
130+
if (index !== -1) {
131+
pinned.splice(index, 1);
132+
await cli.sendStateEvent(room.roomId, EventType.RoomPinnedEvents, { pinned }, "");
136133
}
137-
};
138-
}
134+
}
135+
};
139136

140137
// show them in reverse, with latest pinned at the top
141138
content = pinnedEvents.filter(Boolean).reverse().map(ev => (
142-
<PinnedEventTile key={ev.getId()} room={room} event={ev} onUnpinClicked={() => onUnpinClicked(ev)} />
139+
<PinnedEventTile
140+
key={ev.getId()}
141+
room={room}
142+
event={ev}
143+
onUnpinClicked={canUnpin ? () => onUnpinClicked(ev) : undefined}
144+
/>
143145
));
144146
} else {
145147
content = <div className="mx_PinnedMessagesCard_empty">

0 commit comments

Comments
 (0)