Merge branch 'develop' of codeberg.org:calckey/calckey into develop

packages/backend/src/queue/processors/db/import-posts.ts

@@ -9,6 +9,8 @@ import type { DbUserImportPostsJobData } from "@/queue/types.js";
 import { queueLogger } from "../../logger.js";
 import type Bull from "bull";
 import { htmlToMfm } from "@/remote/activitypub/misc/html-to-mfm.js";
+import { resolveNote } from "@/remote/activitypub/models/note.js";
+import { Note } from "@/models/entities/note.js";
 
 const logger = queueLogger.createSubLogger("import-posts");
 
@@ -79,45 +81,48 @@ export async function importPosts(
 		} else if (parsed instanceof Object) {
 			logger.info("Parsing animal style posts");
 			for (const post of parsed.orderedItems) {
-				try {
-					linenum++;
-					if (post.object.inReplyTo != null) {
-						continue;
-					}
-					if (post.directMessage) {
-						continue;
-					}
-					if (job.data.signatureCheck) {
-						if (!post.signature) {
-							continue;
-						}
-					}
-					let text;
+				async () =>{
 					try {
-						text = htmlToMfm(post.object.content, post.object.tag);
+						linenum++;
+						let reply: Note | null = null;
+						if (post.object.inReplyTo != null) {
+							reply = await resolveNote(post.object.inReplyTo);
+						}
+						if (post.directMessage) {
+							return;
+						}
+						if (job.data.signatureCheck) {
+							if (!post.signature) {
+								return;
+							}
+						}
+						let text;
+						try {
+							text = htmlToMfm(post.object.content, post.object.tag);
+						} catch (e) {
+							return;
+						}
+						logger.info(`Posting[${linenum}] ...`);
+	
+						const note = await create(user, {
+							createdAt: new Date(post.object.published),
+							files: undefined,
+							poll: undefined,
+							text: text || undefined,
+							reply,
+							renote: null,
+							cw: post.sensitive,
+							localOnly: false,
+							visibility: "hidden",
+							visibleUsers: [],
+							channel: null,
+							apMentions: new Array(0),
+							apHashtags: undefined,
+							apEmojis: undefined,
+						});
 					} catch (e) {
-						continue;
+						logger.warn(`Error in line:${linenum} ${e}`);
 					}
-					logger.info(`Posting[${linenum}] ...`);
-
-					const note = await create(user, {
-						createdAt: new Date(post.object.published),
-						files: undefined,
-						poll: undefined,
-						text: text || undefined,
-						reply: null,
-						renote: null,
-						cw: post.sensitive,
-						localOnly: false,
-						visibility: "hidden",
-						visibleUsers: [],
-						channel: null,
-						apMentions: new Array(0),
-						apHashtags: undefined,
-						apEmojis: undefined,
-					});
-				} catch (e) {
-					logger.warn(`Error in line:${linenum} ${e}`);
 				}
 			}
 		}