161sh/trashposs
1
0
Fork 0
mirror of https://iceshrimp.dev/crimekillz/trashposs synced 2024-11-22 17:03:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ThatOneCalculator 2023-05-08 13:36:28 -07:00
commit 72b224a40c
1 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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