Merge pull request #57 from net-tech/revert/use-include

net-tech · Nov 21, 2023 · 8ce8225 · 8ce8225
2 parents 5efb4f5 + 15ba4e7
commit 8ce8225
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/src/commands/settings.ts b/src/commands/settings.ts
@@ -169,7 +169,7 @@ export default {
 			return
 		})
 
-		const guildData = await getGuildData(interaction.guild.id, true)
+		const guildData = await getGuildData(interaction.guild.id)
 
 		const settingsEmbed = new EmbedBuilder()
 			.setTitle("Server Settings")

diff --git a/src/util/database.ts b/src/util/database.ts
@@ -10,10 +10,7 @@ export const prisma = new PrismaClient({
  * @param select - The fields to select from the database. If true, all fields will be selected, including the `roles` field. If false, roles will still be selected.
  * @returns The data for the guild
  */
-export const getGuildData = async (
-	guildId: string,
-	select: Prisma.GuildSelect | true
-) => {
+export const getGuildData = async (guildId: string) => {
 	const guildData = await prisma.guild.upsert({
 		where: {
 			id: guildId
@@ -22,14 +19,9 @@ export const getGuildData = async (
 		create: {
 			id: guildId
 		},
-		select: select
-			? {
-					roles: true
-			  }
-			: {
-					roles: true,
-					...(select as Prisma.GuildSelect)
-			  }
+		include: {
+			roles: true
+		}
 	})
 	return guildData
 }