diff --git a/api/assets/schemas.json b/api/assets/schemas.json index eac24ad..ae2426d 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", @@ -10512,8 +10509,7 @@ "additionalProperties": false, "required": [ "channel_id", - "description", - "emoji_name" + "description" ] } }, diff --git a/api/client_test/index.html b/api/client_test/index.html index b438b49..7a3e469 100644 --- a/api/client_test/index.html +++ b/api/client_test/index.html @@ -71,10 +71,10 @@ } - - - - + + + + diff --git "a/api/src/routes/guilds/\043guild_id/index.ts" "b/api/src/routes/guilds/\043guild_id/index.ts" index 4ec3df7..45e30a7 100644 --- "a/api/src/routes/guilds/\043guild_id/index.ts" +++ "b/api/src/routes/guilds/\043guild_id/index.ts" @@ -20,6 +20,7 @@ afk_timeout?: number; afk_channel_id?: string; preferred_locale?: string; + premium_progress_bar_enabled?: boolean; } router.get("/", route({}), async (req: Request, res: Response) => { diff --git "a/api/src/routes/guilds/\043guild_id/member-verification.ts" "b/api/src/routes/guilds/\043guild_id/member-verification.ts" new file mode 100644 index 0000000..265a1b3 --- /dev/null +++ "b/api/src/routes/guilds/\043guild_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; diff --git "a/api/src/routes/guilds/\043guild_id/welcome-screen.ts" "b/api/src/routes/guilds/\043guild_id/welcome-screen.ts" new file mode 100644 index 0000000..5c7a9da --- /dev/null +++ "b/api/src/routes/guilds/\043guild_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/\043guild_id/welcome_screen.ts" "b/api/src/routes/guilds/\043guild_id/welcome_screen.ts" deleted file mode 100644 index 7141f17..0000000 --- "a/api/src/routes/guilds/\043guild_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; diff --git a/api/src/routes/guilds/index.ts b/api/src/routes/guilds/index.ts index 1072141..489dea4 100644 --- a/api/src/routes/guilds/index.ts +++ b/api/src/routes/guilds/index.ts @@ -9,7 +9,7 @@ /** * @maxLength 100 */ - name: string; + name?: string; region?: string; icon?: string | null; channels?: ChannelModifySchema[]; diff --git "a/api/src/routes/store/published-listings/skus/\043sku_id/subscription-plans.ts" "b/api/src/routes/store/published-listings/skus/\043sku_id/subscription-plans.ts" index 723a516..03162ec 100644 --- "a/api/src/routes/store/published-listings/skus/\043sku_id/subscription-plans.ts" +++ "b/api/src/routes/store/published-listings/skus/\043sku_id/subscription-plans.ts" @@ -5,6 +5,22 @@ 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", [ {