Merge pull request #1180 from DEVTomatoCake/fix/guild-create-response-schema

Trying to fix guild response schemas

src/api/routes/guilds/#guild_id/index.ts

@@ -1,17 +1,17 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -77,8 +77,8 @@ router.patch(
 		requestBody: "GuildUpdateSchema",
 		permission: "MANAGE_GUILD",
 		responses: {
-			"200": {
+			200: {
-				body: "GuildUpdateSchema",
+				body: "GuildCreateResponse",
 			},
 			401: {
 				body: "APIErrorResponse",

src/api/routes/guilds/#guild_id/widget.json.ts

@@ -52,7 +52,7 @@ router.get(
 	}),
 	async (req: Request, res: Response) => {
 		const { guild_id } = req.params;
-    
+
 		const guild = await Guild.findOneOrFail({
 			where: { id: guild_id },
 			select: {

src/util/interfaces/Event.ts

@@ -28,7 +28,6 @@ import {
 	Role,
 	Emoji,
 	PublicMember,
-	Guild,
 	Channel,
 	PublicUser,
 	User,
@@ -43,6 +42,7 @@ import {
 	ReadyUserGuildSettingsEntries,
 	ReadyPrivateChannel,
 	GuildOrUnavailable,
+	GuildCreateResponse,
 } from "@spacebar/util";
 
 export interface Event {
@@ -195,7 +195,7 @@ export interface GuildCreateEvent extends Event {
 
 export interface GuildUpdateEvent extends Event {
 	event: "GUILD_UPDATE";
-	data: Guild;
+	data: GuildCreateResponse;
 }
 
 export interface GuildDeleteEvent extends Event {

src/util/schemas/GuildCreateSchema.ts

@@ -1,17 +1,17 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -26,7 +26,6 @@ export interface GuildCreateSchema {
 	region?: string;
 	icon?: string | null;
 	channels?: ChannelModifySchema[];
-	guild_template_code?: string;
 	system_channel_id?: string;
 	rules_channel_id?: string;
 }

src/util/schemas/GuildUpdateSchema.ts

@@ -1,26 +1,24 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 import { GuildCreateSchema } from "@spacebar/util";
 
-export interface GuildUpdateSchema
+export interface GuildUpdateSchema extends Omit<GuildCreateSchema, "channels"> {
-	extends Omit<GuildCreateSchema, "channels" | "name"> {
-	name?: string;
 	banner?: string | null;
 	splash?: string | null;
 	description?: string;

src/util/schemas/responses/GuildCreateResponse.ts

@@ -1,21 +1,42 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-export interface GuildCreateResponse {
+import { GuildUpdateSchema, GuildWelcomeScreen } from "@spacebar/util";
+
+export interface GuildCreateResponse extends Omit<GuildUpdateSchema, "name"> {
 	id: string;
+	name: string;
+	primary_category_id: string | undefined;
+	large: boolean | undefined;
+	max_members: number | undefined;
+	max_presences: number | undefined;
+	max_video_channel_users: number | undefined;
+	member_count: number | undefined;
+	presence_count: number | undefined;
+	template_id: string | undefined;
+	mfa_level: number | undefined;
+	owner_id: string | undefined;
+	premium_subscription_count: number | undefined;
+	premium_tier: number | undefined;
+	welcome_screen: GuildWelcomeScreen;
+	widget_channel_id: string | undefined;
+	widget_enabled: boolean;
+	nsfw_level: number | undefined;
+	nsfw: boolean;
+	parent: string | undefined;
 }

src/util/schemas/responses/MemberJoinGuildResponse.ts

@@ -1,25 +1,26 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Emoji, Guild, Role, Sticker } from "../../entities";
+import { GuildCreateResponse } from "@spacebar/util";
+import { Emoji, Role, Sticker } from "../../entities";
 
 export interface MemberJoinGuildResponse {
-	guild: Guild;
+	guild: GuildCreateResponse;
 	emojis: Emoji[];
 	roles: Role[];
 	stickers: Sticker[];

src/util/schemas/responses/TypedResponses.ts

@@ -16,6 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { GuildCreateResponse } from "@spacebar/util";
 import { GeneralConfiguration, LimitsConfiguration } from "../../config";
 import { DmChannelDTO } from "../../dtos";
 import {
@@ -89,7 +90,7 @@ export type APIEmojiArray = Emoji[];
 export type APIMemberArray = Member[];
 export type APIPublicMember = PublicMember;
 
-export interface APIGuildWithJoinedAt extends Guild {
+export interface APIGuildWithJoinedAt extends GuildCreateResponse {
 	joined_at: string;
 }