From 02ee8aefc86b3a9902827874260d59115e73af13 Mon Sep 17 00:00:00 2001 From: Federico Rapetti Date: Sat, 4 Mar 2023 22:39:33 +0100 Subject: Create guild settings if not found (#911) Co-authored-by: Max Isom --- src/services/add-query-to-queue.ts | 8 ++------ src/services/player.ts | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) (limited to 'src/services') diff --git a/src/services/add-query-to-queue.ts b/src/services/add-query-to-queue.ts index 15192b4..dc972cd 100644 --- a/src/services/add-query-to-queue.ts +++ b/src/services/add-query-to-queue.ts @@ -6,9 +6,9 @@ import {TYPES} from '../types.js'; import GetSongs from '../services/get-songs.js'; import {SongMetadata, STATUS} from './player.js'; import PlayerManager from '../managers/player.js'; -import {prisma} from '../utils/db.js'; import {buildPlayingMessageEmbed} from '../utils/build-embed.js'; import {getMemberVoiceChannel, getMostPopularVoiceChannel} from '../utils/channels.js'; +import {getGuildSettings} from '../utils/get-guild-settings'; @injectable() export default class AddQueryToQueue { @@ -34,11 +34,7 @@ export default class AddQueryToQueue { const [targetVoiceChannel] = getMemberVoiceChannel(interaction.member as GuildMember) ?? getMostPopularVoiceChannel(interaction.guild!); - const settings = await prisma.setting.findUnique({where: {guildId}}); - - if (!settings) { - throw new Error('Could not find settings for guild'); - } + const settings = await getGuildSettings(guildId); const {playlistLimit} = settings; diff --git a/src/services/player.ts b/src/services/player.ts index 0b57ad7..9c1a122 100644 --- a/src/services/player.ts +++ b/src/services/player.ts @@ -18,7 +18,7 @@ import { } from '@discordjs/voice'; import FileCacheProvider from './file-cache.js'; import debug from '../utils/debug.js'; -import {prisma} from '../utils/db.js'; +import {getGuildSettings} from '../utils/get-guild-settings'; export enum MediaSource { Youtube, @@ -272,11 +272,7 @@ export default class { this.audioPlayer?.stop(); this.status = STATUS.IDLE; - const settings = await prisma.setting.findUnique({where: {guildId: this.guildId}}); - - if (!settings) { - throw new Error('Could not find settings for guild'); - } + const settings = await getGuildSettings(this.guildId); const {secondsToWaitAfterQueueEmpties} = settings; if (secondsToWaitAfterQueueEmpties !== 0) { -- cgit v1.2.3