HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix (backend): update note_file table by post imports

Browse source
This commit is contained in:
naskya 2024-04-25 08:22:30 +09:00
parent 7441f0861a
commit 24e6e31b2b
No known key found for this signature in database
GPG key ID: 712D413B3A9FED5C
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
packages/backend/src/queue/processors/db/import-firefish-post.ts
View file

@ -1,6 +1,6 @@
import * as Post from "@/misc/post.js"; import * as Post from "@/misc/post.js";
import create from "@/services/note/create.js"; import create from "@/services/note/create.js";
import { Users } from "@/models/index.js"; import { NoteFiles, Users } from "@/models/index.js";
import type { DbUserImportMastoPostJobData } from "@/queue/types.js"; import type { DbUserImportMastoPostJobData } from "@/queue/types.js";
import { queueLogger } from "../../logger.js"; import { queueLogger } from "../../logger.js";
import { uploadFromUrl } from "@/services/drive/upload-from-url.js"; import { uploadFromUrl } from "@/services/drive/upload-from-url.js";
@ -59,9 +59,17 @@ export async function importCkPost(
userId: user.id, userId: user.id,
}); });
if (note && (note?.fileIds?.length || 0) < files.length) { if (note != null && (note.fileIds?.length || 0) < files.length) {
const update: Partial<Note> = {}; const update: Partial<Note> = {};
update.fileIds = files.map((x) => x.id); update.fileIds = files.map((x) => x.id);
if (update.fileIds != null) {
await NoteFiles.delete({ noteId: note.id });
await NoteFiles.insert(
update.fileIds.map((fileId) => ({ noteId: note?.id, fileId })),
);
}
await Notes.update(note.id, update); await Notes.update(note.id, update);
await NoteEdits.insert({ await NoteEdits.insert({
id: genId(), id: genId(),

12
packages/backend/src/queue/processors/db/import-masto-post.ts
View file

@ -1,5 +1,5 @@
import create from "@/services/note/create.js"; import create from "@/services/note/create.js";
import { Users } from "@/models/index.js"; import { NoteFiles, Users } from "@/models/index.js";
import type { DbUserImportMastoPostJobData } from "@/queue/types.js"; import type { DbUserImportMastoPostJobData } from "@/queue/types.js";
import { queueLogger } from "../../logger.js"; import { queueLogger } from "../../logger.js";
import type Bull from "bull"; import type Bull from "bull";
@ -85,9 +85,17 @@ export async function importMastoPost(
userId: user.id, userId: user.id,
}); });
if (note && (note?.fileIds?.length || 0) < files.length) { if (note != null && (note.fileIds?.length || 0) < files.length) {
const update: Partial<Note> = {}; const update: Partial<Note> = {};
update.fileIds = files.map((x) => x.id); update.fileIds = files.map((x) => x.id);
if (update.fileIds != null) {
await NoteFiles.delete({ noteId: note.id });
await NoteFiles.insert(
update.fileIds.map((fileId) => ({ noteId: note?.id, fileId })),
);
}
await Notes.update(note.id, update); await Notes.update(note.id, update);
await NoteEdits.insert({ await NoteEdits.insert({
id: genId(), id: genId(),