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,24 +81,26 @@ export async function importPosts(
 		} else if (parsed instanceof Object) {
 			logger.info("Parsing animal style posts");
 			for (const post of parsed.orderedItems) {
+				async () =>{
 					try {
 						linenum++;
+						let reply: Note | null = null;
 						if (post.object.inReplyTo != null) {
-						continue;
+							reply = await resolveNote(post.object.inReplyTo);
 						}
 						if (post.directMessage) {
-						continue;
+							return;
 						}
 						if (job.data.signatureCheck) {
 							if (!post.signature) {
-							continue;
+								return;
 							}
 						}
 						let text;
 						try {
 							text = htmlToMfm(post.object.content, post.object.tag);
 						} catch (e) {
-						continue;
+							return;
 						}
 						logger.info(`Posting[${linenum}] ...`);
 	
@@ -105,7 +109,7 @@ export async function importPosts(
 							files: undefined,
 							poll: undefined,
 							text: text || undefined,
-						reply: null,
+							reply,
 							renote: null,
 							cw: post.sensitive,
 							localOnly: false,
@@ -121,6 +125,7 @@ export async function importPosts(
 					}
 				}
 			}
+		}
 	} catch (e) {
 		// handle error
 		logger.warn(`Error reading: ${e}`);