diff options
author | Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> | 2021-09-16 20:49:17 +0200 |
---|---|---|
committer | Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> | 2021-09-16 20:49:17 +0200 |
commit | 55051d6cabac07128fb326b16d7819f9d63de2b3 (patch) | |
tree | 4af619b91757ec758e0d89269e9c8bfe75e9f598 | |
parent | Revert "fix #129" (diff) | |
download | server-55051d6cabac07128fb326b16d7819f9d63de2b3.tar.xz |
Revert "fix #128"
This reverts commit a359375b77aef4c0792680149382be18661b8bac.
-rw-r--r-- | api/src/routes/channels/#channel_id/webhooks.ts | 61 |
1 files changed, 9 insertions, 52 deletions
diff --git a/api/src/routes/channels/#channel_id/webhooks.ts b/api/src/routes/channels/#channel_id/webhooks.ts index 9c8df3fb..7b894455 100644 --- a/api/src/routes/channels/#channel_id/webhooks.ts +++ b/api/src/routes/channels/#channel_id/webhooks.ts @@ -1,21 +1,9 @@ import { Router, Response, Request } from "express"; -import { handleFile, route } from "@fosscord/api"; -import { - Channel, - Config, - emitEvent, - getPermission, - Snowflake, - trimSpecial, - User, - Webhook, - WebhooksUpdateEvent, - WebhookType -} from "@fosscord/util"; +import { route } from "@fosscord/api"; +import { Channel, Config, getPermission, trimSpecial, Webhook } from "@fosscord/util"; import { HTTPError } from "lambert-server"; import { isTextChannel } from "./messages/index"; import { DiscordApiErrors } from "@fosscord/util"; -import { generateToken } from "../../auth/login"; const router: Router = Router(); // TODO: webhooks @@ -23,26 +11,13 @@ export interface WebhookCreateSchema { /** * @maxLength 80 */ - name?: string; - avatar?: string; + name: string; + avatar: string; } -router.get("/", route({ permission: "MANAGE_WEBHOOKS" }), async (req, res) => { - const webhooks = await Webhook.find({ - where: { channel_id: req.params.channel_id }, - select: ["application", "avatar", "channel_id", "guild_id", "id", "token", "type", "user", "source_guild", "name"], - relations: ["user", "application", "source_guild"] - }); - - res.json(webhooks); -}); - // TODO: use Image Data Type for avatar instead of String router.post("/", route({ body: "WebhookCreateSchema", permission: "MANAGE_WEBHOOKS" }), async (req: Request, res: Response) => { - var { avatar, name } = req.body as WebhookCreateSchema; - name = trimSpecial(name) || "Webhook"; - if (name === "clyde") throw new HTTPError("Invalid name", 400); - const { channel_id } = req.params; + const channel_id = req.params.channel_id; const channel = await Channel.findOneOrFail({ id: channel_id }); isTextChannel(channel.type); @@ -52,29 +27,11 @@ router.post("/", route({ body: "WebhookCreateSchema", permission: "MANAGE_WEBHOO const { maxWebhooks } = Config.get().limits.channel; if (webhook_count > maxWebhooks) throw DiscordApiErrors.MAXIMUM_WEBHOOKS.withParams(maxWebhooks); - const id = Snowflake.generate(); - // TODO: save webhook in database and send response - const webhook = await new Webhook({ - id, - name, - avatar: await handleFile(`/icons/${id}`, avatar), - user: await User.getPublicUser(req.user_id), - guild_id: channel.guild_id, - channel_id, - token: await generateToken(id), - type: WebhookType.Incoming - }).save(); - - await emitEvent({ - event: "WEBHOOKS_UPDATE", - channel_id, - data: { - channel_id, - guild_id: channel.guild_id - } - } as WebhooksUpdateEvent); + var { avatar, name } = req.body as { name: string; avatar?: string }; + name = trimSpecial(name); + if (name === "clyde") throw new HTTPError("Invalid name", 400); - return res.json(webhook); + // TODO: save webhook in database and send response }); export default router; |