mirror of
https://github.com/deadcxap/YandexMusicDiscordBot.git
synced 2026-01-10 12:31:46 +03:00
up-to-date actual
This commit is contained in:
@@ -20,7 +20,7 @@ class PlayButton(Button, VoiceExtension):
|
||||
|
||||
if not interaction.guild_id:
|
||||
logging.info("[FIND] No guild found in PlayButton callback")
|
||||
await interaction.respond("❌ Эта команда доступна только на серверах.", ephemeral=True, delete_after=15)
|
||||
await self.respond(interaction, "error", "Эта команда доступна только на серверах.", ephemeral=True, delete_after=15)
|
||||
return
|
||||
|
||||
if not await self.voice_check(interaction):
|
||||
@@ -28,7 +28,7 @@ class PlayButton(Button, VoiceExtension):
|
||||
|
||||
guild = await self.db.get_guild(interaction.guild_id, projection={'current_track': 1, 'current_menu': 1, 'vote_add': 1, 'vibing': 1})
|
||||
if guild['vibing']:
|
||||
await interaction.respond("❌ Нельзя добавлять треки в очередь, пока запущена волна.", ephemeral=True, delete_after=15)
|
||||
await self.respond(interaction, "error", "Нельзя добавлять треки в очередь, пока запущена волна.", ephemeral=True, delete_after=15)
|
||||
return
|
||||
|
||||
channel = cast(discord.VoiceChannel, interaction.channel)
|
||||
@@ -38,54 +38,54 @@ class PlayButton(Button, VoiceExtension):
|
||||
tracks = [self.item]
|
||||
action = 'add_track'
|
||||
vote_message = f"{member.mention} хочет добавить трек **{self.item.title}** в очередь.\n\n Голосуйте за добавление."
|
||||
response_message = f"✅ Трек **{self.item.title}** был добавлен в очередь."
|
||||
response_message = f"Трек **{self.item.title}** был добавлен в очередь."
|
||||
|
||||
elif isinstance(self.item, Album):
|
||||
album = await self.item.with_tracks_async()
|
||||
if not album or not album.volumes:
|
||||
logging.debug("[FIND] Failed to fetch album tracks in PlayButton callback")
|
||||
await interaction.respond("❌ Не удалось получить треки альбома.", ephemeral=True, delete_after=15)
|
||||
await self.respond(interaction, "error", "Не удалось получить треки альбома.", ephemeral=True, delete_after=15)
|
||||
return
|
||||
|
||||
tracks = [track for volume in album.volumes for track in volume]
|
||||
action = 'add_album'
|
||||
vote_message = f"{member.mention} хочет добавить альбом **{self.item.title}** в очередь.\n\n Голосуйте за добавление."
|
||||
response_message = f"✅ Альбом **{self.item.title}** был добавлен в очередь."
|
||||
response_message = f"Альбом **{self.item.title}** был добавлен в очередь."
|
||||
|
||||
elif isinstance(self.item, Artist):
|
||||
artist_tracks = await self.item.get_tracks_async()
|
||||
if not artist_tracks:
|
||||
logging.debug("[FIND] Failed to fetch artist tracks in PlayButton callback")
|
||||
await interaction.respond("❌ Не удалось получить треки артиста.", ephemeral=True, delete_after=15)
|
||||
await self.respond(interaction, "error", "Не удалось получить треки артиста.", ephemeral=True, delete_after=15)
|
||||
return
|
||||
|
||||
tracks = artist_tracks.tracks.copy()
|
||||
action = 'add_artist'
|
||||
vote_message = f"{member.mention} хочет добавить треки от **{self.item.name}** в очередь.\n\n Голосуйте за добавление."
|
||||
response_message = f"✅ Песни артиста **{self.item.name}** были добавлены в очередь."
|
||||
response_message = f"Песни артиста **{self.item.name}** были добавлены в очередь."
|
||||
|
||||
elif isinstance(self.item, Playlist):
|
||||
short_tracks = await self.item.fetch_tracks_async()
|
||||
if not short_tracks:
|
||||
logging.debug("[FIND] Failed to fetch playlist tracks in PlayButton callback")
|
||||
await interaction.respond("❌ Не удалось получить треки из плейлиста.", ephemeral=True, delete_after=15)
|
||||
await self.respond(interaction, "error", "Не удалось получить треки из плейлиста.", ephemeral=True, delete_after=15)
|
||||
return
|
||||
|
||||
tracks = [cast(Track, short_track.track) for short_track in short_tracks]
|
||||
action = 'add_playlist'
|
||||
vote_message = f"{member.mention} хочет добавить плейлист **{self.item.title}** в очередь.\n\n Голосуйте за добавление."
|
||||
response_message = f"✅ Плейлист **{self.item.title}** был добавлен в очередь."
|
||||
response_message = f"Плейлист **{self.item.title}** был добавлен в очередь."
|
||||
|
||||
elif isinstance(self.item, list):
|
||||
tracks = self.item.copy()
|
||||
if not tracks:
|
||||
logging.debug("[FIND] Empty tracks list in PlayButton callback")
|
||||
await interaction.respond("❌ Не удалось получить треки.", ephemeral=True, delete_after=15)
|
||||
await self.respond(interaction, "error", "Не удалось получить треки.", ephemeral=True, delete_after=15)
|
||||
return
|
||||
|
||||
action = 'add_playlist'
|
||||
vote_message = f"{member.mention} хочет добавить плейлист **Мне Нравится** в очередь.\n\n Голосуйте за добавление."
|
||||
response_message = f"✅ Плейлист **«Мне нравится»** был добавлен в очередь."
|
||||
response_message = f"Плейлист **«Мне нравится»** был добавлен в очередь."
|
||||
|
||||
else:
|
||||
raise ValueError(f"Unknown item type: '{type(self.item).__name__}'")
|
||||
@@ -93,7 +93,7 @@ class PlayButton(Button, VoiceExtension):
|
||||
if guild['vote_add'] and len(channel.members) > 2 and not member.guild_permissions.manage_channels:
|
||||
logging.info(f"Starting vote for '{action}' (from PlayButton callback)")
|
||||
|
||||
message = cast(discord.Interaction, await interaction.respond(vote_message, delete_after=60))
|
||||
message = cast(discord.Interaction, await self.respond(interaction, "info", vote_message, delete_after=60))
|
||||
response = await message.original_response()
|
||||
|
||||
await response.add_reaction('✅')
|
||||
@@ -113,9 +113,9 @@ class PlayButton(Button, VoiceExtension):
|
||||
return
|
||||
|
||||
if guild['current_menu']:
|
||||
await interaction.respond(response_message, delete_after=15)
|
||||
await self.respond(interaction, "success", response_message, delete_after=15)
|
||||
elif not await self.send_menu_message(interaction, disable=True):
|
||||
await interaction.respond('❌ Не удалось отправить сообщение.', ephemeral=True, delete_after=15)
|
||||
await self.respond(interaction, "error", "Не удалось отправить сообщение.", ephemeral=True, delete_after=15)
|
||||
|
||||
if guild['current_track']:
|
||||
logging.debug(f"[FIND] Adding tracks to queue")
|
||||
@@ -125,7 +125,7 @@ class PlayButton(Button, VoiceExtension):
|
||||
track = tracks.pop(0)
|
||||
await self.db.modify_track(interaction.guild_id, tracks, 'next', 'extend')
|
||||
if not await self.play_track(interaction, track):
|
||||
await interaction.respond('❌ Не удалось воспроизвести трек.', ephemeral=True, delete_after=15)
|
||||
await self.respond(interaction, "error", "Не удалось воспроизвести трек.", ephemeral=True, delete_after=15)
|
||||
|
||||
if interaction.message:
|
||||
await interaction.message.delete()
|
||||
@@ -150,7 +150,7 @@ class MyVibeButton(Button, VoiceExtension):
|
||||
|
||||
guild = await self.db.get_guild(interaction.guild_id, projection={'current_menu': 1, 'vibing': 1})
|
||||
if guild['vibing']:
|
||||
await interaction.respond('❌ Волна уже запущена. Остановите её с помощью команды /voice stop.', ephemeral=True, delete_after=15)
|
||||
await self.respond(interaction, "error", "Волна уже запущена. Остановите её с помощью команды /voice stop.", ephemeral=True, delete_after=15)
|
||||
return
|
||||
|
||||
track_type_map = {
|
||||
@@ -160,7 +160,7 @@ class MyVibeButton(Button, VoiceExtension):
|
||||
if isinstance(self.item, Playlist):
|
||||
if not self.item.owner:
|
||||
logging.warning(f"[VIBE] Playlist owner is None")
|
||||
await interaction.respond("❌ Не удалось получить информацию о плейлисте. Отсутствует владелец.", ephemeral=True, delete_after=15)
|
||||
await self.respond(interaction, "error", "Не удалось получить информацию о плейлисте. Отсутствует владелец.", ephemeral=True, delete_after=15)
|
||||
return
|
||||
|
||||
_id = self.item.owner.login + '_' + str(self.item.kind)
|
||||
@@ -187,7 +187,7 @@ class MyVibeButton(Button, VoiceExtension):
|
||||
case list():
|
||||
response_message = f"{member.mention} хочет запустить станцию **Моя Волна**.\n\n Выполнить действие?"
|
||||
|
||||
message = cast(discord.Interaction, await interaction.respond(response_message))
|
||||
message = cast(discord.Interaction, await self.respond(interaction, "info", response_message))
|
||||
response = await message.original_response()
|
||||
|
||||
await response.add_reaction('✅')
|
||||
@@ -207,7 +207,7 @@ class MyVibeButton(Button, VoiceExtension):
|
||||
return
|
||||
|
||||
if not guild['current_menu'] and not await self.send_menu_message(interaction, disable=True):
|
||||
await interaction.respond('❌ Не удалось отправить сообщение.', ephemeral=True, delete_after=15)
|
||||
await self.respond(interaction, "error", "Не удалось отправить сообщение.", ephemeral=True, delete_after=15)
|
||||
|
||||
await self.update_vibe(interaction, track_type_map[type(self.item)], _id)
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import logging
|
||||
from typing import Self, cast
|
||||
from time import monotonic
|
||||
from typing import Self, Literal, cast
|
||||
|
||||
from discord.ui import View, Button, Item, Select
|
||||
from discord import (
|
||||
@@ -13,20 +14,21 @@ from yandex_music import TrackLyrics, Playlist, ClientAsync as YMClient
|
||||
from MusicBot.cogs.utils import VoiceExtension
|
||||
|
||||
class ToggleButton(Button, VoiceExtension):
|
||||
def __init__(self, *args, **kwargs):
|
||||
def __init__(self, root: 'MenuView', *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
VoiceExtension.__init__(self, None)
|
||||
self.root = root
|
||||
|
||||
async def callback(self, interaction: Interaction) -> None:
|
||||
callback_type = interaction.custom_id
|
||||
if callback_type not in ('repeat', 'shuffle'):
|
||||
|
||||
if (callback_type := interaction.custom_id) not in ('repeat', 'shuffle'):
|
||||
raise ValueError(f"Invalid callback type: '{callback_type}'")
|
||||
|
||||
logging.info(f'[MENU] {callback_type.capitalize()} button callback')
|
||||
|
||||
if not (gid := interaction.guild_id) or not interaction.user:
|
||||
logging.warning('[MENU] Failed to get guild ID.')
|
||||
await interaction.respond("❌ Что-то пошло не так. Попробуйте снова.", delete_after=15, ephemeral=True)
|
||||
await self.respond(interaction, "error", "Что-то пошло не так. Попробуйте снова.", delete_after=15, ephemeral=True)
|
||||
return
|
||||
|
||||
if not await self.voice_check(interaction):
|
||||
@@ -41,7 +43,7 @@ class ToggleButton(Button, VoiceExtension):
|
||||
|
||||
action = "выключить" if guild[callback_type] else "включить"
|
||||
task = "перемешивание треков" if callback_type == 'shuffle' else "повтор трека"
|
||||
message = cast(Interaction, await interaction.respond(f"{member.mention} хочет {action} {task}.\n\nВыполнить действие?", delete_after=60))
|
||||
message = cast(Interaction, await self.respond(interaction, "info", f"{member.mention} хочет {action} {task}.\n\nВыполнить действие?", delete_after=60))
|
||||
response = await message.original_response()
|
||||
|
||||
await response.add_reaction('✅')
|
||||
@@ -62,8 +64,10 @@ class ToggleButton(Button, VoiceExtension):
|
||||
|
||||
await self.db.update(gid, {callback_type: not guild[callback_type]})
|
||||
|
||||
if not await self.update_menu_view(interaction, button_callback=True):
|
||||
await interaction.respond("❌ Что-то пошло не так. Попробуйте снова.", delete_after=15, ephemeral=True)
|
||||
button = self.root.repeat_button if callback_type == 'repeat' else self.root.shuffle_button
|
||||
button.style = ButtonStyle.secondary if guild[callback_type] else ButtonStyle.success
|
||||
|
||||
await interaction.edit(view=await self.root.update())
|
||||
|
||||
class PlayPauseButton(Button, VoiceExtension):
|
||||
def __init__(self, **kwargs):
|
||||
@@ -90,7 +94,7 @@ class PlayPauseButton(Button, VoiceExtension):
|
||||
logging.info(f"[MENU] User {interaction.user.id} started vote to pause/resume track in guild {gid}")
|
||||
|
||||
task = "приостановить" if vc.is_playing() else "возобновить"
|
||||
message = cast(Interaction, await interaction.respond(f"{member.mention} хочет {task} проигрывание.\n\nВыполнить действие?", delete_after=60))
|
||||
message = cast(Interaction, await self.respond(interaction, "info", f"{member.mention} хочет {task} проигрывание.\n\nВыполнить действие?", delete_after=60))
|
||||
response = await message.original_response()
|
||||
|
||||
await response.add_reaction('✅')
|
||||
@@ -109,23 +113,31 @@ class PlayPauseButton(Button, VoiceExtension):
|
||||
)
|
||||
return
|
||||
|
||||
if vc.is_paused():
|
||||
vc.resume()
|
||||
else:
|
||||
vc.pause()
|
||||
|
||||
try:
|
||||
embed = interaction.message.embeds[0]
|
||||
except IndexError:
|
||||
await interaction.respond("❌ Нет воспроизводимого трека.", delete_after=15, ephemeral=True)
|
||||
await self.respond(interaction, "error", "Нет воспроизводимого трека.", delete_after=15, ephemeral=True)
|
||||
return
|
||||
|
||||
guild = await self.db.get_guild(interaction.guild_id, projection={'single_token_uid': 1})
|
||||
|
||||
if vc.is_paused():
|
||||
vc.resume()
|
||||
if guild['single_token_uid'] and (user := await self.get_discord_user_by_id(interaction, guild['single_token_uid'])):
|
||||
|
||||
if not vc.is_paused() and guild['single_token_uid']:
|
||||
user = await self.get_discord_user_by_id(interaction, guild['single_token_uid'])
|
||||
|
||||
if guild['single_token_uid'] and user:
|
||||
embed.set_footer(text=f"Используется токен {user.display_name}", icon_url=user.display_avatar.url)
|
||||
else:
|
||||
embed.remove_footer()
|
||||
else:
|
||||
vc.pause()
|
||||
embed.set_footer(text='Используется токен (неизвестный пользователь)')
|
||||
|
||||
elif vc.is_paused():
|
||||
embed.set_footer(text='Приостановлено')
|
||||
else:
|
||||
embed.remove_footer()
|
||||
|
||||
await interaction.edit(embed=embed)
|
||||
|
||||
@@ -135,8 +147,8 @@ class SwitchTrackButton(Button, VoiceExtension):
|
||||
VoiceExtension.__init__(self, None)
|
||||
|
||||
async def callback(self, interaction: Interaction) -> None:
|
||||
callback_type = interaction.custom_id
|
||||
if callback_type not in ('next', 'previous'):
|
||||
|
||||
if (callback_type := interaction.custom_id) not in ('next', 'previous'):
|
||||
raise ValueError(f"Invalid callback type: '{callback_type}'")
|
||||
|
||||
if not (gid := interaction.guild_id) or not interaction.user:
|
||||
@@ -153,7 +165,7 @@ class SwitchTrackButton(Button, VoiceExtension):
|
||||
|
||||
if not guild[tracks_type] and not guild['vibing']:
|
||||
logging.info(f"[MENU] No tracks in '{tracks_type}' list in guild {gid}")
|
||||
await interaction.respond(f"❌ Нет треков в {'очереди' if callback_type == 'next' else 'истории'}.", delete_after=15, ephemeral=True)
|
||||
await self.respond(interaction, "error", f"Нет треков в {'очереди' if callback_type == 'next' else 'истории'}.", delete_after=15, ephemeral=True)
|
||||
return
|
||||
|
||||
member = cast(Member, interaction.user)
|
||||
@@ -163,7 +175,7 @@ class SwitchTrackButton(Button, VoiceExtension):
|
||||
logging.info(f"[MENU] User {interaction.user.id} started vote to skip track in guild {gid}")
|
||||
|
||||
task = "пропустить текущий трек" if callback_type == 'next' else "вернуться к предыдущему треку"
|
||||
message = cast(Interaction, await interaction.respond(f"{member.mention} хочет {task}.\n\nВыполнить переход?", delete_after=60))
|
||||
message = cast(Interaction, await self.respond(interaction, "info", f"{member.mention} хочет {task}.\n\nВыполнить переход?", delete_after=60))
|
||||
response = await message.original_response()
|
||||
|
||||
await response.add_reaction('✅')
|
||||
@@ -188,12 +200,13 @@ class SwitchTrackButton(Button, VoiceExtension):
|
||||
title = await self.play_previous_track(interaction, button_callback=True)
|
||||
|
||||
if not title:
|
||||
await interaction.respond(f"❌ Что-то пошло не так. Попробуйте позже.", delete_after=15, ephemeral=True)
|
||||
await self.respond(interaction, "error", "Что-то пошло не так. Попробуйте позже.", delete_after=15, ephemeral=True)
|
||||
|
||||
class ReactionButton(Button, VoiceExtension):
|
||||
def __init__(self, *args, **kwargs):
|
||||
def __init__(self, root: 'MenuView', *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
VoiceExtension.__init__(self, None)
|
||||
self.root = root
|
||||
|
||||
async def callback(self, interaction: Interaction):
|
||||
callback_type = interaction.custom_id
|
||||
@@ -206,34 +219,81 @@ class ReactionButton(Button, VoiceExtension):
|
||||
return
|
||||
|
||||
if not (vc := await self.get_voice_client(interaction)) or not vc.is_playing:
|
||||
await interaction.respond("❌ Нет воспроизводимого трека.", delete_after=15, ephemeral=True)
|
||||
await self.respond(interaction, "error", "Нет воспроизводимого трека.", delete_after=15, ephemeral=True)
|
||||
|
||||
channel = cast(VoiceChannel, interaction.channel)
|
||||
res = await self.react_track(interaction, callback_type)
|
||||
|
||||
if callback_type == 'like' and res[0]:
|
||||
await self.update_menu_views_dict(interaction)
|
||||
await interaction.edit(view=self.menu_views[gid])
|
||||
await interaction.respond(
|
||||
f"✅ Трек был {'добавлен в понравившиеся.' if res[1] == 'added' else 'удалён из понравившихся.'}",
|
||||
delete_after=15, ephemeral=True
|
||||
)
|
||||
button = self.root.like_button
|
||||
response_message = f"Трек был {'добавлен в понравившиеся.' if res[1] == 'added' else 'удалён из понравившихся.'}"
|
||||
|
||||
elif callback_type == 'dislike' and res[0]:
|
||||
|
||||
if len(channel.members) == 2 and not await self.play_next_track(interaction, vc=vc, button_callback=True):
|
||||
await interaction.respond("✅ Воспроизведение приостановлено. Нет треков в очереди.", delete_after=15)
|
||||
if len(channel.members) == 2:
|
||||
await self.play_next_track(interaction, vc=vc, button_callback=True)
|
||||
return
|
||||
|
||||
await self.update_menu_views_dict(interaction)
|
||||
await interaction.edit(view=self.menu_views[gid])
|
||||
await interaction.respond(
|
||||
f"✅ Трек был {'добавлен в дизлайки.' if res[1] == 'added' else 'удалён из дизлайков.'}",
|
||||
delete_after=15, ephemeral=True
|
||||
)
|
||||
button = self.root.dislike_button
|
||||
response_message =f"Трек был {'добавлен в дизлайки.' if res[1] == 'added' else 'удалён из дизлайков.'}"
|
||||
|
||||
else:
|
||||
logging.debug(f"[VC_EXT] Failed to get {callback_type} tracks")
|
||||
await interaction.respond("❌ Операция не удалась. Попробуйте позже.", delete_after=15, ephemeral=True)
|
||||
await self.respond(interaction, "error", "Операция не удалась. Попробуйте позже.", delete_after=15, ephemeral=True)
|
||||
return
|
||||
|
||||
if len(channel.members) == 2:
|
||||
button.style = ButtonStyle.success if res[1] == 'added' else ButtonStyle.secondary
|
||||
await interaction.edit(view=await self.root.update())
|
||||
else:
|
||||
await self.respond(interaction, "success", response_message, delete_after=15, ephemeral=True)
|
||||
|
||||
async def react_track(
|
||||
self,
|
||||
ctx: ApplicationContext | Interaction,
|
||||
action: Literal['like', 'dislike']
|
||||
) -> tuple[bool, Literal['added', 'removed'] | None]:
|
||||
"""Like or dislike current track. Return track title on success.
|
||||
|
||||
Args:
|
||||
ctx (ApplicationContext | Interaction): Context.
|
||||
action (Literal['like', 'dislike']): Action to perform.
|
||||
|
||||
Returns:
|
||||
(tuple[bool, Literal['added', 'removed'] | None]): Tuple with success status and action.
|
||||
"""
|
||||
if not (gid := ctx.guild_id) or not ctx.user:
|
||||
logging.warning("[VC_EXT] Guild or User not found")
|
||||
return (False, None)
|
||||
|
||||
if not (current_track := await self.db.get_track(gid, 'current')):
|
||||
logging.debug("[VC_EXT] Current track not found")
|
||||
return (False, None)
|
||||
|
||||
if not (client := await self.init_ym_client(ctx)):
|
||||
return (False, None)
|
||||
|
||||
if action == 'like':
|
||||
tracks = await client.users_likes_tracks()
|
||||
add_func = client.users_likes_tracks_add
|
||||
remove_func = client.users_likes_tracks_remove
|
||||
else:
|
||||
tracks = await client.users_dislikes_tracks()
|
||||
add_func = client.users_dislikes_tracks_add
|
||||
remove_func = client.users_dislikes_tracks_remove
|
||||
|
||||
if tracks is None:
|
||||
logging.debug(f"[VC_EXT] No {action}s found")
|
||||
return (False, None)
|
||||
|
||||
if str(current_track['id']) not in [str(track.id) for track in tracks]:
|
||||
logging.debug(f"[VC_EXT] Track not found in {action}s. Adding...")
|
||||
await add_func(current_track['id'])
|
||||
return (True, 'added')
|
||||
else:
|
||||
logging.debug(f"[VC_EXT] Track found in {action}s. Removing...")
|
||||
await remove_func(current_track['id'])
|
||||
return (True, 'removed')
|
||||
|
||||
class LyricsButton(Button, VoiceExtension):
|
||||
def __init__(self, **kwargs):
|
||||
@@ -249,8 +309,7 @@ class LyricsButton(Button, VoiceExtension):
|
||||
if not (client := await self.init_ym_client(interaction)):
|
||||
return
|
||||
|
||||
current_track = await self.db.get_track(interaction.guild_id, 'current')
|
||||
if not current_track:
|
||||
if not (current_track := await self.db.get_track(interaction.guild_id, 'current')):
|
||||
logging.debug('[MENU] No current track found')
|
||||
return
|
||||
|
||||
@@ -258,7 +317,7 @@ class LyricsButton(Button, VoiceExtension):
|
||||
lyrics = cast(TrackLyrics, await client.tracks_lyrics(current_track['id']))
|
||||
except yandex_music.exceptions.NotFoundError:
|
||||
logging.debug('[MENU] Lyrics not found')
|
||||
await interaction.respond("❌ Текст песни не найден. Яндекс нам соврал (опять)!", delete_after=15, ephemeral=True)
|
||||
await self.respond(interaction, "error", "Текст песни не найден. Яндекс нам соврал (опять)!", delete_after=15, ephemeral=True)
|
||||
return
|
||||
|
||||
embed = Embed(
|
||||
@@ -304,7 +363,7 @@ class MyVibeButton(Button, VoiceExtension):
|
||||
vibe_type = 'user'
|
||||
vibe_id = 'onyourwave'
|
||||
|
||||
message = cast(Interaction, await interaction.respond(response_message))
|
||||
message = cast(Interaction, await self.respond(interaction, "info", response_message))
|
||||
response = await message.original_response()
|
||||
|
||||
await response.add_reaction('✅')
|
||||
@@ -340,7 +399,7 @@ class MyVibeButton(Button, VoiceExtension):
|
||||
|
||||
if not res:
|
||||
logging.info('[MENU] Failed to start the vibe')
|
||||
await interaction.respond('❌ Не удалось запустить "Мою Волну". Возможно, у вас нет подписки на Яндекс Музыку.', ephemeral=True)
|
||||
await self.respond(interaction, "error", "Не удалось запустить **Мою Волну**. Возможно, у вас нет подписки на Яндекс Музыку.", ephemeral=True)
|
||||
|
||||
if (next_track := await self.db.get_track(interaction.guild_id, 'next')):
|
||||
await self.play_track(interaction, next_track, button_callback=True)
|
||||
@@ -359,7 +418,7 @@ class MyVibeSelect(Select, VoiceExtension):
|
||||
if not interaction.user:
|
||||
logging.warning('[MENU] No user in select callback')
|
||||
return
|
||||
|
||||
|
||||
custom_id = interaction.custom_id
|
||||
if custom_id not in ('diversity', 'mood', 'lang'):
|
||||
logging.error(f'[MENU] Unknown custom_id: {custom_id}')
|
||||
@@ -470,7 +529,7 @@ class MyVibeSettingsButton(Button, VoiceExtension):
|
||||
if not await self.voice_check(interaction, check_vibe_privilage=True):
|
||||
return
|
||||
|
||||
await interaction.respond('Настройки **Волны**', view=await MyVibeSettingsView(interaction).init(), ephemeral=True)
|
||||
await self.respond(interaction, "info", "Настройки **Волны**", view=await MyVibeSettingsView(interaction).init(), ephemeral=True)
|
||||
|
||||
class AddToPlaylistSelect(Select, VoiceExtension):
|
||||
def __init__(self, ym_client: YMClient, *args, **kwargs):
|
||||
@@ -522,11 +581,11 @@ class AddToPlaylistSelect(Select, VoiceExtension):
|
||||
)
|
||||
|
||||
if not res:
|
||||
await interaction.respond('❌ Что-то пошло не так. Попробуйте позже.', delete_after=15, ephemeral=True)
|
||||
await self.respond(interaction, "error", "Что-то пошло не так. Попробуйте позже.", delete_after=15, ephemeral=True)
|
||||
elif track_in_playlist:
|
||||
await interaction.respond('🗑 Трек был удалён из плейлиста.', delete_after=15, ephemeral=True)
|
||||
await self.respond(interaction, "success", "🗑 Трек был удалён из плейлиста.", delete_after=15, ephemeral=True)
|
||||
else:
|
||||
await interaction.respond('📩 Трек был добавлен в плейлист.', delete_after=15, ephemeral=True)
|
||||
await self.respond(interaction, "success", "📩 Трек был добавлен в плейлист.", delete_after=15, ephemeral=True)
|
||||
|
||||
|
||||
class AddToPlaylistButton(Button, VoiceExtension):
|
||||
@@ -538,22 +597,20 @@ class AddToPlaylistButton(Button, VoiceExtension):
|
||||
if not await self.voice_check(interaction) or not interaction.guild_id:
|
||||
return
|
||||
|
||||
current_track = await self.db.get_track(interaction.guild_id, 'current')
|
||||
if not current_track:
|
||||
await interaction.respond('❌ Нет воспроизводимого трека.', delete_after=15, ephemeral=True)
|
||||
if not await self.db.get_track(interaction.guild_id, 'current'):
|
||||
await self.respond(interaction, "error", "Нет воспроизводимого трека.", delete_after=15, ephemeral=True)
|
||||
return
|
||||
|
||||
if not (client := await self.init_ym_client(interaction)):
|
||||
await interaction.respond('❌ Что-то пошло не так. Попробуйте позже.', delete_after=15, ephemeral=True)
|
||||
await self.respond(interaction, "error", "Что-то пошло не так. Попробуйте позже.", delete_after=15, ephemeral=True)
|
||||
return
|
||||
|
||||
if not (vc := await self.get_voice_client(interaction)) or not vc.is_playing:
|
||||
await interaction.respond("❌ Нет воспроизводимого трека.", delete_after=15, ephemeral=True)
|
||||
await self.respond(interaction, "error", "Нет воспроизводимого трека.", delete_after=15, ephemeral=True)
|
||||
return
|
||||
|
||||
playlists = await client.users_playlists_list()
|
||||
if not playlists:
|
||||
await interaction.respond('❌ У вас нет плейлистов.', delete_after=15, ephemeral=True)
|
||||
if not (playlists := await client.users_playlists_list()):
|
||||
await self.respond(interaction, "error", "У вас нет плейлистов.", delete_after=15, ephemeral=True)
|
||||
return
|
||||
|
||||
view = View(
|
||||
@@ -580,39 +637,58 @@ class MenuView(View, VoiceExtension):
|
||||
VoiceExtension.__init__(self, None)
|
||||
self.ctx = ctx
|
||||
|
||||
self.repeat_button = ToggleButton(style=ButtonStyle.secondary, emoji='🔂', row=0, custom_id='repeat')
|
||||
self.shuffle_button = ToggleButton(style=ButtonStyle.secondary, emoji='🔀', row=0, custom_id='shuffle')
|
||||
self.repeat_button = ToggleButton(self, style=ButtonStyle.secondary, emoji='🔂', row=0, custom_id='repeat')
|
||||
self.shuffle_button = ToggleButton(self, style=ButtonStyle.secondary, emoji='🔀', row=0, custom_id='shuffle')
|
||||
self.play_pause_button = PlayPauseButton(style=ButtonStyle.primary, emoji='⏯', row=0)
|
||||
self.next_button = SwitchTrackButton(style=ButtonStyle.primary, emoji='⏭', row=0, custom_id='next')
|
||||
self.prev_button = SwitchTrackButton(style=ButtonStyle.primary, emoji='⏮', row=0, custom_id='previous')
|
||||
|
||||
self.like_button = ReactionButton(style=ButtonStyle.secondary, emoji='❤️', row=1, custom_id='like')
|
||||
self.dislike_button = ReactionButton(style=ButtonStyle.secondary, emoji='💔', row=1, custom_id='dislike')
|
||||
self.like_button = ReactionButton(self, style=ButtonStyle.secondary, emoji='❤️', row=1, custom_id='like')
|
||||
self.dislike_button = ReactionButton(self, style=ButtonStyle.secondary, emoji='💔', row=1, custom_id='dislike')
|
||||
self.lyrics_button = LyricsButton(style=ButtonStyle.secondary, emoji='📋', row=1)
|
||||
self.add_to_playlist_button = AddToPlaylistButton(style=ButtonStyle.secondary, emoji='📁', row=1)
|
||||
self.vibe_button = MyVibeButton(style=ButtonStyle.secondary, emoji='🌊', row=1)
|
||||
self.vibe_settings_button = MyVibeSettingsButton(style=ButtonStyle.success, emoji='🛠', row=1)
|
||||
|
||||
self.current_vibe_button: MyVibeButton | MyVibeSettingsButton = self.vibe_button
|
||||
|
||||
async def init(self, *, disable: bool = False) -> Self:
|
||||
if not self.ctx.guild_id:
|
||||
return self
|
||||
|
||||
self.guild = await self.db.get_guild(self.ctx.guild_id, projection={
|
||||
'repeat': 1, 'shuffle': 1, 'current_track': 1, 'current_menu': 1, 'vibing': 1, 'single_token_uid': 1
|
||||
})
|
||||
|
||||
if self.guild['repeat']:
|
||||
self.repeat_button.style = ButtonStyle.success
|
||||
if self.guild['shuffle']:
|
||||
self.shuffle_button.style = ButtonStyle.success
|
||||
|
||||
current_track = self.guild['current_track']
|
||||
await self.update(disable=disable)
|
||||
|
||||
self.add_item(self.repeat_button)
|
||||
self.add_item(self.prev_button)
|
||||
self.add_item(self.play_pause_button)
|
||||
self.add_item(self.next_button)
|
||||
self.add_item(self.shuffle_button)
|
||||
self.add_item(self.like_button)
|
||||
self.add_item(self.dislike_button)
|
||||
self.add_item(self.lyrics_button)
|
||||
self.add_item(self.add_to_playlist_button)
|
||||
self.add_item(self.current_vibe_button)
|
||||
|
||||
return self
|
||||
|
||||
async def update(self, *, disable: bool = False) -> Self:
|
||||
if not self.ctx.guild_id:
|
||||
return self
|
||||
|
||||
self.enable_all_items()
|
||||
|
||||
self.guild = await self.db.get_guild(self.ctx.guild_id, projection={
|
||||
'repeat': 1, 'shuffle': 1, 'current_track': 1, 'current_viber_id': 1, 'vibing': 1, 'single_token_uid': 1
|
||||
})
|
||||
|
||||
if self.guild['repeat']:
|
||||
self.repeat_button.style = ButtonStyle.success
|
||||
else:
|
||||
self.repeat_button.style = ButtonStyle.secondary
|
||||
|
||||
if self.guild['shuffle']:
|
||||
self.shuffle_button.style = ButtonStyle.success
|
||||
else:
|
||||
self.shuffle_button.style = ButtonStyle.secondary
|
||||
|
||||
current_track = self.guild['current_track']
|
||||
|
||||
if not isinstance(self.ctx, RawReactionActionEvent) \
|
||||
and len(cast(VoiceChannel, self.ctx.channel).members) == 2 \
|
||||
@@ -620,9 +696,17 @@ class MenuView(View, VoiceExtension):
|
||||
|
||||
if current_track and str(current_track['id']) in [str(like.id) for like in await self.get_reacted_tracks(self.ctx, 'like')]:
|
||||
self.like_button.style = ButtonStyle.success
|
||||
else:
|
||||
self.like_button.style = ButtonStyle.secondary
|
||||
|
||||
if current_track and str(current_track['id']) in [str(dislike.id) for dislike in await self.get_reacted_tracks(self.ctx, 'dislike')]:
|
||||
self.dislike_button.style = ButtonStyle.success
|
||||
else:
|
||||
self.dislike_button.style = ButtonStyle.secondary
|
||||
|
||||
else:
|
||||
self.like_button.style = ButtonStyle.secondary
|
||||
self.dislike_button.style = ButtonStyle.secondary
|
||||
|
||||
if not current_track:
|
||||
self.lyrics_button.disabled = True
|
||||
@@ -631,32 +715,30 @@ class MenuView(View, VoiceExtension):
|
||||
self.add_to_playlist_button.disabled = True
|
||||
elif not current_track['lyrics_available']:
|
||||
self.lyrics_button.disabled = True
|
||||
|
||||
|
||||
if self.guild['single_token_uid']:
|
||||
self.like_button.disabled = True
|
||||
self.dislike_button.disabled = True
|
||||
self.add_to_playlist_button.disabled = True
|
||||
|
||||
self.add_item(self.like_button)
|
||||
self.add_item(self.dislike_button)
|
||||
self.add_item(self.lyrics_button)
|
||||
self.add_item(self.add_to_playlist_button)
|
||||
|
||||
if self.guild['vibing']:
|
||||
self.add_item(self.vibe_settings_button)
|
||||
self.current_vibe_button = self.vibe_settings_button
|
||||
else:
|
||||
self.add_item(self.vibe_button)
|
||||
self.current_vibe_button = self.vibe_button
|
||||
|
||||
if disable:
|
||||
self.disable_all_items()
|
||||
|
||||
if self.timeout:
|
||||
self.__timeout_expiry = monotonic() + self.timeout
|
||||
|
||||
return self
|
||||
|
||||
|
||||
async def on_timeout(self) -> None:
|
||||
logging.debug('[MENU] Menu timed out. Deleting menu message')
|
||||
if not self.ctx.guild_id:
|
||||
return
|
||||
|
||||
|
||||
if self.guild['current_menu']:
|
||||
await self.db.update(self.ctx.guild_id, {
|
||||
'current_menu': None, 'repeat': False, 'shuffle': False,
|
||||
@@ -670,4 +752,4 @@ class MenuView(View, VoiceExtension):
|
||||
else:
|
||||
logging.debug('[MENU] No menu message found')
|
||||
|
||||
self.stop()
|
||||
self.stop()
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from math import ceil
|
||||
from typing import Self, Any
|
||||
from typing import Any
|
||||
|
||||
from discord.ui import View, Button, Item
|
||||
from discord import ApplicationContext, ButtonStyle, Interaction, Embed, HTTPException
|
||||
@@ -9,83 +9,87 @@ from MusicBot.cogs.utils.voice_extension import VoiceExtension
|
||||
def generate_queue_embed(page: int, tracks_list: list[dict[str, Any]]) -> Embed:
|
||||
count = 15 * page
|
||||
length = len(tracks_list)
|
||||
|
||||
embed = Embed(
|
||||
title=f"Всего: {length}",
|
||||
color=0xfed42b,
|
||||
)
|
||||
embed.set_author(name="Очередь треков")
|
||||
embed.set_footer(text=f"Страница {page + 1} из {ceil(length / 15)}")
|
||||
|
||||
for i, track in enumerate(tracks_list[count:count + 15], start=1 + count):
|
||||
duration = track['duration_ms']
|
||||
if duration:
|
||||
duration_m = duration // 60000
|
||||
duration_s = ceil(duration / 1000) - duration_m * 60
|
||||
if track['duration_ms']:
|
||||
duration_m = track['duration_ms'] // 60000
|
||||
duration_s = ceil(track['duration_ms'] / 1000) - duration_m * 60
|
||||
embed.add_field(name=f"{i} - {track['title']} - {duration_m}:{duration_s:02d}", value="", inline=False)
|
||||
|
||||
return embed
|
||||
|
||||
class QueueNextButton(Button, VoiceExtension):
|
||||
def __init__(self, **kwargs):
|
||||
class QueueNextButton(Button):
|
||||
def __init__(self, root:' QueueView', **kwargs):
|
||||
Button.__init__(self, **kwargs)
|
||||
VoiceExtension.__init__(self, None)
|
||||
self.root = root
|
||||
|
||||
async def callback(self, interaction: Interaction) -> None:
|
||||
if not interaction.user or not interaction.guild:
|
||||
return
|
||||
self.root.page += 1
|
||||
self.root.update()
|
||||
embed = generate_queue_embed(self.root.page, self.root.tracks)
|
||||
await interaction.edit(embed=embed, view=self.root)
|
||||
|
||||
user = await self.users_db.get_user(interaction.user.id)
|
||||
page = user['queue_page'] + 1
|
||||
await self.users_db.update(interaction.user.id, {'queue_page': page})
|
||||
tracks = await self.db.get_tracks_list(interaction.guild.id, 'next')
|
||||
embed = generate_queue_embed(page, tracks)
|
||||
await interaction.edit(embed=embed, view=await QueueView(interaction).init())
|
||||
|
||||
class QueuePrevButton(Button, VoiceExtension):
|
||||
def __init__(self, **kwargs):
|
||||
class QueuePrevButton(Button):
|
||||
def __init__(self, root: 'QueueView', **kwargs):
|
||||
Button.__init__(self, **kwargs)
|
||||
VoiceExtension.__init__(self, None)
|
||||
self.root = root
|
||||
|
||||
async def callback(self, interaction: Interaction) -> None:
|
||||
if not interaction.user or not interaction.guild:
|
||||
return
|
||||
|
||||
user = await self.users_db.get_user(interaction.user.id)
|
||||
page = user['queue_page'] - 1
|
||||
await self.users_db.update(interaction.user.id, {'queue_page': page})
|
||||
tracks = await self.db.get_tracks_list(interaction.guild.id, 'next')
|
||||
embed = generate_queue_embed(page, tracks)
|
||||
await interaction.edit(embed=embed, view=await QueueView(interaction).init())
|
||||
self.root.page -= 1
|
||||
self.root.update()
|
||||
embed = generate_queue_embed(self.root.page, self.root.tracks)
|
||||
await interaction.edit(embed=embed, view=self.root)
|
||||
|
||||
class QueueView(View, VoiceExtension):
|
||||
def __init__(self, ctx: ApplicationContext | Interaction, *items: Item, timeout: float | None = 360, disable_on_timeout: bool = False):
|
||||
def __init__(
|
||||
self,
|
||||
ctx: ApplicationContext | Interaction,
|
||||
tracks: list[dict[str, Any]],
|
||||
*items: Item,
|
||||
timeout: float | None = 360,
|
||||
disable_on_timeout: bool = False
|
||||
):
|
||||
View.__init__(self, *items, timeout=timeout, disable_on_timeout=disable_on_timeout)
|
||||
VoiceExtension.__init__(self, None)
|
||||
|
||||
self.ctx = ctx
|
||||
self.next_button = QueueNextButton(style=ButtonStyle.primary, emoji='▶️')
|
||||
self.prev_button = QueuePrevButton(style=ButtonStyle.primary, emoji='◀️')
|
||||
self.tracks = tracks
|
||||
self.page = 0
|
||||
|
||||
async def init(self) -> Self:
|
||||
if not self.ctx.user or not self.ctx.guild:
|
||||
return self
|
||||
|
||||
tracks = await self.db.get_tracks_list(self.ctx.guild.id, 'next')
|
||||
user = await self.users_db.get_user(self.ctx.user.id)
|
||||
|
||||
count = 15 * user['queue_page']
|
||||
|
||||
if not tracks[count + 15:]:
|
||||
self.next_button = QueueNextButton(self, style=ButtonStyle.primary, emoji='▶️')
|
||||
self.prev_button = QueuePrevButton(self, style=ButtonStyle.primary, emoji='◀️', disabled=True)
|
||||
|
||||
if not self.tracks[15:]:
|
||||
self.next_button.disabled = True
|
||||
if not tracks[:count]:
|
||||
self.prev_button.disabled = True
|
||||
|
||||
self.prev_button.disabled = True
|
||||
|
||||
self.add_item(self.prev_button)
|
||||
self.add_item(self.next_button)
|
||||
|
||||
return self
|
||||
def update(self):
|
||||
count = 15 * self.page
|
||||
|
||||
if self.tracks[15:]:
|
||||
self.next_button.disabled = False
|
||||
else:
|
||||
self.next_button.disabled = True
|
||||
|
||||
if self.tracks[:count]:
|
||||
self.prev_button.disabled = False
|
||||
else:
|
||||
self.prev_button.disabled = True
|
||||
|
||||
async def on_timeout(self) -> None:
|
||||
try:
|
||||
await super().on_timeout()
|
||||
except HTTPException:
|
||||
pass
|
||||
self.stop()
|
||||
self.stop()
|
||||
|
||||
Reference in New Issue
Block a user