From b8ca880247d85a31143b039c6551b118ea957146 Mon Sep 17 00:00:00 2001 From: Intevel ツ <59223342+Intevel@users.noreply.github.com> Date: Tue, 4 May 2021 11:37:00 +0200 Subject: [Route] PUT /guilds/:id/members Not tested --- src/routes/guilds/#guild_id/members.ts | 18 +++++++++++++++--- src/schema/Member.ts | 13 +++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 src/schema/Member.ts (limited to 'src') diff --git a/src/routes/guilds/#guild_id/members.ts b/src/routes/guilds/#guild_id/members.ts index 61493485..faba269c 100644 --- a/src/routes/guilds/#guild_id/members.ts +++ b/src/routes/guilds/#guild_id/members.ts @@ -1,9 +1,10 @@ import { Request, Response, Router } from "express"; -import { GuildModel, MemberModel, toObject } from "@fosscord/server-util"; +import { GuildModel, MemberModel, UserModel, toObject, GuildMemberAddEvent } from "@fosscord/server-util"; import { HTTPError } from "lambert-server"; import { instanceOf, Length } from "../../../util/instanceOf"; -import { PublicMemberProjection } from "../../../util/Member"; -import { PublicUserProjection } from "../../../util/User"; +import { PublicMemberProjection, addMember } from "../../../util/Member"; +import { emitEvent } from "../../../util/Event"; +import { getPublicUser } from "../../../util/User"; const router = Router(); @@ -47,6 +48,17 @@ router.get("/:member", async (req: Request, res: Response) => { }); router.put("/:member", async (req: Request, res: Response) => { + const { guild_id } = req.params; + const guild = await GuildModel.findOne({ id: guild_id }).exec(); + if (!guild) throw new HTTPError("Guild not found", 404); + + const user_id = req.params.member; + + const user = await UserModel.findOne({ id: user_id }).exec(); + if (!user) throw new HTTPError("User not found", 404); + + await addMember(user_id, guild_id); + // https://discord.com/developers/docs/resources/guild#add-guild-member }); diff --git a/src/schema/Member.ts b/src/schema/Member.ts new file mode 100644 index 00000000..037e24f4 --- /dev/null +++ b/src/schema/Member.ts @@ -0,0 +1,13 @@ +export const MemberCreateSchema = { + id: String, + nick: String, + guild_id: String, + joined_at: Date, +}; + +export interface MemberCreateSchema { + id: string; + nick: string; + guild_id: string; + joined_at: Date; +} -- cgit 1.5.1 From 4a61f250c9c0651256a66b54d2dcd55ff371d19a Mon Sep 17 00:00:00 2001 From: Intevel ツ <59223342+Intevel@users.noreply.github.com> Date: Tue, 4 May 2021 11:39:44 +0200 Subject: [ROUTE] DELETE /guilds/:id/members Not tested --- src/routes/guilds/#guild_id/members.ts | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/routes/guilds/#guild_id/members.ts b/src/routes/guilds/#guild_id/members.ts index faba269c..5567912c 100644 --- a/src/routes/guilds/#guild_id/members.ts +++ b/src/routes/guilds/#guild_id/members.ts @@ -2,7 +2,7 @@ import { Request, Response, Router } from "express"; import { GuildModel, MemberModel, UserModel, toObject, GuildMemberAddEvent } from "@fosscord/server-util"; import { HTTPError } from "lambert-server"; import { instanceOf, Length } from "../../../util/instanceOf"; -import { PublicMemberProjection, addMember } from "../../../util/Member"; +import { PublicMemberProjection, addMember, removeMember } from "../../../util/Member"; import { emitEvent } from "../../../util/Event"; import { getPublicUser } from "../../../util/User"; @@ -62,4 +62,20 @@ router.put("/:member", async (req: Request, res: Response) => { // https://discord.com/developers/docs/resources/guild#add-guild-member }); + +router.delete("/:member", async (req: Request, res: Response) => { + const { guild_id } = req.params; + const guild = await GuildModel.findOne({ id: guild_id }).exec(); + if (!guild) throw new HTTPError("Guild not found", 404); + + const user_id = req.params.member; + + const member = await MemberModel.findOne({ id: user_id, guild_id }).exec(); + if (!member) throw new HTTPError("Member not found", 404); + + await removeMember(user_id, guild_id); + + // https://discord.com/developers/docs/resources/guild#remove-guild-member +}); + export default router; -- cgit 1.5.1 From d8beabe53afd988430a695dd4b43ef0f8c1a004c Mon Sep 17 00:00:00 2001 From: Intevel ツ <59223342+Intevel@users.noreply.github.com> Date: Tue, 4 May 2021 11:42:19 +0200 Subject: Update members.ts --- src/routes/guilds/#guild_id/members.ts | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/routes/guilds/#guild_id/members.ts b/src/routes/guilds/#guild_id/members.ts index 5567912c..82c94aa1 100644 --- a/src/routes/guilds/#guild_id/members.ts +++ b/src/routes/guilds/#guild_id/members.ts @@ -78,4 +78,5 @@ router.delete("/:member", async (req: Request, res: Response) => { // https://discord.com/developers/docs/resources/guild#remove-guild-member }); + export default router; -- cgit 1.5.1 From ab6c35f128b57c69c695370dd142a3192207fa8b Mon Sep 17 00:00:00 2001 From: Intevel ツ <59223342+Intevel@users.noreply.github.com> Date: Tue, 4 May 2021 11:45:12 +0200 Subject: [Route] GET /users/:id get current user --- src/routes/users/@me/index.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/routes/users/@me/index.ts b/src/routes/users/@me/index.ts index 22d4cf3b..e4d9588f 100644 --- a/src/routes/users/@me/index.ts +++ b/src/routes/users/@me/index.ts @@ -1,6 +1,7 @@ import { Router, Request, Response } from "express"; import { UserModel } from "@fosscord/server-util"; import { HTTPError } from "lambert-server"; +import { getPublicUser } from "../../../util/User"; const router: Router = Router(); @@ -9,7 +10,9 @@ router.get("/", async (req: Request, res: Response) => { const user = await UserModel.findOne({ id: req.user_id }).exec(); if (!user) throw new HTTPError("User not found", 404); - res.json(user); + var publicUser = await getPublicUser(user.id); + + res.json(publicUser); }); export default router; -- cgit 1.5.1 From c800c6f43989dcfa8ffde7c6a675d807d7e517c9 Mon Sep 17 00:00:00 2001 From: Intevel ツ <59223342+Intevel@users.noreply.github.com> Date: Tue, 4 May 2021 11:52:21 +0200 Subject: [Route] PATCH /guilds/:id/channels modify --- src/routes/guilds/#guild_id/channels.ts | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/routes/guilds/#guild_id/channels.ts b/src/routes/guilds/#guild_id/channels.ts index 19d466f3..73982ed5 100644 --- a/src/routes/guilds/#guild_id/channels.ts +++ b/src/routes/guilds/#guild_id/channels.ts @@ -1,5 +1,5 @@ import { Router } from "express"; -import { ChannelCreateEvent, ChannelModel, ChannelType, GuildModel, Snowflake, toObject } from "@fosscord/server-util"; +import { ChannelCreateEvent, ChannelModel, ChannelType, GuildModel, Snowflake, toObject, ChannelUpdateEvent } from "@fosscord/server-util"; import { HTTPError } from "lambert-server"; import { ChannelModifySchema } from "../../../schema/Channel"; import { emitEvent } from "../../../util/Event"; @@ -37,7 +37,7 @@ router.post("/", check(ChannelModifySchema), async (req, res) => { } const guild = await GuildModel.findOne({ id: guild_id }, { id: true }).exec(); - if (!guild) throw new HTTPError("Guild not found", 4040); + if (!guild) throw new HTTPError("Guild not found", 404); const channel = { ...body, @@ -52,4 +52,24 @@ router.post("/", check(ChannelModifySchema), async (req, res) => { res.json(channel); }); +router.patch("/", check(ChannelModifySchema), async (req, res) => { + const { guild_id } = req.params; + const body = req.body as ChannelModifySchema; + + const guild = await GuildModel.findOne({ id: guild_id }, { id: true }).exec(); + if (!guild) throw new HTTPError("Guild not found", 404); + + const channel = { + ...body + }; + const channelm = await ChannelModel.find({ guild_id }).exec(); + if(!channelm) throw new HTTPError("Channel not found", 404); + + await new ChannelModel(channel).save(); + + await emitEvent({ event: "CHANNEL_UPDATE", data: channel } as ChannelUpdateEvent); + + res.json(channel); +}); + export default router; -- cgit 1.5.1