Consolidate failedMessages to use shared store logic (#5043)

open-chat-labs · Dec 19, 2023 · d000cb1 · d000cb1
1 parent 2e35ca7
commit d000cb1
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 28 deletions.
diff --git a/frontend/app/src/components/home/ChatEventList.svelte b/frontend/app/src/components/home/ChatEventList.svelte
@@ -70,6 +70,7 @@
     let messageReadTimers: Record<number, number> = {};
 
     $: user = client.user;
+    $: userId = $user.userId;
     $: unconfirmed = client.unconfirmed;
     $: failedMessagesStore = client.failedMessagesStore;
     $: threadSummary = threadRootEvent?.event.thread;
@@ -283,7 +284,7 @@
     async function afterSendMessage(context: MessageContext, event: EventWrapper<Message>) {
         if (context.threadRootMessageIndex !== undefined && threadRootEvent !== undefined) {
             const summary = {
-                participantIds: new Set<string>([$user.userId]),
+                participantIds: new Set<string>([userId]),
                 numberOfReplies: event.event.messageIndex + 1,
                 latestEventIndex: event.index,
                 latestEventTimestamp: event.timestamp,
@@ -395,7 +396,7 @@
     }
 
     function isReadByMe(_store: unknown, evt: EventWrapper<ChatEventType>): boolean {
-        if (readonly) return true;
+        if (readonly || (evt.event.kind === "message" && evt.event.sender === userId)) return true;
 
         if (evt.event.kind === "message" || evt.event.kind === "aggregate_common_events") {
             let messageIndex =

diff --git a/frontend/openchat-client/src/stores/dataByMessageContextFactory.ts b/frontend/openchat-client/src/stores/dataByMessageContextFactory.ts
@@ -46,6 +46,7 @@ export function createMessageContextSpecificObjectStore<T>(init: () => T) {
             }
             return false;
         },
-        clear: (): void => store.set(new MessageContextMap<T>()),
+        clear: (newValue?: MessageContextMap<T>): void =>
+            store.set(newValue ?? new MessageContextMap<T>()),
     };
 }
diff --git a/frontend/openchat-client/src/stores/failedMessages.ts b/frontend/openchat-client/src/stores/failedMessages.ts
@@ -1,48 +1,45 @@
-import { writable } from "svelte/store";
-import { type EventWrapper, type Message, type MessageContext, MessageContextMap } from "openchat-shared";
+import {
+    type EventWrapper,
+    type Message,
+    type MessageContext,
+    MessageContextMap,
+} from "openchat-shared";
+import { createMessageContextSpecificObjectStore } from "./dataByMessageContextFactory";
 
-type FailedMessageState = Record<number, EventWrapper<Message>>;
+type FailedMessageState = Record<string, EventWrapper<Message>>;
 export type FailedMessages = MessageContextMap<FailedMessageState>;
 
 function createFailedMessagesStore() {
-    const store = writable<FailedMessages>(new MessageContextMap<FailedMessageState>());
-    let storeValue: FailedMessages = new MessageContextMap<FailedMessageState>();
-    store.subscribe((v) => (storeValue = v));
+    const store = createMessageContextSpecificObjectStore(() => ({}) as FailedMessageState);
 
     return {
         subscribe: store.subscribe,
         getMessages: (key: MessageContext): EventWrapper<Message>[] => {
-            const chatState = storeValue.get(key);
+            const chatState = store.get(key);
             return chatState ? Object.values(chatState) : [];
         },
         add: (key: MessageContext, message: EventWrapper<Message>): void => {
-            store.update((state) => {
-                const chatState = state.get(key) ?? {};
-                state.set(key, {
-                    ...chatState,
-                    [Number(message.event.messageId)]: message,
-                });
-                return state;
-            });
+            store.update(key, (chatState) => ({
+                ...chatState,
+                [message.event.messageId.toString()]: message,
+            }));
         },
         contains: (key: MessageContext, messageId: bigint): boolean => {
-            const chatState = storeValue.get(key);
-            return chatState ? chatState[Number(messageId)] !== undefined : false;
+            const chatState = store.get(key);
+            return chatState ? chatState[messageId.toString()] !== undefined : false;
         },
         delete: (key: MessageContext, messageId: bigint): boolean => {
-            const chatState = storeValue.get(key);
-            if (chatState && chatState[Number(messageId)]) {
-                delete chatState[Number(messageId)];
-                store.update((state) => {
-                    state.set(key, { ...chatState });
-                    return state;
-                });
+            const chatState = store.get(key);
+            const messageIdString = messageId.toString();
+            if (chatState && chatState[messageIdString]) {
+                delete chatState[messageIdString];
+                store.set(key, chatState);
                 return true;
             }
             return false;
         },
         initialise(data: FailedMessages) {
-            store.set(data);
+            store.clear(data);
         },
     };
 }