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

Commit d9846dc

Browse files
authored
Hide pinned messages when grouped in timeline when feature pinning is disabled (#12888)
1 parent 4751c52 commit d9846dc

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/components/structures/grouper/MainGrouper.tsx

+7
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import DateSeparator from "../../views/messages/DateSeparator";
2626
import HistoryTile from "../../views/rooms/HistoryTile";
2727
import EventListSummary from "../../views/elements/EventListSummary";
2828
import { SeparatorKind } from "../../views/messages/TimelineSeparator";
29+
import SettingsStore from "../../../settings/SettingsStore";
2930

3031
const groupedStateEvents = [
3132
EventType.RoomMember,
@@ -97,6 +98,12 @@ export class MainGrouper extends BaseGrouper {
9798
// absorb hidden events to not split the summary
9899
return;
99100
}
101+
102+
if (ev.getType() === EventType.RoomPinnedEvents && !SettingsStore.getValue("feature_pinning")) {
103+
// If pinned messages are disabled, don't show the summary
104+
return;
105+
}
106+
100107
this.events.push(wrappedEvent);
101108
}
102109

0 commit comments

Comments
 (0)