fix thread/comment creation/editing

hicommonwealth · Sep 11, 2024 · 08966c7 · 08966c7
1 parent 568e17e
commit 08966c7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 33 deletions.
diff --git a/libs/model/src/comment/UpdateComment.command.ts b/libs/model/src/comment/UpdateComment.command.ts
@@ -4,11 +4,11 @@ import { models } from '../database';
 import { isAuthorized, type AuthContext } from '../middleware';
 import { mustBeAuthorized } from '../middleware/guards';
 import {
+  decodeContent,
   emitMentions,
   findMentionDiff,
   parseUserMentions,
   quillToPlain,
-  sanitizeQuillText,
   uniqueMentions,
 } from '../utils';
 
@@ -37,7 +37,7 @@ export function UpdateComment(): Command<
       });
 
       if (currentVersion?.text !== payload.text) {
-        const text = sanitizeQuillText(payload.text);
+        const text = decodeContent(payload.text);
         const plaintext = quillToPlain(text);
         const mentions = findMentionDiff(
           parseUserMentions(currentVersion?.text),

diff --git a/packages/commonwealth/scripts/decode-db-content.ts b/packages/commonwealth/scripts/decode-db-content.ts
@@ -1,37 +1,11 @@
 import { dispose, logger } from '@hicommonwealth/core';
-import { models } from '@hicommonwealth/model';
-import { deltaToMarkdown } from 'quill-delta-to-markdown';
+import { decodeContent, models } from '@hicommonwealth/model';
 import { Op, QueryTypes } from 'sequelize';
 
 const log = logger(import.meta);
 const BATCH_SIZE = 10;
 const queryCase = 'WHEN id = ? THEN ? ';
 
-function decodeContent(content: string) {
-  // decode if URI encoded
-  let decodedContent: string;
-  try {
-    decodedContent = decodeURIComponent(content);
-  } catch {
-    decodedContent = content;
-  }
-
-  // convert to Markdown if Quill Delta format
-  let rawMarkdown: string;
-  try {
-    const delta = JSON.parse(decodedContent);
-    if ('ops' in delta) {
-      rawMarkdown = deltaToMarkdown(delta.ops);
-    } else {
-      rawMarkdown = delta;
-    }
-  } catch (e) {
-    rawMarkdown = decodedContent;
-  }
-
-  return rawMarkdown.trim();
-}
-
 async function decodeThreads(lastId: number = 0) {
   let lastThreadId = lastId;
   while (true) {

diff --git a/packages/commonwealth/server/controllers/server_threads_methods/update_thread.ts b/packages/commonwealth/server/controllers/server_threads_methods/update_thread.ts
@@ -7,6 +7,7 @@ import {
   ThreadAttributes,
   ThreadInstance,
   UserInstance,
+  decodeContent,
   emitMentions,
   findMentionDiff,
   parseUserMentions,
@@ -246,7 +247,7 @@ export async function __updateThread(
         {
           thread_id: threadId!,
           address: address.address,
-          body,
+          body: decodeContent(body),
           timestamp: new Date(),
         },
         {
@@ -487,12 +488,12 @@ async function setThreadAttributes(
       if (thread.kind === 'discussion' && (!body || !body.trim())) {
         throw new AppError(Errors.NoBody);
       }
-      toUpdate.body = body;
+      toUpdate.body = decodeContent(body);
       toUpdate.plaintext = (() => {
         try {
-          return renderQuillDeltaToText(JSON.parse(decodeURIComponent(body)));
+          return renderQuillDeltaToText(JSON.parse(body));
         } catch (e) {
-          return decodeURIComponent(body);
+          return body;
         }
       })();
     }