Change event to chat.schildi.hide_ui->read_receipts

SchildiChat · Sep 2, 2023 · 8d70f5a · 8d70f5a
1 parent af709e4
commit 8d70f5a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
@@ -214,9 +214,7 @@ export interface IRoomState {
     readMarkerOutOfViewThresholdMs: number;
     showHiddenEvents: boolean;
     showReadReceipts: boolean;
-    preferHidden: {
-        read_receipts: boolean;
-    }
+    schildichatHideUIReadReceipts: boolean;
     showRedactions: boolean;
     showJoinLeaves: boolean;
     showAvatarChanges: boolean;
@@ -432,9 +430,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             readMarkerOutOfViewThresholdMs: SettingsStore.getValue("readMarkerOutOfViewThresholdMs"),
             showHiddenEvents: SettingsStore.getValue("showHiddenEventsInTimeline"),
             showReadReceipts: true,
-            preferHidden: {
-                read_receipts: false
-            },
+            schildichatHideUIReadReceipts: false,
             showRedactions: true,
             showJoinLeaves: true,
             showAvatarChanges: true,
@@ -668,9 +664,10 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             activeCall: CallStore.instance.getActiveCall(roomId),
         };
 
-        newState.preferHidden = room?.getLiveTimeline().getState(EventTimeline.FORWARDS).getStateEvents("chat.schildi.prefer_hidden", "")?.getContent() || {
-            read_receipts: false
-        }
+        newState.schildichatHideUIReadReceipts =
+            room?.getLiveTimeline().getState(EventTimeline.FORWARDS)
+            .getStateEvents("chat.schildi.hide_ui", "read_receipts")?.getContent()?.hidden
+            || false;
 
         if (
             this.state.mainSplitContentType !== MainSplitContentType.Timeline &&
@@ -1544,8 +1541,12 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                 this.setState({ tombstone: this.getRoomTombstone() });
                 break;
 
-            case "chat.schildi.prefer_hidden":
-                this.setState({ preferHidden: ev.getContent() })
+            case "chat.schildi.hide_ui":
+                switch (ev.getStateKey()) {
+                    case "read_receipts":
+                         this.setState({ schildichatHideUIReadReceipts: ev.getContent()?.hidden })
+                         break;
+                }
                 break;
 
             default:
@@ -2410,7 +2411,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                 timelineSet={this.state.room.getUnfilteredTimelineSet()}
                 overlayTimelineSet={this.state.virtualRoom?.getUnfilteredTimelineSet()}
                 overlayTimelineSetFilter={isCallEvent}
-                showReadReceipts={this.state.showReadReceipts && !this.state.preferHidden.read_receipts}
+                showReadReceipts={this.state.showReadReceipts && !this.state.schildichatHideUIReadReceipts}
                 manageReadReceipts={!this.state.isPeeking}
                 sendReadReceiptOnLoad={!this.state.wasContextSwitch}
                 manageReadMarkers={!this.state.isPeeking}

diff --git a/src/contexts/RoomContext.ts b/src/contexts/RoomContext.ts
@@ -58,6 +58,7 @@ const RoomContext = createContext<IRoomState>({
     readMarkerOutOfViewThresholdMs: 30000,
     showHiddenEvents: false,
     showReadReceipts: true,
+    schildichatHideUIReadReceipts: false,
     showRedactions: true,
     showJoinLeaves: true,
     showAvatarChanges: true,

diff --git a/test/test-utils/room.ts b/test/test-utils/room.ts
@@ -79,6 +79,7 @@ export function getRoomContext(room: Room, override: Partial<IRoomState>): IRoom
         readMarkerOutOfViewThresholdMs: 30000,
         showHiddenEvents: false,
         showReadReceipts: true,
+        schildichatHideUIReadReceipts: false,
         showRedactions: true,
         showJoinLeaves: true,
         showAvatarChanges: true,