mirror of
https://github.com/deadcxap/YandexMusicDiscordBot.git
synced 2026-01-11 22:11:38 +03:00
feat: MyVibe settings and memory leak fix.
This commit is contained in:
Lemon4ksan
@@ -5,10 +5,7 @@ from typing import cast
|
||||
import discord
|
||||
from discord.ext.commands import Cog
|
||||
|
||||
import yandex_music.exceptions
|
||||
from yandex_music import ClientAsync
|
||||
|
||||
from MusicBot.cogs.utils import VoiceExtension
|
||||
from MusicBot.cogs.utils import VoiceExtension, menu_views
|
||||
from MusicBot.ui import QueueView, generate_queue_embed
|
||||
|
||||
def setup(bot: discord.Bot):
|
||||
@@ -22,31 +19,39 @@ class Voice(Cog, VoiceExtension):
|
||||
|
||||
def __init__(self, bot: discord.Bot):
|
||||
VoiceExtension.__init__(self, bot)
|
||||
self.typed_bot: discord.Bot = bot
|
||||
self.typed_bot: discord.Bot = bot # should be removed later
|
||||
|
||||
@Cog.listener()
|
||||
async def on_voice_state_update(self, member: discord.Member, before: discord.VoiceState, after: discord.VoiceState) -> None:
|
||||
logging.info(f"Voice state update for member {member.id} in guild {member.guild.id}")
|
||||
logging.info(f"[VOICE] Voice state update for member {member.id} in guild {member.guild.id}")
|
||||
|
||||
gid = member.guild.id
|
||||
guild = self.db.get_guild(gid)
|
||||
discord_guild = await self.typed_bot.fetch_guild(gid)
|
||||
current_menu = self.db.get_current_menu(gid)
|
||||
current_menu = guild['current_menu']
|
||||
|
||||
channel = after.channel or before.channel
|
||||
if not channel:
|
||||
logging.info(f"No channel found for member {member.id}")
|
||||
logging.info(f"[VOICE] No channel found for member {member.id}")
|
||||
return
|
||||
|
||||
vc = cast(discord.VoiceClient | None, discord.utils.get(self.typed_bot.voice_clients, guild=discord_guild))
|
||||
|
||||
if len(channel.members) == 1 and vc:
|
||||
logging.info(f"Clearing history and stopping playback for guild {gid}")
|
||||
self.db.update(gid, {'previous_tracks': [], 'next_tracks': [], 'current_track': None, 'is_stopped': True})
|
||||
logging.info(f"[VOICE] Clearing history and stopping playback for guild {gid}")
|
||||
if guild['current_menu']:
|
||||
message = self.typed_bot.get_message(guild['current_menu'])
|
||||
if message:
|
||||
await message.delete()
|
||||
if member.guild.id in menu_views:
|
||||
menu_views[member.guild.id].stop()
|
||||
del menu_views[member.guild.id]
|
||||
|
||||
self.db.update(gid, {'previous_tracks': [], 'next_tracks': [], 'vibing': False, 'current_menu': None, 'repeat': False, 'shuffle': False})
|
||||
vc.stop()
|
||||
elif len(channel.members) > 2 and not guild['always_allow_menu']:
|
||||
if current_menu:
|
||||
logging.info(f"Disabling current player for guild {gid} due to multiple members")
|
||||
logging.info(f"[VOICE] Disabling current menu for guild {gid} due to multiple members")
|
||||
|
||||
self.db.update(gid, {'current_menu': None, 'repeat': False, 'shuffle': False})
|
||||
try:
|
||||
@@ -55,10 +60,14 @@ class Voice(Cog, VoiceExtension):
|
||||
await channel.send("Меню отключено из-за большого количества участников.", delete_after=15)
|
||||
except (discord.NotFound, discord.Forbidden):
|
||||
pass
|
||||
|
||||
if member.guild.id in menu_views:
|
||||
menu_views[member.guild.id].stop()
|
||||
del menu_views[member.guild.id]
|
||||
|
||||
@Cog.listener()
|
||||
async def on_raw_reaction_add(self, payload: discord.RawReactionActionEvent) -> None:
|
||||
logging.info(f"Reaction added by user {payload.user_id} in channel {payload.channel_id}")
|
||||
logging.info(f"[VOICE] Reaction added by user {payload.user_id} in channel {payload.channel_id}")
|
||||
if not self.typed_bot.user or not payload.member:
|
||||
return
|
||||
|
||||
@@ -86,24 +95,24 @@ class Voice(Cog, VoiceExtension):
|
||||
votes = guild['votes']
|
||||
|
||||
if payload.message_id not in votes:
|
||||
logging.info(f"Message {payload.message_id} not found in votes")
|
||||
logging.info(f"[VOICE] Message {payload.message_id} not found in votes")
|
||||
return
|
||||
|
||||
vote_data = votes[str(payload.message_id)]
|
||||
if payload.emoji.name == '✅':
|
||||
logging.info(f"User {payload.user_id} voted positively for message {payload.message_id}")
|
||||
logging.info(f"[VOICE] User {payload.user_id} voted positively for message {payload.message_id}")
|
||||
vote_data['positive_votes'].append(payload.user_id)
|
||||
elif payload.emoji.name == '❌':
|
||||
logging.info(f"User {payload.user_id} voted negatively for message {payload.message_id}")
|
||||
logging.info(f"[VOICE] User {payload.user_id} voted negatively for message {payload.message_id}")
|
||||
vote_data['negative_votes'].append(payload.user_id)
|
||||
|
||||
total_members = len(channel.members)
|
||||
required_votes = 2 if total_members <= 5 else 4 if total_members <= 10 else 6 if total_members <= 15 else 9
|
||||
if len(vote_data['positive_votes']) >= required_votes:
|
||||
logging.info(f"Enough positive votes for message {payload.message_id}")
|
||||
logging.info(f"[VOICE] Enough positive votes for message {payload.message_id}")
|
||||
|
||||
if vote_data['action'] == 'next':
|
||||
logging.info(f"Skipping track for message {payload.message_id}")
|
||||
logging.info(f"[VOICE] Skipping track for message {payload.message_id}")
|
||||
|
||||
self.db.update(guild_id, {'is_stopped': False})
|
||||
title = await self.next_track(payload)
|
||||
@@ -112,12 +121,12 @@ class Voice(Cog, VoiceExtension):
|
||||
del votes[str(payload.message_id)]
|
||||
|
||||
elif vote_data['action'] == 'add_track':
|
||||
logging.info(f"Adding track for message {payload.message_id}")
|
||||
logging.info(f"[VOICE] Adding track for message {payload.message_id}")
|
||||
await message.clear_reactions()
|
||||
|
||||
track = vote_data['vote_content']
|
||||
if not track:
|
||||
logging.info(f"Recieved empty vote context for message {payload.message_id}")
|
||||
logging.info(f"[VOICE] Recieved empty vote context for message {payload.message_id}")
|
||||
return
|
||||
|
||||
self.db.update(guild_id, {'is_stopped': False})
|
||||
@@ -132,13 +141,13 @@ class Voice(Cog, VoiceExtension):
|
||||
del votes[str(payload.message_id)]
|
||||
|
||||
elif vote_data['action'] in ('add_album', 'add_artist', 'add_playlist'):
|
||||
logging.info(f"Performing '{vote_data['action']}' action for message {payload.message_id}")
|
||||
logging.info(f"[VOICE] Performing '{vote_data['action']}' action for message {payload.message_id}")
|
||||
|
||||
await message.clear_reactions()
|
||||
|
||||
tracks = vote_data['vote_content']
|
||||
if not tracks:
|
||||
logging.info(f"Recieved empty vote context for message {payload.message_id}")
|
||||
logging.info(f"[VOICE] Recieved empty vote context for message {payload.message_id}")
|
||||
return
|
||||
|
||||
self.db.update(guild_id, {'is_stopped': False})
|
||||
@@ -153,7 +162,7 @@ class Voice(Cog, VoiceExtension):
|
||||
del votes[str(payload.message_id)]
|
||||
|
||||
elif len(vote_data['negative_votes']) >= required_votes:
|
||||
logging.info(f"Enough negative votes for message {payload.message_id}")
|
||||
logging.info(f"[VOICE] Enough negative votes for message {payload.message_id}")
|
||||
await message.clear_reactions()
|
||||
await message.edit(content='Запрос был отклонён.', delete_after=15)
|
||||
del votes[str(payload.message_id)]
|
||||
@@ -162,7 +171,7 @@ class Voice(Cog, VoiceExtension):
|
||||
|
||||
@Cog.listener()
|
||||
async def on_raw_reaction_remove(self, payload: discord.RawReactionActionEvent) -> None:
|
||||
logging.info(f"Reaction removed by user {payload.user_id} in channel {payload.channel_id}")
|
||||
logging.info(f"[VOICE] Reaction removed by user {payload.user_id} in channel {payload.channel_id}")
|
||||
if not self.typed_bot.user:
|
||||
return
|
||||
|
||||
@@ -182,23 +191,23 @@ class Voice(Cog, VoiceExtension):
|
||||
|
||||
vote_data = votes[str(payload.message_id)]
|
||||
if payload.emoji.name == '✔️':
|
||||
logging.info(f"User {payload.user_id} removed positive vote for message {payload.message_id}")
|
||||
logging.info(f"[VOICE] User {payload.user_id} removed positive vote for message {payload.message_id}")
|
||||
del vote_data['positive_votes'][payload.user_id]
|
||||
elif payload.emoji.name == '❌':
|
||||
logging.info(f"User {payload.user_id} removed negative vote for message {payload.message_id}")
|
||||
logging.info(f"[VOICE] User {payload.user_id} removed negative vote for message {payload.message_id}")
|
||||
del vote_data['negative_votes'][payload.user_id]
|
||||
|
||||
self.db.update(guild_id, {'votes': votes})
|
||||
|
||||
@voice.command(name="menu", description="Создать меню проигрывателя. Доступно только если вы единственный в голосовом канале.")
|
||||
async def menu(self, ctx: discord.ApplicationContext) -> None:
|
||||
logging.info(f"Menu command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] Menu command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
|
||||
guild = self.db.get_guild(ctx.guild.id)
|
||||
channel = cast(discord.VoiceChannel, ctx.channel)
|
||||
|
||||
if len(channel.members) > 2 and not guild['always_allow_menu']:
|
||||
logging.info(f"Action declined: other members are present in the voice channel")
|
||||
logging.info(f"[VOICE] Action declined: other members are present in the voice channel")
|
||||
await ctx.respond("❌ Вы не единственный в голосовом канале.", ephemeral=True)
|
||||
return
|
||||
|
||||
@@ -206,7 +215,7 @@ class Voice(Cog, VoiceExtension):
|
||||
|
||||
@voice.command(name="join", description="Подключиться к голосовому каналу, в котором вы сейчас находитесь.")
|
||||
async def join(self, ctx: discord.ApplicationContext) -> None:
|
||||
logging.info(f"Join command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] Join command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
|
||||
member = cast(discord.Member, ctx.author)
|
||||
if not member.guild_permissions.manage_channels:
|
||||
@@ -219,16 +228,16 @@ class Voice(Cog, VoiceExtension):
|
||||
else:
|
||||
response_message = "❌ Вы должны отправить команду в голосовом канале."
|
||||
|
||||
logging.info(f"Join command response: {response_message}")
|
||||
logging.info(f"[VOICE] Join command response: {response_message}")
|
||||
await ctx.respond(response_message, delete_after=15, ephemeral=True)
|
||||
|
||||
@voice.command(description="Заставить бота покинуть голосовой канал.")
|
||||
async def leave(self, ctx: discord.ApplicationContext) -> None:
|
||||
logging.info(f"Leave command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] Leave command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
|
||||
member = cast(discord.Member, ctx.author)
|
||||
if not member.guild_permissions.manage_channels:
|
||||
logging.info(f"User {ctx.author.id} does not have permissions to execute leave command in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] User {ctx.author.id} does not have permissions to execute leave command in guild {ctx.guild.id}")
|
||||
await ctx.respond("❌ У вас нет прав для выполнения этой команды.", delete_after=15, ephemeral=True)
|
||||
return
|
||||
|
||||
@@ -238,26 +247,26 @@ class Voice(Cog, VoiceExtension):
|
||||
vc.stop()
|
||||
await vc.disconnect(force=True)
|
||||
await ctx.respond("Отключение успешно!", delete_after=15, ephemeral=True)
|
||||
logging.info(f"Successfully disconnected from voice channel in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] Successfully disconnected from voice channel in guild {ctx.guild.id}")
|
||||
|
||||
@queue.command(description="Очистить очередь треков и историю прослушивания.")
|
||||
async def clear(self, ctx: discord.ApplicationContext) -> None:
|
||||
logging.info(f"Clear queue command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] Clear queue command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
|
||||
member = cast(discord.Member, ctx.author)
|
||||
channel = cast(discord.VoiceChannel, ctx.channel)
|
||||
|
||||
if len(channel.members) > 2 and not member.guild_permissions.manage_channels:
|
||||
logging.info(f"User {ctx.author.id} does not have permissions to execute leave command in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] User {ctx.author.id} does not have permissions to execute leave command in guild {ctx.guild.id}")
|
||||
await ctx.respond("❌ У вас нет прав для выполнения этой команды.", delete_after=15, ephemeral=True)
|
||||
elif await self.voice_check(ctx):
|
||||
self.db.update(ctx.guild.id, {'previous_tracks': [], 'next_tracks': []})
|
||||
await ctx.respond("Очередь и история сброшены.", delete_after=15, ephemeral=True)
|
||||
logging.info(f"Queue and history cleared in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] Queue and history cleared in guild {ctx.guild.id}")
|
||||
|
||||
@queue.command(description="Получить очередь треков.")
|
||||
async def get(self, ctx: discord.ApplicationContext) -> None:
|
||||
logging.info(f"Get queue command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] Get queue command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
|
||||
if not await self.voice_check(ctx):
|
||||
return
|
||||
@@ -267,95 +276,91 @@ class Voice(Cog, VoiceExtension):
|
||||
embed = generate_queue_embed(0, tracks)
|
||||
await ctx.respond(embed=embed, view=QueueView(ctx), ephemeral=True)
|
||||
|
||||
logging.info(f"Queue embed sent to user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] Queue embed sent to user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
|
||||
@track.command(description="Приостановить текущий трек.")
|
||||
async def pause(self, ctx: discord.ApplicationContext) -> None:
|
||||
logging.info(f"Pause command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] Pause command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
|
||||
member = cast(discord.Member, ctx.author)
|
||||
channel = cast(discord.VoiceChannel, ctx.channel)
|
||||
|
||||
if len(channel.members) > 2 and not member.guild_permissions.manage_channels:
|
||||
logging.info(f"User {ctx.author.id} does not have permissions to pause the track in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] User {ctx.author.id} does not have permissions to pause the track in guild {ctx.guild.id}")
|
||||
await ctx.respond("❌ Вы не можете остановить воспроизведение, пока в канале находятся другие пользователи.", delete_after=15, ephemeral=True)
|
||||
|
||||
elif await self.voice_check(ctx) and (vc := await self.get_voice_client(ctx)) is not None:
|
||||
if not vc.is_paused():
|
||||
vc.pause()
|
||||
|
||||
player = self.db.get_current_menu(ctx.guild.id)
|
||||
if player:
|
||||
await self.update_menu_embed(ctx, player)
|
||||
menu = self.db.get_current_menu(ctx.guild.id)
|
||||
if menu:
|
||||
await self.update_menu_embed(ctx, menu)
|
||||
|
||||
logging.info(f"Track paused in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] Track paused in guild {ctx.guild.id}")
|
||||
await ctx.respond("Воспроизведение приостановлено.", delete_after=15, ephemeral=True)
|
||||
else:
|
||||
logging.info(f"Track already paused in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] Track already paused in guild {ctx.guild.id}")
|
||||
await ctx.respond("Воспроизведение уже приостановлено.", delete_after=15, ephemeral=True)
|
||||
|
||||
@track.command(description="Возобновить текущий трек.")
|
||||
async def resume(self, ctx: discord.ApplicationContext) -> None:
|
||||
logging.info(f"Resume command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] Resume command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
|
||||
member = cast(discord.Member, ctx.author)
|
||||
channel = cast(discord.VoiceChannel, ctx.channel)
|
||||
|
||||
if len(channel.members) > 2 and not member.guild_permissions.manage_channels:
|
||||
logging.info(f"User {ctx.author.id} does not have permissions to resume the track in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] User {ctx.author.id} does not have permissions to resume the track in guild {ctx.guild.id}")
|
||||
await ctx.respond("❌ Вы не можете остановить воспроизведение, пока в канале находятся другие пользователи.", delete_after=15, ephemeral=True)
|
||||
|
||||
elif await self.voice_check(ctx) and (vc := await self.get_voice_client(ctx)):
|
||||
if vc.is_paused():
|
||||
vc.resume()
|
||||
player = self.db.get_current_menu(ctx.guild.id)
|
||||
if player:
|
||||
await self.update_menu_embed(ctx, player)
|
||||
logging.info(f"Track resumed in guild {ctx.guild.id}")
|
||||
menu = self.db.get_current_menu(ctx.guild.id)
|
||||
if menu:
|
||||
await self.update_menu_embed(ctx, menu)
|
||||
logging.info(f"[VOICE] Track resumed in guild {ctx.guild.id}")
|
||||
await ctx.respond("Воспроизведение восстановлено.", delete_after=15, ephemeral=True)
|
||||
else:
|
||||
logging.info(f"Track is not paused in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] Track is not paused in guild {ctx.guild.id}")
|
||||
await ctx.respond("Воспроизведение не на паузе.", delete_after=15, ephemeral=True)
|
||||
|
||||
@track.command(description="Прервать проигрывание, удалить историю, очередь и текущий плеер.")
|
||||
async def stop(self, ctx: discord.ApplicationContext) -> None:
|
||||
logging.info(f"Stop command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] Stop command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
|
||||
member = cast(discord.Member, ctx.author)
|
||||
channel = cast(discord.VoiceChannel, ctx.channel)
|
||||
|
||||
if len(channel.members) > 2 and not member.guild_permissions.manage_channels:
|
||||
logging.info(f"User {ctx.author.id} tried to stop playback in guild {ctx.guild.id} but there are other users in the channel")
|
||||
logging.info(f"[VOICE] User {ctx.author.id} tried to stop playback in guild {ctx.guild.id} but there are other users in the channel")
|
||||
await ctx.respond("❌ Вы не можете остановить воспроизведение, пока в канале находятся другие пользователи.", delete_after=15, ephemeral=True)
|
||||
|
||||
elif await self.voice_check(ctx):
|
||||
guild = self.db.get_guild(ctx.guild.id)
|
||||
await self.stop_playing(ctx)
|
||||
|
||||
current_menu = self.db.get_current_menu(ctx.guild.id)
|
||||
if current_menu:
|
||||
player = await self.get_menu_message(ctx, current_menu)
|
||||
if player:
|
||||
await player.delete()
|
||||
if guild['current_menu']:
|
||||
menu = await self.get_menu_message(ctx, guild['current_menu'])
|
||||
if menu:
|
||||
await menu.delete()
|
||||
|
||||
self.db.update(ctx.guild.id, {
|
||||
'current_menu': None, 'repeat': False, 'shuffle': False, 'previous_tracks': [], 'next_tracks': [], 'vibing': False
|
||||
})
|
||||
logging.info(f"Playback stopped in guild {ctx.guild.id}")
|
||||
|
||||
guild = self.db.get_guild(ctx.guild_id)
|
||||
logging.info(f"[VOICE] Playback stopped in guild {ctx.guild.id}")
|
||||
|
||||
if guild['vibing']:
|
||||
user = self.users_db.get_user(ctx.user.id)
|
||||
token = user['ym_token']
|
||||
if not token:
|
||||
logging.info(f"User {ctx.user.id} has no YM token")
|
||||
logging.info(f"[VOICE] User {ctx.user.id} has no YM token")
|
||||
await ctx.respond("❌ Укажите токен через /account login.", ephemeral=True)
|
||||
return
|
||||
|
||||
try:
|
||||
client = await ClientAsync(token).init()
|
||||
except yandex_music.exceptions.UnauthorizedError:
|
||||
logging.info(f"User {ctx.user.id} provided invalid token")
|
||||
await ctx.respond('❌ Недействительный токен.')
|
||||
client = await self.init_ym_client(ctx, user['ym_token'])
|
||||
if not client:
|
||||
return
|
||||
|
||||
track = guild['current_track']
|
||||
@@ -369,20 +374,24 @@ class Voice(Cog, VoiceExtension):
|
||||
cast(str, user['vibe_batch_id']),
|
||||
time()
|
||||
)
|
||||
logging.info(f"User {ctx.user.id} finished vibing with result: {res}")
|
||||
|
||||
logging.info(f"[VOICE] User {ctx.user.id} finished vibing with result: {res}")
|
||||
|
||||
if ctx.guild.id in menu_views:
|
||||
menu_views[ctx.guild.id].stop()
|
||||
del menu_views[ctx.guild.id]
|
||||
|
||||
await ctx.respond("Воспроизведение остановлено.", delete_after=15, ephemeral=True)
|
||||
|
||||
@track.command(description="Переключиться на следующую песню в очереди.")
|
||||
async def next(self, ctx: discord.ApplicationContext) -> None:
|
||||
logging.info(f"Next command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] Next command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
if not await self.voice_check(ctx):
|
||||
return
|
||||
|
||||
gid = ctx.guild.id
|
||||
guild = self.db.get_guild(gid)
|
||||
if not guild['next_tracks']:
|
||||
logging.info(f"No tracks in queue in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] No tracks in queue in guild {ctx.guild.id}")
|
||||
await ctx.respond("❌ Нет песенен в очереди.", delete_after=15, ephemeral=True)
|
||||
return
|
||||
|
||||
@@ -390,7 +399,7 @@ class Voice(Cog, VoiceExtension):
|
||||
channel = cast(discord.VoiceChannel, ctx.channel)
|
||||
|
||||
if guild['vote_next_track'] and len(channel.members) > 2 and not member.guild_permissions.manage_channels:
|
||||
logging.info(f"User {ctx.author.id} started vote to skip track in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] User {ctx.author.id} started vote to skip track in guild {ctx.guild.id}")
|
||||
|
||||
message = cast(discord.Interaction, await ctx.respond(f"{member.mention} хочет пропустить текущий трек.\n\nВыполнить переход?", delete_after=30))
|
||||
response = await message.original_response()
|
||||
@@ -410,7 +419,7 @@ class Voice(Cog, VoiceExtension):
|
||||
}
|
||||
)
|
||||
else:
|
||||
logging.info(f"Skipping vote for user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] Skipping vote for user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
|
||||
self.db.update(gid, {'is_stopped': False})
|
||||
title = await self.next_track(ctx)
|
||||
@@ -418,14 +427,14 @@ class Voice(Cog, VoiceExtension):
|
||||
|
||||
@track.command(description="Добавить трек в избранное или убрать, если он уже там.")
|
||||
async def like(self, ctx: discord.ApplicationContext) -> None:
|
||||
logging.info(f"Like command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] Like command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
|
||||
if not await self.voice_check(ctx):
|
||||
return
|
||||
|
||||
vc = await self.get_voice_client(ctx)
|
||||
if not vc or not vc.is_playing:
|
||||
logging.info(f"No current track in {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] No current track in {ctx.guild.id}")
|
||||
await ctx.respond("Нет воспроизводимого трека.", delete_after=15, ephemeral=True)
|
||||
return
|
||||
|
||||
@@ -434,15 +443,15 @@ class Voice(Cog, VoiceExtension):
|
||||
logging.warning(f"Like command failed for user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
await ctx.respond("❌ Операция не удалась.", delete_after=15, ephemeral=True)
|
||||
elif result == 'TRACK REMOVED':
|
||||
logging.info(f"Track removed from favorites for user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] Track removed from favorites for user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
await ctx.respond("Трек был удалён из избранного.", delete_after=15, ephemeral=True)
|
||||
else:
|
||||
logging.info(f"Track added to favorites for user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] Track added to favorites for user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
await ctx.respond(f"Трек **{result}** был добавлен в избранное.", delete_after=15, ephemeral=True)
|
||||
|
||||
@track.command(name='vibe', description="Запустить мою волну по текущему треку.")
|
||||
async def track_vibe(self, ctx: discord.ApplicationContext) -> None:
|
||||
logging.info(f"Vibe (track) command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] Vibe (track) command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
|
||||
if not await self.voice_check(ctx):
|
||||
return
|
||||
|
||||
@@ -450,11 +459,11 @@ class Voice(Cog, VoiceExtension):
|
||||
channel = cast(discord.VoiceChannel, ctx.channel)
|
||||
|
||||
if len(channel.members) > 2 and not guild['always_allow_menu']:
|
||||
logging.info(f"Action declined: other members are present in the voice channel")
|
||||
logging.info(f"[VOICE] Action declined: other members are present in the voice channel")
|
||||
await ctx.respond("❌ Вы не единственный в голосовом канале.", ephemeral=True)
|
||||
return
|
||||
if not guild['current_track']:
|
||||
logging.info(f"No current track in {ctx.guild.id}")
|
||||
logging.info(f"[VOICE] No current track in {ctx.guild.id}")
|
||||
await ctx.respond("❌ Нет воспроизводимого трека.", ephemeral=True)
|
||||
return
|
||||
|
||||
@@ -463,7 +472,7 @@ class Voice(Cog, VoiceExtension):
|
||||
|
||||
@discord.slash_command(name='vibe', description="Запустить Мою Волну.")
|
||||
async def user_vibe(self, ctx: discord.ApplicationContext) -> None:
|
||||
logging.info(f"Vibe (user) command invoked by user {ctx.user.id} in guild {ctx.guild_id}")
|
||||
logging.info(f"[VOICE] Vibe (user) command invoked by user {ctx.user.id} in guild {ctx.guild_id}")
|
||||
if not await self.voice_check(ctx):
|
||||
return
|
||||
|
||||
@@ -471,7 +480,7 @@ class Voice(Cog, VoiceExtension):
|
||||
channel = cast(discord.VoiceChannel, ctx.channel)
|
||||
|
||||
if len(channel.members) > 2 and not guild['always_allow_menu']:
|
||||
logging.info(f"Action declined: other members are present in the voice channel")
|
||||
logging.info(f"[VOICE] Action declined: other members are present in the voice channel")
|
||||
await ctx.respond("❌ Вы не единственный в голосовом канале.", ephemeral=True)
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user