From cab822b06d0dbf75f8d431e29f5dfeda1893683f Mon Sep 17 00:00:00 2001 From: Lemon4ksan Date: Thu, 13 Feb 2025 17:58:01 +0300 Subject: [PATCH] fix: Missed checks. --- MusicBot/cogs/general.py | 5 +++++ MusicBot/cogs/voice.py | 5 ++++- MusicBot/database/base.py | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/MusicBot/cogs/general.py b/MusicBot/cogs/general.py index 75cce78..f5d5673 100644 --- a/MusicBot/cogs/general.py +++ b/MusicBot/cogs/general.py @@ -207,6 +207,11 @@ class General(Cog): @account.command(description="Удалить токен из базы данных бота.") async def remove(self, ctx: discord.ApplicationContext) -> None: logging.info(f"[GENERAL] Remove command invoked by user {ctx.author.id} in guild {ctx.guild.id}") + if not await self.users_db.get_ym_token(ctx.user.id): + logging.info(f"[GENERAL] No token found for user {ctx.author.id}") + await ctx.respond('❌ Токен не указан.', delete_after=15, ephemeral=True) + return + await self.users_db.update(ctx.user.id, {'ym_token': None}) await ctx.respond(f'Токен был удалён.', delete_after=15, ephemeral=True) diff --git a/MusicBot/cogs/voice.py b/MusicBot/cogs/voice.py index 01df414..d164de5 100644 --- a/MusicBot/cogs/voice.py +++ b/MusicBot/cogs/voice.py @@ -282,14 +282,17 @@ class Voice(Cog, VoiceExtension): await ctx.respond("❌ У вас нет прав для выполнения этой команды.", delete_after=15, ephemeral=True) return - if (vc := await self.get_voice_client(ctx)) and await self.voice_check(ctx): + if (vc := await self.get_voice_client(ctx)) and await self.voice_check(ctx) and vc.is_connected: res = await self.stop_playing(ctx, full=True) if res: await vc.disconnect(force=True) await ctx.respond("Отключение успешно!", delete_after=15, ephemeral=True) logging.info(f"[VOICE] Successfully disconnected from voice channel in guild {ctx.guild.id}") + return else: await ctx.respond("❌ Не удалось отключиться.", delete_after=15, ephemeral=True) + else: + await ctx.respond("❌ Бот не подключен к голосовому каналу.", delete_after=15, ephemeral=True) @queue.command(description="Очистить очередь треков и историю прослушивания.") async def clear(self, ctx: discord.ApplicationContext) -> None: diff --git a/MusicBot/database/base.py b/MusicBot/database/base.py index 928ccda..55a9a79 100644 --- a/MusicBot/database/base.py +++ b/MusicBot/database/base.py @@ -81,7 +81,7 @@ class BaseGuildsDatabase: is_stopped=True, allow_explicit=True, always_allow_menu=False, - allow_connect=False, + allow_connect=True, vote_next_track=True, vote_add_track=True, vote_add_album=True,