Merge branch 'master' of https://github.com/discord-open-source/discord-api

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;

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, removeMember } from "../../../util/Member";
+import { emitEvent } from "../../../util/Event";
+import { getPublicUser } from "../../../util/User";
 
 const router = Router();
 
@@ -47,7 +48,35 @@ 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
 });
 
+
+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;

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;

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;
+}