From a4ee68336ecadcbb2cc9e1fb272b0f1d3511ddae Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 27 Apr 2021 01:28:15 +0530 Subject: [PATCH] Typing + create pin + get pin --- package-lock.json | 14 ++++----- package.json | 2 +- src/routes/channels/#channel_id/pins.ts | 38 +++++++++++++++++++++-- src/routes/channels/#channel_id/typing.ts | 33 ++++++++++++++++++-- 4 files changed, 74 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 47439e70..8509e268 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "i18next-http-middleware": "^3.1.0", "i18next-node-fs-backend": "^2.1.3", "jsonwebtoken": "^8.5.1", - "lambert-server": "^1.1.9", + "lambert-server": "^1.2.1", "missing-native-js-functions": "^1.2.6", "mongodb": "^3.6.4", "mongoose": "^5.12.3", @@ -7622,9 +7622,9 @@ } }, "node_modules/lambert-server": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/lambert-server/-/lambert-server-1.1.9.tgz", - "integrity": "sha512-LXiIB6m4nExFgn1Rsv+uuP0KoxHfStsNzxsud+8cajd2MgJlMARRxjuGdr7smhx1WftQWbU6g1jghFEYJ++9SQ==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/lambert-server/-/lambert-server-1.2.1.tgz", + "integrity": "sha512-ApyFBSOLlhCcTOePIILgtBz5m3+4AGaQEiS9T35etwKcZt9yjHQmMUOXD49ELxV9RQk620LB2APIlB9MexeprQ==", "dependencies": { "body-parser": "^1.19.0", "express": "^4.17.1", @@ -18608,9 +18608,9 @@ } }, "lambert-server": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/lambert-server/-/lambert-server-1.1.9.tgz", - "integrity": "sha512-LXiIB6m4nExFgn1Rsv+uuP0KoxHfStsNzxsud+8cajd2MgJlMARRxjuGdr7smhx1WftQWbU6g1jghFEYJ++9SQ==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/lambert-server/-/lambert-server-1.2.1.tgz", + "integrity": "sha512-ApyFBSOLlhCcTOePIILgtBz5m3+4AGaQEiS9T35etwKcZt9yjHQmMUOXD49ELxV9RQk620LB2APIlB9MexeprQ==", "requires": { "body-parser": "^1.19.0", "express": "^4.17.1", diff --git a/package.json b/package.json index 36017e31..d10adc8c 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "i18next-http-middleware": "^3.1.0", "i18next-node-fs-backend": "^2.1.3", "jsonwebtoken": "^8.5.1", - "lambert-server": "^1.1.9", + "lambert-server": "^1.2.1", "missing-native-js-functions": "^1.2.6", "mongodb": "^3.6.4", "mongoose": "^5.12.3", diff --git a/src/routes/channels/#channel_id/pins.ts b/src/routes/channels/#channel_id/pins.ts index 93c33ea5..fc7dfb09 100644 --- a/src/routes/channels/#channel_id/pins.ts +++ b/src/routes/channels/#channel_id/pins.ts @@ -1,5 +1,37 @@ -import { Router } from "express"; -const router: Router = Router(); -// TODO: +import { ChannelModel, getPermission, MessageModel, toObject } from "@fosscord/server-util"; +import { Router, Request, Response } from "express"; +import Config from "../../../util/Config" +import { HTTPError } from "lambert-server"; +const router: Router = Router(); + +router.put("/:message_id", async (req: Request, res: Response) => { + const { channel_id, message_id } = req.params; + const channel = await ChannelModel.findOne({ id: channel_id }).exec() + if (!channel) throw new HTTPError("Channel not found", 404) + const permission = await getPermission(req.user_id, channel.guild_id, channel_id) + permission.hasThrow("VIEW_CHANNEL") + permission.hasThrow("MANAGE_MESSAGES") + + const pinned_count = await MessageModel.count({ channel_id, pinned: true }).exec() + const { maxPins } = Config.get().limits.channel + if (pinned_count >= maxPins) throw new HTTPError("Max pin count reached: " + maxPins) + + await MessageModel.updateOne({ id: message_id }, { pinned: true }).exec() + + res.sendStatus(204) +}); + +router.get("/", async (req: Request, res: Response) => { + const { channel_id } = req.params; + + const channel = await ChannelModel.findOne({ id: channel_id }).exec() + if (!channel) throw new HTTPError("Channel not found", 404) + const permission = await getPermission(req.user_id, channel.guild_id, channel_id) + permission.hasThrow("VIEW_CHANNEL") + + let pins = await MessageModel.find({ channel_id: channel_id, pinned: true }).exec() + + res.send(toObject(pins)) +}); export default router; diff --git a/src/routes/channels/#channel_id/typing.ts b/src/routes/channels/#channel_id/typing.ts index 93c33ea5..f0ca138c 100644 --- a/src/routes/channels/#channel_id/typing.ts +++ b/src/routes/channels/#channel_id/typing.ts @@ -1,5 +1,34 @@ -import { Router } from "express"; +import { ChannelModel, MemberModel, toObject, TypingStartEvent } from "@fosscord/server-util"; +import { Router, Request, Response } from "express"; + +import { HTTPError } from "lambert-server"; +import { emitEvent } from "../../../util/Event"; + const router: Router = Router(); -// TODO: + +router.post("/", async (req: Request, res: Response) => { + const { channel_id } = req.params; + const user_id = req.user_id; + const timestamp = Date.now() + const channel = await ChannelModel.findOne({ id: channel_id }); + if (!channel) throw new HTTPError("Channel not found", 404) + const member = await MemberModel.findOne({ id: user_id }).exec() + if (!member) throw new HTTPError("Member not found", 404) + + + await emitEvent({ + event: "TYPING_START", + channel_id: channel_id, + guild_id: channel.guild_id, + data: { // this is the paylod + member: toObject(member), + channel_id, + timestamp, + user_id, + guild_id: channel.guild_id + } + } as TypingStartEvent) + res.sendStatus(204) +}); export default router;