From 851897a95a996e3cbfc863d043064f90198807d5 Mon Sep 17 00:00:00 2001 From: xnacly Date: Tue, 9 Feb 2021 19:37:39 +0100 Subject: [PATCH 1/5] added guild routes --- package-lock.json | Bin 151949 -> 71132 bytes package.json | 10 +- src/routes/api/v8/guilds/index.ts | 149 +++++++++++++++++++++++++++++- 3 files changed, 153 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 366b5b8ea15df25af8f7bc19eb5e7caccf90f47c..88ea3b9e3a8b257af7100833c00b8157a9907b29 100644 GIT binary patch delta 446 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 { + const member = await db.data.guilds({ id: req.params.id }).members({ id: req.userid }).get({}); + + if (!member) { + throw new HTTPError("you arent a member of the guild you are trying to access", 401); + } + + const guild = await db.data.guilds({ id: req.params.id }).get({ + id: true, + name: true, + icon: true, + // icon_hash: true, + splash: true, + discovery_splash: true, + owner: true, + owner_id: true, + permissions: true, + region: true, + afk_channel_id: true, + afk_timeout: true, + widget_enabled: true, + widget_channel_id: true, + verification_level: true, + default_message_notifications: true, + explicit_content_filter: true, + roles: true, + emojis: true, + features: true, + mfa_level: true, + application_id: true, + system_channel_id: true, + system_channel_flags: true, + rules_channel_id: true, + joined_at: true, + // large: true, + // unavailable: true, + member_count: true, + // voice_states: true, + // members: true, + // channels: true, + // presences: true, + max_presences: true, + max_members: true, + vanity_url_code: true, + description: true, + banner: true, + premium_tier: true, + premium_subscription_count: true, + preferred_locale: true, + public_updates_channel_id: true, + max_video_channel_users: true, + approximate_member_count: true, + approximate_presence_count: true, + // welcome_screen: true, + }); + return res.json(guild); +}); + +// router.put("/:id", check(GuildSchema), async (req: Request, res: Response) => {}); // TODO: add addGuildSchema & createGuildSchema + +// TODO: finish POST route +// router.post("/", check(GuildSchema), async (req: Request, res: Response) => { +// const body = req.body as GuildSchema; +// const guildID = BigInt(); +// const guild: Guild = { +// ...body, // ! contains name & icon values +// afk_channel_id: undefined, +// afk_timeout: undefined, +// application_id: undefined, +// approximate_member_count: undefined, +// approximate_presence_count: undefined, +// banner: undefined, +// channels: [], +// default_message_notifications: undefined, +// description: undefined, +// discovery_splash: undefined, +// emojis: [], +// explicit_content_filter: undefined, +// features: [], +// // icon: undefined, +// id: guildID, +// // joined_at: undefined, +// large: undefined, +// max_members: undefined, +// max_presences: undefined, +// max_video_channel_users: undefined, +// member_count: undefined, +// members: undefined, +// mfa_level: undefined, +// // name: undefined, +// owner_id: req.userid, // ! important +// // owner: undefined, +// permissions: undefined, +// preferred_locale: undefined, +// premium_subscription_count: undefined, +// premium_tier: undefined, +// presences: [], +// public_updates_channel_id: undefined, +// region: undefined, +// roles: [], +// rules_channel_id: undefined, +// splash: undefined, +// system_channel_flags: undefined, +// system_channel_id: undefined, +// unavailable: undefined, +// vanity_url_code: undefined, +// verification_level: undefined, +// voice_states: [], +// welcome_screen: [], +// widget_channel_id: undefined, +// widget_enabled: undefined, +// }; + +// try { +// await db.data.guilds.push(guild); +// } catch (error) { +// throw new HTTPError("Couldnt create Guild", 500); +// } +// res.status(201).json({ id: guild.id }); +// }); + +router.delete("/:id", async (req: Request, res: Response) => { + const { id: guildID } = req.params; + + const guild = await db.data.guilds({ id: guildID }).get({ owner_id: true }); + + if (!guild) { + throw new HTTPError("This guild doesnt exist", 404); + } + + if (!guild.owner_id) { + throw new HTTPError("You arent the owner of this guild", 401); + } + + try { + await db.data.guilds({ id: guildID }).delete(); + } catch (error) { + throw new HTTPError(`Couldnt delete guild: ${error}`, 500); + } + + return res.status(204); +}); + export default router; From b1a20e05ae02b65c8eb5eb78fe2beb15ba82b453 Mon Sep 17 00:00:00 2001 From: xnacly Date: Tue, 9 Feb 2021 21:19:07 +0100 Subject: [PATCH 2/5] made requested changes --- src/routes/api/v8/guilds/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/api/v8/guilds/index.ts b/src/routes/api/v8/guilds/index.ts index 73fac4d2..57b0905d 100644 --- a/src/routes/api/v8/guilds/index.ts +++ b/src/routes/api/v8/guilds/index.ts @@ -6,7 +6,7 @@ import { check } from "./../../../../util/instanceOf"; const router: Router = Router(); router.get("/:id", async (req: Request, res: Response) => { - const member = await db.data.guilds({ id: req.params.id }).members({ id: req.userid }).get({}); + const member = await db.data.guilds({ id: req.params.id }).members({ id: req.userid }).get({ id: true }); if (!member) { throw new HTTPError("you arent a member of the guild you are trying to access", 401); @@ -135,7 +135,7 @@ router.delete("/:id", async (req: Request, res: Response) => { throw new HTTPError("This guild doesnt exist", 404); } - if (!guild.owner_id) { + if (guild.owner_id !== req.userid) { throw new HTTPError("You arent the owner of this guild", 401); } From c083310a93fb5c516197f556fbddccac8dbd4243 Mon Sep 17 00:00:00 2001 From: xnacly Date: Tue, 9 Feb 2021 21:28:24 +0100 Subject: [PATCH 3/5] [guild] finished POST --- src/routes/api/v8/guilds/index.ts | 123 +++++++++++++++--------------- 1 file changed, 62 insertions(+), 61 deletions(-) diff --git a/src/routes/api/v8/guilds/index.ts b/src/routes/api/v8/guilds/index.ts index 57b0905d..ca9d8824 100644 --- a/src/routes/api/v8/guilds/index.ts +++ b/src/routes/api/v8/guilds/index.ts @@ -1,5 +1,5 @@ import { Router, Request, Response } from "express"; -import { db, GuildSchema, Guild } from "fosscord-server-util"; +import { db, GuildSchema, Guild, Snowflake } from "fosscord-server-util"; import { HTTPError } from "lambert-server"; import { check } from "./../../../../util/instanceOf"; @@ -63,68 +63,69 @@ router.get("/:id", async (req: Request, res: Response) => { return res.json(guild); }); -// router.put("/:id", check(GuildSchema), async (req: Request, res: Response) => {}); // TODO: add addGuildSchema & createGuildSchema +// TODO: add addGuildSchema & createGuildSchema +// router.put("/:id", check(GuildSchema), async (req: Request, res: Response) => {}); -// TODO: finish POST route -// router.post("/", check(GuildSchema), async (req: Request, res: Response) => { -// const body = req.body as GuildSchema; -// const guildID = BigInt(); -// const guild: Guild = { -// ...body, // ! contains name & icon values -// afk_channel_id: undefined, -// afk_timeout: undefined, -// application_id: undefined, -// approximate_member_count: undefined, -// approximate_presence_count: undefined, -// banner: undefined, -// channels: [], -// default_message_notifications: undefined, -// description: undefined, -// discovery_splash: undefined, -// emojis: [], -// explicit_content_filter: undefined, -// features: [], -// // icon: undefined, -// id: guildID, -// // joined_at: undefined, -// large: undefined, -// max_members: undefined, -// max_presences: undefined, -// max_video_channel_users: undefined, -// member_count: undefined, -// members: undefined, -// mfa_level: undefined, -// // name: undefined, -// owner_id: req.userid, // ! important -// // owner: undefined, -// permissions: undefined, -// preferred_locale: undefined, -// premium_subscription_count: undefined, -// premium_tier: undefined, -// presences: [], -// public_updates_channel_id: undefined, -// region: undefined, -// roles: [], -// rules_channel_id: undefined, -// splash: undefined, -// system_channel_flags: undefined, -// system_channel_id: undefined, -// unavailable: undefined, -// vanity_url_code: undefined, -// verification_level: undefined, -// voice_states: [], -// welcome_screen: [], -// widget_channel_id: undefined, -// widget_enabled: undefined, -// }; +// // TODO: finish POST route +router.post("/", check(GuildSchema), async (req: Request, res: Response) => { + const body = req.body as GuildSchema; + const guildID = Snowflake.generate(); + const guild: Guild = { + ...body, // ! contains name & icon values + afk_channel_id: undefined, + afk_timeout: undefined, + application_id: undefined, + approximate_member_count: undefined, + approximate_presence_count: undefined, + banner: undefined, + channels: [], + default_message_notifications: undefined, + description: undefined, + discovery_splash: undefined, + emojis: [], + explicit_content_filter: undefined, + features: [], + // icon: undefined, + id: guildID, + // joined_at: undefined, + large: undefined, + max_members: undefined, + max_presences: undefined, + max_video_channel_users: undefined, + member_count: undefined, + members: undefined, + mfa_level: undefined, + // name: undefined, + owner_id: req.userid, // ! important + // owner: undefined, + permissions: undefined, + preferred_locale: undefined, + premium_subscription_count: undefined, + premium_tier: undefined, + presences: [], + public_updates_channel_id: undefined, + region: undefined, + roles: [], + rules_channel_id: undefined, + splash: undefined, + system_channel_flags: undefined, + system_channel_id: undefined, + unavailable: undefined, + vanity_url_code: undefined, + verification_level: undefined, + voice_states: [], + welcome_screen: [], + widget_channel_id: undefined, + widget_enabled: undefined, + }; -// try { -// await db.data.guilds.push(guild); -// } catch (error) { -// throw new HTTPError("Couldnt create Guild", 500); -// } -// res.status(201).json({ id: guild.id }); -// }); + try { + await db.data.guilds.push(guild); + } catch (error) { + throw new HTTPError("Couldnt create Guild", 500); + } + res.status(201).json({ id: guild.id }); +}); router.delete("/:id", async (req: Request, res: Response) => { const { id: guildID } = req.params; From d8a5084255a3614c67d462f3b7d4490c8c453ae9 Mon Sep 17 00:00:00 2001 From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com> Date: Tue, 9 Feb 2021 22:13:13 +0100 Subject: [PATCH 4/5] :bug: update package import to fosscord-server-util --- package-lock.json | Bin 71132 -> 152895 bytes src/routes/api/v8/auth/login.ts | 2 +- src/routes/api/v8/auth/register.ts | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 88ea3b9e3a8b257af7100833c00b8157a9907b29..12c6f21684dfb241c1e6bccfda1c96ef4b725aa4 100644 GIT binary patch delta 16202 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 delta 74 zcmV-Q0JZCb0Rt*baHiNEDDn`9u>E{KLNj7lVJfg gm#~}xIJf Date: Wed, 10 Feb 2021 14:16:30 +0100 Subject: [PATCH 5/5] update imports for fosscord-server-util --- src/Server.ts | 2 +- src/middlewares/Authentication.ts | 2 +- src/middlewares/GlobalRateLimit.ts | 2 +- src/middlewares/RateLimit.ts | 2 +- src/routes/api/v8/auth/register.ts | 1 + src/test/mongo_test.ts | 2 +- src/util/Config.ts | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Server.ts b/src/Server.ts index d427b964..b561f94e 100644 --- a/src/Server.ts +++ b/src/Server.ts @@ -3,7 +3,7 @@ import fs from "fs/promises"; import { Server, ServerOptions } from "lambert-server"; import { Authentication, GlobalRateLimit } from "./middlewares/"; import Config from "./util/Config"; -import { db } from "discord-server-util"; +import { db } from "fosscord-server-util"; import i18next from "i18next"; import i18nextMiddleware, { I18next } from "i18next-http-middleware"; import i18nextBackend from "i18next-node-fs-backend"; diff --git a/src/middlewares/Authentication.ts b/src/middlewares/Authentication.ts index 979c954a..d6eb5796 100644 --- a/src/middlewares/Authentication.ts +++ b/src/middlewares/Authentication.ts @@ -1,6 +1,6 @@ import { NextFunction, Request, Response } from "express"; import { HTTPError } from "lambert-server"; -import { checkToken } from "discord-server-util"; +import { checkToken } from "fosscord-server-util"; export const NO_AUTHORIZATION_ROUTES = ["/api/v8/auth/login", "/api/v8/auth/register"]; diff --git a/src/middlewares/GlobalRateLimit.ts b/src/middlewares/GlobalRateLimit.ts index 121616f8..3d2d9d1b 100644 --- a/src/middlewares/GlobalRateLimit.ts +++ b/src/middlewares/GlobalRateLimit.ts @@ -1,6 +1,6 @@ import { NextFunction, Request, Response } from "express"; import Config from "../util/Config"; -import { db } from "discord-server-util"; +import { db } from "fosscord-server-util"; export async function GlobalRateLimit(req: Request, res: Response, next: NextFunction) { if (!Config.get().limits.rate.ip.enabled) return next(); diff --git a/src/middlewares/RateLimit.ts b/src/middlewares/RateLimit.ts index 33ae0cd5..c42d773c 100644 --- a/src/middlewares/RateLimit.ts +++ b/src/middlewares/RateLimit.ts @@ -1,5 +1,5 @@ import { NextFunction, Request, Response } from "express"; -import { db } from "discord-server-util"; +import { db } from "fosscord-server-util"; import { getIpAdress } from "./GlobalRateLimit"; diff --git a/src/routes/api/v8/auth/register.ts b/src/routes/api/v8/auth/register.ts index 0ef55b96..1250b689 100644 --- a/src/routes/api/v8/auth/register.ts +++ b/src/routes/api/v8/auth/register.ts @@ -177,6 +177,7 @@ router.post( email: adjusted_email, flags: 0n, // TODO: generate default flags hash: adjusted_password, + guilds: [], valid_tokens_since: Date.now(), user_settings: { afk_timeout: 300, diff --git a/src/test/mongo_test.ts b/src/test/mongo_test.ts index b3fadf5a..b2cc2bce 100644 --- a/src/test/mongo_test.ts +++ b/src/test/mongo_test.ts @@ -1,6 +1,6 @@ import mongoose from "mongoose"; import { Long } from "mongodb"; -import { Snowflake } from "discord-server-util"; +import { Snowflake } from "fosscord-server-util"; async function main() { const conn = await mongoose.createConnection( diff --git a/src/util/Config.ts b/src/util/Config.ts index be0f4a3b..e2625aff 100644 --- a/src/util/Config.ts +++ b/src/util/Config.ts @@ -1,4 +1,4 @@ -import { Config } from "discord-server-util"; +import { Config } from "fosscord-server-util"; import crypto from "crypto"; import fs from "fs";