diff --git a/api/src/routes/users/@me/notes.ts b/api/src/routes/users/@me/notes.ts
index 4887b191..e3406d18 100644
--- a/api/src/routes/users/@me/notes.ts
+++ b/api/src/routes/users/@me/notes.ts
@@ -1,37 +1,54 @@
import { Request, Response, Router } from "express";
import { route } from "@fosscord/api";
-import { User, emitEvent } from "@fosscord/util";
+import { User, Note, emitEvent, Snowflake } from "@fosscord/util";
const router: Router = Router();
router.get("/:id", route({}), async (req: Request, res: Response) => {
const { id } = req.params;
- const user = await User.findOneOrFail({ where: { id: req.user_id }, select: ["notes"] });
- const note = user.notes[id];
+ const note = await Note.findOneOrFail({
+ where: {
+ owner: { id: req.user_id },
+ target: { id: id },
+ }
+ });
+
return res.json({
- note: note,
+ note: note?.content,
note_user_id: id,
- user_id: user.id,
+ user_id: req.user_id,
});
});
router.put("/:id", route({}), async (req: Request, res: Response) => {
const { id } = req.params;
- const user = await User.findOneOrFail({ where: { id: req.user_id } });
- const noteUser = await User.findOneOrFail({ where: { id: id }}); //if noted user does not exist throw
+ const owner = await User.findOneOrFail({ where: { id: req.user_id } });
+ const target = await User.findOneOrFail({ where: { id: id } }); //if noted user does not exist throw
const { note } = req.body;
- await User.update({ id: req.user_id }, { notes: { ...user.notes, [noteUser.id]: note } });
+ // await User.update({ id: req.user_id }, { notes: { ...user.notes, [noteUser.id]: note } });
+
+ if (await Note.findOne({ owner: { id: owner.id }, target: { id: target.id } })) {
+ Note.update(
+ { owner: { id: owner.id }, target: { id: target.id } },
+ { owner, target, content: note }
+ );
+ }
+ else {
+ Note.insert(
+ { id: Snowflake.generate(), owner, target, content: note }
+ );
+ }
await emitEvent({
event: "USER_NOTE_UPDATE",
data: {
note: note,
- id: noteUser.id
+ id: target.id
},
- user_id: user.id,
- })
+ user_id: owner.id,
+ });
return res.status(204);
});
|
