Alvorada 1.3.0

Author: kmrin

changelog

@@ -17,3 +17,11 @@
 * 6.2.1:
 	* Added permission check for voice channels on the /play command.
 	* Modified way of fetching player.
+
+* 6.3.0:
+    * Added user count check for voice channels on the /play command.
+    * Fixed a problem where the bot would hang and not respond when given a private/deleted track/playlist link.
+    * Fixed a proglem where the bot would hand and not respond when no search results for a song query where found.
+    * The skip command now adds the skipped tracks to the player's history, so you can go back to them if you wish.
+    * Valorant daily shop now correctly pings the user.
+    * Finished Kobold integration.

init.py

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

rinbot/config/client/rin.json

@@ -1,5 +1,5 @@
 {
-    "VERSION": "v6.2.1 'Alvorada' (STABLE)",
+    "VERSION": "v6.3.0 'Alvorada' (STABLE)",
     "STATUS_LANG": "en-GB",
     "LOG_STATUS_CHANGE": false,
     "PREFIX": "!",
@@ -23,7 +23,7 @@
 
     "FORTNITE_DAILY_SHOP_ENABLED": false,
     "FORTNITE_DAILY_SHOP_UPDATE_TIME": "00:00:10",
-    "FORTNITE_DAILY_SHOP_LANG": "en",
+    "FORTNITE_DAILY_SHOP_LANG": "en-US",
     "FORTNITE_KEY": null,
 
     "VALORANT_DAILY_SHOP_ENABLED": false,

rinbot/config/localization/en-GB.json

@@ -436,8 +436,10 @@
     "MUSIC_INVALID_URL": " ❌  The URL provided is invalid.",
     "MUSIC_LINK_IS_PLAYLIST": " ❌  The URL provided is for a playlist, not a individual track.",
     "MUSIC_LINK_IS_NOT_PLAYLIST": " ❌  The URL provided is not a playlist URL.",
-    "MUSIC_NO_RESULTS_FROM_URL": " ❌  Couldn't get any data from the provided URL.",
+    "MUSIC_NO_RESULTS_FROM_URL": " ❌  Couldn't get any data from the provided URL.\nThe track or playlist could've been privated or deleted.",
     "MUSIC_FAV_CHOOSE": " ⭐  Pick a favourite",
+    "MUSIC_CHANNEL_FULL": " ❌  The music channel is full, I can't join you!",
+    "MUSIC_SEARCH_NO_RESULTS": " ❌  No results for `{search}`",
 
     "BOORU_ROOT_NAME": "booru",
     "BOORU_ROOT_DESC": "Danbooru commands",
@@ -481,7 +483,7 @@
 
     "VALORANT_PROVIDE_BOTH": " ❌  Please provide both a username and password.",
     "VALORANT_NO_LOGIN": " ❌  No login for this user",
-    "VALORANT_USER_STORE": "**{player}'s daily shop!**\nExpires in: `{time}`",
+    "VALORANT_USER_STORE": "**{player}'s** daily shop!\nExpires in: `{time}`",
     "VALORANT_NAME": "valorant",
     "VALORANT_DESC": "Valorant commands",
     "VALORANT_LOGIN_NAME": "login",
@@ -514,6 +516,8 @@
     "VALORANT_CONFIG_GUILD_MISCONFIG_NO_CHANNEL": " ❌  Couldn't fetch the daily shop channel from this server, it probably got deleted. Use the DMs option.",
     "VALORANT_CONFIG_SET": " ✅  Valorant daily shop settings updated!",
     "VALORANT_DS_PRIVATE": " ⚠️  You are receiving this in your DMs because the server you configured disabled the functionality.",
+    "VALORANT_DS_CHANNEL": " ✌️  Hey, {player}!",
+    "VALORANT_LOGIN_2FA_NOT_SUPPORTED": " ❌  Sorry, but at the moment 2FA is not supported due to development issues.\nPlease wait for a future version of RinBot.",
 
     "": ""
 }

rinbot/config/localization/pt-BR.json

@@ -439,8 +439,10 @@
     "MUSIC_INVALID_URL": " ❌  Link inválido.",
     "MUSIC_LINK_IS_PLAYLIST": " ❌  Esse link é para uma playlist, não uma música individual.",
     "MUSIC_LINK_IS_NOT_PLAYLIST": " ❌  Esse link não é de uma playlist.",
-    "MUSIC_NO_RESULTS_FROM_URL": " ❌  Não consegui extrair nenhuma informação desse link.",
+    "MUSIC_NO_RESULTS_FROM_URL": " ❌  Não consegui extrair nenhuma informação deste link.\nA música ou playlist pode estar privada ou ter sido excluída.",
     "MUSIC_FAV_CHOOSE": " ⭐  Escolha um favorito",
+    "MUSIC_CHANNEL_FULL": " ❌  O canal está cheio, não consigo entrar!",
+    "MUSIC_SEARCH_NO_RESULTS": " ❌  Nenhum resultado para `{search}`",
 
     "BOORU_ROOT_NAME": "booru",
     "BOORU_ROOT_DESC": "Comandos do danbooru",
@@ -484,7 +486,7 @@
 
     "VALORANT_PROVIDE_BOTH": " ❌  Porfavor providencie tanto um nome de usuário quanto uma senha.",
     "VALORANT_NO_LOGIN": " ❌  Nenhum login salvo para este usuário",
-    "VALORANT_USER_STORE": "**Loja diária de {player}!**\nExpira em: `{time}`",
+    "VALORANT_USER_STORE": "Loja diária de **{player}**!\nExpira em: `{time}`",
     "VALORANT_NAME": "valorant",
     "VALORANT_DESC": "Comandos do vava",
     "VALORANT_LOGIN_NAME": "login",
@@ -517,6 +519,8 @@
     "VALORANT_CONFIG_GUILD_MISCONFIG_NO_CHANNEL": " ❌  Não consegui verificar o canal de texto de lojas diárias deste servidor, ele provavelmente foi deletado. Use a opção de direct.",
     "VALORANT_CONFIG_SET": " ✅  Configurações da loja diária do Valorant atualizadas!",
     "VALORANT_DS_PRIVATE": " ⚠️  Você recebeu este direct pois o servidor onde você configurou a loja diária do Valorant desligou a funcionalidade.",
+    "VALORANT_DS_CHANNEL": " ✌️  Opa, {player}!",
+    "VALORANT_LOGIN_2FA_NOT_SUPPORTED": " ❌  Desculpe, mas no momento a RinBot não consegue fazer login em contas que possuem 2FA ativo devido a problemas de desenvolvimento.\nAguarde uma futura versão da RinBot ter o problema corrigido.",
 
     "": ""
 }

rinbot/core/interface.py

@@ -801,9 +801,13 @@ 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)]
+        to_remove.reverse()
 
         for track in to_remove:
             self.player.queue.remove(track)
+            self.player.history.insert(-1, track)
+        
+        self.player.performed_skip = True
 
         await self.player.skip(force=True)
 

rinbot/core/loggers.py

@@ -70,6 +70,7 @@ def format(self, record):
 
 class Loggers:
     ROOT: logging.Logger            = root_logger
+    AI: logging.Logger              = logging.getLogger('AI')
     COMMAND_CHECKS: logging.Logger  = logging.getLogger('Command Checks')
     CLIENT: logging.Logger          = logging.getLogger('Client')
     COMMANDS: logging.Logger        = logging.getLogger('Commands')

rinbot/core/tasks.py

@@ -36,12 +36,12 @@ async def start(self) -> None:
     @tasks.loop(minutes=int(conf['STATUS_CHANGE_INTERVAL']))
     async def _status_loop(self) -> None:
         def _get_lang() -> None:
-            txt = read(get_os_path(f'{Path.locale}/en-GB.json'))
+            txt = read(get_os_path(f'{Path.locale}/en-GB.json'), silent=True)
             if not txt:
                 logger.error('huh? what?')
 
         status_lang = conf['STATUS_LANG']
-        txt = read(get_os_path(f'{Path.locale}/{status_lang}.json'))
+        txt = read(get_os_path(f'{Path.locale}/{status_lang}.json'), silent=True)
         if not txt:
             _get_lang()
 

rinbot/extensions/music.py

@@ -119,7 +119,11 @@ async def on_wavelink_track_end(self, payload: nextlink.TrackEndEventPayload) ->
         await player.last_message.edit(embed=new_embed, view=None)
 
         if not player.from_previous_interaction:
-            player.history.append(payload.track)
+            if player.performed_skip:
+                player.history.insert(0, payload.track)
+                player.performed_skip = False
+            else:
+                player.history.append(payload.track)
 
         player.from_previous_interaction = False
 
@@ -236,6 +240,18 @@ async def _play(
                 resp_type=ResponseType.FOLLOWUP
             )
 
+        # Make sure there is space for me in there
+        if voice_channel.user_limit != 0:
+            if len(voice_channel.members) >= voice_channel.user_limit:
+                return await respond(
+                    interaction, Colour.red(),
+                    get_localized_string(
+                        locale, 'MUSIC_CHANNEL_FULL'
+                    ),
+                    hidden=True,
+                    resp_type=ResponseType.FOLLOWUP
+                )
+        
         """ # Get player
         if guild_id in self.bot.music_clients:
             player = self.bot.music_clients[guild_id]
@@ -281,8 +297,17 @@ async def _play(
                 )
 
             else:
-                if results:
-                    playables.append(results[0])
+                if not results:
+                    return await respond(
+                        interaction, Colour.red(),
+                        get_localized_string(
+                            locale, 'MUSIC_NO_RESULTS_FROM_URL'
+                        ),
+                        hidden=True,
+                        resp_type=ResponseType.FOLLOWUP
+                    )
+                
+                playables.append(results[0])
 
         # If it's a search query
         else:
@@ -325,7 +350,7 @@ async def _play(
                     colour=Colour.yellow()
                 )
 
-                return await interaction.edit_original_message(embed=embed, view=None)
+                return await interaction.edit_original_message(content=None, embed=embed, view=None)
 
 
             for result in view.user_choices:

rinbot/extensions/valorant.py

@@ -77,6 +77,7 @@ def __embed(skin: Dict) -> Embed:
     def __get_store_embeds(cls, player: str, offer: Dict, locale: str) -> List[Embed]:
         data = GetFormat.offer_format(offer, locale)
 
+        player = player.split('#')[0]
         duration = data.pop('duration')
         expires = get_expiration_time(datetime.now(UTC) + timedelta(seconds=duration), locale)
         description = get_localized_string(
@@ -177,15 +178,24 @@ async def _valorant_login(
             )
 
         elif authenticate['auth'] == '2fa':
-            cookies = authenticate['cookie']
+            """ cookies = authenticate['cookie']
             message = authenticate['message']
             label = authenticate['label']
             
             modal = Valorant2FAView(
                 interaction, locale, self.bot.val_db, cookies, message, label
             )
             
-            await interaction.response.send_modal(modal)
+            await interaction.response.send_modal(modal) """
+            
+            await respond(
+                interaction, Colour.red(),
+                get_localized_string(
+                    locale, 'VALORANT_LOGIN_2FA_NOT_SUPPORTED'
+                ),
+                hidden=True,
+                resp_type=ResponseType.FOLLOWUP
+            )
 
     # /valorant logout
     @_valorant.subcommand(