Handle sending captions for images

cinnyapp · Nov 17, 2024 · 9a3cfd0 · 9a3cfd0
1 parent dccf87d
commit 9a3cfd0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/app/features/room/RoomInput.tsx b/src/app/features/room/RoomInput.tsx
@@ -227,9 +227,10 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
       const contentsPromises = uploads.map(async (upload) => {
         const fileItem = selectedFiles.find((f) => f.file === upload.file);
         if (!fileItem) throw new Error('Broken upload');
+        const caption = toPlainText(editor.children).trim() || null;
 
         if (fileItem.file.type.startsWith('image')) {
-          return getImageMsgContent(mx, fileItem, upload.mxc);
+          return getImageMsgContent(mx, fileItem, upload.mxc, caption);
         }
         if (fileItem.file.type.startsWith('video')) {
           return getVideoMsgContent(mx, fileItem, upload.mxc);
@@ -318,7 +319,9 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
           content['m.relates_to'].is_falling_back = false;
         }
       }
-      mx.sendMessage(roomId, content);
+      if (!uploadBoardHandlers.current) {
+          mx.sendMessage(roomId, content);
+      }
       resetEditor(editor);
       resetEditorHistory(editor);
       setReplyDraft(undefined);

diff --git a/src/app/features/room/msgContent.ts b/src/app/features/room/msgContent.ts
@@ -42,15 +42,17 @@ const generateThumbnailContent = async (
 export const getImageMsgContent = async (
   mx: MatrixClient,
   item: TUploadItem,
-  mxc: string
+  mxc: string,
+  caption?: string
 ): Promise<IContent> => {
   const { file, originalFile, encInfo } = item;
   const [imgError, imgEl] = await to(loadImageElement(getImageFileUrl(originalFile)));
   if (imgError) console.warn(imgError);
 
   const content: IContent = {
     msgtype: MsgType.Image,
-    body: file.name,
+    filename: file.name,
+    body: caption || file.name,
   };
   if (imgEl) {
     const blurHash = encodeBlurHash(imgEl, 512, scaleYDimension(imgEl.width, 512, imgEl.height));