)
case "code": {
text += "`";
- appendChildren(node.childNodes);
+ await appendChildren(node.childNodes);
text += "`";
break;
}
@@ -184,7 +184,7 @@ export function fromHtml(html: string, hashtagNames?: string[]): string {
case "h5":
case "h6": {
text += "\n\n";
- appendChildren(node.childNodes);
+ await appendChildren(node.childNodes);
break;
}
@@ -197,13 +197,13 @@ export function fromHtml(html: string, hashtagNames?: string[]): string {
case "dt":
case "dd": {
text += "\n";
- appendChildren(node.childNodes);
+ await appendChildren(node.childNodes);
break;
}
default: {
// includes inline elements
- appendChildren(node.childNodes);
+ await appendChildren(node.childNodes);
break;
}
}
diff --git a/packages/backend/src/queue/processors/db/import-masto-post.ts b/packages/backend/src/queue/processors/db/import-masto-post.ts
index 1d18008a0..bbab4ece3 100644
--- a/packages/backend/src/queue/processors/db/import-masto-post.ts
+++ b/packages/backend/src/queue/processors/db/import-masto-post.ts
@@ -40,7 +40,7 @@ export async function importMastoPost(
job.progress(60);
let text;
try {
- text = htmlToMfm(post.object.content, post.object.tag);
+ text = await htmlToMfm(post.object.content, post.object.tag);
} catch (e) {
throw e;
}
diff --git a/packages/backend/src/remote/activitypub/misc/html-to-mfm.ts b/packages/backend/src/remote/activitypub/misc/html-to-mfm.ts
index 9d71a46a3..a6ea63b15 100644
--- a/packages/backend/src/remote/activitypub/misc/html-to-mfm.ts
+++ b/packages/backend/src/remote/activitypub/misc/html-to-mfm.ts
@@ -2,10 +2,10 @@ import type { IObject } from "../type.js";
import { extractApHashtagObjects } from "../models/tag.js";
import { fromHtml } from "../../../mfm/from-html.js";
-export function htmlToMfm(html: string, tag?: IObject | IObject[]) {
+export async function htmlToMfm(html: string, tag?: IObject | IObject[]) {
const hashtagNames = extractApHashtagObjects(tag)
.map((x) => x.name)
.filter((x): x is string => x != null);
- return fromHtml(html, hashtagNames);
+ return await fromHtml(html, hashtagNames);
}
diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts
index a0d3bdc65..1cb348973 100644
--- a/packages/backend/src/remote/activitypub/models/note.ts
+++ b/packages/backend/src/remote/activitypub/models/note.ts
@@ -313,7 +313,7 @@ export async function createNote(
} else if (typeof note._misskey_content !== "undefined") {
text = note._misskey_content;
} else if (typeof note.content === "string") {
- text = htmlToMfm(note.content, note.tag);
+ text = await htmlToMfm(note.content, note.tag);
}
// vote
@@ -575,7 +575,7 @@ export async function updateNote(value: string | IObject, resolver?: Resolver) {
} else if (typeof post._misskey_content !== "undefined") {
text = post._misskey_content;
} else if (typeof post.content === "string") {
- text = htmlToMfm(post.content, post.tag);
+ text = await htmlToMfm(post.content, post.tag);
}
const cw = post.sensitive && post.summary;
diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts
index fef04d593..bd12f02cb 100644
--- a/packages/backend/src/remote/activitypub/models/person.ts
+++ b/packages/backend/src/remote/activitypub/models/person.ts
@@ -234,7 +234,7 @@ export async function createPerson(
}
}
- const { fields } = analyzeAttachments(person.attachment || []);
+ const { fields } = await analyzeAttachments(person.attachment || []);
const tags = extractApHashtags(person.tag)
.map((tag) => normalizeForSearch(tag))
@@ -335,7 +335,7 @@ export async function createPerson(
new UserProfile({
userId: user.id,
description: person.summary
- ? htmlToMfm(truncate(person.summary, summaryLength), person.tag)
+ ? await htmlToMfm(truncate(person.summary, summaryLength), person.tag)
: null,
url: url,
fields,
@@ -481,7 +481,7 @@ export async function updatePerson(
const emojiNames = emojis.map((emoji) => emoji.name);
- const { fields } = analyzeAttachments(person.attachment || []);
+ const { fields } = await analyzeAttachments(person.attachment || []);
const tags = extractApHashtags(person.tag)
.map((tag) => normalizeForSearch(tag))
@@ -591,7 +591,7 @@ export async function updatePerson(
url: url,
fields,
description: person.summary
- ? htmlToMfm(truncate(person.summary, summaryLength), person.tag)
+ ? await htmlToMfm(truncate(person.summary, summaryLength), person.tag)
: null,
birthday: bday ? bday[0] : null,
location: person["vcard:Address"] || null,
@@ -676,7 +676,7 @@ function addService(target: { [x: string]: any }, source: IApPropertyValue) {
}
}
-export function analyzeAttachments(
+export async function analyzeAttachments(
attachments: IObject | IObject[] | undefined,
) {
const fields: {
@@ -692,7 +692,7 @@ export function analyzeAttachments(
} else {
fields.push({
name: attachment.name,
- value: fromHtml(attachment.value),
+ value: await fromHtml(attachment.value),
});
}
}
diff --git a/packages/backend/test/mfm.ts b/packages/backend/test/mfm.ts
index d4fe201e4..6b7d5fb1b 100644
--- a/packages/backend/test/mfm.ts
+++ b/packages/backend/test/mfm.ts
@@ -19,106 +19,106 @@ describe("toHtml", () => {
});
describe("fromHtml", () => {
- it("p", () => {
- assert.deepStrictEqual(fromHtml("a
b
"), "a\n\nb");
+ it("p", async () => {
+ assert.deepStrictEqual(await fromHtml("a
b
"), "a\n\nb");
});
- it("block element", () => {
- assert.deepStrictEqual(fromHtml("ab"), "a\nb");
+ it("block element", async () => {
+ assert.deepStrictEqual(await fromHtml("ab"), "a\nb");
});
- it("inline element", () => {
- assert.deepStrictEqual(fromHtml("- a
- b
"), "a\nb");
+ it("inline element", async () => {
+ assert.deepStrictEqual(await fromHtml("- a
- b
"), "a\nb");
});
- it("block code", () => {
+ it("block code", async () => {
assert.deepStrictEqual(
- fromHtml("a\nb
"),
+ await fromHtml("a\nb
"),
"```\na\nb\n```",
);
});
- it("inline code", () => {
- assert.deepStrictEqual(fromHtml("a"), "`a`");
+ it("inline code", async () => {
+ assert.deepStrictEqual(await fromHtml("a"), "`a`");
});
- it("quote", () => {
+ it("quote", async () => {
assert.deepStrictEqual(
- fromHtml("a\nb
"),
+ await fromHtml("a\nb
"),
"> a\n> b",
);
});
- it("br", () => {
- assert.deepStrictEqual(fromHtml("abc
d
"), "abc\n\nd");
+ it("br", async () => {
+ assert.deepStrictEqual(await fromHtml("abc
d
"), "abc\n\nd");
});
- it("link with different text", () => {
+ it("link with different text", async () => {
assert.deepStrictEqual(
- fromHtml('a c d
'),
+ await fromHtml('a c d
'),
"a [c](https://iceshrimp.dev/b) d",
);
});
- it("link with different text, but not encoded", () => {
+ it("link with different text, but not encoded", async () => {
assert.deepStrictEqual(
- fromHtml('a c d
'),
+ await fromHtml('a c d
'),
"a [c]() d",
);
});
- it("link with same text", () => {
+ it("link with same text", async () => {
assert.deepStrictEqual(
- fromHtml(
+ await fromHtml(
'a https://joiniceshrimp.org/b d
',
),
"a https://joiniceshrimp.org/b d",
);
});
- it("link with same text, but not encoded", () => {
+ it("link with same text, but not encoded", async () => {
assert.deepStrictEqual(
- fromHtml(
+ await fromHtml(
'a https://joiniceshrimp.org/ä d
',
),
"a d",
);
});
- it("link with no url", () => {
+ it("link with no url", async () => {
assert.deepStrictEqual(
- fromHtml('a c d
'),
+ await fromHtml('a c d
'),
"a [c](b) d",
);
});
- it("link without href", () => {
- assert.deepStrictEqual(fromHtml("a c d
"), "a c d");
+ it("link without href", async () => {
+ assert.deepStrictEqual(await fromHtml("a c d
"), "a c d");
});
- it("link without text", () => {
+ it("link without text", async () => {
assert.deepStrictEqual(
- fromHtml(''),
+ await fromHtml(''),
"a https://joiniceshrimp.org/b d",
);
});
- it("link without both", () => {
- assert.deepStrictEqual(fromHtml(""), "a d");
+ it("link without both", async () => {
+ assert.deepStrictEqual(await fromHtml(""), "a d");
});
- it("mention", () => {
+ it("mention", async () => {
assert.deepStrictEqual(
- fromHtml(
+ await fromHtml(
'a @user d
',
),
"a @user@joiniceshrimp.org d",
);
});
- it("hashtag", () => {
+ it("hashtag", async () => {
assert.deepStrictEqual(
- fromHtml('a #a d
', [
+ await fromHtml('a #a d
', [
"#a",
]),
"a #a d",