Merge pull request #29 from yacchin1205/fix/update-hash-after-rich-texts

Fix misalignment of replacements when updating hashes after itemized text
NII-cloud-operation · Aug 27, 2024 · ae8fd6c · ae8fd6c
2 parents 2a83c33 + fa0694c
commit ae8fd6c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/pad/database/hash.ts b/src/pad/database/hash.ts
@@ -2,7 +2,7 @@ import { SearchEngine, PadType } from "ep_search/setup";
 import { tokenize } from "../static/js/parser";
 import { logPrefix } from "../util/log";
 import { getHashQuery } from "../static/js/hash";
-import { applyReplaceSet, ReplaceSet } from "./text";
+import { applyReplaceSet, ReplaceSet, getAText } from "./text";
 
 const api = require("ep_etherpad-lite/node/db/API");
 const { decode, encode } = require("he");
@@ -62,7 +62,7 @@ function replaceHash(text: string, updates: HashUpdate[]): ReplaceSet[] {
 }
 
 export async function updateHash(padId: string, updates: HashUpdate[]) {
-  const { text } = await api.getText(padId);
+  const { text } = await getAText(padId);
   console.debug(
     logPrefix,
     "Update hash with text",

diff --git a/src/pad/database/text.ts b/src/pad/database/text.ts
@@ -57,3 +57,8 @@ export async function applyReplaceSet(
   }
   await padMessageHandler.updatePadClients(pad);
 }
+
+export async function getAText(padID: string) {
+  const pad = await getPadSafe(padID, true);
+  return pad.atext;
+}
diff --git a/src/pad/database/title.ts b/src/pad/database/title.ts
@@ -3,7 +3,7 @@ import removeMdBase from "remove-markdown";
 import { searchHashes, updateHash } from "./hash";
 import { logPrefix } from "../util/log";
 import { escapeForText } from "../static/js/result";
-import { applyReplaceSet, ReplaceSet } from "./text";
+import { applyReplaceSet, ReplaceSet, getAText } from "./text";
 
 const api = require("ep_etherpad-lite/node/db/API");
 const db = require("ep_etherpad-lite/node/db/DB").db;
@@ -67,7 +67,7 @@ async function updateTitleContent(
   newTitle: string
 ): Promise<TitleUpdateResult> {
   console.info(logPrefix, "Update title", pad.id, oldTitle, newTitle);
-  const { text } = await api.getText(pad.id);
+  const { text } = await getAText(pad.id);
   const replaceSet = replaceTitle(text, oldTitle, newTitle);
   if (replaceSet === null) {
     console.warn(logPrefix, "Title not found in HTML", oldTitle, newTitle);