From fef27927fe9e877f29398001706d27b8bb795e3a Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Sun, 3 Jul 2022 20:56:25 +1000 Subject: [PATCH 1/6] Bump client version --- api/client_test/index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/client_test/index.html b/api/client_test/index.html index b438b492..7a3e4695 100644 --- a/api/client_test/index.html +++ b/api/client_test/index.html @@ -71,10 +71,10 @@ } - - - - + + + + From aa80bad1277fe0153c52ff5e087da6a0c401aa01 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: [PATCH 2/6] Add Nitro Lite Monthly SKU --- .../skus/#sku_id/subscription-plans.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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", [ From edcc5948ffc76b9416e6e31da0cafc3469d11379 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: [PATCH 3/6] Add premium_progress_bar_enabled to GuildUpdateSchema --- api/src/routes/guilds/#guild_id/index.ts | 1 + 1 file changed, 1 insertion(+) 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) => { From 7111e8b1a5d4b4fae6a95ef79979c00cfbcdf439 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: [PATCH 4/6] 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(-) 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[]; From a97bc5182dd95077f323d4567f0bcb0781905762 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: [PATCH 5/6] Placeholder member verification endpoint --- .../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 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; From 316efa02e876d3caf8013e0dc93e7ce0c68daddc 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: [PATCH 6/6] Welcome screen --- api/assets/schemas.json | 3 +-- .../guilds/#guild_id/{welcome_screen.ts => welcome-screen.ts} | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) rename api/src/routes/guilds/#guild_id/{welcome_screen.ts => welcome-screen.ts} (96%) 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 similarity index 96% rename from api/src/routes/guilds/#guild_id/welcome_screen.ts rename to api/src/routes/guilds/#guild_id/welcome-screen.ts index 7141f17e..5c7a9daa 100644 --- a/api/src/routes/guilds/#guild_id/welcome_screen.ts +++ b/api/src/routes/guilds/#guild_id/welcome-screen.ts @@ -10,7 +10,7 @@ export interface GuildUpdateWelcomeScreenSchema { channel_id: string; description: string; emoji_id?: string; - emoji_name: string; + emoji_name?: string; }[]; enabled?: boolean; description?: string; @@ -36,6 +36,8 @@ router.patch("/", route({ body: "GuildUpdateWelcomeScreenSchema", permission: "M 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); });