diff --git a/package-lock.json b/package-lock.json index 95af52cfe..dbf98809f 100644 Binary files a/package-lock.json and b/package-lock.json differ diff --git a/package.json b/package.json index a732991be..354ad460f 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ }, "homepage": "https://github.com/fosscord/fosscord-api#readme", "dependencies": { - "@fosscord/server-util": "^1.3.32", + "@fosscord/server-util": "^1.3.35", "@types/jest": "^26.0.22", "@types/json-schema": "^7.0.7", "ajv": "^8.4.0", diff --git a/src/routes/channels/#channel_id/messages/#message_id/ack.ts b/src/routes/channels/#channel_id/messages/#message_id/ack.ts index 9782365f9..f4d9e6967 100644 --- a/src/routes/channels/#channel_id/messages/#message_id/ack.ts +++ b/src/routes/channels/#channel_id/messages/#message_id/ack.ts @@ -1,29 +1,35 @@ -import { getPermission } from "@fosscord/server-util"; -import { MessageModel } from "@fosscord/server-util"; -import { Event } from "@fosscord/server-util"; -import { ChannelModel } from "@fosscord/server-util"; +import { getPermission, MessageAckEvent, ReadStateModel } from "@fosscord/server-util"; import { Request, Response, Router } from "express"; -import { HTTPError } from "lambert-server"; import { emitEvent } from "../../../../../util/Event"; +import { check } from "../../../../../util/instanceOf"; const router = Router(); -// router.pot("/", async (req: Request, res: Response) => { -// const { channel_id, message_id } = req.params; +// TODO: check if message exists +// TODO: send read state event to all channel members -// const permission = await getPermission(req.user_id, channel?.guild_id, channel_id, { channel }); -// permission.hasThrow("MANAGE_MESSAGES"); +router.post("/", check({ $manual: Boolean, $mention_count: Number }), async (req: Request, res: Response) => { + const { channel_id, message_id } = req.params; -// await emitEvent({ -// event: "MESSAGE_ACK", -// channel_id, -// data: { -// channel_id, -// message_id -// } -// } as MessageAckEvent); + const permission = await getPermission(req.user_id, undefined, channel_id); + permission.hasThrow("VIEW_CHANNEL"); -// res.sendStatus(204); -// }); + await ReadStateModel.updateOne( + { user_id: req.user_id, channel_id, message_id }, + { user_id: req.user_id, channel_id, message_id } + ).exec(); + + await emitEvent({ + event: "MESSAGE_ACK", + user_id: req.user_id, + data: { + channel_id, + message_id, + version: 496 + } + } as MessageAckEvent); + + res.sendStatus(204); +}); export default router; diff --git a/src/util/Message.ts b/src/util/Message.ts index 42cdbb902..3e1775174 100644 --- a/src/util/Message.ts +++ b/src/util/Message.ts @@ -124,7 +124,7 @@ export async function sendMessage(opts: Partial) { await emitEvent({ event: "MESSAGE_CREATE", channel_id: opts.channel_id, data, guild_id: message.guild_id } as MessageCreateEvent); - postHandleMessage(data); // no await as it shouldnt block the message send function + postHandleMessage(data).catch((e) => {}); // no await as it shouldnt block the message send function and silently catch error return data; }