From f75ebe81744d7945a9a303afef89ca5740873351 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Sun, 3 Jul 2022 20:56:44 +1000 Subject: Add Nitro Lite Monthly SKU --- .../skus/#sku_id/subscription-plans.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'api/src/routes') diff --git a/api/src/routes/store/published-listings/skus/#sku_id/subscription-plans.ts b/api/src/routes/store/published-listings/skus/#sku_id/subscription-plans.ts index 723a5160..03162ec8 100644 --- a/api/src/routes/store/published-listings/skus/#sku_id/subscription-plans.ts +++ b/api/src/routes/store/published-listings/skus/#sku_id/subscription-plans.ts @@ -4,6 +4,22 @@ import { route } from "@fosscord/api"; const router: Router = Router(); const skus = new Map([ + [ + "978380684370378762", + [ + { + id: "978380692553465866", + name: "Nitro Lite Monthly", + interval: 1, + interval_count: 1, + tag_inclusive: true, + sku_id: "978380684370378762", + currency: "usd", + price: 0, + price_tier: null, + } + ] + ], [ "521842865731534868", [ -- cgit 1.5.1 From b87d1e3496d34987aa6eff78511b04a889da75be Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Sun, 3 Jul 2022 20:56:57 +1000 Subject: Add premium_progress_bar_enabled to GuildUpdateSchema --- api/src/routes/guilds/#guild_id/index.ts | 1 + 1 file changed, 1 insertion(+) (limited to 'api/src/routes') diff --git a/api/src/routes/guilds/#guild_id/index.ts b/api/src/routes/guilds/#guild_id/index.ts index 4ec3df72..45e30a74 100644 --- a/api/src/routes/guilds/#guild_id/index.ts +++ b/api/src/routes/guilds/#guild_id/index.ts @@ -20,6 +20,7 @@ export interface GuildUpdateSchema extends Omit { afk_timeout?: number; afk_channel_id?: string; preferred_locale?: string; + premium_progress_bar_enabled?: boolean; } router.get("/", route({}), async (req: Request, res: Response) => { -- cgit 1.5.1 From f7b5ae4bbc479e43c7a078198a0dfee43b14f827 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Sun, 3 Jul 2022 20:58:44 +1000 Subject: Merge branch 'fix/channelPermissionOverwriteSchema' into feat/latestWebClient --- api/assets/schemas.json | 9 +++------ api/src/routes/guilds/index.ts | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'api/src/routes') diff --git a/api/assets/schemas.json b/api/assets/schemas.json index a930938f..4464304b 100644 --- a/api/assets/schemas.json +++ b/api/assets/schemas.json @@ -6505,9 +6505,6 @@ } }, "additionalProperties": false, - "required": [ - "name" - ], "definitions": { "Embed": { "type": "object", @@ -6867,6 +6864,9 @@ "preferred_locale": { "type": "string" }, + "premium_progress_bar_enabled": { + "type": "boolean" + }, "name": { "maxLength": 100, "type": "string" @@ -6891,9 +6891,6 @@ } }, "additionalProperties": false, - "required": [ - "name" - ], "definitions": { "Embed": { "type": "object", diff --git a/api/src/routes/guilds/index.ts b/api/src/routes/guilds/index.ts index 10721413..489dea49 100644 --- a/api/src/routes/guilds/index.ts +++ b/api/src/routes/guilds/index.ts @@ -9,7 +9,7 @@ export interface GuildCreateSchema { /** * @maxLength 100 */ - name: string; + name?: string; region?: string; icon?: string | null; channels?: ChannelModifySchema[]; -- cgit 1.5.1 From f012c33d45f9b157d4a7b62642f993f97a991fb2 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Mon, 4 Jul 2022 19:33:47 +1000 Subject: Placeholder member verification endpoint --- api/src/routes/guilds/#guild_id/member-verification.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 api/src/routes/guilds/#guild_id/member-verification.ts (limited to 'api/src/routes') diff --git a/api/src/routes/guilds/#guild_id/member-verification.ts b/api/src/routes/guilds/#guild_id/member-verification.ts new file mode 100644 index 00000000..265a1b35 --- /dev/null +++ b/api/src/routes/guilds/#guild_id/member-verification.ts @@ -0,0 +1,14 @@ +import { Router, Request, Response } from "express"; +import { route } from "@fosscord/api"; +const router = Router(); + +router.get("/",route({}), async (req: Request, res: Response) => { + // TODO: member verification + + res.status(404).json({ + message: "Unknown Guild Member Verification Form", + code: 10068 + }); +}); + +export default router; -- cgit 1.5.1 From d237be1aacbd4294b65542844ffeaf7d61f9d458 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Mon, 4 Jul 2022 19:45:28 +1000 Subject: Welcome screen --- api/assets/schemas.json | 3 +- api/src/routes/guilds/#guild_id/welcome-screen.ts | 44 +++++++++++++++++++++++ api/src/routes/guilds/#guild_id/welcome_screen.ts | 42 ---------------------- 3 files changed, 45 insertions(+), 44 deletions(-) create mode 100644 api/src/routes/guilds/#guild_id/welcome-screen.ts delete mode 100644 api/src/routes/guilds/#guild_id/welcome_screen.ts (limited to 'api/src/routes') diff --git a/api/assets/schemas.json b/api/assets/schemas.json index 4464304b..f066f71e 100644 --- a/api/assets/schemas.json +++ b/api/assets/schemas.json @@ -10506,8 +10506,7 @@ "additionalProperties": false, "required": [ "channel_id", - "description", - "emoji_name" + "description" ] } }, diff --git a/api/src/routes/guilds/#guild_id/welcome-screen.ts b/api/src/routes/guilds/#guild_id/welcome-screen.ts new file mode 100644 index 00000000..5c7a9daa --- /dev/null +++ b/api/src/routes/guilds/#guild_id/welcome-screen.ts @@ -0,0 +1,44 @@ +import { Request, Response, Router } from "express"; +import { Guild, getPermission, Snowflake, Member } from "@fosscord/util"; +import { HTTPError } from "lambert-server"; +import { route } from "@fosscord/api"; + +const router: Router = Router(); + +export interface GuildUpdateWelcomeScreenSchema { + welcome_channels?: { + channel_id: string; + description: string; + emoji_id?: string; + emoji_name?: string; + }[]; + enabled?: boolean; + description?: string; +} + +router.get("/", route({}), async (req: Request, res: Response) => { + const guild_id = req.params.guild_id; + + const guild = await Guild.findOneOrFail({ id: guild_id }); + await Member.IsInGuildOrFail(req.user_id, guild_id); + + res.json(guild.welcome_screen); +}); + +router.patch("/", route({ body: "GuildUpdateWelcomeScreenSchema", permission: "MANAGE_GUILD" }), async (req: Request, res: Response) => { + const guild_id = req.params.guild_id; + const body = req.body as GuildUpdateWelcomeScreenSchema; + + const guild = await Guild.findOneOrFail({ id: guild_id }); + + if (!guild.welcome_screen.enabled) throw new HTTPError("Welcome screen disabled", 400); + if (body.welcome_channels) guild.welcome_screen.welcome_channels = body.welcome_channels; // TODO: check if they exist and are valid + if (body.description) guild.welcome_screen.description = body.description; + if (body.enabled != null) guild.welcome_screen.enabled = body.enabled; + + await guild.save(); + + res.sendStatus(204); +}); + +export default router; diff --git a/api/src/routes/guilds/#guild_id/welcome_screen.ts b/api/src/routes/guilds/#guild_id/welcome_screen.ts deleted file mode 100644 index 7141f17e..00000000 --- a/api/src/routes/guilds/#guild_id/welcome_screen.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { Request, Response, Router } from "express"; -import { Guild, getPermission, Snowflake, Member } from "@fosscord/util"; -import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; - -const router: Router = Router(); - -export interface GuildUpdateWelcomeScreenSchema { - welcome_channels?: { - channel_id: string; - description: string; - emoji_id?: string; - emoji_name: string; - }[]; - enabled?: boolean; - description?: string; -} - -router.get("/", route({}), async (req: Request, res: Response) => { - const guild_id = req.params.guild_id; - - const guild = await Guild.findOneOrFail({ id: guild_id }); - await Member.IsInGuildOrFail(req.user_id, guild_id); - - res.json(guild.welcome_screen); -}); - -router.patch("/", route({ body: "GuildUpdateWelcomeScreenSchema", permission: "MANAGE_GUILD" }), async (req: Request, res: Response) => { - const guild_id = req.params.guild_id; - const body = req.body as GuildUpdateWelcomeScreenSchema; - - const guild = await Guild.findOneOrFail({ id: guild_id }); - - if (!guild.welcome_screen.enabled) throw new HTTPError("Welcome screen disabled", 400); - if (body.welcome_channels) guild.welcome_screen.welcome_channels = body.welcome_channels; // TODO: check if they exist and are valid - if (body.description) guild.welcome_screen.description = body.description; - if (body.enabled != null) guild.welcome_screen.enabled = body.enabled; - - res.sendStatus(204); -}); - -export default router; -- cgit 1.5.1