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

note_reaction cleanup

Browse source
This commit is contained in:
Namekuji 2023-09-05 12:01:50 -04:00
parent 06141e1ecc
commit bd7dab44c0
No known key found for this signature in database
GPG key ID: 1D62332C07FBA532
1 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
packages/backend/src/server/activitypub.ts
View file

@ -33,8 +33,14 @@ import Following from "./activitypub/following.js";
import Followers from "./activitypub/followers.js";
import Outbox, { packActivity } from "./activitypub/outbox.js";
import { serverLogger } from "./index.js";
import { parseScyllaNote, prepared, scyllaClient } from "@/db/scylla.js";
import {
parseScyllaNote,
parseScyllaReaction,
prepared,
scyllaClient,
} from "@/db/scylla.js";
import type { Note } from "@/models/entities/note.js";
import type { NoteReaction } from "@/models/entities/note-reaction.js";
// Init router
const router = new Router();
@ -388,16 +394,40 @@ router.get("/likes/:like", async (ctx) => {
return;
}
const reaction = await NoteReactions.findOneBy({ id: ctx.params.like });
let reaction: NoteReaction | null = null;
if (scyllaClient) {
const result = await scyllaClient.execute(
prepared.reaction.select.byId,
[ctx.params.like],
{ prepare: true },
);
if (result.rowLength > 0) {
reaction = parseScyllaReaction(result.first());
}
} else {
reaction = await NoteReactions.findOneBy({ id: ctx.params.like });
}
if (reaction == null) {
if (!reaction) {
ctx.status = 404;
return;
}
const note = await Notes.findOneBy({ id: reaction.noteId });
let note: Note | null = null;
if (scyllaClient) {
const result = await scyllaClient.execute(
prepared.note.select.byId,
[reaction.noteId],
{ prepare: true },
);
if (result.rowLength > 0) {
note = parseScyllaNote(result.first());
}
} else {
note = await Notes.findOneBy({ id: reaction.noteId });
}
if (note == null) {
if (!note) {
ctx.status = 404;
return;
}