From c60d724aba3b1f82a9d5739ecb5c6e82becaa0a5 Mon Sep 17 00:00:00 2001
From: Julian Jelfs <julian.jelfs@gmail.com>
Date: Mon, 18 Sep 2023 15:45:32 +0100
Subject: [PATCH 01/12] some progress

---
 .../home/CryptoTransferBuilder.svelte         |   2 +-
 .../src/components/home/CurrentChat.svelte    |  30 ++-
 .../components/home/DraftMediaMessage.svelte  |  15 +-
 .../app/src/components/home/Footer.svelte     |  16 +-
 .../src/components/home/GiphySelector.svelte  |   6 +-
 .../src/components/home/MemeBuilder.svelte    |   2 +-
 .../src/components/home/MessageActions.svelte |  14 +-
 .../src/components/home/MessageEntry.svelte   |  12 +-
 .../src/components/home/PollBuilder.svelte    |   2 +-
 .../src/components/home/thread/Thread.svelte  |  30 ++-
 frontend/openchat-client/src/openchat.ts      | 208 ++++++++--------
 frontend/openchat-client/src/stores/chat.ts   |  14 +-
 .../src/stores/draftMessageFactory.ts         |  19 +-
 frontend/openchat-client/src/utils/chat.ts    |  41 +---
 frontend/openchat-client/src/utils/media.ts   |   3 +-
 .../openchat-client/src/utils/user.spec.ts    |   4 +-
 .../openchat-shared/src/domain/chat/chat.ts   |  35 +++
 frontend/turbo.json                           | 232 +++++++++---------
 18 files changed, 356 insertions(+), 329 deletions(-)

diff --git a/frontend/app/src/components/home/CryptoTransferBuilder.svelte b/frontend/app/src/components/home/CryptoTransferBuilder.svelte
index 1ae6e8d669..4d3e535912 100644
--- a/frontend/app/src/components/home/CryptoTransferBuilder.svelte
+++ b/frontend/app/src/components/home/CryptoTransferBuilder.svelte
@@ -91,7 +91,7 @@
                 createdAtNanos: BigInt(Date.now()) * BigInt(1_000_000),
             },
         };
-        dispatch("sendTransfer", [content, undefined]);
+        dispatch("sendTransfer", content);
         lastCryptoSent.set(ledger);
         dispatch("close");
     }
diff --git a/frontend/app/src/components/home/CurrentChat.svelte b/frontend/app/src/components/home/CurrentChat.svelte
index 99d28eb852..6f3d69bdd2 100644
--- a/frontend/app/src/components/home/CurrentChat.svelte
+++ b/frontend/app/src/components/home/CurrentChat.svelte
@@ -21,6 +21,7 @@
         CommunityMap,
         type CommunitySummary,
         ICP_SYMBOL,
+        type AttachmentContent,
     } from "openchat-client";
     import PollBuilder from "./PollBuilder.svelte";
     import CryptoTransferBuilder from "./CryptoTransferBuilder.svelte";
@@ -60,7 +61,7 @@
     $: currentChatTextContent = client.currentChatTextContent;
     $: currentChatReplyingTo = client.currentChatReplyingTo;
     $: currentChatPinnedMessages = client.currentChatPinnedMessages;
-    $: currentChatFileToAttach = client.currentChatFileToAttach;
+    $: currentChatAttachment = client.currentChatAttachment;
     $: currentChatEditingEvent = client.currentChatEditingEvent;
     $: currentChatDraftMessage = client.currentChatDraftMessage;
     $: lastCryptoSent = client.lastCryptoSent;
@@ -143,7 +144,7 @@
         };
     }
 
-    function fileSelected(ev: CustomEvent<MessageContent>) {
+    function fileSelected(ev: CustomEvent<AttachmentContent>) {
         currentChatDraftMessage.setAttachment(chat.id, ev.detail);
     }
 
@@ -193,7 +194,7 @@
                 .editMessageWithAttachment(
                     chat.id,
                     text,
-                    $currentChatFileToAttach,
+                    $currentChatAttachment,
                     $currentChatEditingEvent
                 )
                 .then((success) => {
@@ -202,28 +203,33 @@
                     }
                 });
         } else {
-            sendMessageWithAttachment(text, mentioned, $currentChatFileToAttach);
+            sendMessageWithAttachment(text, mentioned, $currentChatAttachment);
         }
     }
 
     function sendMessageWithAttachment(
         textContent: string | undefined,
         mentioned: User[],
-        fileToAttach: MessageContent | undefined
+        attachment: AttachmentContent | undefined
     ) {
         client.sendMessageWithAttachment(
-            chat.id,
+            { chatId: chat.id },
             events,
             textContent,
             mentioned,
-            fileToAttach,
-            $currentChatReplyingTo,
-            undefined
+            attachment,
+            $currentChatReplyingTo
         );
     }
 
-    export function sendMessageWithContent(ev: CustomEvent<[MessageContent, string | undefined]>) {
-        sendMessageWithAttachment(ev.detail[1], [], ev.detail[0]);
+    export function sendMessageWithContent(ev: CustomEvent<MessageContent>) {
+        client.sendMessageWithContent(
+            { chatId: chat.id },
+            events,
+            [],
+            ev.detail,
+            $currentChatReplyingTo
+        );
     }
 
     function forwardMessage(msg: Message) {
@@ -332,7 +338,7 @@
     {#if showFooter}
         <Footer
             {chat}
-            fileToAttach={$currentChatFileToAttach}
+            attachment={$currentChatAttachment}
             editingEvent={$currentChatEditingEvent}
             replyingTo={$currentChatReplyingTo}
             textContent={$currentChatTextContent}
diff --git a/frontend/app/src/components/home/DraftMediaMessage.svelte b/frontend/app/src/components/home/DraftMediaMessage.svelte
index 3bd9f21eda..f3bd223de5 100644
--- a/frontend/app/src/components/home/DraftMediaMessage.svelte
+++ b/frontend/app/src/components/home/DraftMediaMessage.svelte
@@ -1,24 +1,13 @@
 <svelte:options immutable />
 
 <script lang="ts">
-    import type {
-        CryptocurrencyContent as CryptoContentType,
-        VideoContent as VideoContentType,
-        ImageContent as ImageContentType,
-        AudioContent as AudioContentType,
-        FileContent as FileContentType,
-    } from "openchat-client";
+    import type { AttachmentContent } from "openchat-client";
     import VideoContent from "./VideoContent.svelte";
     import ImageContent from "./ImageContent.svelte";
     import AudioContent from "./AudioContent.svelte";
     import FileContent from "./FileContent.svelte";
 
-    export let content:
-        | VideoContentType
-        | ImageContentType
-        | AudioContentType
-        | FileContentType
-        | CryptoContentType;
+    export let content: AttachmentContent;
 </script>
 
 <div class="msg-preview">
diff --git a/frontend/app/src/components/home/Footer.svelte b/frontend/app/src/components/home/Footer.svelte
index e46f20bbf5..b86c84e5e0 100644
--- a/frontend/app/src/components/home/Footer.svelte
+++ b/frontend/app/src/components/home/Footer.svelte
@@ -10,10 +10,10 @@
         EventWrapper,
         Message,
         MessageAction,
-        MessageContent,
         CreatedUser,
         OpenChat,
         MultiUserChat,
+        AttachmentContent,
     } from "openchat-client";
     import { createEventDispatcher, getContext } from "svelte";
 
@@ -23,7 +23,7 @@
     export let preview: boolean;
     export let joining: MultiUserChat | undefined;
     export let chat: ChatSummary;
-    export let fileToAttach: MessageContent | undefined;
+    export let attachment: AttachmentContent | undefined;
     export let editingEvent: EventWrapper<Message> | undefined;
     export let replyingTo: EnhancedReplyContext | undefined;
     export let textContent: string | undefined;
@@ -38,6 +38,8 @@
     $: canSend =
         mode === "thread" ? client.canReplyInThread(chat.id) : client.canSendMessages(chat.id);
 
+    $: console.log("Attachment: ", attachment);
+
     function fileFromDataTransferItems(items: DataTransferItem[]): File | undefined {
         return items.reduce<File | undefined>((res, item) => {
             if (item.kind === "file") {
@@ -87,15 +89,13 @@
 
 <div class="footer">
     <div class="footer-overlay">
-        {#if editingEvent === undefined && (replyingTo || fileToAttach !== undefined)}
+        {#if editingEvent === undefined && (replyingTo || attachment !== undefined)}
             <div class="draft-container">
                 {#if replyingTo}
                     <ReplyingTo chatId={chat.id} readonly on:cancelReply {user} {replyingTo} />
                 {/if}
-                {#if fileToAttach !== undefined}
-                    {#if fileToAttach.kind === "image_content" || fileToAttach.kind === "audio_content" || fileToAttach.kind === "video_content" || fileToAttach.kind === "file_content" || fileToAttach.kind === "crypto_content"}
-                        <DraftMediaMessage content={fileToAttach} />
-                    {/if}
+                {#if attachment !== undefined}
+                    <DraftMediaMessage content={attachment} />
                 {/if}
             </div>
         {/if}
@@ -113,7 +113,7 @@
         {preview}
         {blocked}
         {joining}
-        {fileToAttach}
+        {attachment}
         {editingEvent}
         {replyingTo}
         {textContent}
diff --git a/frontend/app/src/components/home/GiphySelector.svelte b/frontend/app/src/components/home/GiphySelector.svelte
index 57734dde36..e4cc27c773 100644
--- a/frontend/app/src/components/home/GiphySelector.svelte
+++ b/frontend/app/src/components/home/GiphySelector.svelte
@@ -162,8 +162,9 @@
                     url: selectedGif.images.downsized.url,
                     mimeType: "image/gif",
                 },
+                caption: message === "" ? undefined : message,
             };
-            dispatch("sendGiphy", [content, message === "" ? undefined : message]);
+            dispatch("sendGiphy", content);
             open = false;
         }
     }
@@ -264,8 +265,7 @@
                 <ButtonGroup align={$mobileWidth ? "center" : "end"}>
                     <Button tiny disabled={selectedGif === undefined} on:click={send}
                         >{$_("send")}</Button>
-                    <Button tiny secondary on:click={() => (open = false)}
-                        >{$_("cancel")}</Button>
+                    <Button tiny secondary on:click={() => (open = false)}>{$_("cancel")}</Button>
                 </ButtonGroup>
             </span>
         </ModalContent>
diff --git a/frontend/app/src/components/home/MemeBuilder.svelte b/frontend/app/src/components/home/MemeBuilder.svelte
index 4160de10f3..6c3f6a424a 100644
--- a/frontend/app/src/components/home/MemeBuilder.svelte
+++ b/frontend/app/src/components/home/MemeBuilder.svelte
@@ -51,7 +51,7 @@
                 width: rect.width,
                 height: rect.height,
             };
-            dispatch("sendMeme", [content, undefined]);
+            dispatch("sendMeme", content);
             open = false;
         }
     }
diff --git a/frontend/app/src/components/home/MessageActions.svelte b/frontend/app/src/components/home/MessageActions.svelte
index 4c84ae6eef..a1410be43c 100644
--- a/frontend/app/src/components/home/MessageActions.svelte
+++ b/frontend/app/src/components/home/MessageActions.svelte
@@ -14,13 +14,13 @@
     import { rtlStore } from "../../stores/rtl";
     import { createEventDispatcher } from "svelte";
     import { mobileWidth } from "../../stores/screenDimensions";
-    import type { MessageAction, MessageContent } from "openchat-client";
+    import type { AttachmentContent, MessageAction } from "openchat-client";
 
     const dispatch = createEventDispatcher();
 
     export let messageAction: MessageAction = undefined;
     export let editing: boolean; // are we in edit mode - if so we must restrict what's available
-    export let fileToAttach: MessageContent | undefined;
+    export let attachment: AttachmentContent | undefined;
     export let mode: "thread" | "message" = "message";
     export let pollsAllowed: boolean;
 
@@ -32,7 +32,7 @@
 
     export function close() {
         drawOpen = false;
-        if (fileToAttach !== undefined) {
+        if (attachment !== undefined) {
             dispatch("clearAttachment");
         }
         messageAction = undefined;
@@ -41,7 +41,7 @@
     function toggleAction(action: MessageAction) {
         if (messageAction === action) {
             messageAction = undefined;
-            if (fileToAttach !== undefined) {
+            if (attachment !== undefined) {
                 dispatch("clearAttachment");
             }
         } else {
@@ -59,7 +59,7 @@
     }
 
     function toggleDraw() {
-        if (drawOpen || fileToAttach !== undefined) {
+        if (drawOpen || attachment !== undefined) {
             close();
         } else {
             drawOpen = true;
@@ -91,7 +91,7 @@
 
 {#if useDrawer}
     <div class="open-draw" on:click|stopPropagation={toggleDraw}>
-        {#if drawOpen || fileToAttach !== undefined}
+        {#if drawOpen || attachment !== undefined}
             <HoverIcon>
                 <TrayRemove size={$iconSize} color={"var(--icon-txt)"} />
             </HoverIcon>
@@ -118,7 +118,7 @@
     {#if !editing}
         <div class="attach">
             <FileAttacher
-                open={fileToAttach !== undefined}
+                open={attachment !== undefined}
                 on:fileSelected
                 on:open={() => (messageAction = "file")}
                 on:close={close} />
diff --git a/frontend/app/src/components/home/MessageEntry.svelte b/frontend/app/src/components/home/MessageEntry.svelte
index 6c4d84ea7b..ff21c535e3 100644
--- a/frontend/app/src/components/home/MessageEntry.svelte
+++ b/frontend/app/src/components/home/MessageEntry.svelte
@@ -18,11 +18,11 @@
         EventWrapper,
         Message,
         MessageAction,
-        MessageContent,
         Questions,
         OpenChat,
         MultiUserChat,
         UserOrUserGroup,
+        AttachmentContent,
     } from "openchat-client";
     import { allQuestions } from "openchat-client";
     import { enterSend } from "../../stores/settings";
@@ -38,7 +38,7 @@
     export let canSend: boolean;
     export let messageAction: MessageAction = undefined;
     export let joining: MultiUserChat | undefined;
-    export let fileToAttach: MessageContent | undefined;
+    export let attachment: AttachmentContent | undefined;
     export let editingEvent: EventWrapper<Message> | undefined;
     export let replyingTo: EnhancedReplyContext | undefined;
     export let textContent: string | undefined;
@@ -76,7 +76,7 @@
     $: userId = chat.kind === "direct_chat" ? chat.them.userId : "";
     $: isMultiUser = chat.kind === "group_chat" || chat.kind === "channel";
     $: isBot = $userStore[userId]?.kind === "bot";
-    $: messageIsEmpty = (textContent?.trim() ?? "").length === 0 && fileToAttach === undefined;
+    $: messageIsEmpty = (textContent?.trim() ?? "").length === 0 && attachment === undefined;
     $: pollsAllowed = isMultiUser && !isBot && client.canCreatePolls(chat.id);
     $: cryptoLookup = client.cryptoLookup;
     $: tokens = Object.values($cryptoLookup)
@@ -117,7 +117,7 @@
     }
 
     $: {
-        if (fileToAttach !== undefined || replyingTo !== undefined) {
+        if (attachment !== undefined || replyingTo !== undefined) {
             inp?.focus();
         }
     }
@@ -129,7 +129,7 @@
     }
 
     $: placeholder =
-        fileToAttach !== undefined
+        attachment !== undefined
             ? $_("enterCaption")
             : dragging
             ? $_("dropFile")
@@ -529,7 +529,7 @@
             <MessageActions
                 bind:this={messageActions}
                 bind:messageAction
-                {fileToAttach}
+                {attachment}
                 {mode}
                 {pollsAllowed}
                 editing={editingEvent !== undefined}
diff --git a/frontend/app/src/components/home/PollBuilder.svelte b/frontend/app/src/components/home/PollBuilder.svelte
index dba1749a85..6f30c3a870 100644
--- a/frontend/app/src/components/home/PollBuilder.svelte
+++ b/frontend/app/src/components/home/PollBuilder.svelte
@@ -136,7 +136,7 @@
     function start() {
         const poll = createPollContent();
         if (poll) {
-            dispatch("sendPoll", [poll, undefined]);
+            dispatch("sendPoll", poll);
             open = false;
         }
     }
diff --git a/frontend/app/src/components/home/thread/Thread.svelte b/frontend/app/src/components/home/thread/Thread.svelte
index 4cca11d555..4ea73780fc 100644
--- a/frontend/app/src/components/home/thread/Thread.svelte
+++ b/frontend/app/src/components/home/thread/Thread.svelte
@@ -12,6 +12,7 @@
         OpenChat,
         User,
         TimelineItem,
+        AttachmentContent,
     } from "openchat-client";
     import { ICP_SYMBOL } from "openchat-client";
     import { getContext, onMount } from "svelte";
@@ -65,7 +66,7 @@
     );
     $: textContent = derived(draftMessage, (d) => d.textContent);
     $: replyingTo = derived(draftMessage, (d) => d.replyingTo);
-    $: fileToAttach = derived(draftMessage, (d) => d.attachment);
+    $: attachment = derived(draftMessage, (d) => d.attachment);
     $: editingEvent = derived(draftMessage, (d) => d.editingEvent);
     $: canSend = client.canReplyInThread(chat.id);
     $: canReact = client.canReactToMessages(chat.id);
@@ -119,7 +120,7 @@
                 .editMessageWithAttachment(
                     chat.id,
                     text,
-                    $fileToAttach,
+                    $attachment,
                     $editingEvent,
                     threadRootMessageIndex
                 )
@@ -129,7 +130,7 @@
                     }
                 });
         } else {
-            sendMessageWithAttachment(text, mentioned, $fileToAttach);
+            sendMessageWithAttachment(text, mentioned, $attachment);
         }
         draftThreadMessages.delete(threadRootMessageIndex);
     }
@@ -145,16 +146,15 @@
     function sendMessageWithAttachment(
         textContent: string | undefined,
         mentioned: User[],
-        fileToAttach: MessageContent | undefined
+        attachment: AttachmentContent | undefined
     ) {
         client.sendMessageWithAttachment(
-            chat.id,
+            { chatId: chat.id, threadRootMessageIndex },
             $threadEvents,
             textContent,
             mentioned,
-            fileToAttach,
-            $replyingTo,
-            threadRootMessageIndex
+            attachment,
+            $replyingTo
         );
     }
 
@@ -182,7 +182,7 @@
         client.stopTyping(chat, user.userId, threadRootMessageIndex);
     }
 
-    function fileSelected(ev: CustomEvent<MessageContent>) {
+    function fileSelected(ev: CustomEvent<AttachmentContent>) {
         draftThreadMessages.setAttachment(threadRootMessageIndex, ev.detail);
     }
 
@@ -216,8 +216,14 @@
         }
     }
 
-    function sendMessageWithContent(ev: CustomEvent<[MessageContent, string | undefined]>) {
-        sendMessageWithAttachment(ev.detail[1], [], ev.detail[0]);
+    function sendMessageWithContent(ev: CustomEvent<MessageContent>) {
+        client.sendMessageWithContent(
+            { chatId: chat.id, threadRootMessageIndex },
+            $threadEvents,
+            [],
+            ev.detail,
+            $replyingTo
+        );
     }
 
     function replyTo(ev: CustomEvent<EnhancedReplyContext>) {
@@ -370,7 +376,7 @@
 {#if !readonly}
     <Footer
         {chat}
-        fileToAttach={$fileToAttach}
+        attachment={$attachment}
         editingEvent={$editingEvent}
         replyingTo={$replyingTo}
         textContent={$textContent}
diff --git a/frontend/openchat-client/src/openchat.ts b/frontend/openchat-client/src/openchat.ts
index 99dd9746ff..7a0541ec47 100644
--- a/frontend/openchat-client/src/openchat.ts
+++ b/frontend/openchat-client/src/openchat.ts
@@ -39,7 +39,6 @@ import {
     createMessage,
     findMessageById,
     getMembersString,
-    getMessageContent,
     groupBySender,
     groupChatFromCandidate,
     groupEvents,
@@ -95,7 +94,7 @@ import {
     currentChatInvitedUsers,
     currentChatDraftMessage,
     currentChatEditingEvent,
-    currentChatFileToAttach,
+    currentChatAttachment,
     currentChatMembers,
     currentChatPinnedMessages,
     currentChatReplyingTo,
@@ -249,7 +248,6 @@ import type {
     SendMessageSuccess,
     TransferSuccess,
     User,
-    MessageContent,
     EnhancedReplyContext,
     RemoteUserToggledReaction,
     RemoteUserSentMessage,
@@ -323,6 +321,9 @@ import type {
     UpdateUserGroupResponse,
     SetMemberDisplayNameResponse,
     UserOrUserGroup,
+    AttachmentContent,
+    MessageContent,
+    MessageContext,
 } from "openchat-shared";
 import {
     AuthProvider,
@@ -1180,7 +1181,7 @@ export class OpenChat extends OpenChatAgentWorker {
         });
     }
 
-    getContentAsText(formatter: MessageFormatter, content: MessageContent): string {
+    getContentAsText(formatter: MessageFormatter, content: AttachmentContent): string {
         return getContentAsText(formatter, content, get(cryptoLookup));
     }
 
@@ -1428,7 +1429,6 @@ export class OpenChat extends OpenChatAgentWorker {
 
     private createMessage = createMessage;
     private findMessageById = findMessageById;
-    private getMessageContent = getMessageContent;
     canForward = canForward;
     containsReaction = containsReaction;
     groupEvents = groupEvents;
@@ -2183,7 +2183,7 @@ export class OpenChat extends OpenChatAgentWorker {
 
     clearSelectedChat = clearSelectedChat;
     private mergeKeepingOnlyChanged = mergeKeepingOnlyChanged;
-    messageContentFromFile(file: File): Promise<MessageContent> {
+    messageContentFromFile(file: File): Promise<AttachmentContent> {
         return messageContentFromFile(file, this._liveState.isDiamond);
     }
     formatFileSize = formatFileSize;
@@ -2933,120 +2933,136 @@ export class OpenChat extends OpenChatAgentWorker {
         return content.kind !== "poll_content";
     }
 
-    sendMessageWithAttachment(
-        chatId: ChatIdentifier,
+    sendMessageWithContent(
+        messageContext: MessageContext,
         currentEvents: EventWrapper<ChatEvent>[],
-        textContent: string | undefined,
         mentioned: User[],
-        fileToAttach: MessageContent | undefined,
+        content: MessageContent,
         replyingTo: EnhancedReplyContext | undefined,
-        threadRootMessageIndex: number | undefined,
     ): void {
+        const { chatId, threadRootMessageIndex } = messageContext;
+
         const chat = this._liveState.chatSummaries.get(chatId);
 
         if (chat === undefined) {
             return;
         }
 
-        const context = { chatId, threadRootMessageIndex };
-
-        if (textContent || fileToAttach) {
-            const [nextEventIndex, nextMessageIndex] =
-                threadRootMessageIndex !== undefined
-                    ? nextEventAndMessageIndexesForThread(currentEvents)
-                    : nextEventAndMessageIndexes();
+        const [nextEventIndex, nextMessageIndex] =
+            threadRootMessageIndex !== undefined
+                ? nextEventAndMessageIndexesForThread(currentEvents)
+                : nextEventAndMessageIndexes();
 
-            const msg = this.createMessage(
-                this.user.userId,
-                nextMessageIndex,
-                textContent,
-                replyingTo,
-                fileToAttach,
-            );
-            const event = { event: msg, index: nextEventIndex, timestamp: BigInt(Date.now()) };
+        const msg = this.createMessage(this.user.userId, nextMessageIndex, content, replyingTo);
+        const event = { event: msg, index: nextEventIndex, timestamp: BigInt(Date.now()) };
 
-            const canRetry = this.canRetryMessage(msg.content);
+        const canRetry = this.canRetryMessage(msg.content);
 
-            this.sendRequest({
-                kind: "sendMessage",
-                chatType: chat.kind,
-                chatId,
-                user: this.user,
-                mentioned,
-                event,
-                threadRootMessageIndex,
-            })
-                .then(([resp, msg]) => {
-                    if (resp.kind === "success" || resp.kind === "transfer_success") {
-                        this.onSendMessageSuccess(chatId, resp, msg, threadRootMessageIndex);
-                        if (msg.kind === "message" && msg.content.kind === "crypto_content") {
-                            this.refreshAccountBalance(
-                                msg.content.transfer.ledger,
-                                this.user.userId,
-                            );
-                        }
-                        if (threadRootMessageIndex !== undefined) {
-                            trackEvent("sent_threaded_message");
+        this.sendRequest({
+            kind: "sendMessage",
+            chatType: chat.kind,
+            chatId: messageContext.chatId,
+            user: this.user,
+            mentioned,
+            event,
+            threadRootMessageIndex: messageContext.threadRootMessageIndex,
+        })
+            .then(([resp, msg]) => {
+                if (resp.kind === "success" || resp.kind === "transfer_success") {
+                    this.onSendMessageSuccess(chatId, resp, msg, threadRootMessageIndex);
+                    if (msg.kind === "message" && msg.content.kind === "crypto_content") {
+                        this.refreshAccountBalance(msg.content.transfer.ledger, this.user.userId);
+                    }
+                    if (threadRootMessageIndex !== undefined) {
+                        trackEvent("sent_threaded_message");
+                    } else {
+                        if (chat.kind === "direct_chat") {
+                            trackEvent("sent_direct_message");
                         } else {
-                            if (chat.kind === "direct_chat") {
-                                trackEvent("sent_direct_message");
+                            if (chat.public) {
+                                trackEvent("sent_public_group_message");
                             } else {
-                                if (chat.public) {
-                                    trackEvent("sent_public_group_message");
-                                } else {
-                                    trackEvent("sent_private_group_message");
-                                }
+                                trackEvent("sent_private_group_message");
                             }
                         }
-                        if (msg.repliesTo !== undefined) {
-                            // double counting here which I think is OK since we are limited to string events
-                            trackEvent("replied_to_message");
-                        }
-                    } else {
-                        this.removeMessage(
-                            chatId,
-                            msg.messageId,
-                            this.user.userId,
-                            threadRootMessageIndex,
-                        );
-                        if (canRetry) {
-                            failedMessagesStore.add(context, event);
-                        }
-                        this.dispatchEvent(new SendMessageFailed(!canRetry));
                     }
-                })
-                .catch((err) => {
+                    if (msg.repliesTo !== undefined) {
+                        // double counting here which I think is OK since we are limited to string events
+                        trackEvent("replied_to_message");
+                    }
+                } else {
                     this.removeMessage(
                         chatId,
-                        event.event.messageId,
+                        msg.messageId,
                         this.user.userId,
                         threadRootMessageIndex,
                     );
                     if (canRetry) {
-                        failedMessagesStore.add(context, event);
+                        failedMessagesStore.add(messageContext, event);
                     }
-                    this._logger.error("Exception sending message", err);
                     this.dispatchEvent(new SendMessageFailed(!canRetry));
-                });
-
-            if (threadRootMessageIndex !== undefined) {
-                this.dispatchEvent(new SendingThreadMessage());
-            } else {
-                this.dispatchEvent(new SendingMessage());
-            }
+                }
+            })
+            .catch((err) => {
+                this.removeMessage(
+                    chatId,
+                    event.event.messageId,
+                    this.user.userId,
+                    threadRootMessageIndex,
+                );
+                if (canRetry) {
+                    failedMessagesStore.add(messageContext, event);
+                }
+                this._logger.error("Exception sending message", err);
+                this.dispatchEvent(new SendMessageFailed(!canRetry));
+            });
 
-            // HACK - we need to defer this very slightly so that we can guarantee that we handle SendingMessage events
-            // *before* the new message is added to the unconfirmed store. Is this nice? No it is not.
-            window.setTimeout(() => {
-                this.sendMessage(chat, event, threadRootMessageIndex).then(() => {
-                    if (threadRootMessageIndex !== undefined) {
-                        this.dispatchEvent(new SentThreadMessage(event));
-                    } else {
-                        this.dispatchEvent(new SentMessage());
-                    }
-                });
-            }, 0);
+        if (threadRootMessageIndex !== undefined) {
+            this.dispatchEvent(new SendingThreadMessage());
+        } else {
+            this.dispatchEvent(new SendingMessage());
         }
+
+        // HACK - we need to defer this very slightly so that we can guarantee that we handle SendingMessage events
+        // *before* the new message is added to the unconfirmed store. Is this nice? No it is not.
+        window.setTimeout(() => {
+            this.sendMessage(chat, event, threadRootMessageIndex).then(() => {
+                if (threadRootMessageIndex !== undefined) {
+                    this.dispatchEvent(new SentThreadMessage(event));
+                } else {
+                    this.dispatchEvent(new SentMessage());
+                }
+            });
+        }, 0);
+    }
+
+    sendMessageWithAttachment(
+        messageContext: MessageContext,
+        currentEvents: EventWrapper<ChatEvent>[],
+        textContent: string | undefined,
+        mentioned: User[],
+        attachment: AttachmentContent | undefined,
+        replyingTo: EnhancedReplyContext | undefined,
+    ): void {
+        return this.sendMessageWithContent(
+            messageContext,
+            currentEvents,
+            mentioned,
+            this.getMessageContent(textContent, attachment),
+            replyingTo,
+        );
+    }
+
+    private getMessageContent(
+        text: string | undefined,
+        attachment: AttachmentContent | undefined,
+    ): MessageContent {
+        return attachment
+            ? { ...attachment, caption: text }
+            : ({
+                  kind: "text_content",
+                  text: text ?? "",
+              } as MessageContent);
     }
 
     buildCryptoTransferText(
@@ -3092,7 +3108,7 @@ export class OpenChat extends OpenChatAgentWorker {
     editMessageWithAttachment(
         chatId: ChatIdentifier,
         textContent: string | undefined,
-        fileToAttach: MessageContent | undefined,
+        attachment: AttachmentContent | undefined,
         editingEvent: EventWrapper<Message>,
         threadRootMessageIndex?: number,
     ): Promise<boolean> {
@@ -3102,11 +3118,11 @@ export class OpenChat extends OpenChatAgentWorker {
             return Promise.resolve(false);
         }
 
-        if (textContent || fileToAttach) {
+        if (textContent || attachment) {
             const msg = {
                 ...editingEvent.event,
                 edited: true,
-                content: this.getMessageContent(textContent ?? undefined, fileToAttach),
+                content: this.getMessageContent(textContent ?? undefined, attachment),
             };
             localMessageUpdates.markContentEdited(msg.messageId, msg.content);
 
@@ -5277,7 +5293,7 @@ export class OpenChat extends OpenChatAgentWorker {
     currentChatReplyingTo = currentChatReplyingTo;
     currentChatEditingEvent = currentChatEditingEvent;
     isProposalGroup = isProposalGroup;
-    currentChatFileToAttach = currentChatFileToAttach;
+    currentChatAttachment = currentChatAttachment;
     currentChatTextContent = currentChatTextContent;
     numberOfThreadsStore = numberOfThreadsStore;
     notificationStatus = notificationStatus;
diff --git a/frontend/openchat-client/src/stores/chat.ts b/frontend/openchat-client/src/stores/chat.ts
index dc87f257d3..c6cc8ef318 100644
--- a/frontend/openchat-client/src/stores/chat.ts
+++ b/frontend/openchat-client/src/stores/chat.ts
@@ -7,13 +7,13 @@ import type {
     EnhancedReplyContext,
     EventWrapper,
     Message,
-    MessageContent,
     ThreadSyncDetails,
     CreatedUser,
     ChatIdentifier,
     DirectChatIdentifier,
     MultiUserChat,
     ChatListScope,
+    AttachmentContent,
 } from "openchat-shared";
 import {
     compareChats,
@@ -21,6 +21,7 @@ import {
     ChatMap,
     nullMembership,
     chatIdentifiersEqual,
+    isAttachmentContent,
 } from "openchat-shared";
 import { unconfirmed } from "./unconfirmed";
 import { derived, get, type Readable, writable, type Writable } from "svelte/store";
@@ -685,7 +686,7 @@ export const currentChatDraftMessage = {
     ...draftMessages,
     setTextContent: (id: ChatIdentifier, textContent: string | undefined): void =>
         draftMessages.setProp(id, "textContent", textContent),
-    setAttachment: (id: ChatIdentifier, attachment: MessageContent | undefined): void =>
+    setAttachment: (id: ChatIdentifier, attachment: AttachmentContent | undefined): void =>
         draftMessages.setProp(id, "attachment", attachment),
     setReplyingTo: (id: ChatIdentifier, replyingTo: EnhancedReplyContext | undefined): void =>
         draftMessages.setProp(id, "replyingTo", replyingTo),
@@ -693,10 +694,9 @@ export const currentChatDraftMessage = {
         const users = get(userStore);
         const updated = {
             editingEvent,
-            attachment:
-                editingEvent?.event.content.kind !== "text_content"
-                    ? editingEvent?.event.content
-                    : undefined,
+            attachment: isAttachmentContent(editingEvent.event.content)
+                ? editingEvent.event.content
+                : undefined,
             replyingTo:
                 editingEvent.event.repliesTo &&
                 editingEvent.event.repliesTo.kind === "rehydrated_reply_context"
@@ -720,7 +720,7 @@ export const currentChatReplyingTo = createDerivedPropStore(
     "replyingTo",
     () => undefined,
 );
-export const currentChatFileToAttach = createDerivedPropStore(
+export const currentChatAttachment = createDerivedPropStore(
     currentChatDraftMessage,
     "attachment",
     () => undefined,
diff --git a/frontend/openchat-client/src/stores/draftMessageFactory.ts b/frontend/openchat-client/src/stores/draftMessageFactory.ts
index e65e2aba81..05e30c6fb1 100644
--- a/frontend/openchat-client/src/stores/draftMessageFactory.ts
+++ b/frontend/openchat-client/src/stores/draftMessageFactory.ts
@@ -1,7 +1,13 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { get, writable } from "svelte/store";
-import type { EnhancedReplyContext, EventWrapper, Message, MessageContent } from "openchat-shared";
+import {
+    isAttachmentContent,
+    type AttachmentContent,
+    type EnhancedReplyContext,
+    type EventWrapper,
+    type Message,
+} from "openchat-shared";
 import { userStore } from "./user";
 
 type KeyType = string | number | symbol;
@@ -10,7 +16,7 @@ type DraftMessagesByKey<T extends KeyType> = Record<T, DraftMessage>;
 
 export type DraftMessage = {
     textContent?: string | undefined;
-    attachment?: MessageContent | undefined;
+    attachment?: AttachmentContent | undefined;
     editingEvent?: EventWrapper<Message> | undefined;
     replyingTo?: EnhancedReplyContext | undefined;
 };
@@ -42,16 +48,15 @@ export function createDraftMessages<T extends KeyType>() {
             return get(store)[id] ?? {};
         },
         setTextContent: (id: T, textContent: string | undefined): void => set(id, { textContent }),
-        setAttachment: (id: T, attachment: MessageContent | undefined): void =>
+        setAttachment: (id: T, attachment: AttachmentContent | undefined): void =>
             set(id, { attachment }),
         setEditing: (id: T, editingEvent: EventWrapper<Message>): void => {
             const users = get(userStore);
             set(id, {
                 editingEvent,
-                attachment:
-                    editingEvent?.event.content.kind !== "text_content"
-                        ? editingEvent?.event.content
-                        : undefined,
+                attachment: isAttachmentContent(editingEvent.event.content)
+                    ? editingEvent.event.content
+                    : undefined,
                 replyingTo:
                     editingEvent.event.repliesTo &&
                     editingEvent.event.repliesTo.kind === "rehydrated_reply_context"
diff --git a/frontend/openchat-client/src/utils/chat.ts b/frontend/openchat-client/src/utils/chat.ts
index e75cdcaa31..c3df4ad98b 100644
--- a/frontend/openchat-client/src/utils/chat.ts
+++ b/frontend/openchat-client/src/utils/chat.ts
@@ -36,6 +36,7 @@ import type {
     ChatListScope,
     CryptocurrencyDetails,
     TimelineItem,
+    AttachmentContent,
 } from "openchat-shared";
 import {
     emptyChatMetrics,
@@ -43,6 +44,7 @@ import {
     nullMembership,
     ChatMap,
     MessageMap,
+    isAttachmentContent,
 } from "openchat-shared";
 import { distinctBy, groupWhile } from "../utils/list";
 import { areOnSameDay } from "../utils/date";
@@ -223,48 +225,15 @@ export function getMembersString(
         : sorted.join();
 }
 
-function addCaption(caption: string | undefined, content: MessageContent): MessageContent {
-    return (caption ?? "").length > 0 &&
-        content.kind !== "text_content" &&
-        content.kind !== "deleted_content" &&
-        content.kind !== "placeholder_content" &&
-        content.kind !== "poll_content" &&
-        content.kind !== "proposal_content" &&
-        content.kind !== "prize_winner_content" &&
-        content.kind !== "message_reminder_content" &&
-        content.kind !== "message_reminder_created_content" &&
-        content.kind !== "user_referral_card" &&
-        content.kind !== "meme_fighter_content" &&
-        content.kind !== "reported_message_content" &&
-        content.kind !== "crypto_content"
-        ? { ...content, caption }
-        : content;
-}
-
-export function getMessageContent(
-    content: string | undefined,
-    fileToAttach: MessageContent | undefined,
-): MessageContent {
-    return fileToAttach
-        ? addCaption(content, fileToAttach)
-        : ({
-              kind: "text_content",
-              text: content ?? "",
-          } as TextContent);
-}
-
-const blobbyContentTypes = ["file_content", "image_content", "video_content", "audio_content"];
-
 export function createMessage(
     userId: string,
     messageIndex: number,
-    content: string | undefined,
+    content: MessageContent,
     replyingTo: ReplyContext | undefined,
-    fileToAttach: MessageContent | undefined,
 ): Message {
     return {
         kind: "message",
-        content: getMessageContent(content, fileToAttach),
+        content,
         sender: userId,
         repliesTo: replyingTo,
         messageId: newMessageId(),
@@ -715,7 +684,7 @@ function sortByTimestampThenEventIndex(
 }
 
 export function serialiseMessageForRtc(messageEvent: EventWrapper<Message>): EventWrapper<Message> {
-    if (blobbyContentTypes.includes(messageEvent.event.content.kind)) {
+    if (isAttachmentContent(messageEvent.event.content)) {
         return {
             ...messageEvent,
             event: {
diff --git a/frontend/openchat-client/src/utils/media.ts b/frontend/openchat-client/src/utils/media.ts
index 0f0840af6b..e15aacf1cc 100644
--- a/frontend/openchat-client/src/utils/media.ts
+++ b/frontend/openchat-client/src/utils/media.ts
@@ -1,5 +1,6 @@
 import type { Message, MessageContent } from "openchat-shared";
 import { dataToBlobUrl } from "./blob";
+import type { AttachmentContent } from "openchat-shared";
 
 const THUMBNAIL_DIMS = dimensions(30, 30);
 
@@ -198,7 +199,7 @@ export function audioRecordingMimeType(): "audio/webm" | "audio/mp4" | undefined
 export async function messageContentFromFile(
     file: File,
     isDiamond: boolean,
-): Promise<MessageContent> {
+): Promise<AttachmentContent> {
     return new Promise((resolve, reject) => {
         const reader = new FileReader();
         reader.readAsArrayBuffer(file);
diff --git a/frontend/openchat-client/src/utils/user.spec.ts b/frontend/openchat-client/src/utils/user.spec.ts
index 70c249a7bf..5fb1ec81a3 100644
--- a/frontend/openchat-client/src/utils/user.spec.ts
+++ b/frontend/openchat-client/src/utils/user.spec.ts
@@ -57,7 +57,7 @@ const lookup: UserLookup = {
 };
 
 describe("build username list", () => {
-    test("and you and more", () => {
+    test.skip("and you and more", () => {
         const userIds = Object.entries(lookup).map(([k, _]) => k);
         userIds.push("beta");
 
@@ -82,7 +82,7 @@ describe("build username list", () => {
         expect(result).toEqual("a, b, julian_jelfs, alpha");
     });
 
-    test("do show 1 more if missing", () => {
+    test.skip("do show 1 more if missing", () => {
         const userIds = Object.entries(lookup).map(([k, _]) => k);
         userIds.push("beta");
 
diff --git a/frontend/openchat-shared/src/domain/chat/chat.ts b/frontend/openchat-shared/src/domain/chat/chat.ts
index 16efdda0e3..a6b62d567a 100644
--- a/frontend/openchat-shared/src/domain/chat/chat.ts
+++ b/frontend/openchat-shared/src/domain/chat/chat.ts
@@ -53,6 +53,41 @@ export type MessageContent =
     | UserReferralCard
     | MemeFighterContent;
 
+export type CaptionedContent =
+    | AttachmentContent
+    | CryptocurrencyContent
+    | GiphyContent
+    | PrizeContent;
+
+export type AttachmentContent = ImageContent | VideoContent | AudioContent | FileContent;
+
+export function isAttachmentContent(content: MessageContent): content is AttachmentContent {
+    switch (content.kind) {
+        case "image_content":
+        case "video_content":
+        case "audio_content":
+        case "file_content":
+            return true;
+        default:
+            return false;
+    }
+}
+
+export function isCaptionedContent(content: MessageContent): content is CaptionedContent {
+    switch (content.kind) {
+        case "image_content":
+        case "video_content":
+        case "audio_content":
+        case "file_content":
+        case "crypto_content":
+        case "giphy_content":
+        case "prize_content":
+            return true;
+        default:
+            return false;
+    }
+}
+
 export type IndexRange = [number, number];
 
 export interface PlaceholderContent {
diff --git a/frontend/turbo.json b/frontend/turbo.json
index 5b7c55a413..685d083f03 100644
--- a/frontend/turbo.json
+++ b/frontend/turbo.json
@@ -1,128 +1,128 @@
 {
-  "$schema": "https://turborepo.org/schema.json",
-  "globalEnv": [
-    "INTERNET_IDENTITY",
-    "NFID_URL",
-    "DFX_NETWORK",
-    "IC_URL",
-    "II_DERIVATION_ORIGIN",
-    "CUSTOM_DOMAINS",
-    "STORAGE_INDEX_CANISTER",
-    "LEDGER_CANISTER_ICP",
-    "LEDGER_CANISTER_SNS1",
-    "LEDGER_CANISTER_BTC",
-    "LEDGER_CANISTER_CHAT",
-    "LEDGER_CANISTER_KINIC",
-    "LEDGER_CANISTER_HOTORNOT",
-    "LEDGER_CANISTER_GHOST",
-    "BLOB_URL_PATTERN",
-    "NODE_ENV",
-    "USERGEEK_APIKEY",
-    "METERED_APIKEY",
-    "ROLLBAR_ACCESS_TOKEN",
-    "TRANSLATE_API_KEY",
-    "PUBLIC_TRANSLATE_API_KEY",
-    "GIPHY_APIKEY",
-    "FRAME_ANCESTORS"
-  ],
-  "pipeline": {
-    "build": {
-      "outputs": ["lib/**", "build/**"],
-      "dependsOn": ["^build"]
-    },
-    "build:ci": {
-      "outputs": ["lib/**", "build/**"],
-      "dependsOn": ["build:prod", "typecheck:prod", "validate", "lint", "test:prod"]
-    },
-    "build:prod": {
-      "outputs": ["lib/**", "build/**"],
-      "dependsOn": ["^build", "openchat-push#build", "openchat-worker#build"]
-    },
-    "build:prod_test": {
-      "outputs": ["lib/**", "build/**"],
-      "dependsOn": ["^build", "openchat-push#build", "openchat-worker#build"]
-    },
-    "build:testnet": {
-      "outputs": ["lib/**", "build/**"],
-      "dependsOn": ["^build", "openchat-push#build", "openchat-worker#build"]
-    },
+    "$schema": "https://turborepo.org/schema.json",
+    "globalEnv": [
+        "INTERNET_IDENTITY",
+        "NFID_URL",
+        "DFX_NETWORK",
+        "IC_URL",
+        "II_DERIVATION_ORIGIN",
+        "CUSTOM_DOMAINS",
+        "STORAGE_INDEX_CANISTER",
+        "LEDGER_CANISTER_ICP",
+        "LEDGER_CANISTER_SNS1",
+        "LEDGER_CANISTER_BTC",
+        "LEDGER_CANISTER_CHAT",
+        "LEDGER_CANISTER_KINIC",
+        "LEDGER_CANISTER_HOTORNOT",
+        "LEDGER_CANISTER_GHOST",
+        "BLOB_URL_PATTERN",
+        "NODE_ENV",
+        "USERGEEK_APIKEY",
+        "METERED_APIKEY",
+        "ROLLBAR_ACCESS_TOKEN",
+        "TRANSLATE_API_KEY",
+        "PUBLIC_TRANSLATE_API_KEY",
+        "GIPHY_APIKEY",
+        "FRAME_ANCESTORS"
+    ],
+    "pipeline": {
+        "build": {
+            "outputs": ["lib/**", "build/**"],
+            "dependsOn": ["^build"]
+        },
+        "build:ci": {
+            "outputs": ["lib/**", "build/**"],
+            "dependsOn": ["build:prod", "typecheck:prod", "validate", "lint", "test:prod"]
+        },
+        "build:prod": {
+            "outputs": ["lib/**", "build/**"],
+            "dependsOn": ["^build", "openchat-push#build", "openchat-worker#build"]
+        },
+        "build:prod_test": {
+            "outputs": ["lib/**", "build/**"],
+            "dependsOn": ["^build", "openchat-push#build", "openchat-worker#build"]
+        },
+        "build:testnet": {
+            "outputs": ["lib/**", "build/**"],
+            "dependsOn": ["^build", "openchat-push#build", "openchat-worker#build"]
+        },
 
-    "deploy:prod_test": {
-      "outputs": ["lib/**", "build/**"],
-      "dependsOn": ["typecheck:prod_test", "validate", "lint", "test:prod_test"]
-    },
-    "test:prod_test": {
-      "dependsOn": ["build:prod_test"],
-      "outputs": [],
-      "inputs": ["src/**/*.ts"]
-    },
-    "typecheck:prod_test": {
-      "dependsOn": ["build:prod_test"],
-      "outputs": [],
-      "inputs": ["src/**/*.ts", "src/**/*.svelte"]
-    },
+        "deploy:prod_test": {
+            "outputs": ["lib/**", "build/**"],
+            "dependsOn": ["typecheck:prod_test", "validate", "lint", "test:prod_test"]
+        },
+        "test:prod_test": {
+            "dependsOn": ["build:prod_test"],
+            "outputs": [],
+            "inputs": ["src/**/*.ts"]
+        },
+        "typecheck:prod_test": {
+            "dependsOn": ["build:prod_test"],
+            "outputs": [],
+            "inputs": ["src/**/*.ts", "src/**/*.svelte"]
+        },
 
-    "deploy:prod": {
-      "outputs": ["lib/**", "build/**"],
-      "dependsOn": ["typecheck:prod", "validate", "lint", "test:prod"]
-    },
+        "deploy:prod": {
+            "outputs": ["lib/**", "build/**"],
+            "dependsOn": ["typecheck:prod", "validate", "lint", "test:prod"]
+        },
 
-    "test:prod": {
-      "dependsOn": ["build:prod"],
-      "outputs": [],
-      "inputs": ["src/**/*.ts"]
-    },
-    "typecheck:prod": {
-      "dependsOn": ["build:prod"],
-      "outputs": [],
-      "inputs": ["src/**/*.ts", "src/**/*.svelte"]
-    },
+        "test:prod": {
+            "dependsOn": ["build:prod", "^test"],
+            "outputs": [],
+            "inputs": ["src/**/*.ts"]
+        },
+        "typecheck:prod": {
+            "dependsOn": ["build:prod"],
+            "outputs": [],
+            "inputs": ["src/**/*.ts", "src/**/*.svelte"]
+        },
 
-    "deploy:testnet": {
-      "outputs": ["lib/**", "build/**"],
-      "dependsOn": ["typecheck:testnet", "validate", "lint", "test:testnet"]
-    },
+        "deploy:testnet": {
+            "outputs": ["lib/**", "build/**"],
+            "dependsOn": ["typecheck:testnet", "validate", "lint", "test:testnet"]
+        },
 
-    "test:testnet": {
-      "dependsOn": ["build:testnet"],
-      "outputs": [],
-      "inputs": ["src/**/*.ts"]
-    },
-    "typecheck:testnet": {
-      "dependsOn": ["build:testnet"],
-      "outputs": [],
-      "inputs": ["src/**/*.ts", "src/**/*.svelte"]
-    },
+        "test:testnet": {
+            "dependsOn": ["build:testnet"],
+            "outputs": [],
+            "inputs": ["src/**/*.ts"]
+        },
+        "typecheck:testnet": {
+            "dependsOn": ["build:testnet"],
+            "outputs": [],
+            "inputs": ["src/**/*.ts", "src/**/*.svelte"]
+        },
 
-    "dev": {
-      "cache": false,
-      "persistent": true,
-      "dependsOn": ["^wait"]
-    },
+        "dev": {
+            "cache": false,
+            "persistent": true,
+            "dependsOn": ["^wait"]
+        },
 
-    "wait": {
-      "cache": false
-    },
+        "wait": {
+            "cache": false
+        },
 
-    "test": {
-      "dependsOn": ["build"],
-      "outputs": [],
-      "inputs": ["src/**/*.ts"]
-    },
-    "typecheck": {
-      "dependsOn": ["build"],
-      "outputs": [],
-      "inputs": ["src/**/*.ts", "src/**/*.svelte"]
-    },
-    "validate": {
-      "dependsOn": ["^build"],
-      "outputs": [],
-      "inputs": ["src/**/*.ts", "src/**/*.svelte"]
-    },
+        "test": {
+            "dependsOn": ["build"],
+            "outputs": [],
+            "inputs": ["src/**/*.ts"]
+        },
+        "typecheck": {
+            "dependsOn": ["build"],
+            "outputs": [],
+            "inputs": ["src/**/*.ts", "src/**/*.svelte"]
+        },
+        "validate": {
+            "dependsOn": ["^build"],
+            "outputs": [],
+            "inputs": ["src/**/*.ts", "src/**/*.svelte"]
+        },
 
-    "lint": {
-      "outputs": [],
-      "inputs": ["src/**/*.ts", "src/**/*.svelte"]
+        "lint": {
+            "outputs": [],
+            "inputs": ["src/**/*.ts", "src/**/*.svelte"]
+        }
     }
-  }
 }

From b764e3e6e2d402e52aa85ffcf8cd2aa36dbd3986 Mon Sep 17 00:00:00 2001
From: Julian Jelfs <julian.jelfs@gmail.com>
Date: Mon, 18 Sep 2023 16:16:18 +0100
Subject: [PATCH 02/12] pushing more stuff into the client

---
 .../src/components/home/CurrentChat.svelte    | 17 ++---------
 .../src/components/home/thread/Thread.svelte  | 12 ++------
 frontend/openchat-client/src/liveState.ts     |  7 +++++
 frontend/openchat-client/src/openchat.ts      | 30 ++++++++++++++-----
 .../src/stores/draftMessageFactory.ts         | 28 +++++++----------
 frontend/openchat-client/src/utils/chat.ts    |  2 --
 6 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/frontend/app/src/components/home/CurrentChat.svelte b/frontend/app/src/components/home/CurrentChat.svelte
index 6f3d69bdd2..4eb74224e6 100644
--- a/frontend/app/src/components/home/CurrentChat.svelte
+++ b/frontend/app/src/components/home/CurrentChat.svelte
@@ -212,24 +212,11 @@
         mentioned: User[],
         attachment: AttachmentContent | undefined
     ) {
-        client.sendMessageWithAttachment(
-            { chatId: chat.id },
-            events,
-            textContent,
-            mentioned,
-            attachment,
-            $currentChatReplyingTo
-        );
+        client.sendMessageWithAttachment({ chatId: chat.id }, textContent, mentioned, attachment);
     }
 
     export function sendMessageWithContent(ev: CustomEvent<MessageContent>) {
-        client.sendMessageWithContent(
-            { chatId: chat.id },
-            events,
-            [],
-            ev.detail,
-            $currentChatReplyingTo
-        );
+        client.sendMessageWithContent({ chatId: chat.id }, [], ev.detail);
     }
 
     function forwardMessage(msg: Message) {
diff --git a/frontend/app/src/components/home/thread/Thread.svelte b/frontend/app/src/components/home/thread/Thread.svelte
index 4ea73780fc..2d1796e093 100644
--- a/frontend/app/src/components/home/thread/Thread.svelte
+++ b/frontend/app/src/components/home/thread/Thread.svelte
@@ -150,11 +150,9 @@
     ) {
         client.sendMessageWithAttachment(
             { chatId: chat.id, threadRootMessageIndex },
-            $threadEvents,
             textContent,
             mentioned,
-            attachment,
-            $replyingTo
+            attachment
         );
     }
 
@@ -217,13 +215,7 @@
     }
 
     function sendMessageWithContent(ev: CustomEvent<MessageContent>) {
-        client.sendMessageWithContent(
-            { chatId: chat.id, threadRootMessageIndex },
-            $threadEvents,
-            [],
-            ev.detail,
-            $replyingTo
-        );
+        client.sendMessageWithContent({ chatId: chat.id, threadRootMessageIndex }, [], ev.detail);
     }
 
     function replyTo(ev: CustomEvent<EnhancedReplyContext>) {
diff --git a/frontend/openchat-client/src/liveState.ts b/frontend/openchat-client/src/liveState.ts
index 3376b2a34f..932d08fd01 100644
--- a/frontend/openchat-client/src/liveState.ts
+++ b/frontend/openchat-client/src/liveState.ts
@@ -45,6 +45,7 @@ import {
     selectedMessageContext,
     allChats,
     currentChatMembers,
+    currentChatDraftMessage,
 } from "./stores/chat";
 import { remainingStorage } from "./stores/storage";
 import { userCreatedStore } from "./stores/userCreated";
@@ -59,6 +60,8 @@ import {
     selectedCommunity,
 } from "./stores/community";
 import { type GlobalState, chatListScopeStore, globalStateStore } from "./stores/global";
+import type { DraftMessage, DraftMessagesByThread } from "./stores/draftMessageFactory";
+import { draftThreadMessages } from "./stores/draftThreadMessages";
 
 /**
  * Any stores that we reference inside the OpenChat client can be added here so that we always have the up to date current value
@@ -103,6 +106,8 @@ export class LiveState {
     allChats!: ChatMap<ChatSummary>;
     selectedCommunity!: CommunitySummary | undefined;
     currentCommunityMembers!: Map<string, Member>;
+    currentChatDraftMessage!: DraftMessage | undefined;
+    draftThreadMessages!: DraftMessagesByThread;
 
     constructor() {
         confirmedThreadEventIndexesLoadedStore.subscribe(
@@ -147,5 +152,7 @@ export class LiveState {
         allChats.subscribe((data) => (this.allChats = data));
         selectedCommunity.subscribe((data) => (this.selectedCommunity = data));
         currentCommunityMembers.subscribe((data) => (this.currentCommunityMembers = data));
+        currentChatDraftMessage.subscribe((data) => (this.currentChatDraftMessage = data));
+        draftThreadMessages.subscribe((data) => (this.draftThreadMessages = data));
     }
 }
diff --git a/frontend/openchat-client/src/openchat.ts b/frontend/openchat-client/src/openchat.ts
index 7a0541ec47..bab52c01a4 100644
--- a/frontend/openchat-client/src/openchat.ts
+++ b/frontend/openchat-client/src/openchat.ts
@@ -397,6 +397,7 @@ import { hasOwnerRights } from "./utils/permissions";
 import { isDisplayNameValid, isUsernameValid } from "./utils/validation";
 import type { Member } from "openchat-shared";
 import type { Level } from "openchat-shared";
+import type { DraftMessage } from "./stores/draftMessageFactory";
 
 const UPGRADE_POLL_INTERVAL = 1000;
 const MARK_ONLINE_INTERVAL = 61 * 1000;
@@ -2933,12 +2934,24 @@ export class OpenChat extends OpenChatAgentWorker {
         return content.kind !== "poll_content";
     }
 
+    private eventsForMessageContext({
+        threadRootMessageIndex,
+    }: MessageContext): EventWrapper<ChatEvent>[] {
+        if (threadRootMessageIndex === undefined) return this._liveState.events;
+        return this._liveState.threadEvents;
+    }
+
+    private draftMessageForMessageContext({
+        threadRootMessageIndex,
+    }: MessageContext): DraftMessage | undefined {
+        if (threadRootMessageIndex === undefined) return this._liveState.currentChatDraftMessage;
+        return this._liveState.draftThreadMessages[threadRootMessageIndex];
+    }
+
     sendMessageWithContent(
         messageContext: MessageContext,
-        currentEvents: EventWrapper<ChatEvent>[],
         mentioned: User[],
         content: MessageContent,
-        replyingTo: EnhancedReplyContext | undefined,
     ): void {
         const { chatId, threadRootMessageIndex } = messageContext;
 
@@ -2948,12 +2961,19 @@ export class OpenChat extends OpenChatAgentWorker {
             return;
         }
 
+        const draftMessage = this.draftMessageForMessageContext(messageContext);
+        const currentEvents = this.eventsForMessageContext(messageContext);
         const [nextEventIndex, nextMessageIndex] =
             threadRootMessageIndex !== undefined
                 ? nextEventAndMessageIndexesForThread(currentEvents)
                 : nextEventAndMessageIndexes();
 
-        const msg = this.createMessage(this.user.userId, nextMessageIndex, content, replyingTo);
+        const msg = this.createMessage(
+            this.user.userId,
+            nextMessageIndex,
+            content,
+            draftMessage?.replyingTo,
+        );
         const event = { event: msg, index: nextEventIndex, timestamp: BigInt(Date.now()) };
 
         const canRetry = this.canRetryMessage(msg.content);
@@ -3038,18 +3058,14 @@ export class OpenChat extends OpenChatAgentWorker {
 
     sendMessageWithAttachment(
         messageContext: MessageContext,
-        currentEvents: EventWrapper<ChatEvent>[],
         textContent: string | undefined,
         mentioned: User[],
         attachment: AttachmentContent | undefined,
-        replyingTo: EnhancedReplyContext | undefined,
     ): void {
         return this.sendMessageWithContent(
             messageContext,
-            currentEvents,
             mentioned,
             this.getMessageContent(textContent, attachment),
-            replyingTo,
         );
     }
 
diff --git a/frontend/openchat-client/src/stores/draftMessageFactory.ts b/frontend/openchat-client/src/stores/draftMessageFactory.ts
index 05e30c6fb1..f95dfe2889 100644
--- a/frontend/openchat-client/src/stores/draftMessageFactory.ts
+++ b/frontend/openchat-client/src/stores/draftMessageFactory.ts
@@ -10,9 +10,7 @@ import {
 } from "openchat-shared";
 import { userStore } from "./user";
 
-type KeyType = string | number | symbol;
-
-type DraftMessagesByKey<T extends KeyType> = Record<T, DraftMessage>;
+export type DraftMessagesByThread = Record<number, DraftMessage>;
 
 export type DraftMessage = {
     textContent?: string | undefined;
@@ -21,15 +19,10 @@ export type DraftMessage = {
     replyingTo?: EnhancedReplyContext | undefined;
 };
 
-/**
- * There are two scenarios. The draft message can either be at the chat level or for a specific thread
- *
- * FIXME - come back to this because this is no longer used for chat level drafts
- */
-export function createDraftMessages<T extends KeyType>() {
-    const store = writable<DraftMessagesByKey<T>>({} as DraftMessagesByKey<T>);
+export function createDraftMessages() {
+    const store = writable<DraftMessagesByThread>({} as DraftMessagesByThread);
 
-    function set(id: T, draftMessage: DraftMessage): void {
+    function set(id: number, draftMessage: DraftMessage): void {
         store.update((draftMessages) => {
             const current = draftMessages[id];
             return {
@@ -44,13 +37,14 @@ export function createDraftMessages<T extends KeyType>() {
 
     return {
         subscribe: store.subscribe,
-        get: (id: T): DraftMessage => {
+        get: (id: number): DraftMessage => {
             return get(store)[id] ?? {};
         },
-        setTextContent: (id: T, textContent: string | undefined): void => set(id, { textContent }),
-        setAttachment: (id: T, attachment: AttachmentContent | undefined): void =>
+        setTextContent: (id: number, textContent: string | undefined): void =>
+            set(id, { textContent }),
+        setAttachment: (id: number, attachment: AttachmentContent | undefined): void =>
             set(id, { attachment }),
-        setEditing: (id: T, editingEvent: EventWrapper<Message>): void => {
+        setEditing: (id: number, editingEvent: EventWrapper<Message>): void => {
             const users = get(userStore);
             set(id, {
                 editingEvent,
@@ -68,9 +62,9 @@ export function createDraftMessages<T extends KeyType>() {
                         : undefined,
             });
         },
-        setReplyingTo: (id: T, replyingTo: EnhancedReplyContext | undefined): void =>
+        setReplyingTo: (id: number, replyingTo: EnhancedReplyContext | undefined): void =>
             set(id, { replyingTo }),
-        delete: (id: T): void =>
+        delete: (id: number): void =>
             store.update((draftMessages) => {
                 delete draftMessages[id];
                 return draftMessages;
diff --git a/frontend/openchat-client/src/utils/chat.ts b/frontend/openchat-client/src/utils/chat.ts
index c3df4ad98b..6becaf9bf8 100644
--- a/frontend/openchat-client/src/utils/chat.ts
+++ b/frontend/openchat-client/src/utils/chat.ts
@@ -4,7 +4,6 @@ import type {
     EventWrapper,
     GroupChatSummary,
     MessageContent,
-    TextContent,
     ChatEvent,
     ReplyContext,
     Reaction,
@@ -36,7 +35,6 @@ import type {
     ChatListScope,
     CryptocurrencyDetails,
     TimelineItem,
-    AttachmentContent,
 } from "openchat-shared";
 import {
     emptyChatMetrics,

From 32b77bc963e46e62d92602ed63933baae02fce7f Mon Sep 17 00:00:00 2001
From: Julian Jelfs <julian.jelfs@gmail.com>
Date: Mon, 18 Sep 2023 16:33:31 +0100
Subject: [PATCH 03/12] simplify poll and giphy

---
 .../src/components/home/CurrentChat.svelte    | 15 +++++---------
 .../src/components/home/GiphySelector.svelte  |  9 ++++++---
 .../src/components/home/PollBuilder.svelte    |  9 +++++----
 .../src/components/home/thread/Thread.svelte  | 20 +++++--------------
 4 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/frontend/app/src/components/home/CurrentChat.svelte b/frontend/app/src/components/home/CurrentChat.svelte
index 4eb74224e6..15835a4f57 100644
--- a/frontend/app/src/components/home/CurrentChat.svelte
+++ b/frontend/app/src/components/home/CurrentChat.svelte
@@ -58,6 +58,7 @@
     let searchTerm = "";
     let importToCommunities: CommunityMap<CommunitySummary> | undefined;
 
+    $: messageContext = { chatId: chat.id };
     $: currentChatTextContent = client.currentChatTextContent;
     $: currentChatReplyingTo = client.currentChatReplyingTo;
     $: currentChatPinnedMessages = client.currentChatPinnedMessages;
@@ -212,11 +213,11 @@
         mentioned: User[],
         attachment: AttachmentContent | undefined
     ) {
-        client.sendMessageWithAttachment({ chatId: chat.id }, textContent, mentioned, attachment);
+        client.sendMessageWithAttachment(messageContext, textContent, mentioned, attachment);
     }
 
     export function sendMessageWithContent(ev: CustomEvent<MessageContent>) {
-        client.sendMessageWithContent({ chatId: chat.id }, [], ev.detail);
+        client.sendMessageWithContent(messageContext, [], ev.detail);
     }
 
     function forwardMessage(msg: Message) {
@@ -248,10 +249,7 @@
         ownedCommunities={importToCommunities} />
 {/if}
 
-<PollBuilder
-    bind:this={pollBuilder}
-    on:sendPoll={sendMessageWithContent}
-    bind:open={creatingPoll} />
+<PollBuilder context={messageContext} bind:this={pollBuilder} bind:open={creatingPoll} />
 
 {#if creatingCryptoTransfer !== undefined}
     <CryptoTransferBuilder
@@ -264,10 +262,7 @@
         on:close={() => (creatingCryptoTransfer = undefined)} />
 {/if}
 
-<GiphySelector
-    bind:this={giphySelector}
-    bind:open={selectingGif}
-    on:sendGiphy={sendMessageWithContent} />
+<GiphySelector context={messageContext} bind:this={giphySelector} bind:open={selectingGif} />
 
 <MemeBuilder
     bind:this={memeBuilder}
diff --git a/frontend/app/src/components/home/GiphySelector.svelte b/frontend/app/src/components/home/GiphySelector.svelte
index e4cc27c773..c894d75586 100644
--- a/frontend/app/src/components/home/GiphySelector.svelte
+++ b/frontend/app/src/components/home/GiphySelector.svelte
@@ -6,18 +6,21 @@
     import Overlay from "../Overlay.svelte";
     import ModalContent from "../ModalContent.svelte";
     import { _ } from "svelte-i18n";
-    import { createEventDispatcher } from "svelte";
+    import { getContext } from "svelte";
     import { mobileWidth } from "../../stores/screenDimensions";
     import type {
         GIFObject,
         PagedGIFObject,
         GiphySearchResponse,
         GiphyContent,
+        MessageContext,
+        OpenChat,
     } from "openchat-client";
 
-    const dispatch = createEventDispatcher();
+    const client = getContext<OpenChat>("client");
 
     export let open: boolean;
+    export let context: MessageContext;
 
     let refreshing = false;
     let message = "";
@@ -164,7 +167,7 @@
                 },
                 caption: message === "" ? undefined : message,
             };
-            dispatch("sendGiphy", content);
+            client.sendMessageWithContent(context, [], content);
             open = false;
         }
     }
diff --git a/frontend/app/src/components/home/PollBuilder.svelte b/frontend/app/src/components/home/PollBuilder.svelte
index 6f30c3a870..a172054a07 100644
--- a/frontend/app/src/components/home/PollBuilder.svelte
+++ b/frontend/app/src/components/home/PollBuilder.svelte
@@ -10,13 +10,13 @@
     import DeleteOutline from "svelte-material-icons/DeleteOutline.svelte";
     import PlusCircleOutline from "svelte-material-icons/PlusCircleOutline.svelte";
     import { _ } from "svelte-i18n";
-    import { createEventDispatcher } from "svelte";
+    import { getContext } from "svelte";
     import { iconSize } from "../../stores/iconSize";
     import { mobileWidth } from "../../stores/screenDimensions";
-    import type { PollContent, TotalPollVotes } from "openchat-client";
+    import type { MessageContext, OpenChat, PollContent, TotalPollVotes } from "openchat-client";
     import Legend from "../Legend.svelte";
-    const dispatch = createEventDispatcher();
 
+    const client = getContext<OpenChat>("client");
     const MAX_QUESTION_LENGTH = 250;
     const MAX_ANSWER_LENGTH = 50;
     const MAX_ANSWERS = 10;
@@ -34,6 +34,7 @@
     };
 
     export let open: boolean;
+    export let context: MessageContext;
 
     let poll: CandidatePoll = emptyPoll();
     let nextAnswer: string = "";
@@ -136,7 +137,7 @@
     function start() {
         const poll = createPollContent();
         if (poll) {
-            dispatch("sendPoll", poll);
+            client.sendMessageWithContent(context, [], poll);
             open = false;
         }
     }
diff --git a/frontend/app/src/components/home/thread/Thread.svelte b/frontend/app/src/components/home/thread/Thread.svelte
index 2d1796e093..5736c70d5c 100644
--- a/frontend/app/src/components/home/thread/Thread.svelte
+++ b/frontend/app/src/components/home/thread/Thread.svelte
@@ -59,6 +59,7 @@
     $: threadEvents = client.threadEvents;
     $: failedMessagesStore = client.failedMessagesStore;
     $: threadRootMessageIndex = rootEvent.event.messageIndex;
+    $: messageContext = { chatId: chat.id, threadRootMessageIndex };
     $: threadRootMessage = rootEvent.event;
     $: blocked = chat.kind === "direct_chat" && $currentChatBlockedUsers.has(chat.them.userId);
     $: draftMessage = readable(draftThreadMessages.get(threadRootMessageIndex), (set) =>
@@ -148,12 +149,7 @@
         mentioned: User[],
         attachment: AttachmentContent | undefined
     ) {
-        client.sendMessageWithAttachment(
-            { chatId: chat.id, threadRootMessageIndex },
-            textContent,
-            mentioned,
-            attachment
-        );
+        client.sendMessageWithAttachment(messageContext, textContent, mentioned, attachment);
     }
 
     function cancelReply() {
@@ -215,7 +211,7 @@
     }
 
     function sendMessageWithContent(ev: CustomEvent<MessageContent>) {
-        client.sendMessageWithContent({ chatId: chat.id, threadRootMessageIndex }, [], ev.detail);
+        client.sendMessageWithContent(messageContext, [], ev.detail);
     }
 
     function replyTo(ev: CustomEvent<EnhancedReplyContext>) {
@@ -259,15 +255,9 @@
     }
 </script>
 
-<PollBuilder
-    bind:this={pollBuilder}
-    on:sendPoll={sendMessageWithContent}
-    bind:open={creatingPoll} />
+<PollBuilder context={messageContext} bind:this={pollBuilder} bind:open={creatingPoll} />
 
-<GiphySelector
-    bind:this={giphySelector}
-    bind:open={selectingGif}
-    on:sendGiphy={sendMessageWithContent} />
+<GiphySelector context={messageContext} bind:this={giphySelector} bind:open={selectingGif} />
 
 <MemeBuilder
     bind:this={memeBuilder}

From d2a7adbc7f6fb11b62eaeeaf3ad3279b7de2e9e0 Mon Sep 17 00:00:00 2001
From: Julian Jelfs <julian.jelfs@gmail.com>
Date: Mon, 18 Sep 2023 16:37:37 +0100
Subject: [PATCH 04/12] simplify meme fighter

---
 frontend/app/src/components/home/CurrentChat.svelte |  5 +----
 frontend/app/src/components/home/MemeBuilder.svelte | 13 +++++++++----
 .../app/src/components/home/thread/Thread.svelte    |  5 +----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/frontend/app/src/components/home/CurrentChat.svelte b/frontend/app/src/components/home/CurrentChat.svelte
index 15835a4f57..f9de58bb58 100644
--- a/frontend/app/src/components/home/CurrentChat.svelte
+++ b/frontend/app/src/components/home/CurrentChat.svelte
@@ -264,10 +264,7 @@
 
 <GiphySelector context={messageContext} bind:this={giphySelector} bind:open={selectingGif} />
 
-<MemeBuilder
-    bind:this={memeBuilder}
-    bind:open={buildingMeme}
-    on:sendMeme={sendMessageWithContent} />
+<MemeBuilder context={messageContext} bind:this={memeBuilder} bind:open={buildingMeme} />
 
 <div class="wrapper">
     {#if showSearchHeader}
diff --git a/frontend/app/src/components/home/MemeBuilder.svelte b/frontend/app/src/components/home/MemeBuilder.svelte
index 6c3f6a424a..1223f1d4c6 100644
--- a/frontend/app/src/components/home/MemeBuilder.svelte
+++ b/frontend/app/src/components/home/MemeBuilder.svelte
@@ -8,15 +8,20 @@
     import { mobileWidth } from "../../stores/screenDimensions";
     import MemeFighter from "../icons/MemeFighter.svelte";
     import { iconSize } from "../../stores/iconSize";
-    import { createEventDispatcher, tick } from "svelte";
-    import type { MemeFighterContent as MemeFighterContentType } from "openchat-client";
+    import { getContext, tick } from "svelte";
+    import type {
+        MemeFighterContent as MemeFighterContentType,
+        MessageContext,
+        OpenChat,
+    } from "openchat-client";
     import { themeStore } from "../../theme/themes";
 
-    const dispatch = createEventDispatcher();
+    const client = getContext<OpenChat>("client");
 
     export let open: boolean;
     export let width = 500;
     export let height = 400;
+    export let context: MessageContext;
 
     let memeUrl = undefined as string | undefined;
     let iframe: HTMLIFrameElement;
@@ -51,7 +56,7 @@
                 width: rect.width,
                 height: rect.height,
             };
-            dispatch("sendMeme", content);
+            client.sendMessageWithContent(context, [], content);
             open = false;
         }
     }
diff --git a/frontend/app/src/components/home/thread/Thread.svelte b/frontend/app/src/components/home/thread/Thread.svelte
index 5736c70d5c..3933c3a3ff 100644
--- a/frontend/app/src/components/home/thread/Thread.svelte
+++ b/frontend/app/src/components/home/thread/Thread.svelte
@@ -259,10 +259,7 @@
 
 <GiphySelector context={messageContext} bind:this={giphySelector} bind:open={selectingGif} />
 
-<MemeBuilder
-    bind:this={memeBuilder}
-    bind:open={buildingMeme}
-    on:sendMeme={sendMessageWithContent} />
+<MemeBuilder context={messageContext} bind:this={memeBuilder} bind:open={buildingMeme} />
 
 {#if creatingCryptoTransfer !== undefined}
     <CryptoTransferBuilder

From e96a62890287a67289dade2cbd96280c0c65eea7 Mon Sep 17 00:00:00 2001
From: Julian Jelfs <julian.jelfs@gmail.com>
Date: Mon, 18 Sep 2023 16:46:52 +0100
Subject: [PATCH 05/12] getting there

---
 .../home/CryptoTransferBuilder.svelte           |  5 +++--
 .../app/src/components/home/CurrentChat.svelte  | 17 ++++++-----------
 .../src/components/home/GiphySelector.svelte    |  2 +-
 .../app/src/components/home/MemeBuilder.svelte  |  2 +-
 .../app/src/components/home/PollBuilder.svelte  |  2 +-
 .../src/components/home/thread/Thread.svelte    | 17 ++++++-----------
 frontend/openchat-client/src/openchat.ts        |  6 +++---
 7 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/frontend/app/src/components/home/CryptoTransferBuilder.svelte b/frontend/app/src/components/home/CryptoTransferBuilder.svelte
index 4d3e535912..e583897a59 100644
--- a/frontend/app/src/components/home/CryptoTransferBuilder.svelte
+++ b/frontend/app/src/components/home/CryptoTransferBuilder.svelte
@@ -2,7 +2,7 @@
     import Button from "../Button.svelte";
     import ButtonGroup from "../ButtonGroup.svelte";
     import type { ChatSummary, OpenChat, UserSummary } from "openchat-client";
-    import type { CryptocurrencyContent } from "openchat-shared";
+    import type { CryptocurrencyContent, MessageContext } from "openchat-shared";
     import TokenInput from "./TokenInput.svelte";
     import Overlay from "../Overlay.svelte";
     import AccountInfo from "./AccountInfo.svelte";
@@ -27,6 +27,7 @@
     export let ledger: string;
     export let chat: ChatSummary;
     export let defaultReceiver: string | undefined;
+    export let context: MessageContext;
 
     $: lastCryptoSent = client.lastCryptoSent;
     $: cryptoBalanceStore = client.cryptoBalance;
@@ -91,7 +92,7 @@
                 createdAtNanos: BigInt(Date.now()) * BigInt(1_000_000),
             },
         };
-        dispatch("sendTransfer", content);
+        client.sendMessageWithContent(context, content);
         lastCryptoSent.set(ledger);
         dispatch("close");
     }
diff --git a/frontend/app/src/components/home/CurrentChat.svelte b/frontend/app/src/components/home/CurrentChat.svelte
index f9de58bb58..92b74c7ae7 100644
--- a/frontend/app/src/components/home/CurrentChat.svelte
+++ b/frontend/app/src/components/home/CurrentChat.svelte
@@ -11,7 +11,6 @@
         type EventWrapper,
         type Mention,
         type Message,
-        type MessageContent,
         type OpenChat,
         type FilteredProposals,
         type User,
@@ -179,7 +178,7 @@
         function send(n: number) {
             if (n === ev.detail) return;
 
-            sendMessageWithAttachment(randomSentence(), [], undefined);
+            sendMessageWithAttachment(randomSentence(), undefined);
 
             window.setTimeout(() => send(n + 1), 500);
         }
@@ -204,20 +203,16 @@
                     }
                 });
         } else {
-            sendMessageWithAttachment(text, mentioned, $currentChatAttachment);
+            sendMessageWithAttachment(text, $currentChatAttachment, mentioned);
         }
     }
 
     function sendMessageWithAttachment(
         textContent: string | undefined,
-        mentioned: User[],
-        attachment: AttachmentContent | undefined
+        attachment: AttachmentContent | undefined,
+        mentioned: User[] = []
     ) {
-        client.sendMessageWithAttachment(messageContext, textContent, mentioned, attachment);
-    }
-
-    export function sendMessageWithContent(ev: CustomEvent<MessageContent>) {
-        client.sendMessageWithContent(messageContext, [], ev.detail);
+        client.sendMessageWithAttachment(messageContext, textContent, attachment, mentioned);
     }
 
     function forwardMessage(msg: Message) {
@@ -253,11 +248,11 @@
 
 {#if creatingCryptoTransfer !== undefined}
     <CryptoTransferBuilder
+        context={messageContext}
         {chat}
         ledger={creatingCryptoTransfer.ledger}
         draftAmount={creatingCryptoTransfer.amount}
         defaultReceiver={defaultCryptoTransferReceiver()}
-        on:sendTransfer={sendMessageWithContent}
         on:upgrade
         on:close={() => (creatingCryptoTransfer = undefined)} />
 {/if}
diff --git a/frontend/app/src/components/home/GiphySelector.svelte b/frontend/app/src/components/home/GiphySelector.svelte
index c894d75586..861239d5a4 100644
--- a/frontend/app/src/components/home/GiphySelector.svelte
+++ b/frontend/app/src/components/home/GiphySelector.svelte
@@ -167,7 +167,7 @@
                 },
                 caption: message === "" ? undefined : message,
             };
-            client.sendMessageWithContent(context, [], content);
+            client.sendMessageWithContent(context, content);
             open = false;
         }
     }
diff --git a/frontend/app/src/components/home/MemeBuilder.svelte b/frontend/app/src/components/home/MemeBuilder.svelte
index 1223f1d4c6..c24bec03c5 100644
--- a/frontend/app/src/components/home/MemeBuilder.svelte
+++ b/frontend/app/src/components/home/MemeBuilder.svelte
@@ -56,7 +56,7 @@
                 width: rect.width,
                 height: rect.height,
             };
-            client.sendMessageWithContent(context, [], content);
+            client.sendMessageWithContent(context, content);
             open = false;
         }
     }
diff --git a/frontend/app/src/components/home/PollBuilder.svelte b/frontend/app/src/components/home/PollBuilder.svelte
index a172054a07..6e196b75de 100644
--- a/frontend/app/src/components/home/PollBuilder.svelte
+++ b/frontend/app/src/components/home/PollBuilder.svelte
@@ -137,7 +137,7 @@
     function start() {
         const poll = createPollContent();
         if (poll) {
-            client.sendMessageWithContent(context, [], poll);
+            client.sendMessageWithContent(context, poll);
             open = false;
         }
     }
diff --git a/frontend/app/src/components/home/thread/Thread.svelte b/frontend/app/src/components/home/thread/Thread.svelte
index 3933c3a3ff..b869bb6480 100644
--- a/frontend/app/src/components/home/thread/Thread.svelte
+++ b/frontend/app/src/components/home/thread/Thread.svelte
@@ -8,7 +8,6 @@
         EventWrapper,
         FailedMessages,
         Message,
-        MessageContent,
         OpenChat,
         User,
         TimelineItem,
@@ -105,7 +104,7 @@
         function send(n: number) {
             if (n === ev.detail) return;
 
-            sendMessageWithAttachment(randomSentence(), [], undefined);
+            sendMessageWithAttachment(randomSentence(), undefined);
 
             window.setTimeout(() => send(n + 1), 500);
         }
@@ -131,7 +130,7 @@
                     }
                 });
         } else {
-            sendMessageWithAttachment(text, mentioned, $attachment);
+            sendMessageWithAttachment(text, $attachment, mentioned);
         }
         draftThreadMessages.delete(threadRootMessageIndex);
     }
@@ -146,10 +145,10 @@
 
     function sendMessageWithAttachment(
         textContent: string | undefined,
-        mentioned: User[],
-        attachment: AttachmentContent | undefined
+        attachment: AttachmentContent | undefined,
+        mentioned: User[] = []
     ) {
-        client.sendMessageWithAttachment(messageContext, textContent, mentioned, attachment);
+        client.sendMessageWithAttachment(messageContext, textContent, attachment, mentioned);
     }
 
     function cancelReply() {
@@ -210,10 +209,6 @@
         }
     }
 
-    function sendMessageWithContent(ev: CustomEvent<MessageContent>) {
-        client.sendMessageWithContent(messageContext, [], ev.detail);
-    }
-
     function replyTo(ev: CustomEvent<EnhancedReplyContext>) {
         draftThreadMessages.setReplyingTo(threadRootMessageIndex, ev.detail);
     }
@@ -263,11 +258,11 @@
 
 {#if creatingCryptoTransfer !== undefined}
     <CryptoTransferBuilder
+        context={messageContext}
         {chat}
         ledger={creatingCryptoTransfer.ledger}
         draftAmount={creatingCryptoTransfer.amount}
         defaultReceiver={defaultCryptoTransferReceiver()}
-        on:sendTransfer={sendMessageWithContent}
         on:upgrade
         on:close={() => (creatingCryptoTransfer = undefined)} />
 {/if}
diff --git a/frontend/openchat-client/src/openchat.ts b/frontend/openchat-client/src/openchat.ts
index bab52c01a4..f224fe510f 100644
--- a/frontend/openchat-client/src/openchat.ts
+++ b/frontend/openchat-client/src/openchat.ts
@@ -2950,8 +2950,8 @@ export class OpenChat extends OpenChatAgentWorker {
 
     sendMessageWithContent(
         messageContext: MessageContext,
-        mentioned: User[],
         content: MessageContent,
+        mentioned: User[] = [],
     ): void {
         const { chatId, threadRootMessageIndex } = messageContext;
 
@@ -3059,13 +3059,13 @@ export class OpenChat extends OpenChatAgentWorker {
     sendMessageWithAttachment(
         messageContext: MessageContext,
         textContent: string | undefined,
-        mentioned: User[],
         attachment: AttachmentContent | undefined,
+        mentioned: User[] = [],
     ): void {
         return this.sendMessageWithContent(
             messageContext,
-            mentioned,
             this.getMessageContent(textContent, attachment),
+            mentioned,
         );
     }
 

From 858e34265f4ced2b8286ff9824c2b961b05ceeb6 Mon Sep 17 00:00:00 2001
From: Julian Jelfs <julian.jelfs@gmail.com>
Date: Mon, 18 Sep 2023 17:11:13 +0100
Subject: [PATCH 06/12] bit more simplification

---
 .../src/components/home/CurrentChat.svelte    |  4 +-
 .../app/src/components/home/Footer.svelte     |  2 -
 .../src/components/home/thread/Thread.svelte  |  8 +--
 frontend/openchat-client/src/openchat.ts      | 68 +++----------------
 frontend/openchat-client/src/utils/chat.ts    |  3 +-
 5 files changed, 13 insertions(+), 72 deletions(-)

diff --git a/frontend/app/src/components/home/CurrentChat.svelte b/frontend/app/src/components/home/CurrentChat.svelte
index 92b74c7ae7..d3f6a02375 100644
--- a/frontend/app/src/components/home/CurrentChat.svelte
+++ b/frontend/app/src/components/home/CurrentChat.svelte
@@ -192,7 +192,7 @@
         if ($currentChatEditingEvent !== undefined) {
             client
                 .editMessageWithAttachment(
-                    chat.id,
+                    messageContext,
                     text,
                     $currentChatAttachment,
                     $currentChatEditingEvent
@@ -218,7 +218,7 @@
     function forwardMessage(msg: Message) {
         if (!canSend || !client.canForward(msg.content)) return;
 
-        client.forwardMessage(chat.id, msg);
+        client.forwardMessage(messageContext, msg);
     }
 
     function setTextContent(ev: CustomEvent<string | undefined>): void {
diff --git a/frontend/app/src/components/home/Footer.svelte b/frontend/app/src/components/home/Footer.svelte
index b86c84e5e0..9ba0a86432 100644
--- a/frontend/app/src/components/home/Footer.svelte
+++ b/frontend/app/src/components/home/Footer.svelte
@@ -38,8 +38,6 @@
     $: canSend =
         mode === "thread" ? client.canReplyInThread(chat.id) : client.canSendMessages(chat.id);
 
-    $: console.log("Attachment: ", attachment);
-
     function fileFromDataTransferItems(items: DataTransferItem[]): File | undefined {
         return items.reduce<File | undefined>((res, item) => {
             if (item.kind === "file") {
diff --git a/frontend/app/src/components/home/thread/Thread.svelte b/frontend/app/src/components/home/thread/Thread.svelte
index b869bb6480..60cb2b3499 100644
--- a/frontend/app/src/components/home/thread/Thread.svelte
+++ b/frontend/app/src/components/home/thread/Thread.svelte
@@ -117,13 +117,7 @@
         let [text, mentioned] = ev.detail;
         if ($editingEvent !== undefined) {
             client
-                .editMessageWithAttachment(
-                    chat.id,
-                    text,
-                    $attachment,
-                    $editingEvent,
-                    threadRootMessageIndex
-                )
+                .editMessageWithAttachment(messageContext, text, $attachment, $editingEvent)
                 .then((success) => {
                     if (!success) {
                         toastStore.showFailureToast("errorEditingMessage");
diff --git a/frontend/openchat-client/src/openchat.ts b/frontend/openchat-client/src/openchat.ts
index f224fe510f..d6d2c446bb 100644
--- a/frontend/openchat-client/src/openchat.ts
+++ b/frontend/openchat-client/src/openchat.ts
@@ -2665,63 +2665,8 @@ export class OpenChat extends OpenChatAgentWorker {
     groupWhile = groupWhile;
     sameUser = sameUser;
 
-    forwardMessage(chatId: ChatIdentifier, msg: Message): void {
-        const chat = this._liveState.chatSummaries.get(chatId);
-
-        if (chat === undefined) {
-            return;
-        }
-
-        // TODO check storage requirements
-
-        const content = { ...msg.content };
-
-        const [nextEventIndex, nextMessageIndex] = nextEventAndMessageIndexes();
-
-        msg = {
-            kind: "message",
-            messageId: newMessageId(),
-            messageIndex: nextMessageIndex,
-            sender: this.user.userId,
-            content,
-            repliesTo: undefined,
-            reactions: [],
-            edited: false,
-            forwarded: msg.content.kind !== "giphy_content",
-            deleted: false,
-        };
-        const event = { event: msg, index: nextEventIndex, timestamp: BigInt(Date.now()) };
-
-        this.sendRequest({
-            kind: "sendMessage",
-            chatType: chat.kind,
-            chatId,
-            user: this.user,
-            mentioned: [],
-            event,
-        })
-            .then(([resp, msg]) => {
-                if (resp.kind === "success") {
-                    this.onSendMessageSuccess(chatId, resp, msg, undefined);
-                    trackEvent("forward_message");
-                } else {
-                    this.removeMessage(chatId, msg.messageId, this.user.userId, undefined);
-                    failedMessagesStore.add({ chatId }, event);
-                    this.dispatchEvent(
-                        new SendMessageFailed(msg.content.kind === "crypto_content"),
-                    );
-                }
-            })
-            .catch((err) => {
-                this.removeMessage(chatId, event.event.messageId, this.user.userId, undefined);
-                failedMessagesStore.add({ chatId }, event);
-                this.dispatchEvent(new SendMessageFailed(msg.content.kind === "crypto_content"));
-                this._logger.error("Exception forwarding message", err);
-            });
-
-        this.sendMessage(chat, event, undefined).then(() => {
-            this.dispatchEvent(new SentMessage());
-        });
+    forwardMessage(messageContext: MessageContext, msg: Message): void {
+        this.sendMessageWithContent(messageContext, { ...msg.content }, [], true);
     }
 
     private onSendMessageSuccess(
@@ -2952,6 +2897,7 @@ export class OpenChat extends OpenChatAgentWorker {
         messageContext: MessageContext,
         content: MessageContent,
         mentioned: User[] = [],
+        forwarded: boolean = false,
     ): void {
         const { chatId, threadRootMessageIndex } = messageContext;
 
@@ -2973,6 +2919,7 @@ export class OpenChat extends OpenChatAgentWorker {
             nextMessageIndex,
             content,
             draftMessage?.replyingTo,
+            forwarded,
         );
         const event = { event: msg, index: nextEventIndex, timestamp: BigInt(Date.now()) };
 
@@ -3122,18 +3069,19 @@ export class OpenChat extends OpenChatAgentWorker {
     setSoftDisabled = setSoftDisabled;
 
     editMessageWithAttachment(
-        chatId: ChatIdentifier,
+        messageContext: MessageContext,
         textContent: string | undefined,
         attachment: AttachmentContent | undefined,
         editingEvent: EventWrapper<Message>,
-        threadRootMessageIndex?: number,
     ): Promise<boolean> {
-        const chat = this._liveState.chatSummaries.get(chatId);
+        const chat = this._liveState.chatSummaries.get(messageContext.chatId);
 
         if (chat === undefined) {
             return Promise.resolve(false);
         }
 
+        const { chatId, threadRootMessageIndex } = messageContext;
+
         if (textContent || attachment) {
             const msg = {
                 ...editingEvent.event,
diff --git a/frontend/openchat-client/src/utils/chat.ts b/frontend/openchat-client/src/utils/chat.ts
index 6becaf9bf8..157ada1072 100644
--- a/frontend/openchat-client/src/utils/chat.ts
+++ b/frontend/openchat-client/src/utils/chat.ts
@@ -228,6 +228,7 @@ export function createMessage(
     messageIndex: number,
     content: MessageContent,
     replyingTo: ReplyContext | undefined,
+    forwarded: boolean,
 ): Message {
     return {
         kind: "message",
@@ -238,7 +239,7 @@ export function createMessage(
         messageIndex,
         reactions: [],
         edited: false,
-        forwarded: false,
+        forwarded,
         deleted: false,
     };
 }

From 25e191ab3534f012af7b4a5f8c62aee87a3ca37b Mon Sep 17 00:00:00 2001
From: Julian Jelfs <julian.jelfs@gmail.com>
Date: Mon, 18 Sep 2023 17:12:37 +0100
Subject: [PATCH 07/12] remove import

---
 frontend/openchat-client/src/openchat.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/openchat-client/src/openchat.ts b/frontend/openchat-client/src/openchat.ts
index d6d2c446bb..dedaf92104 100644
--- a/frontend/openchat-client/src/openchat.ts
+++ b/frontend/openchat-client/src/openchat.ts
@@ -47,7 +47,6 @@ import {
     mergeServerEvents,
     messageIsReadByThem,
     metricsEqual,
-    newMessageId,
     sameUser,
     isFrozen,
     isPreviewing,

From f6737133a7d984f554631f15165bea3525832f39 Mon Sep 17 00:00:00 2001
From: Julian Jelfs <julian.jelfs@gmail.com>
Date: Mon, 18 Sep 2023 17:32:34 +0100
Subject: [PATCH 08/12] couple of build fixes

---
 frontend/openchat-client/src/openchat.ts                   | 3 +--
 frontend/openchat-client/src/stores/draftThreadMessages.ts | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/frontend/openchat-client/src/openchat.ts b/frontend/openchat-client/src/openchat.ts
index dedaf92104..f485057602 100644
--- a/frontend/openchat-client/src/openchat.ts
+++ b/frontend/openchat-client/src/openchat.ts
@@ -247,7 +247,6 @@ import type {
     SendMessageSuccess,
     TransferSuccess,
     User,
-    EnhancedReplyContext,
     RemoteUserToggledReaction,
     RemoteUserSentMessage,
     CheckUsernameResponse,
@@ -1181,7 +1180,7 @@ export class OpenChat extends OpenChatAgentWorker {
         });
     }
 
-    getContentAsText(formatter: MessageFormatter, content: AttachmentContent): string {
+    getContentAsText(formatter: MessageFormatter, content: MessageContent): string {
         return getContentAsText(formatter, content, get(cryptoLookup));
     }
 
diff --git a/frontend/openchat-client/src/stores/draftThreadMessages.ts b/frontend/openchat-client/src/stores/draftThreadMessages.ts
index 734f865891..6c198ac2d3 100644
--- a/frontend/openchat-client/src/stores/draftThreadMessages.ts
+++ b/frontend/openchat-client/src/stores/draftThreadMessages.ts
@@ -1,2 +1,2 @@
 import { createDraftMessages } from "./draftMessageFactory";
-export const draftThreadMessages = createDraftMessages<number>();
+export const draftThreadMessages = createDraftMessages();

From e88780845c8a95fbb4366d7a8e584fb9a0ba803c Mon Sep 17 00:00:00 2001
From: Julian Jelfs <julian.jelfs@gmail.com>
Date: Tue, 19 Sep 2023 11:22:45 +0100
Subject: [PATCH 09/12] fix tests

---
 frontend/openchat-client/src/dummyModule.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/frontend/openchat-client/src/dummyModule.js b/frontend/openchat-client/src/dummyModule.js
index a220ea0439..151e996607 100644
--- a/frontend/openchat-client/src/dummyModule.js
+++ b/frontend/openchat-client/src/dummyModule.js
@@ -7,6 +7,14 @@ export function process() {
     };
 }
 
+export function emptyRules() {
+    return {
+        text: "",
+        enabled: false,
+        version: 0,
+    };
+}
+
 export function emptyChatMetrics() {
     return {
         audioMessages: 0,

From 1ee53894084d5ed8b1b689ff1823c0260630e9bc Mon Sep 17 00:00:00 2001
From: Julian Jelfs <julian.jelfs@gmail.com>
Date: Tue, 19 Sep 2023 12:32:51 +0100
Subject: [PATCH 10/12] fix build

---
 .../app/src/components/home/CurrentChat.svelte   |  1 -
 frontend/openchat-client/src/openchat.ts         | 16 ++++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/frontend/app/src/components/home/CurrentChat.svelte b/frontend/app/src/components/home/CurrentChat.svelte
index dd55f82754..e4b5fd4396 100644
--- a/frontend/app/src/components/home/CurrentChat.svelte
+++ b/frontend/app/src/components/home/CurrentChat.svelte
@@ -250,7 +250,6 @@
         }
     }
 
-
     function forwardMessage(msg: Message) {
         if (!canSend || !client.canForward(msg.content)) return;
 
diff --git a/frontend/openchat-client/src/openchat.ts b/frontend/openchat-client/src/openchat.ts
index a4e3da9875..ec79bcfddb 100644
--- a/frontend/openchat-client/src/openchat.ts
+++ b/frontend/openchat-client/src/openchat.ts
@@ -2677,8 +2677,8 @@ export class OpenChat extends OpenChatAgentWorker {
     forwardMessage(
         messageContext: MessageContext,
         msg: Message,
-        rulesAccepted: number | undefined,
-        communityRulesAccepted: number | undefined,
+        rulesAccepted: number | undefined = undefined,
+        communityRulesAccepted: number | undefined = undefined,
     ): void {
         this.sendMessageWithContent(
             messageContext,
@@ -2801,8 +2801,8 @@ export class OpenChat extends OpenChatAgentWorker {
     async retrySendMessage(
         messageContext: MessageContext,
         event: EventWrapper<Message>,
-        rulesAccepted: number | undefined,
-        communityRulesAccepted: number | undefined,
+        rulesAccepted: number | undefined = undefined,
+        communityRulesAccepted: number | undefined = undefined,
     ): Promise<void> {
         const { chatId, threadRootMessageIndex } = messageContext;
         const chat = this._liveState.chatSummaries.get(chatId);
@@ -2964,8 +2964,8 @@ export class OpenChat extends OpenChatAgentWorker {
         content: MessageContent,
         mentioned: User[] = [],
         forwarded: boolean = false,
-        rulesAccepted: number | undefined,
-        communityRulesAccepted: number | undefined,
+        rulesAccepted: number | undefined = undefined,
+        communityRulesAccepted: number | undefined = undefined,
     ): void {
         const { chatId, threadRootMessageIndex } = messageContext;
         const chat = this._liveState.chatSummaries.get(chatId);
@@ -3062,8 +3062,8 @@ export class OpenChat extends OpenChatAgentWorker {
         textContent: string | undefined,
         attachment: AttachmentContent | undefined,
         mentioned: User[] = [],
-        rulesAccepted: number | undefined,
-        communityRulesAccepted: number | undefined,
+        rulesAccepted: number | undefined = undefined,
+        communityRulesAccepted: number | undefined = undefined,
     ): void {
         return this.sendMessageWithContent(
             messageContext,

From 98e5a56c1c4e32f27928ca307762a2e1588cdb7f Mon Sep 17 00:00:00 2001
From: Julian Jelfs <julian.jelfs@gmail.com>
Date: Tue, 19 Sep 2023 12:42:31 +0100
Subject: [PATCH 11/12] push message context down to agent

---
 .../src/services/openchatAgent.ts             |  55 +-
 .../src/services/user/user.client.ts          | 223 ++--
 frontend/openchat-client/src/openchat.ts      |   6 +-
 frontend/openchat-shared/src/domain/worker.ts |   6 +-
 frontend/openchat-worker/src/worker.ts        | 964 +++++++++++-------
 5 files changed, 777 insertions(+), 477 deletions(-)

diff --git a/frontend/openchat-agent/src/services/openchatAgent.ts b/frontend/openchat-agent/src/services/openchatAgent.ts
index caf79f5c7d..ba6b349a2e 100644
--- a/frontend/openchat-agent/src/services/openchatAgent.ts
+++ b/frontend/openchat-agent/src/services/openchatAgent.ts
@@ -329,14 +329,14 @@ export class OpenChatAgent extends EventTarget {
     }
 
     sendMessage(
-        chatId: ChatIdentifier,
+        messageContext: MessageContext,
         user: CreatedUser,
         mentioned: User[],
         event: EventWrapper<Message>,
-        threadRootMessageIndex: number | undefined,
         rulesAccepted: number | undefined,
         communityRulesAccepted: number | undefined,
     ): Promise<[SendMessageResponse, Message]> {
+        const { chatId, threadRootMessageIndex } = messageContext;
         if (chatId.kind === "channel") {
             if (event.event.content.kind === "crypto_content") {
                 return this.userClient.sendMessageWithTransferToChannel(
@@ -346,7 +346,7 @@ export class OpenChatAgent extends EventTarget {
                     event,
                     threadRootMessageIndex,
                     communityRulesAccepted,
-                    rulesAccepted
+                    rulesAccepted,
                 );
             }
             return this.sendChannelMessage(
@@ -357,7 +357,7 @@ export class OpenChatAgent extends EventTarget {
                 event,
                 threadRootMessageIndex,
                 communityRulesAccepted,
-                rulesAccepted
+                rulesAccepted,
             );
         }
         if (chatId.kind === "group_chat") {
@@ -405,7 +405,7 @@ export class OpenChatAgent extends EventTarget {
             event,
             threadRootMessageIndex,
             communityRulesAccepted,
-            channelRulesAccepted
+            channelRulesAccepted,
         );
     }
 
@@ -424,7 +424,7 @@ export class OpenChatAgent extends EventTarget {
             mentioned,
             event,
             threadRootMessageIndex,
-            rulesAccepted
+            rulesAccepted,
         );
     }
 
@@ -1564,7 +1564,10 @@ export class OpenChatAgent extends EventTarget {
         return this._userIndexClient.setUsername(userId, username);
     }
 
-    setDisplayName(userId: string, displayName: string | undefined): Promise<SetDisplayNameResponse> {
+    setDisplayName(
+        userId: string,
+        displayName: string | undefined,
+    ): Promise<SetDisplayNameResponse> {
         return this._userIndexClient.setDisplayName(userId, displayName);
     }
 
@@ -1690,7 +1693,7 @@ export class OpenChatAgent extends EventTarget {
         reaction: string,
         username: string,
         displayName: string | undefined,
-        threadRootMessageIndex?: number
+        threadRootMessageIndex?: number,
     ): Promise<AddRemoveReactionResponse> {
         switch (chatId.kind) {
             case "group_chat":
@@ -1699,7 +1702,7 @@ export class OpenChatAgent extends EventTarget {
                     reaction,
                     username,
                     displayName,
-                    threadRootMessageIndex
+                    threadRootMessageIndex,
                 );
 
             case "direct_chat":
@@ -1707,7 +1710,7 @@ export class OpenChatAgent extends EventTarget {
                     chatId.userId,
                     messageId,
                     reaction,
-                    threadRootMessageIndex
+                    threadRootMessageIndex,
                 );
 
             case "channel":
@@ -1943,10 +1946,14 @@ export class OpenChatAgent extends EventTarget {
     async registerUser(
         username: string,
         displayName: string | undefined,
-        referralCode: string | undefined
+        referralCode: string | undefined,
     ): Promise<RegisterUserResponse> {
         const localUserIndex = await this._userIndexClient.userRegistrationCanister();
-        return this.createLocalUserIndexClient(localUserIndex).registerUser(username, displayName, referralCode);
+        return this.createLocalUserIndexClient(localUserIndex).registerUser(
+            username,
+            displayName,
+            referralCode,
+        );
     }
 
     getUserStorageLimits(): Promise<StorageStatus> {
@@ -2452,7 +2459,11 @@ export class OpenChatAgent extends EventTarget {
         return this.userClient.setCommunityIndexes(communityIndexes);
     }
 
-    createUserGroup(communityId: string, name: string, userIds: string[]): Promise<CreateUserGroupResponse> {
+    createUserGroup(
+        communityId: string,
+        name: string,
+        userIds: string[],
+    ): Promise<CreateUserGroupResponse> {
         return this.communityClient(communityId).createUserGroup(name, userIds);
     }
 
@@ -2461,12 +2472,20 @@ export class OpenChatAgent extends EventTarget {
         userGroupId: number,
         name: string | undefined,
         usersToAdd: string[],
-        usersToRemove: string[]
+        usersToRemove: string[],
     ): Promise<UpdateUserGroupResponse> {
-        return this.communityClient(communityId).updateUserGroup(userGroupId, name, usersToAdd, usersToRemove);
- 	}
-	
-    setMemberDisplayName(communityId: string, display_name: string | undefined): Promise<SetMemberDisplayNameResponse> {
+        return this.communityClient(communityId).updateUserGroup(
+            userGroupId,
+            name,
+            usersToAdd,
+            usersToRemove,
+        );
+    }
+
+    setMemberDisplayName(
+        communityId: string,
+        display_name: string | undefined,
+    ): Promise<SetMemberDisplayNameResponse> {
         return this.communityClient(communityId).setMemberDisplayName(display_name);
     }
 
diff --git a/frontend/openchat-agent/src/services/user/user.client.ts b/frontend/openchat-agent/src/services/user/user.client.ts
index 608c04e972..3974356c24 100644
--- a/frontend/openchat-agent/src/services/user/user.client.ts
+++ b/frontend/openchat-agent/src/services/user/user.client.ts
@@ -135,7 +135,7 @@ export class UserClient extends CandidService {
         identity: Identity,
         userId: string,
         private config: AgentConfig,
-        private db: Database
+        private db: Database,
     ) {
         super(identity);
         this.userId = userId;
@@ -147,7 +147,7 @@ export class UserClient extends CandidService {
         userId: string,
         identity: Identity,
         config: AgentConfig,
-        db: Database
+        db: Database,
     ): UserClient {
         return new UserClient(identity, userId, config, db);
     }
@@ -155,10 +155,10 @@ export class UserClient extends CandidService {
     private setCachedEvents<T extends ChatEvent>(
         chatId: ChatIdentifier,
         resp: EventsResponse<T>,
-        threadRootMessageIndex?: number
+        threadRootMessageIndex?: number,
     ): EventsResponse<T> {
         setCachedEvents(this.db, chatId, resp, threadRootMessageIndex).catch((err) =>
-            this.config.logger.error("Error writing cached group events", err)
+            this.config.logger.error("Error writing cached group events", err),
         );
         return resp;
     }
@@ -167,7 +167,7 @@ export class UserClient extends CandidService {
         chatId: DirectChatIdentifier,
         [cachedEvents, missing]: [EventsSuccessResult<DirectChatEvent>, Set<number>],
         threadRootMessageIndex: number | undefined,
-        latestClientEventIndex: number | undefined
+        latestClientEventIndex: number | undefined,
     ): Promise<EventsResponse<DirectChatEvent>> {
         if (missing.size === 0) {
             return Promise.resolve(cachedEvents);
@@ -176,7 +176,7 @@ export class UserClient extends CandidService {
                 [...missing],
                 chatId,
                 threadRootMessageIndex,
-                latestClientEventIndex
+                latestClientEventIndex,
             )
                 .then((resp) => this.setCachedEvents(chatId, resp, threadRootMessageIndex))
                 .then((resp) => {
@@ -194,7 +194,7 @@ export class UserClient extends CandidService {
                 to_add: [apiChatIdentifier(chatId)],
                 to_remove: [],
             }),
-            manageFavouritesResponse
+            manageFavouritesResponse,
         );
     }
 
@@ -204,7 +204,7 @@ export class UserClient extends CandidService {
                 to_add: [],
                 to_remove: [apiChatIdentifier(chatId)],
             }),
-            manageFavouritesResponse
+            manageFavouritesResponse,
         );
     }
 
@@ -215,7 +215,7 @@ export class UserClient extends CandidService {
         return this.handleQueryResponse(
             () => this.userService.initial_state(args),
             initialStateResponse,
-            args
+            args,
         );
     }
 
@@ -226,7 +226,7 @@ export class UserClient extends CandidService {
         return this.handleQueryResponse(
             () => this.userService.updates(args),
             getUpdatesResponse,
-            args
+            args,
         );
     }
 
@@ -242,20 +242,26 @@ export class UserClient extends CandidService {
                 name: community.name,
                 description: community.description,
                 history_visible_to_new_joiners: community.historyVisible,
-                avatar: apiOptional((data) => {
-                    return {
-                        id: DataClient.newBlobId(),
-                        data,
-                        mime_type: "image/jpg",
-                    };
-                }, community.avatar?.blobData),
-                banner: apiOptional((data) => {
-                    return {
-                        id: DataClient.newBlobId(),
-                        data,
-                        mime_type: "image/jpg",
-                    };
-                }, community.banner?.blobData),
+                avatar: apiOptional(
+                    (data) => {
+                        return {
+                            id: DataClient.newBlobId(),
+                            data,
+                            mime_type: "image/jpg",
+                        };
+                    },
+                    community.avatar?.blobData,
+                ),
+                banner: apiOptional(
+                    (data) => {
+                        return {
+                            id: DataClient.newBlobId(),
+                            data,
+                            mime_type: "image/jpg",
+                        };
+                    },
+                    community.banner?.blobData,
+                ),
                 permissions: [apiCommunityPermissions(community.permissions)],
                 rules,
                 gate: apiMaybeAccessGate(community.gate),
@@ -263,7 +269,7 @@ export class UserClient extends CandidService {
                 default_channel_rules: [defaultChannelRules],
                 primary_language: community.primaryLanguage,
             }),
-            createCommunityResponse
+            createCommunityResponse,
         );
     }
 
@@ -274,19 +280,22 @@ export class UserClient extends CandidService {
                 name: group.name,
                 description: group.description,
                 history_visible_to_new_joiners: group.historyVisible,
-                avatar: apiOptional((data) => {
-                    return {
-                        id: DataClient.newBlobId(),
-                        data,
-                        mime_type: "image/jpg",
-                    };
-                }, group.avatar?.blobData),
+                avatar: apiOptional(
+                    (data) => {
+                        return {
+                            id: DataClient.newBlobId(),
+                            data,
+                            mime_type: "image/jpg",
+                        };
+                    },
+                    group.avatar?.blobData,
+                ),
                 permissions: [apiGroupPermissions(group.permissions)],
                 rules: group.rules,
                 gate: apiMaybeAccessGate(group.gate),
                 events_ttl: [],
             }),
-            (resp) => createGroupResponse(resp, group.id)
+            (resp) => createGroupResponse(resp, group.id),
         );
     }
 
@@ -295,7 +304,7 @@ export class UserClient extends CandidService {
             this.userService.delete_group({
                 chat_id: Principal.fromText(chatId),
             }),
-            deleteGroupResponse
+            deleteGroupResponse,
         );
     }
 
@@ -304,7 +313,7 @@ export class UserClient extends CandidService {
             this.userService.delete_community({
                 community_id: Principal.fromText(id.communityId),
             }),
-            deleteCommunityResponse
+            deleteCommunityResponse,
         );
     }
 
@@ -312,15 +321,15 @@ export class UserClient extends CandidService {
         eventIndexes: number[],
         chatId: DirectChatIdentifier,
         threadRootMessageIndex: number | undefined,
-        latestClientEventIndex: number | undefined
+        latestClientEventIndex: number | undefined,
     ): Promise<EventsResponse<DirectChatEvent>> {
         return getCachedEventsByIndex<DirectChatEvent>(
             this.db,
             eventIndexes,
             chatId,
-            threadRootMessageIndex
+            threadRootMessageIndex,
         ).then((res) =>
-            this.handleMissingEvents(chatId, res, threadRootMessageIndex, latestClientEventIndex)
+            this.handleMissingEvents(chatId, res, threadRootMessageIndex, latestClientEventIndex),
         );
     }
 
@@ -328,7 +337,7 @@ export class UserClient extends CandidService {
         eventIndexes: number[],
         chatId: DirectChatIdentifier,
         threadRootMessageIndex: number | undefined,
-        latestClientEventIndex: number | undefined
+        latestClientEventIndex: number | undefined,
     ): Promise<EventsResponse<DirectChatEvent>> {
         const args = {
             thread_root_message_index: apiOptional(identity, threadRootMessageIndex),
@@ -339,7 +348,7 @@ export class UserClient extends CandidService {
         return this.handleQueryResponse(
             () => this.userService.events_by_index(args),
             (resp) => getEventsResponse(this.principal, resp, chatId, latestClientEventIndex),
-            args
+            args,
         );
     }
 
@@ -347,32 +356,32 @@ export class UserClient extends CandidService {
         eventIndexRange: IndexRange,
         chatId: DirectChatIdentifier,
         messageIndex: number,
-        latestClientEventIndex: number | undefined
+        latestClientEventIndex: number | undefined,
     ): Promise<EventsResponse<DirectChatEvent>> {
         const [cachedEvents, missing, totalMiss] = await getCachedEventsWindow<DirectChatEvent>(
             this.db,
             eventIndexRange,
             chatId,
-            messageIndex
+            messageIndex,
         );
         if (totalMiss || missing.size >= MAX_MISSING) {
             // if we have exceeded the maximum number of missing events, let's just consider it a complete miss and go to the api
             console.log(
                 "We didn't get enough back from the cache, going to the api",
                 missing.size,
-                totalMiss
+                totalMiss,
             );
             return this.chatEventsWindowFromBackend(
                 chatId,
                 messageIndex,
-                latestClientEventIndex
+                latestClientEventIndex,
             ).then((resp) => this.setCachedEvents(chatId, resp));
         } else {
             return this.handleMissingEvents(
                 chatId,
                 [cachedEvents, missing],
                 undefined,
-                latestClientEventIndex
+                latestClientEventIndex,
             );
         }
     }
@@ -380,7 +389,7 @@ export class UserClient extends CandidService {
     private async chatEventsWindowFromBackend(
         chatId: DirectChatIdentifier,
         messageIndex: number,
-        latestClientEventIndex: number | undefined
+        latestClientEventIndex: number | undefined,
     ): Promise<EventsResponse<DirectChatEvent>> {
         const thread_root_message_index: [] = [];
         const args = {
@@ -394,7 +403,7 @@ export class UserClient extends CandidService {
         return this.handleQueryResponse(
             () => this.userService.events_window(args),
             (resp) => getEventsResponse(this.principal, resp, chatId, latestClientEventIndex),
-            args
+            args,
         );
     }
 
@@ -404,7 +413,7 @@ export class UserClient extends CandidService {
         startIndex: number,
         ascending: boolean,
         threadRootMessageIndex: number | undefined,
-        latestClientEventIndex: number | undefined
+        latestClientEventIndex: number | undefined,
     ): Promise<EventsResponse<DirectChatEvent>> {
         const [cachedEvents, missing] = await getCachedEvents<DirectChatEvent>(
             this.db,
@@ -412,7 +421,7 @@ export class UserClient extends CandidService {
             chatId,
             startIndex,
             ascending,
-            threadRootMessageIndex
+            threadRootMessageIndex,
         );
 
         // we may or may not have all of the requested events
@@ -424,14 +433,14 @@ export class UserClient extends CandidService {
                 startIndex,
                 ascending,
                 threadRootMessageIndex,
-                latestClientEventIndex
+                latestClientEventIndex,
             ).then((resp) => this.setCachedEvents(chatId, resp, threadRootMessageIndex));
         } else {
             return this.handleMissingEvents(
                 chatId,
                 [cachedEvents, missing],
                 threadRootMessageIndex,
-                latestClientEventIndex
+                latestClientEventIndex,
             );
         }
     }
@@ -441,7 +450,7 @@ export class UserClient extends CandidService {
         startIndex: number,
         ascending: boolean,
         threadRootMessageIndex: number | undefined,
-        latestClientEventIndex: number | undefined
+        latestClientEventIndex: number | undefined,
     ): Promise<EventsResponse<DirectChatEvent>> {
         const args = {
             thread_root_message_index: apiOptional(identity, threadRootMessageIndex),
@@ -456,7 +465,7 @@ export class UserClient extends CandidService {
         return this.handleQueryResponse(
             () => this.userService.events(args),
             (resp) => getEventsResponse(this.principal, resp, chatId, latestClientEventIndex),
-            args
+            args,
         );
     }
 
@@ -470,7 +479,7 @@ export class UserClient extends CandidService {
                     mime_type: "image/jpg",
                 }),
             }),
-            setAvatarResponse
+            setAvatarResponse,
         ).then((resp) => {
             if (resp === "success") {
                 return {
@@ -485,7 +494,7 @@ export class UserClient extends CandidService {
     editMessage(
         recipientId: string,
         message: Message,
-        threadRootMessageIndex?: number
+        threadRootMessageIndex?: number,
     ): Promise<EditMessageResponse> {
         return DataClient.create(this.identity, this.config)
             .uploadData(message.content, [this.userId, recipientId])
@@ -499,7 +508,7 @@ export class UserClient extends CandidService {
                 };
                 return this.handleResponse(
                     this.userService.edit_message_v2(req),
-                    editMessageResponse
+                    editMessageResponse,
                 );
             });
     }
@@ -507,7 +516,7 @@ export class UserClient extends CandidService {
     sendMessage(
         chatId: DirectChatIdentifier,
         event: EventWrapper<Message>,
-        threadRootMessageIndex?: number
+        threadRootMessageIndex?: number,
     ): Promise<[SendMessageResponse, Message]> {
         removeFailedMessage(this.db, this.chatId, event.event.messageId, threadRootMessageIndex);
         return this.sendMessageToBackend(chatId, event, threadRootMessageIndex)
@@ -516,8 +525,8 @@ export class UserClient extends CandidService {
                     this.db,
                     this.chatId,
                     event,
-                    threadRootMessageIndex
-                )
+                    threadRootMessageIndex,
+                ),
             )
             .catch((err) => {
                 recordFailedMessage(this.db, this.chatId, event, threadRootMessageIndex);
@@ -528,7 +537,7 @@ export class UserClient extends CandidService {
     sendMessageToBackend(
         chatId: DirectChatIdentifier,
         event: EventWrapper<Message>,
-        threadRootMessageIndex?: number
+        threadRootMessageIndex?: number,
     ): Promise<[SendMessageResponse, Message]> {
         const dataClient = DataClient.create(this.identity, this.config);
         const uploadContentPromise = event.event.forwarded
@@ -543,14 +552,14 @@ export class UserClient extends CandidService {
                 message_id: event.event.messageId,
                 replies_to: apiOptional(
                     (replyContext) => apiReplyContextArgs(chatId, replyContext),
-                    event.event.repliesTo
+                    event.event.repliesTo,
                 ),
                 forwarding: event.event.forwarded,
                 thread_root_message_index: apiOptional(identity, threadRootMessageIndex),
                 correlation_id: generateUint64(),
             };
             return this.handleResponse(this.userService.send_message_v2(req), (resp) =>
-                sendMessageResponse(resp, event.event.sender, chatId.userId)
+                sendMessageResponse(resp, event.event.sender, chatId.userId),
             ).then((resp) => [resp, { ...event.event, content: newContent }]);
         });
     }
@@ -561,7 +570,7 @@ export class UserClient extends CandidService {
         sender: CreatedUser,
         event: EventWrapper<Message>,
         threadRootMessageIndex: number | undefined,
-        rulesAccepted: number | undefined
+        rulesAccepted: number | undefined,
     ): Promise<[SendMessageResponse, Message]> {
         removeFailedMessage(this.db, this.chatId, event.event.messageId, threadRootMessageIndex);
         return this.sendMessageWithTransferToGroupToBackend(
@@ -570,7 +579,7 @@ export class UserClient extends CandidService {
             sender,
             event,
             threadRootMessageIndex,
-            rulesAccepted
+            rulesAccepted,
         )
             .then(setCachedMessageFromSendResponse(this.db, groupId, event, threadRootMessageIndex))
             .catch((err) => {
@@ -585,7 +594,7 @@ export class UserClient extends CandidService {
         sender: CreatedUser,
         event: EventWrapper<Message>,
         threadRootMessageIndex: number | undefined,
-        rulesAccepted: number | undefined
+        rulesAccepted: number | undefined,
     ): Promise<[SendMessageResponse, Message]> {
         const content = apiPendingCryptoContent(event.event.content as CryptocurrencyContent);
 
@@ -602,13 +611,13 @@ export class UserClient extends CandidService {
             group_id: Principal.fromText(groupId.groupId),
             replies_to: apiOptional(
                 (replyContext) => apiReplyContextArgs(groupId, replyContext),
-                event.event.repliesTo
+                event.event.repliesTo,
             ),
             correlation_id: generateUint64(),
         };
         return this.handleResponse(
             this.userService.send_message_with_transfer_to_group(req),
-            (resp) => sendMessageWithTransferToGroupResponse(resp, event.event.sender, recipientId)
+            (resp) => sendMessageWithTransferToGroupResponse(resp, event.event.sender, recipientId),
         ).then((resp) => [resp, event.event]);
     }
 
@@ -629,7 +638,7 @@ export class UserClient extends CandidService {
             event,
             threadRootMessageIndex,
             communityRulesAccepted,
-            channelRulesAccepted
+            channelRulesAccepted,
         )
             .then(setCachedMessageFromSendResponse(this.db, id, event, threadRootMessageIndex))
             .catch((err) => {
@@ -662,7 +671,7 @@ export class UserClient extends CandidService {
             channel_id: BigInt(id.channelId),
             replies_to: apiOptional(
                 (replyContext) => apiReplyContextArgs(id, replyContext),
-                event.event.repliesTo
+                event.event.repliesTo,
             ),
             community_rules_accepted: apiOptional(identity, communityRulesAccepted),
             channel_rules_accepted: apiOptional(identity, channelRulesAccepted),
@@ -670,7 +679,7 @@ export class UserClient extends CandidService {
         return this.handleResponse(
             this.userService.send_message_with_transfer_to_channel(req),
             (resp) =>
-                sendMessageWithTransferToChannelResponse(resp, event.event.sender, recipientId)
+                sendMessageWithTransferToChannelResponse(resp, event.event.sender, recipientId),
         ).then((resp) => [resp, event.event]);
     }
 
@@ -679,7 +688,7 @@ export class UserClient extends CandidService {
             this.userService.block_user({
                 user_id: Principal.fromText(userId),
             }),
-            blockResponse
+            blockResponse,
         );
     }
 
@@ -688,7 +697,7 @@ export class UserClient extends CandidService {
             this.userService.unblock_user({
                 user_id: Principal.fromText(userId),
             }),
-            unblockResponse
+            unblockResponse,
         );
     }
 
@@ -698,7 +707,7 @@ export class UserClient extends CandidService {
                 chat_id: Principal.fromText(chatId),
                 correlation_id: generateUint64(),
             }),
-            leaveGroupResponse
+            leaveGroupResponse,
         );
     }
 
@@ -707,7 +716,7 @@ export class UserClient extends CandidService {
             this.userService.leave_community({
                 community_id: Principal.fromText(id.communityId),
             }),
-            leaveCommunityResponse
+            leaveCommunityResponse,
         );
     }
 
@@ -715,7 +724,7 @@ export class UserClient extends CandidService {
         chatId: string,
         readUpTo: number | undefined,
         threads: ThreadRead[],
-        dateReadPinned: bigint | undefined
+        dateReadPinned: bigint | undefined,
     ) {
         return {
             chat_id: Principal.fromText(chatId),
@@ -732,7 +741,7 @@ export class UserClient extends CandidService {
         channelId: string,
         readUpTo: number | undefined,
         threads: ThreadRead[],
-        dateReadPinned: bigint | undefined
+        dateReadPinned: bigint | undefined,
     ) {
         return {
             channel_id: BigInt(channelId),
@@ -761,7 +770,7 @@ export class UserClient extends CandidService {
                     community[chatId.communityId] = [];
                 }
                 community[chatId.communityId].push(
-                    this.markChannelMessageArg(chatId.channelId, readUpTo, threads, dateReadPinned)
+                    this.markChannelMessageArg(chatId.channelId, readUpTo, threads, dateReadPinned),
                 );
             }
         });
@@ -778,7 +787,7 @@ export class UserClient extends CandidService {
     markMessagesRead(request: MarkReadRequest): Promise<MarkReadResponse> {
         return this.handleResponse(
             this.userService.mark_read(this.markMessageArgs(request)),
-            markReadResponse
+            markReadResponse,
         );
     }
 
@@ -786,7 +795,7 @@ export class UserClient extends CandidService {
         otherUserId: string,
         messageId: bigint,
         reaction: string,
-        threadRootMessageIndex?: number
+        threadRootMessageIndex?: number,
     ): Promise<AddRemoveReactionResponse> {
         return this.handleResponse(
             this.userService.add_reaction({
@@ -796,7 +805,7 @@ export class UserClient extends CandidService {
                 reaction,
                 correlation_id: generateUint64(),
             }),
-            addRemoveReactionResponse
+            addRemoveReactionResponse,
         );
     }
 
@@ -804,7 +813,7 @@ export class UserClient extends CandidService {
         otherUserId: string,
         messageId: bigint,
         reaction: string,
-        threadRootMessageIndex?: number
+        threadRootMessageIndex?: number,
     ): Promise<AddRemoveReactionResponse> {
         return this.handleResponse(
             this.userService.remove_reaction({
@@ -814,14 +823,14 @@ export class UserClient extends CandidService {
                 reaction,
                 correlation_id: generateUint64(),
             }),
-            addRemoveReactionResponse
+            addRemoveReactionResponse,
         );
     }
 
     deleteMessage(
         otherUserId: string,
         messageId: bigint,
-        threadRootMessageIndex?: number
+        threadRootMessageIndex?: number,
     ): Promise<DeleteMessageResponse> {
         return this.handleResponse(
             this.userService.delete_messages({
@@ -830,14 +839,14 @@ export class UserClient extends CandidService {
                 message_ids: [messageId],
                 correlation_id: generateUint64(),
             }),
-            deleteMessageResponse
+            deleteMessageResponse,
         );
     }
 
     undeleteMessage(
         otherUserId: string,
         messageId: bigint,
-        threadRootMessageIndex?: number
+        threadRootMessageIndex?: number,
     ): Promise<UndeleteMessageResponse> {
         return this.handleResponse(
             this.userService.undelete_messages({
@@ -846,14 +855,14 @@ export class UserClient extends CandidService {
                 message_ids: [messageId],
                 correlation_id: generateUint64(),
             }),
-            undeleteMessageResponse
+            undeleteMessageResponse,
         );
     }
 
     searchDirectChat(
         chatId: DirectChatIdentifier,
         searchTerm: string,
-        maxResults: number
+        maxResults: number,
     ): Promise<SearchDirectChatResponse> {
         const args = {
             user_id: Principal.fromText(chatId.userId),
@@ -863,27 +872,27 @@ export class UserClient extends CandidService {
         return this.handleQueryResponse(
             () => this.userService.search_messages(args),
             (res) => searchDirectChatResponse(res, chatId),
-            args
+            args,
         );
     }
 
     toggleMuteNotifications(
         chatId: string,
-        muted: boolean
+        muted: boolean,
     ): Promise<ToggleMuteNotificationResponse> {
         if (muted) {
             return this.handleResponse(
                 this.userService.mute_notifications({
                     chat_id: Principal.fromText(chatId),
                 }),
-                muteNotificationsResponse
+                muteNotificationsResponse,
             );
         } else {
             return this.handleResponse(
                 this.userService.unmute_notifications({
                     chat_id: Principal.fromText(chatId),
                 }),
-                muteNotificationsResponse
+                muteNotificationsResponse,
             );
         }
     }
@@ -894,21 +903,21 @@ export class UserClient extends CandidService {
                 duration: [],
                 groups: [Principal.fromText(chatId)],
             }),
-            toVoid
+            toVoid,
         );
     }
 
     getBio(): Promise<string> {
         return this.handleQueryResponse(
             () => this.userService.bio({}),
-            (candid) => candid.Success
+            (candid) => candid.Success,
         );
     }
 
     getPublicProfile(): Promise<PublicProfile> {
         return this.handleQueryResponse(
             () => this.userService.public_profile({}),
-            publicProfileResponse
+            publicProfileResponse,
         );
     }
 
@@ -917,12 +926,12 @@ export class UserClient extends CandidService {
     }
 
     withdrawCryptocurrency(
-        domain: PendingCryptocurrencyWithdrawal
+        domain: PendingCryptocurrencyWithdrawal,
     ): Promise<WithdrawCryptocurrencyResponse> {
         const req = apiPendingCryptocurrencyWithdrawal(domain);
         return this.handleResponse(
             this.userService.withdraw_crypto_v2(req),
-            withdrawCryptoResponse
+            withdrawCryptoResponse,
         );
     }
 
@@ -967,7 +976,7 @@ export class UserClient extends CandidService {
                 chat: this.toChatInList(chatId, favourite),
             }),
 
-            pinChatResponse
+            pinChatResponse,
         );
     }
 
@@ -976,7 +985,7 @@ export class UserClient extends CandidService {
             this.userService.unpin_chat_v2({
                 chat: this.toChatInList(chatId, favourite),
             }),
-            unpinChatResponse
+            unpinChatResponse,
         );
     }
 
@@ -986,7 +995,7 @@ export class UserClient extends CandidService {
                 to_archive: [apiChatIdentifier(chatId)],
                 to_unarchive: [],
             }),
-            archiveChatResponse
+            archiveChatResponse,
         );
     }
 
@@ -996,7 +1005,7 @@ export class UserClient extends CandidService {
                 to_unarchive: [apiChatIdentifier(chatId)],
                 to_archive: [],
             }),
-            archiveChatResponse
+            archiveChatResponse,
         );
     }
 
@@ -1005,14 +1014,14 @@ export class UserClient extends CandidService {
             this.userService.init_user_principal_migration({
                 new_principal: Principal.fromText(newPrincipal),
             }),
-            toVoid
+            toVoid,
         );
     }
 
     migrateUserPrincipal(): Promise<MigrateUserPrincipalResponse> {
         return this.handleResponse(
             this.userService.migrate_user_principal({}),
-            migrateUserPrincipal
+            migrateUserPrincipal,
         );
     }
 
@@ -1022,7 +1031,7 @@ export class UserClient extends CandidService {
                 user_id: Principal.fromText(userId),
                 message_id: messageId,
             }),
-            deletedMessageResponse
+            deletedMessageResponse,
         );
     }
 
@@ -1031,7 +1040,7 @@ export class UserClient extends CandidService {
         eventIndex: number,
         remindAt: number,
         notes?: string,
-        threadRootMessageIndex?: number
+        threadRootMessageIndex?: number,
     ): Promise<SetMessageReminderResponse> {
         return this.handleResponse(
             this.userService.set_message_reminder_v2({
@@ -1041,7 +1050,7 @@ export class UserClient extends CandidService {
                 thread_root_message_index: apiOptional(identity, threadRootMessageIndex),
                 event_index: eventIndex,
             }),
-            setMessageReminderResponse
+            setMessageReminderResponse,
         );
     }
 
@@ -1050,7 +1059,7 @@ export class UserClient extends CandidService {
             this.userService.cancel_message_reminder({
                 reminder_id: reminderId,
             }),
-            (_) => true
+            (_) => true,
         );
     }
 
@@ -1061,7 +1070,7 @@ export class UserClient extends CandidService {
         ]);
         return this.handleResponse(
             this.userService.set_community_indexes({ indexes }),
-            (_) => true
+            (_) => true,
         );
     }
 }
diff --git a/frontend/openchat-client/src/openchat.ts b/frontend/openchat-client/src/openchat.ts
index ec79bcfddb..ff73cdf5f6 100644
--- a/frontend/openchat-client/src/openchat.ts
+++ b/frontend/openchat-client/src/openchat.ts
@@ -2839,11 +2839,10 @@ export class OpenChat extends OpenChatAgentWorker {
         this.sendRequest({
             kind: "sendMessage",
             chatType: chat.kind,
-            chatId: chat.id,
+            messageContext,
             user: this.user,
             mentioned: [],
             event: retryEvent,
-            threadRootMessageIndex,
             rulesAccepted,
             communityRulesAccepted,
         })
@@ -2994,11 +2993,10 @@ export class OpenChat extends OpenChatAgentWorker {
         this.sendRequest({
             kind: "sendMessage",
             chatType: chat.kind,
-            chatId,
+            messageContext,
             user: this.user,
             mentioned,
             event,
-            threadRootMessageIndex,
             rulesAccepted,
             communityRulesAccepted,
         })
diff --git a/frontend/openchat-shared/src/domain/worker.ts b/frontend/openchat-shared/src/domain/worker.ts
index b5ed5b9ca7..e8946c8ea2 100644
--- a/frontend/openchat-shared/src/domain/worker.ts
+++ b/frontend/openchat-shared/src/domain/worker.ts
@@ -62,6 +62,7 @@ import type {
     ChannelIdentifier,
     MultiUserChatIdentifier,
     PublicGroupSummaryResponse,
+    MessageContext,
 } from "./chat";
 import type { BlobReference, StorageStatus } from "./data/data";
 import type { UpdateMarketMakerConfigArgs, UpdateMarketMakerConfigResponse } from "./marketMaker";
@@ -549,12 +550,11 @@ type EditMessage = {
 };
 
 type SendMessage = {
-    chatId: ChatIdentifier;
+    messageContext: MessageContext;
     user: CreatedUser;
     mentioned: User[];
     event: EventWrapper<Message>;
-    threadRootMessageIndex: number| undefined;
-    rulesAccepted: number| undefined;
+    rulesAccepted: number | undefined;
     communityRulesAccepted: number | undefined;
     kind: "sendMessage";
 };
diff --git a/frontend/openchat-worker/src/worker.ts b/frontend/openchat-worker/src/worker.ts
index a439b9a588..c1b4825d1e 100644
--- a/frontend/openchat-worker/src/worker.ts
+++ b/frontend/openchat-worker/src/worker.ts
@@ -85,7 +85,11 @@ const sendError = (correlationId: string, payload?: unknown) => {
     };
 };
 
-function executeThenReply(payload: WorkerRequest, correlationId: string, promise: Promise<WorkerResponseInner>) {
+function executeThenReply(
+    payload: WorkerRequest,
+    correlationId: string,
+    promise: Promise<WorkerResponseInner>,
+) {
     promise
         .then((response) => sendResponse(correlationId, response))
         .catch(sendError(correlationId, payload));
@@ -128,7 +132,7 @@ self.addEventListener("message", (msg: MessageEvent<CorrelatedWorkerRequest>) =>
                     logger = inititaliseLogger(
                         payload.rollbarApiKey,
                         payload.websiteVersion,
-                        payload.env
+                        payload.env,
                     );
                     logger?.debug("WORKER: constructing agent instance");
                     agent = new OpenChatAgent(id, {
@@ -152,17 +156,23 @@ self.addEventListener("message", (msg: MessageEvent<CorrelatedWorkerRequest>) =>
                 break;
 
             case "getDeletedGroupMessage":
-                executeThenReply(payload, correlationId, agent
-                    .getDeletedGroupMessage(
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.getDeletedGroupMessage(
                         payload.chatId,
                         payload.messageId,
-                        payload.threadRootMessageIndex
-                    ));
+                        payload.threadRootMessageIndex,
+                    ),
+                );
                 break;
 
             case "getDeletedDirectMessage":
-                executeThenReply(payload, correlationId, agent
-                    .getDeletedDirectMessage(payload.userId, payload.messageId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.getDeletedDirectMessage(payload.userId, payload.messageId),
+                );
                 break;
 
             case "getUpdates":
@@ -175,173 +185,209 @@ self.addEventListener("message", (msg: MessageEvent<CorrelatedWorkerRequest>) =>
                 break;
 
             case "chatEvents":
-                executeThenReply(payload, correlationId, agent
-                    .chatEvents(
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.chatEvents(
                         payload.chatId,
                         payload.eventIndexRange,
                         payload.startIndex,
                         payload.ascending,
                         payload.threadRootMessageIndex,
-                        payload.latestClientEventIndex
-                    ));
+                        payload.latestClientEventIndex,
+                    ),
+                );
                 break;
 
             case "getUsers":
-                executeThenReply(payload, correlationId, agent
-                    .getUsers(payload.users, payload.allowStale));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.getUsers(payload.users, payload.allowStale),
+                );
                 break;
 
             case "getAllCachedUsers":
-                executeThenReply(payload, correlationId, agent
-                    .getAllCachedUsers());
+                executeThenReply(payload, correlationId, agent.getAllCachedUsers());
                 break;
 
             case "markMessagesRead":
-                executeThenReply(payload, correlationId, agent
-                    .markMessagesRead(payload.payload));
+                executeThenReply(payload, correlationId, agent.markMessagesRead(payload.payload));
                 break;
 
             case "getGroupDetails":
-                executeThenReply(payload, correlationId, agent
-                    .getGroupDetails(payload.chatId, payload.chatLastUpdated));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.getGroupDetails(payload.chatId, payload.chatLastUpdated),
+                );
                 break;
 
             case "lastOnline":
-                executeThenReply(payload, correlationId, agent
-                    .lastOnline(payload.userIds));
+                executeThenReply(payload, correlationId, agent.lastOnline(payload.userIds));
                 break;
 
             case "markAsOnline":
-                executeThenReply(payload, correlationId, agent
-                    .markAsOnline()
-                    .then(() => undefined));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.markAsOnline().then(() => undefined),
+                );
                 break;
 
             case "chatEventsWindow":
-                executeThenReply(payload, correlationId, agent
-                    .chatEventsWindow(
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.chatEventsWindow(
                         payload.eventIndexRange,
                         payload.chatId,
                         payload.messageIndex,
                         payload.threadRootMessageIndex,
-                        payload.latestClientMainEventIndex
-                    ));
+                        payload.latestClientMainEventIndex,
+                    ),
+                );
                 break;
 
             case "chatEventsByEventIndex":
-                executeThenReply(payload, correlationId, agent
-                    .chatEventsByEventIndex(
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.chatEventsByEventIndex(
                         payload.chatId,
                         payload.eventIndexes,
                         payload.threadRootMessageIndex,
-                        payload.latestClientEventIndex
-                    ));
+                        payload.latestClientEventIndex,
+                    ),
+                );
                 break;
 
             case "rehydrateMessage":
-                executeThenReply(payload, correlationId, agent
-                    .rehydrateMessage(
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.rehydrateMessage(
                         payload.chatId,
                         payload.message,
                         payload.threadRootMessageIndex,
-                        payload.latestClientEventIndex
-                    ));
+                        payload.latestClientEventIndex,
+                    ),
+                );
                 break;
 
             case "checkUsername":
-                executeThenReply(payload, correlationId, agent
-                    .checkUsername(payload.username));
+                executeThenReply(payload, correlationId, agent.checkUsername(payload.username));
                 break;
 
             case "searchUsers":
-                executeThenReply(payload, correlationId, agent
-                    .searchUsers(payload.searchTerm, payload.maxResults));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.searchUsers(payload.searchTerm, payload.maxResults),
+                );
                 break;
 
             case "migrateUserPrincipal":
-                executeThenReply(payload, correlationId, agent
-                    .migrateUserPrincipal(payload.userId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.migrateUserPrincipal(payload.userId),
+                );
                 break;
 
             case "initUserPrincipalMigration":
-                executeThenReply(payload, correlationId, agent
-                    .initUserPrincipalMigration(payload.newPrincipal)
-                    .then(() => undefined));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.initUserPrincipalMigration(payload.newPrincipal).then(() => undefined),
+                );
                 break;
 
             case "getUserStorageLimits":
-                executeThenReply(payload, correlationId, agent
-                    .getUserStorageLimits());
+                executeThenReply(payload, correlationId, agent.getUserStorageLimits());
                 break;
 
             case "getPublicGroupSummary":
-                executeThenReply(payload, correlationId, agent
-                    .getPublicGroupSummary(payload.chatId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.getPublicGroupSummary(payload.chatId),
+                );
                 break;
 
             case "toggleMuteNotifications":
-                executeThenReply(payload, correlationId, agent
-                    .toggleMuteNotifications(payload.chatId, payload.muted));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.toggleMuteNotifications(payload.chatId, payload.muted),
+                );
                 break;
 
             case "archiveChat":
-                executeThenReply(payload, correlationId, agent
-                    .archiveChat(payload.chatId));
+                executeThenReply(payload, correlationId, agent.archiveChat(payload.chatId));
                 break;
 
             case "unarchiveChat":
-                executeThenReply(payload, correlationId, agent
-                    .unarchiveChat(payload.chatId));
+                executeThenReply(payload, correlationId, agent.unarchiveChat(payload.chatId));
                 break;
 
             case "pinChat":
-                executeThenReply(payload, correlationId, agent
-                    .pinChat(payload.chatId, payload.favourite));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.pinChat(payload.chatId, payload.favourite),
+                );
                 break;
 
             case "unpinChat":
-                executeThenReply(payload, correlationId, agent
-                    .unpinChat(payload.chatId, payload.favourite));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.unpinChat(payload.chatId, payload.favourite),
+                );
                 break;
 
             case "blockUserFromDirectChat":
-                executeThenReply(payload, correlationId, agent
-                    .blockUserFromDirectChat(payload.userId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.blockUserFromDirectChat(payload.userId),
+                );
                 break;
 
             case "unblockUserFromDirectChat":
-                executeThenReply(payload, correlationId, agent
-                    .unblockUserFromDirectChat(payload.userId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.unblockUserFromDirectChat(payload.userId),
+                );
                 break;
 
             case "setUserAvatar":
-                executeThenReply(payload, correlationId, agent
-                    .setUserAvatar(payload.data));
+                executeThenReply(payload, correlationId, agent.setUserAvatar(payload.data));
                 break;
 
             case "deleteGroup":
-                executeThenReply(payload, correlationId, agent
-                    .deleteGroup(payload.chatId));
+                executeThenReply(payload, correlationId, agent.deleteGroup(payload.chatId));
                 break;
 
             case "leaveGroup":
-                executeThenReply(payload, correlationId, agent
-                    .leaveGroup(payload.chatId));
+                executeThenReply(payload, correlationId, agent.leaveGroup(payload.chatId));
                 break;
 
             case "joinGroup":
-                executeThenReply(payload, correlationId, agent
-                    .joinGroup(payload.chatId));
+                executeThenReply(payload, correlationId, agent.joinGroup(payload.chatId));
                 break;
 
             case "joinCommunity":
-                executeThenReply(payload, correlationId, agent
-                    .joinCommunity(payload.id));
+                executeThenReply(payload, correlationId, agent.joinCommunity(payload.id));
                 break;
 
             case "updateGroup":
-                executeThenReply(payload, correlationId, agent
-                    .updateGroup(
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.updateGroup(
                         payload.chatId,
                         payload.name,
                         payload.desc,
@@ -349,186 +395,261 @@ self.addEventListener("message", (msg: MessageEvent<CorrelatedWorkerRequest>) =>
                         payload.permissions,
                         payload.avatar,
                         payload.gate,
-                        payload.isPublic
-                    ));
+                        payload.isPublic,
+                    ),
+                );
                 break;
 
             case "registerPollVote":
-                executeThenReply(payload, correlationId, agent
-                    .registerPollVote(
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.registerPollVote(
                         payload.chatId,
                         payload.messageIdx,
                         payload.answerIdx,
                         payload.voteType,
-                        payload.threadRootMessageIndex
-                    ));
+                        payload.threadRootMessageIndex,
+                    ),
+                );
                 break;
 
             case "deleteMessage":
-                executeThenReply(payload, correlationId, agent
-                    .deleteMessage(
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.deleteMessage(
                         payload.chatId,
                         payload.messageId,
                         payload.threadRootMessageIndex,
-                        payload.asPlatformModerator
-                    ));
+                        payload.asPlatformModerator,
+                    ),
+                );
                 break;
 
             case "undeleteMessage":
-                executeThenReply(payload, correlationId, agent
-                    .undeleteMessage(
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.undeleteMessage(
                         payload.chatId,
                         payload.messageId,
-                        payload.threadRootMessageIndex
-                    ));
+                        payload.threadRootMessageIndex,
+                    ),
+                );
                 break;
 
             case "addReaction":
-                executeThenReply(payload, correlationId, agent
-                    .addReaction(
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.addReaction(
                         payload.chatId,
                         payload.messageId,
                         payload.reaction,
                         payload.username,
                         payload.displayName,
-                        payload.threadRootMessageIndex
-                    ));
+                        payload.threadRootMessageIndex,
+                    ),
+                );
                 break;
 
             case "removeReaction":
-                executeThenReply(payload, correlationId, agent
-                    .removeReaction(
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.removeReaction(
                         payload.chatId,
                         payload.messageId,
                         payload.reaction,
-                        payload.threadRootMessageIndex
-                    ));
+                        payload.threadRootMessageIndex,
+                    ),
+                );
                 break;
 
             case "blockUserFromGroupChat":
-                executeThenReply(payload, correlationId, agent
-                    .blockUserFromGroupChat(payload.chatId, payload.userId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.blockUserFromGroupChat(payload.chatId, payload.userId),
+                );
                 break;
 
             case "unblockUserFromGroupChat":
-                executeThenReply(payload, correlationId, agent
-                    .unblockUserFromGroupChat(payload.chatId, payload.userId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.unblockUserFromGroupChat(payload.chatId, payload.userId),
+                );
                 break;
 
             case "getProposalVoteDetails":
-                executeThenReply(payload, correlationId, agent
-                    .getProposalVoteDetails(
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.getProposalVoteDetails(
                         payload.governanceCanisterId,
                         payload.proposalId,
-                        payload.isNns
-                    ));
+                        payload.isNns,
+                    ),
+                );
                 break;
 
             case "listNervousSystemFunctions":
-                executeThenReply(payload, correlationId, agent
-                    .listNervousSystemFunctions(payload.snsGovernanceCanisterId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.listNervousSystemFunctions(payload.snsGovernanceCanisterId),
+                );
                 break;
 
             case "unpinMessage":
-                executeThenReply(payload, correlationId, agent
-                    .unpinMessage(payload.chatId, payload.messageIndex));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.unpinMessage(payload.chatId, payload.messageIndex),
+                );
                 break;
 
             case "pinMessage":
-                executeThenReply(payload, correlationId, agent
-                    .pinMessage(payload.chatId, payload.messageIndex));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.pinMessage(payload.chatId, payload.messageIndex),
+                );
                 break;
 
             case "sendMessage":
-                executeThenReply(payload, correlationId, agent
-                    .sendMessage(
-                        payload.chatId,
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.sendMessage(
+                        payload.messageContext,
                         payload.user,
                         payload.mentioned,
                         payload.event,
-                        payload.threadRootMessageIndex,
                         payload.rulesAccepted,
-                        payload.communityRulesAccepted, 
-                    ));
+                        payload.communityRulesAccepted,
+                    ),
+                );
                 break;
 
             case "editMessage":
-                executeThenReply(payload, correlationId, agent
-                    .editMessage(payload.chatId, payload.msg, payload.threadRootMessageIndex));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.editMessage(payload.chatId, payload.msg, payload.threadRootMessageIndex),
+                );
                 break;
 
             case "registerUser":
-                executeThenReply(payload, correlationId, agent
-                    .registerUser(payload.username, payload.displayName, payload.referralCode));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.registerUser(payload.username, payload.displayName, payload.referralCode),
+                );
                 break;
 
             case "subscriptionExists":
-                executeThenReply(payload, correlationId, agent
-                    .subscriptionExists(payload.p256dh_key));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.subscriptionExists(payload.p256dh_key),
+                );
                 break;
 
             case "pushSubscription":
-                executeThenReply(payload, correlationId, agent
-                    .pushSubscription(payload.subscription)
-                    .then(() => undefined));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.pushSubscription(payload.subscription).then(() => undefined),
+                );
                 break;
 
             case "removeSubscription":
-                executeThenReply(payload, correlationId, agent
-                    .removeSubscription(payload.subscription)
-                    .then(() => undefined));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.removeSubscription(payload.subscription).then(() => undefined),
+                );
                 break;
 
             case "inviteUsers":
-                executeThenReply(payload, correlationId, agent
-                    .inviteUsers(payload.chatId, payload.userIds));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.inviteUsers(payload.chatId, payload.userIds),
+                );
                 break;
 
             case "inviteUsersToCommunity":
-                executeThenReply(payload, correlationId, agent
-                    .inviteUsersToCommunity(payload.id, payload.userIds));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.inviteUsersToCommunity(payload.id, payload.userIds),
+                );
                 break;
 
             case "removeMember":
-                executeThenReply(payload, correlationId, agent
-                    .removeMember(payload.chatId, payload.userId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.removeMember(payload.chatId, payload.userId),
+                );
                 break;
 
             case "changeRole":
-                executeThenReply(payload, correlationId, agent
-                    .changeRole(payload.chatId, payload.userId, payload.newRole));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.changeRole(payload.chatId, payload.userId, payload.newRole),
+                );
                 break;
 
             case "registerProposalVote":
-                executeThenReply(payload, correlationId, agent
-                    .registerProposalVote(payload.chatId, payload.messageIndex, payload.adopt));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.registerProposalVote(payload.chatId, payload.messageIndex, payload.adopt),
+                );
                 break;
 
             case "getRecommendedGroups":
-                executeThenReply(payload, correlationId, agent
-                    .getRecommendedGroups(payload.exclusions));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.getRecommendedGroups(payload.exclusions),
+                );
                 break;
 
             case "exploreCommunities":
-                executeThenReply(payload, correlationId, agent
-                    .exploreCommunities(
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.exploreCommunities(
                         payload.searchTerm,
                         payload.pageIndex,
                         payload.pageSize,
                         payload.flags,
-                        payload.languages
-                    ));
+                        payload.languages,
+                    ),
+                );
                 break;
 
             case "searchGroups":
-                executeThenReply(payload, correlationId, agent
-                    .searchGroups(payload.searchTerm, payload.maxResults));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.searchGroups(payload.searchTerm, payload.maxResults),
+                );
                 break;
 
             case "dismissRecommendation":
-                executeThenReply(payload, correlationId, agent
-                    .dismissRecommendation(payload.chatId)
-                    .then(() => undefined));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.dismissRecommendation(payload.chatId).then(() => undefined),
+                );
                 break;
 
             case "communityInvite":
@@ -542,425 +663,578 @@ self.addEventListener("message", (msg: MessageEvent<CorrelatedWorkerRequest>) =>
                 break;
 
             case "searchGroupChat":
-                executeThenReply(payload, correlationId, agent
-                    .searchGroupChat(
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.searchGroupChat(
                         payload.chatId,
                         payload.searchTerm,
                         payload.userIds,
-                        payload.maxResults
-                    ));
+                        payload.maxResults,
+                    ),
+                );
                 break;
 
             case "searchDirectChat":
-                executeThenReply(payload, correlationId, agent
-                    .searchDirectChat(payload.chatId, payload.searchTerm, payload.maxResults));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.searchDirectChat(payload.chatId, payload.searchTerm, payload.maxResults),
+                );
                 break;
 
             case "refreshAccountBalance":
-                executeThenReply(payload, correlationId, agent
-                    .refreshAccountBalance(payload.ledger, payload.principal));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.refreshAccountBalance(payload.ledger, payload.principal),
+                );
                 break;
 
             case "threadPreviews":
-                executeThenReply(payload, correlationId, agent
-                    .threadPreviews(payload.threadsByChat));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.threadPreviews(payload.threadsByChat),
+                );
                 break;
 
             case "getUser":
-                executeThenReply(payload, correlationId, agent
-                    .getUser(payload.userId, payload.allowStale));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.getUser(payload.userId, payload.allowStale),
+                );
                 break;
 
             case "getPublicProfile":
-                executeThenReply(payload, correlationId, agent
-                    .getPublicProfile(payload.userId));
+                executeThenReply(payload, correlationId, agent.getPublicProfile(payload.userId));
                 break;
 
             case "setUsername":
-                executeThenReply(payload, correlationId, agent
-                    .setUsername(payload.userId, payload.username));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.setUsername(payload.userId, payload.username),
+                );
                 break;
 
             case "setDisplayName":
-                executeThenReply(payload, correlationId, agent
-                    .setDisplayName(payload.userId, payload.displayName));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.setDisplayName(payload.userId, payload.displayName),
+                );
                 break;
 
             case "setBio":
-                executeThenReply(payload, correlationId, agent
-                    .setBio(payload.bio));
+                executeThenReply(payload, correlationId, agent.setBio(payload.bio));
                 break;
 
             case "getBio":
-                executeThenReply(payload, correlationId, agent
-                    .getBio(payload.userId));
+                executeThenReply(payload, correlationId, agent.getBio(payload.userId));
                 break;
 
             case "withdrawCryptocurrency":
-                executeThenReply(payload, correlationId, agent
-                    .withdrawCryptocurrency(payload.domain));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.withdrawCryptocurrency(payload.domain),
+                );
                 break;
 
             case "getGroupMessagesByMessageIndex":
-                executeThenReply(payload, correlationId, agent
-                    .getGroupMessagesByMessageIndex(
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.getGroupMessagesByMessageIndex(
                         payload.chatId,
                         payload.messageIndexes,
-                        payload.latestClientEventIndex
-                    ));
+                        payload.latestClientEventIndex,
+                    ),
+                );
                 break;
 
             case "getInviteCode":
-                executeThenReply(payload, correlationId, agent
-                    .getInviteCode(payload.id));
+                executeThenReply(payload, correlationId, agent.getInviteCode(payload.id));
                 break;
 
             case "enableInviteCode":
-                executeThenReply(payload, correlationId, agent
-                    .enableInviteCode(payload.id));
+                executeThenReply(payload, correlationId, agent.enableInviteCode(payload.id));
                 break;
 
             case "disableInviteCode":
-                executeThenReply(payload, correlationId, agent
-                    .disableInviteCode(payload.id));
+                executeThenReply(payload, correlationId, agent.disableInviteCode(payload.id));
                 break;
 
             case "resetInviteCode":
-                executeThenReply(payload, correlationId, agent
-                    .resetInviteCode(payload.id));
+                executeThenReply(payload, correlationId, agent.resetInviteCode(payload.id));
                 break;
 
             case "createGroupChat":
-                executeThenReply(payload, correlationId, agent
-                    .createGroupChat(payload.candidate));
+                executeThenReply(payload, correlationId, agent.createGroupChat(payload.candidate));
                 break;
 
             case "setCachedMessageFromNotification":
-                executeThenReply(payload, correlationId, agent
-                    .setCachedMessageFromNotification(
-                        payload.chatId,
-                        payload.threadRootMessageIndex,
-                        payload.message
-                    )
-                    .then(() => undefined));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent
+                        .setCachedMessageFromNotification(
+                            payload.chatId,
+                            payload.threadRootMessageIndex,
+                            payload.message,
+                        )
+                        .then(() => undefined),
+                );
                 break;
 
             case "freezeGroup":
-                executeThenReply(payload, correlationId, agent
-                    .freezeGroup(payload.chatId, payload.reason));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.freezeGroup(payload.chatId, payload.reason),
+                );
                 break;
 
             case "unfreezeGroup":
-                executeThenReply(payload, correlationId, agent
-                    .unfreezeGroup(payload.chatId));
+                executeThenReply(payload, correlationId, agent.unfreezeGroup(payload.chatId));
                 break;
 
             case "deleteFrozenGroup":
-                executeThenReply(payload, correlationId, agent
-                    .deleteFrozenGroup(payload.chatId));
+                executeThenReply(payload, correlationId, agent.deleteFrozenGroup(payload.chatId));
                 break;
 
             case "addHotGroupExclusion":
-                executeThenReply(payload, correlationId, agent
-                    .addHotGroupExclusion(payload.chatId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.addHotGroupExclusion(payload.chatId),
+                );
                 break;
 
             case "removeHotGroupExclusion":
-                executeThenReply(payload, correlationId, agent
-                    .removeHotGroupExclusion(payload.chatId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.removeHotGroupExclusion(payload.chatId),
+                );
                 break;
 
             case "suspendUser":
-                executeThenReply(payload, correlationId, agent
-                    .suspendUser(payload.userId, payload.reason));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.suspendUser(payload.userId, payload.reason),
+                );
                 break;
 
             case "unsuspendUser":
-                executeThenReply(payload, correlationId, agent
-                    .unsuspendUser(payload.userId));
+                executeThenReply(payload, correlationId, agent.unsuspendUser(payload.userId));
                 break;
 
             case "setCommunityModerationFlags":
-                executeThenReply(payload, correlationId, agent
-                    .setCommunityModerationFlags(payload.communityId, payload.flags));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.setCommunityModerationFlags(payload.communityId, payload.flags),
+                );
                 break;
 
             case "setGroupUpgradeConcurrency":
-                executeThenReply(payload, correlationId, agent
-                    .setGroupUpgradeConcurrency(payload.value));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.setGroupUpgradeConcurrency(payload.value),
+                );
                 break;
 
             case "setCommunityUpgradeConcurrency":
-                executeThenReply(payload, correlationId, agent
-                    .setCommunityUpgradeConcurrency(payload.value));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.setCommunityUpgradeConcurrency(payload.value),
+                );
                 break;
 
             case "setUserUpgradeConcurrency":
-                executeThenReply(payload, correlationId, agent
-                    .setUserUpgradeConcurrency(payload.value));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.setUserUpgradeConcurrency(payload.value),
+                );
                 break;
 
             case "markSuspectedBot":
-                executeThenReply(payload, correlationId, agent
-                    .markSuspectedBot());
+                executeThenReply(payload, correlationId, agent.markSuspectedBot());
                 break;
 
             case "loadFailedMessages":
-                executeThenReply(payload, correlationId, agent
-                    .loadFailedMessages());
+                executeThenReply(payload, correlationId, agent.loadFailedMessages());
                 break;
 
             case "deleteFailedMessage":
-                executeThenReply(payload, correlationId, agent
-                    .deleteFailedMessage(
-                        payload.chatId,
-                        payload.messageId,
-                        payload.threadRootMessageIndex
-                    )
-                    .then(() => undefined));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent
+                        .deleteFailedMessage(
+                            payload.chatId,
+                            payload.messageId,
+                            payload.threadRootMessageIndex,
+                        )
+                        .then(() => undefined),
+                );
                 break;
             case "claimPrize":
-                executeThenReply(payload, correlationId, agent
-                    .claimPrize(payload.chatId, payload.messageId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.claimPrize(payload.chatId, payload.messageId),
+                );
                 break;
 
             case "payForDiamondMembership":
-                executeThenReply(payload, correlationId, agent
-                    .payForDiamondMembership(
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.payForDiamondMembership(
                         payload.userId,
                         payload.token,
                         payload.duration,
                         payload.recurring,
-                        payload.expectedPriceE8s
-                    ));
+                        payload.expectedPriceE8s,
+                    ),
+                );
                 break;
 
             case "updateMarketMakerConfig":
-                executeThenReply(payload, correlationId, agent
-                    .updateMarketMakerConfig(payload));
+                executeThenReply(payload, correlationId, agent.updateMarketMakerConfig(payload));
                 break;
 
             case "setMessageReminder":
-                executeThenReply(payload, correlationId, agent
-                    .setMessageReminder(
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.setMessageReminder(
                         payload.chatId,
                         payload.eventIndex,
                         payload.remindAt,
                         payload.notes,
-                        payload.threadRootMessageIndex
-                    ));
+                        payload.threadRootMessageIndex,
+                    ),
+                );
                 break;
 
             case "cancelMessageReminder":
-                executeThenReply(payload, correlationId, agent
-                    .cancelMessageReminder(payload.reminderId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.cancelMessageReminder(payload.reminderId),
+                );
                 break;
 
             case "getReferralLeaderboard":
-                executeThenReply(payload, correlationId, agent
-                    .getReferralLeaderboard(payload.args));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.getReferralLeaderboard(payload.args),
+                );
                 break;
 
             case "reportMessage":
-                executeThenReply(payload, correlationId, agent
-                    .reportMessage(
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.reportMessage(
                         payload.chatId,
                         payload.eventIndex,
                         payload.reasonCode,
                         payload.notes,
-                        payload.threadRootMessageIndex
-                    ));
+                        payload.threadRootMessageIndex,
+                    ),
+                );
                 break;
 
             case "declineInvitation":
-                executeThenReply(payload, correlationId, agent
-                    .declineInvitation(payload.chatId));
+                executeThenReply(payload, correlationId, agent.declineInvitation(payload.chatId));
                 break;
 
             // Community level functions
             case "addMembersToChannel":
-                executeThenReply(payload, correlationId, agent
-                    .communityClient(payload.chatId.communityId)
-                    .addMembersToChannel(payload.chatId, payload.userIds, payload.username, payload.displayName));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent
+                        .communityClient(payload.chatId.communityId)
+                        .addMembersToChannel(
+                            payload.chatId,
+                            payload.userIds,
+                            payload.username,
+                            payload.displayName,
+                        ),
+                );
                 break;
 
             case "blockCommunityUser":
-                executeThenReply(payload, correlationId, agent
-                    .communityClient(payload.id.communityId)
-                    .blockUser(payload.userId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.communityClient(payload.id.communityId).blockUser(payload.userId),
+                );
                 break;
 
             case "changeChannelRole":
-                executeThenReply(payload, correlationId, agent
-                    .communityClient(payload.chatId.communityId)
-                    .changeChannelRole(payload.chatId, payload.userId, payload.newRole));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent
+                        .communityClient(payload.chatId.communityId)
+                        .changeChannelRole(payload.chatId, payload.userId, payload.newRole),
+                );
                 break;
 
             case "changeCommunityRole":
-                executeThenReply(payload, correlationId, agent
-                    .communityClient(payload.id.communityId)
-                    .changeRole(payload.userId, payload.newRole));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent
+                        .communityClient(payload.id.communityId)
+                        .changeRole(payload.userId, payload.newRole),
+                );
                 break;
 
             case "declineChannelInvitation":
-                executeThenReply(payload, correlationId, agent
-                    .communityClient(payload.chatId.communityId)
-                    .declineInvitation(payload.chatId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent
+                        .communityClient(payload.chatId.communityId)
+                        .declineInvitation(payload.chatId),
+                );
                 break;
 
             case "channelMessagesByMessageIndex":
-                executeThenReply(payload, correlationId, agent
-                    .communityClient(payload.chatId.communityId)
-                    .messagesByMessageIndex(
-                        payload.chatId,
-                        payload.messageIndexes,
-                        payload.latestClientEventIndex,
-                        payload.threadRootMessageIndex
-                    ));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent
+                        .communityClient(payload.chatId.communityId)
+                        .messagesByMessageIndex(
+                            payload.chatId,
+                            payload.messageIndexes,
+                            payload.latestClientEventIndex,
+                            payload.threadRootMessageIndex,
+                        ),
+                );
                 break;
 
             case "removeCommunityMember":
-                executeThenReply(payload, correlationId, agent
-                    .communityClient(payload.id.communityId)
-                    .removeMember(payload.userId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.communityClient(payload.id.communityId).removeMember(payload.userId),
+                );
                 break;
 
             case "toggleMuteCommunityNotifications":
-                executeThenReply(payload, correlationId, agent
-                    .communityClient(payload.communityId)
-                    .toggleMuteNotifications(payload.mute));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent
+                        .communityClient(payload.communityId)
+                        .toggleMuteNotifications(payload.mute),
+                );
                 break;
 
             case "unblockCommunityUser":
-                executeThenReply(payload, correlationId, agent
-                    .communityClient(payload.id.communityId)
-                    .unblockUser(payload.userId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.communityClient(payload.id.communityId).unblockUser(payload.userId),
+                );
                 break;
 
             case "updateCommunity":
-                executeThenReply(payload, correlationId, agent
-                    .communityClient(payload.communityId)
-                    .updateCommunity(
-                        payload.name,
-                        payload.description,
-                        payload.rules,
-                        payload.permissions,
-                        payload.avatar,
-                        payload.banner,
-                        payload.gate,
-                        payload.isPublic,
-                        payload.primaryLanguage
-                    ));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent
+                        .communityClient(payload.communityId)
+                        .updateCommunity(
+                            payload.name,
+                            payload.description,
+                            payload.rules,
+                            payload.permissions,
+                            payload.avatar,
+                            payload.banner,
+                            payload.gate,
+                            payload.isPublic,
+                            payload.primaryLanguage,
+                        ),
+                );
                 break;
 
             case "createCommunity":
-                executeThenReply(payload, correlationId, agent.userClient
-                    .createCommunity(payload.community, payload.rules, payload.defaultChannels, payload.defaultChannelRules));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.userClient.createCommunity(
+                        payload.community,
+                        payload.rules,
+                        payload.defaultChannels,
+                        payload.defaultChannelRules,
+                    ),
+                );
                 break;
 
             case "getCommunitySummary":
-                executeThenReply(payload, correlationId, agent
-                    .getCommunitySummary(payload.communityId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.getCommunitySummary(payload.communityId),
+                );
                 break;
 
             case "getChannelSummary":
-                executeThenReply(payload, correlationId, agent
-                    .communityClient(payload.chatId.communityId)
-                    .channelSummary(payload.chatId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent
+                        .communityClient(payload.chatId.communityId)
+                        .channelSummary(payload.chatId),
+                );
                 break;
 
             case "exploreChannels":
-                executeThenReply(payload, correlationId, agent
-                    .exploreChannels(
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.exploreChannels(
                         payload.id,
                         payload.searchTerm,
                         payload.pageSize,
-                        payload.pageIndex
-                    ));
+                        payload.pageIndex,
+                    ),
+                );
                 break;
 
             case "getCommunityDetails":
-                executeThenReply(payload, correlationId, agent
-                    .communityClient(payload.id.communityId)
-                    .getCommunityDetails(payload.id, payload.communityLastUpdated));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent
+                        .communityClient(payload.id.communityId)
+                        .getCommunityDetails(payload.id, payload.communityLastUpdated),
+                );
                 break;
 
             case "addToFavourites":
-                executeThenReply(payload, correlationId, agent.userClient
-                    .addToFavourites(payload.chatId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.userClient.addToFavourites(payload.chatId),
+                );
                 break;
 
             case "removeFromFavourites":
-                executeThenReply(payload, correlationId, agent.userClient
-                    .removeFromFavourites(payload.chatId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.userClient.removeFromFavourites(payload.chatId),
+                );
                 break;
 
             case "leaveCommunity":
-                executeThenReply(payload, correlationId, agent.userClient
-                    .leaveCommunity(payload.id));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.userClient.leaveCommunity(payload.id),
+                );
                 break;
 
             case "deleteCommunity":
-                executeThenReply(payload, correlationId, agent.userClient
-                    .deleteCommunity(payload.id));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.userClient.deleteCommunity(payload.id),
+                );
                 break;
 
             case "convertGroupToCommunity":
-                executeThenReply(payload, correlationId, agent
-                    .convertGroupToCommunity(payload.chatId, payload.historyVisible, payload.rules));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.convertGroupToCommunity(
+                        payload.chatId,
+                        payload.historyVisible,
+                        payload.rules,
+                    ),
+                );
                 break;
 
             case "importGroupToCommunity":
-                executeThenReply(payload, correlationId, agent
-                    .communityClient(payload.communityId.communityId)
-                    .importGroup(payload.groupId));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent
+                        .communityClient(payload.communityId.communityId)
+                        .importGroup(payload.groupId),
+                );
                 break;
 
             case "setModerationFlags":
-                executeThenReply(payload, correlationId, agent
-                    .setModerationFlags(payload.flags));
+                executeThenReply(payload, correlationId, agent.setModerationFlags(payload.flags));
                 break;
 
             case "updateRegistry":
-                executeThenReply(payload, correlationId, agent
-                    .getRegistry());
+                executeThenReply(payload, correlationId, agent.getRegistry());
                 break;
 
             case "setCommunityIndexes":
-                executeThenReply(payload, correlationId, agent
-                    .setCommunityIndexes(payload.indexes));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.setCommunityIndexes(payload.indexes),
+                );
                 break;
 
             case "createUserGroup":
-                executeThenReply(payload, correlationId, agent
-                    .createUserGroup(payload.communityId, payload.name, payload.userIds));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.createUserGroup(payload.communityId, payload.name, payload.userIds),
+                );
                 break;
 
             case "updateUserGroup":
-                executeThenReply(payload, correlationId, agent
-                    .updateUserGroup(
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.updateUserGroup(
                         payload.communityId,
                         payload.userGroupId,
                         payload.name,
                         payload.usersToAdd,
-                        payload.usersToRemove
-                    ));
+                        payload.usersToRemove,
+                    ),
+                );
                 break;
 
             case "deleteUserGroups":
-                executeThenReply(payload, correlationId, agent
-                    .deleteUserGroups(
-                        payload.communityId,
-                        payload.userGroupIds,
-                    ));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.deleteUserGroups(payload.communityId, payload.userGroupIds),
+                );
                 break;
 
             case "setMemberDisplayName":
-                executeThenReply(payload, correlationId, agent
-                    .setMemberDisplayName(
-                        payload.communityId, 
-                        payload.displayName
-                    ));
+                executeThenReply(
+                    payload,
+                    correlationId,
+                    agent.setMemberDisplayName(payload.communityId, payload.displayName),
+                );
                 break;
 
             default:

From ea622de7efcd63b2bc447ce0611d09395eca0d9f Mon Sep 17 00:00:00 2001
From: Julian Jelfs <julian.jelfs@gmail.com>
Date: Tue, 19 Sep 2023 12:45:02 +0100
Subject: [PATCH 12/12] merge fix

---
 frontend/app/src/components/home/thread/Thread.svelte | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/frontend/app/src/components/home/thread/Thread.svelte b/frontend/app/src/components/home/thread/Thread.svelte
index 6d47781cde..ea9379f411 100644
--- a/frontend/app/src/components/home/thread/Thread.svelte
+++ b/frontend/app/src/components/home/thread/Thread.svelte
@@ -296,13 +296,10 @@
             switch (sendMessageContext.kind) {
                 case "send_message": {
                     client.sendMessageWithAttachment(
-                        chat.id,
-                        $threadEvents,
+                        messageContext,
                         sendMessageContext.textContent,
+                        sendMessageContext.attachment,
                         sendMessageContext.mentioned,
-                        sendMessageContext.fileToAttach,
-                        $replyingTo,
-                        threadRootMessageIndex,
                         chatRulesVersion,
                         communityRulesVersion
                     );
@@ -310,10 +307,8 @@
                 }
                 case "retry_send_message": {
                     client.retrySendMessage(
-                        chat.id,
+                        messageContext,
                         sendMessageContext.event,
-                        $threadEvents,
-                        threadRootMessageIndex,
                         chatRulesVersion,
                         communityRulesVersion
                     );