From 72204ed419e0160283f9eefdd50b9702f6ac75ef Mon Sep 17 00:00:00 2001 From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> Date: Tue, 23 Feb 2021 22:10:01 +0100 Subject: [PATCH 1/2] :pencil: typo --- .vscode/launch.json | 1 + package-lock.json | Bin 247306 -> 247306 bytes .../api/v8/channels/#CHANNELID/invites.ts | 2 +- src/test/mongo_test.ts | 33 ++++++++++++------ 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 570e485a..557fb6d7 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -19,6 +19,7 @@ "request": "launch", "skipFiles": ["/**"], "runtimeArgs": ["--nolazy", "-r", "ts-node/register/transpile-only"], + "preLaunchTask": "tsc: build - tsconfig.json", "type": "node", "resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"] } diff --git a/package-lock.json b/package-lock.json index dff1862cea7e0aae0ba57f24896c55f9c6e051e2..72f21935d4f6bb0678cb69450e819632fb2dc0bd 100644 GIT binary patch delta 112 zcmeC`;qU6<-|%p&Mp8;rilwoML262xNt$tLN{YFWg_)6wiKS&qQgUKqnt?^4k!fm* g(!_m+%~spCTWw=J`&OMuP3?M1n6~RJVZNgX0J23Up8x;= delta 112 zcmeC`;qU6<-|%p&hPh#)shNeTrJ1Fvv5{d?TB3!SQKDh8nOTaFxskc0fuTimvW1z6 g(!_m+%~spCTWw=J`&OMuP3?M1n6~RJVZNgX0LDHdmjD0& diff --git a/src/routes/api/v8/channels/#CHANNELID/invites.ts b/src/routes/api/v8/channels/#CHANNELID/invites.ts index ee71d1ee..9d03d9f0 100644 --- a/src/routes/api/v8/channels/#CHANNELID/invites.ts +++ b/src/routes/api/v8/channels/#CHANNELID/invites.ts @@ -39,7 +39,7 @@ router.post("/", check(InviteCreateSchema), async (req: Request, res: Response) inviter_id: usID, }; - await new InviteModel(invite).save(); // ! samuel ist ein hurensohn + await new InviteModel(invite).save(); await emitEvent({ event: "INVITE_CREATE", data: invite } as InviteCreateEvent); res.status(201).send(invite); diff --git a/src/test/mongo_test.ts b/src/test/mongo_test.ts index 5c973429..f1a7f3f6 100644 --- a/src/test/mongo_test.ts +++ b/src/test/mongo_test.ts @@ -2,13 +2,26 @@ import mongoose, { Schema, Types } from "mongoose"; import { Long as MongoTypeLong } from "mongodb"; require("mongoose-long")(mongoose); -const partSchema = new Schema({ - long: { - type: mongoose.Types.Long, - }, +const userSchema = new Schema({ + id: MongoTypeLong, }); -const Part = mongoose.model("Part", partSchema, "test"); +const messageSchema = new Schema({ + id: MongoTypeLong, + content: String, +}); +const message = mongoose.model("message", messageSchema, "messages"); +const user = mongoose.model("user", userSchema, "users"); + +messageSchema.virtual("u", { + ref: user, + localField: "id", + foreignField: "id", + justOne: true, +}); + +messageSchema.set("toObject", { virtuals: true }); +messageSchema.set("toJSON", { virtuals: true }); async function main() { const conn = await mongoose.connect("mongodb://localhost:27017/lambert?readPreference=secondaryPreferred", { @@ -17,12 +30,12 @@ async function main() { }); console.log("connected"); - const part = new Part({ long: 390810485244821505n }); + // const u = await new user({ name: "test" }).save(); + // await new message({ user: u._id, content: "test" }).save(); - // await part.save(); - console.log("saved"); - const test = await Part.find({}); - console.log(test); + const test = await message.findOne({}).populate("u").exec(); + // @ts-ignore + console.log(test?.toJSON()); } main(); From 47ad1c2713437d8106a6dbedb12ac3574794df9d Mon Sep 17 00:00:00 2001 From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> Date: Tue, 23 Feb 2021 22:44:12 +0100 Subject: [PATCH 2/2] get specific ban --- src/routes/api/v8/guilds/#id/bans.ts | 9 +++++++++ src/routes/api/v8/guilds/#id/members/index.ts | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/src/routes/api/v8/guilds/#id/bans.ts b/src/routes/api/v8/guilds/#id/bans.ts index e18a1137..8e6e35de 100644 --- a/src/routes/api/v8/guilds/#id/bans.ts +++ b/src/routes/api/v8/guilds/#id/bans.ts @@ -20,6 +20,15 @@ router.get("/", async (req: Request, res: Response) => { return res.json(bans); }); +router.get("/:user", async (req: Request, res: Response) => { + const guild_id = BigInt(req.params.id); + const user_id = BigInt(req.params.ban); + + var ban = await BanModel.findOne({ guild_id: guild_id, user_id: user_id }).exec(); + if (!ban) throw new HTTPError("Ban not found", 404); + return res.json(ban); +}); + router.post("/:userid", check(BanCreateSchema), async (req: Request, res: Response) => { const guild_id = BigInt(req.params.id); const banned_user_id = BigInt(req.params.userid); diff --git a/src/routes/api/v8/guilds/#id/members/index.ts b/src/routes/api/v8/guilds/#id/members/index.ts index 9446e2da..3b422dd0 100644 --- a/src/routes/api/v8/guilds/#id/members/index.ts +++ b/src/routes/api/v8/guilds/#id/members/index.ts @@ -49,4 +49,8 @@ router.get("/:member", async (req: Request, res: Response) => { return res.json(member); }); +router.put("/:member", async (req: Request, res: Response) => { + // https://discord.com/developers/docs/resources/guild#add-guild-member +}); + export default router;