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

This commit is contained in:
ThatOneCalculator 2023-03-29 12:39:17 -07:00
commit e518e86a79
No known key found for this signature in database
GPG key ID: 8703CACD01000000

View file

@ -84,7 +84,7 @@ export async function importPosts(
for (const post of parsed.orderedItems) { for (const post of parsed.orderedItems) {
try { try {
linenum++; linenum++;
if (post.inReplyTo != null) { if (post.object.inReplyTo != null) {
logger.info(`Is reply, skip [${linenum}] ...`); logger.info(`Is reply, skip [${linenum}] ...`);
continue; continue;
} }
@ -94,7 +94,7 @@ export async function importPosts(
} }
let text; let text;
try { try {
text = htmlToMfm(post.content, post.tag); text = htmlToMfm(post.object.content, post.object.tag);
} catch (e) { } catch (e) {
logger.warn(`Error while parsing text in line ${linenum}: ${e}`); logger.warn(`Error while parsing text in line ${linenum}: ${e}`);
continue; continue;
@ -102,7 +102,7 @@ export async function importPosts(
logger.info(`Posting[${linenum}] ...`); logger.info(`Posting[${linenum}] ...`);
const note = await create(user, { const note = await create(user, {
createdAt: new Date(post.published), createdAt: new Date(post.object.published),
files: undefined, files: undefined,
poll: undefined, poll: undefined,
text: text || undefined, text: text || undefined,