v6.2.0

Author: kmrin

README.md

@@ -116,6 +116,7 @@ Users inside the **blacklisted** class are well... blacklisted from using ANY fu
 | - | - |
 | `/play` | Plays tracks from various sources on a voice channel |
 | `/queue show` | Shows the current song queue |
+| `/queue skip` | Shows the current song queue and allows you to choose and skip to a specific track |
 | `/queue clear` | Clears tracks from the current song queue |
 | `/queue shuffle` | Shuffles the current queue |
 | `/recommend` | Toggles the autoplay of recommended tracks on and off |

changelog

@@ -1,11 +1,15 @@
-> 6.0.0:
+* 6.0.0:
     * Initial release.
 
-> 6.0.1:
+* 6.0.1:
     * Fixed an issue where the bot wouldn't respond if the user's language was anything but pt-BR or en-GB / en-US.
 
-> 6.1.0:
+* 6.1.0:
     * Added back valorant daily shop functionality.
     * Modified config file so that the fortnite daily shop language isn't invalid.
     * Modified config file so that the daily shops are disabled by default.
     * Made sure all guild-exclusive commands have the is_guild() check on them.
+
+* 6.2.0:
+    * Added `/queue skip` command.
+    * Fixed incorrect text formatting on the *QueueEditView*.

init.py

@@ -1,5 +1,5 @@
 """
-RinBot v6.0.1 'Alvorada'
+RinBot v6.2.0 'Alvorada'
 development started on 11/06/2024
 made by rin (https://github.com/kmrin, km.rin on https://discord.gg)
 """

rinbot/assets/docs/help_en-GB.md

@@ -54,6 +54,7 @@
 ### Music
  `/play`  Plays tracks from various sources on a voice channel
  `/queue show`  Shows the current song queue
+ `/queue skip`  Shows the current song queue and allows you to choose and skip to a specific track
  `/queue clear`  Clears tracks from the current song queue
  `/queue shuffle`  Shuffles the current queue
  `/recommend`  Toggles the autoplay of recommended tracks on and off

rinbot/assets/docs/help_pt-BR.md

@@ -53,6 +53,7 @@
 ### Music
  `/tocar`  Toca músicas por URLs ou buscas
  `/fila mostrar`  Mostra a fila atual
+ `/fila pular`  Mostra a fila atual e permite que você pule para uma música específica
  `/fila limpar`  Limpa a fila inteira ou uma ou mais músicas específicas
  `/fila randomizar`  Randomiza a fila atual
  `/recomendar`  Alterna a funcionalidade de adicionar músicas na fila automaticamente

rinbot/config/client/rin.json

@@ -1,5 +1,5 @@
 {
-    "VERSION": "v6.1.0 'Alvorada' (STABLE)",
+    "VERSION": "v6.2.0 'Alvorada' (STABLE)",
     "STATUS_LANG": "en-GB",
     "LOG_STATUS_CHANGE": false,
     "PREFIX": "!",

rinbot/config/localization/en-GB.json

@@ -52,6 +52,8 @@
     "INTERFACE_VIDEO_SEARCH_PLAYLIST_ADDED": " • `{tracks}` from `{name}`",
     "INTERFACE_QUEUE_EDIT_PLACEHOLDER": "Choose one or more tracks to remove...",
     "INTERFACE_QUEUE_EDIT_REMOVED": " ✅  Queue items removed!",
+    "INTERFACE_QUEUE_EDIT_SKIP_PLACEHOLDER": "Choose a track to skip to...",
+    "INTERFACE_QUEUE_EDIT_SKIP_SKIPPED": " ✅ Skipping...",
     "INTERFACE_FAV_EDIT_PLAYLIST_DESC": "Tracks: {tracks} | Uploader: {uploader}",
     "INTERFACE_FAV_EDIT_TRACK_DESC": "Duration: {duration} | Uploader: {uploader}",
     "INTERFACE_FAV_EDIT_PLACEHOLDER": "Choose one or more items to be removed...",
@@ -369,6 +371,8 @@
     "MUSIC_QUEUE_SHOW_DESC": "Shows the current queue",
     "MUSIC_QUEUE_SHOW_URL_NAME": "show-urls",
     "MUSIC_QUEUE_SHOW_URL_DESC": "Show URLs instead of titles",
+    "MUSIC_QUEUE_SKIP_NAME": "skip",
+    "MUSIC_QUEUE_SKIP_DESC": "Skips to a specific track on the queue",
     "MUSIC_NO_PLAYERS": " ❌  No players active on this server",
     "MUSIC_QUEUE_EMPTY": " ❌  Queue is empty",
     "MUSIC_CURRENT_QUEUE": " 📋  Current queue",

rinbot/config/localization/pt-BR.json

@@ -55,6 +55,8 @@
     "INTERFACE_VIDEO_SEARCH_PLAYLIST_ADDED": " • `{tracks}` músicas de `{name}`",
     "INTERFACE_QUEUE_EDIT_PLACEHOLDER": "Escolha uma ou mais músicas para remover...",
     "INTERFACE_QUEUE_EDIT_REMOVED": " ✅  Músicas removidas da fila!",
+    "INTERFACE_QUEUE_EDIT_SKIP_PLACEHOLDER": "Escolha uma música...",
+    "INTERFACE_QUEUE_EDIT_SKIP_SKIPPED": " ✅ Pulando...",
     "INTERFACE_FAV_EDIT_PLAYLIST_DESC": "Músicas: {tracks} | Por: {uploader}",
     "INTERFACE_FAV_EDIT_TRACK_DESC": "Duração: {duration} | Por: {uploader}",
     "INTERFACE_FAV_EDIT_PLACEHOLDER": "Escolha um ou mais itens para remover...",
@@ -370,6 +372,8 @@
     "MUSIC_QUEUE_ROOT_DESC": "Comandos de manipulação da fila de músicas",
     "MUSIC_QUEUE_SHOW_NAME": "mostrar",
     "MUSIC_QUEUE_SHOW_DESC": "Mostra a fila atual",
+    "MUSIC_QUEUE_SKIP_NAME": "pular",
+    "MUSIC_QUEUE_SKIP_DESC": "Pula para uma música específica na fila",
     "MUSIC_QUEUE_SHOW_URL_NAME": "mostrar-urls",
     "MUSIC_QUEUE_SHOW_URL_DESC": "Mostrar URLs invés de títulos",
     "MUSIC_NO_PLAYERS": " ❌  Nenhum player ativo no servidor",

rinbot/core/__init__.py

@@ -5,7 +5,7 @@
 from .command_checks import is_owner, is_admin, is_guild, not_blacklisted
 from .client import RinBot
 from .db import DBTable, DBManager
-from .interface import Paginator, SetWelcomeConfirmation, StoreCreateRoleModal, HeadsOrTails, RockPaperScissorsView, MediaControls, VideoSearchView, QueueEditView, FavouritesEditView, FavouritesPlayView, Valorant2FAView, get_timeout_embed
+from .interface import Paginator, SetWelcomeConfirmation, StoreCreateRoleModal, HeadsOrTails, RockPaperScissorsView, MediaControls, VideoSearchView, QueueEditViewMode, QueueEditView, FavouritesEditView, FavouritesPlayView, Valorant2FAView, get_timeout_embed
 from .errors import RinBotInteractionError, UserNotOwner, UserNotAdmin, UserNotInGuild, UserBlacklisted, InteractionTimedOut
 from .helpers import get_localized_string, get_interaction_locale, remove_nl_from_string_iterable, ms_to_str, is_url, get_expiration_time
 from .helpers import translate, get_specs, is_hex_colour, hex_to_colour, hex_to_int

rinbot/core/interface.py

@@ -16,7 +16,7 @@
 from .loggers import Loggers
 from .helpers import get_localized_string, get_interaction_locale, is_hex_colour, hex_to_colour, url_to_playable, ms_to_str
 from .responder import respond
-from .types import Track, Playlist, VideoSearchViewMode
+from .types import Track, Playlist, VideoSearchViewMode, QueueEditViewMode
 
 if TYPE_CHECKING:
     from .client import RinBot
@@ -710,9 +710,10 @@ async def callback_next(self, interaction: Interaction) -> None:
         await interaction.response.edit_message(view=self)
 
 class QueueEditView(nextcord.ui.View):
-    def __init__(self, locale: str, player: Player) -> None:
+    def __init__(self, locale: str, player: Player, mode: QueueEditViewMode) -> None:
         super().__init__(timeout=60)
 
+        self.mode = mode
         self.locale = locale
         self.player = player
         self.current_page = 0
@@ -724,7 +725,7 @@ def __init__(self, locale: str, player: Player) -> None:
         self.next_button.callback = self.callback_next
 
         self.select = self.create_select()
-        self.select.callback = self.callback_select
+        self.select.callback = self.callback_select if mode.value == 0 else self.callback_select_skip
 
         self.add_item(self.select)
         if len(self.queue_parts) > 1:
@@ -753,11 +754,11 @@ def create_select(self) -> nextcord.ui.Select:
 
         return nextcord.ui.Select(
             placeholder=get_localized_string(
-                self.locale, 'INTERFACE_QUEUE_EDIT_PLACEHOLDER'
+                self.locale, 'INTERFACE_QUEUE_EDIT_PLACEHOLDER' if self.mode.value == 0 else 'INTERFACE_QUEUE_EDIT_SKIP_PLACEHOLDER'
             ),
             options=options,
             min_values=1,
-            max_values=len(options)
+            max_values=len(options) if self.mode.value == 0 else 1
         )
 
     def update_buttons(self) -> None:
@@ -770,7 +771,7 @@ def update_select(self) -> None:
                 label=track.title, value=str(i),
                 description=get_localized_string(
                     self.locale, 'INTERFACE_VIDEO_SEARCH_TRACK_DESC',
-                    uploader=track.author
+                    duration=ms_to_str(track.length), uploader=track.author
                 )
             )
             for i, track in enumerate(self.queue_parts[self.current_page])
@@ -796,6 +797,26 @@ async def callback_select(self, interaction: Interaction) -> None:
         self.stop()
         await interaction.response.edit_message(embed=embed, view=None)
 
+    async def callback_select_skip(self, interaction: Interaction) -> None:
+        index = int(self.select.values[0])
+        selected_track = self.queue_parts[self.current_page][index]
+        to_remove = self.player.queue[:self.player.queue.index(selected_track)]
+        
+        for track in to_remove:
+            self.player.queue.remove(track)
+        
+        await self.player.skip(force=True)
+        
+        embed = Embed(
+            description=get_localized_string(
+                self.locale, 'INTERFACE_QUEUE_EDIT_SKIP_SKIPPED'
+            ),
+            colour=Colour.green()
+        )
+        
+        self.stop()
+        await interaction.response.edit_message(embed=embed, view=None)
+    
     async def callback_prev(self, interaction: Interaction) -> None:
         self.current_page -= 1
         self.update_buttons()

rinbot/core/types.py

@@ -10,6 +10,10 @@ class VideoSearchViewMode(Enum):
     TRACK_MODE = 0
     PLAYLIST_MODE = 1
 
+class QueueEditViewMode(Enum):
+    REMOVE = 0
+    SKIP = 1
+
 @dataclass
 class Track:
     title: str

rinbot/extensions/music.py

@@ -3,6 +3,7 @@
 - Commands:
     * /play                      - Plays songs through URLs or search queries
     * /queue show                - Shows the current song queue
+    * /queue skip                - Shows the current song queue and allows you to choose and skip to a specific track
     * /queue clear               - Shows the current song queue and allows you to choose and remove tracks from it
     * /queue shuffle             - Shuffles the current song queue
     * /recommend                 - Toggles on and off the auto-filling of the song queue
@@ -27,7 +28,7 @@
 
 from rinbot.core import RinBot
 from rinbot.core import Loggers
-from rinbot.core import VideoSearchViewMode
+from rinbot.core import VideoSearchViewMode, QueueEditViewMode
 from rinbot.core import ResponseType
 from rinbot.core import DBTable
 from rinbot.core import Track, Playlist
@@ -444,6 +445,50 @@ async def _queue_show(
         embed.description = message
         await respond(interaction, message=embed)
 
+    # /queue skip
+    @_queue.subcommand(
+        name=get_localized_string('en-GB', 'MUSIC_QUEUE_SKIP_NAME'),
+        name_localizations={
+            Locale.pt_BR: get_localized_string(
+                'pt-BR', 'MUSIC_QUEUE_SKIP_NAME'
+            )
+        },
+        description=get_localized_string('en-GB', 'MUSIC_QUEUE_SKIP_DESC'),
+        description_localizations={
+            Locale.pt_BR: get_localized_string(
+                'pt-BR', 'MUSIC_QUEUE_SKIP_DESC'
+            )
+        }
+    )
+    @not_blacklisted()
+    @is_guild()
+    async def _queue_skip(self, interaction: Interaction) -> None:
+        locale = get_interaction_locale(interaction)
+        
+        if interaction.guild.id not in self.bot.music_clients:
+            return await respond(
+                interaction, Colour.red(),
+                get_localized_string(
+                    locale, 'MUSIC_NO_PLAYERS'
+                ),
+                hidden=True
+            )
+        
+        player = self.bot.music_clients[interaction.guild.id]
+        queue = player.queue
+        
+        if len(queue) <= 0:
+            return await respond(
+                interaction, Colour.red(),
+                get_localized_string(
+                    locale, 'MUSIC_QUEUE_EMPTY'
+                ),
+                hidden=True
+            )
+        
+        view = QueueEditView(locale, player, QueueEditViewMode.SKIP)
+        await interaction.response.send_message(view=view)
+    
     # /queue clear
     @_queue.subcommand(
         name=get_localized_string('en-GB', 'MUSIC_QUEUE_CLEAR_NAME'),
@@ -525,7 +570,7 @@ async def _queue_clear(
                 )
             )
 
-        view = QueueEditView(locale, player)
+        view = QueueEditView(locale, player, QueueEditViewMode.REMOVE)
         await interaction.response.send_message(view=view)
 
     # /queue shuffle