From ad13a895901efd7626b6efbdd25bf6d509fa7554 Mon Sep 17 00:00:00 2001
From: Lucas Daniel <lucasdanielbarradas@gmail.com>
Date: Tue, 13 Aug 2024 07:07:37 -0300
Subject: [PATCH] Fix twitch streamer url and send history message ephemeral

- Add dot at the end of error phrase
- Fix ignore WebSocket closed with 1000
- Add www to the twitch streamer url to show the streamer icon
- Add ephemeral message in history view
- Remove twitch challenge log
---
 app/languages/errors/errors.pt-br.yml | 4 ++--
 app/logger.py                         | 2 +-
 app/services/notifications_twitch.py  | 2 +-
 app/views/manager.py                  | 2 +-
 app/views/pagination.py               | 4 ++--
 app/webhooks/twitch.py                | 1 -
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/languages/errors/errors.pt-br.yml b/app/languages/errors/errors.pt-br.yml
index cf1732b..69e68b2 100644
--- a/app/languages/errors/errors.pt-br.yml
+++ b/app/languages/errors/errors.pt-br.yml
@@ -15,12 +15,12 @@ pt-br:
   command-default-roles-low-permissions:
     title: Permissões de Cargo Insuficientes
     message: "Desculpe, mas não tenho permissão para atribuir cargos neste servidor.\n\n
-      Por favor, me atribua um cargo com esses privilégios ou eleve a posição do meu cargo **Keiko** na hierarquia de cargos do servidor"
+      Por favor, me atribua um cargo com esses privilégios ou eleve a posição do meu cargo **Keiko** na hierarquia de cargos do servidor."
 
   command-default-roles-missing-permissions:
     message: "🚨 **ATENÇÃO!!!**\n
       Não tenho mais permissão para atribuir os seguintes cargos no servidor: **$roles**\n\n
-      Por favor, me atribua um cargo com esses privilégios ou eleve a posição do meu cargo **Keiko** na hierarquia de cargos do servidor"
+      Por favor, me atribua um cargo com esses privilégios ou eleve a posição do meu cargo **Keiko** na hierarquia de cargos do servidor."
 
   command-default-roles-disactivated:
     message: A funcionalidade de atribuir cargos automaticamente está desabilitada. Para ativar e configurar a funcionalidade, sinta-se a vontade de rodar o comando `cargos padrao` 🐶
diff --git a/app/logger.py b/app/logger.py
index d6b0fab..2ce6c9f 100644
--- a/app/logger.py
+++ b/app/logger.py
@@ -147,7 +147,7 @@ def emit(self, record):
                 self.bot.config.ADMIN_LOGS_COMMAND_CALL_ID
             )
 
-        if record.levelno == logging.ERROR and "WebSocket closed with 1000" in record.msg:
+        if record.levelno == logging.ERROR and "WebSocket closed with 1000" in record.exc_info[1]:
             return
 
         if not log_channel:
diff --git a/app/services/notifications_twitch.py b/app/services/notifications_twitch.py
index 9ac2b0e..24a94a5 100644
--- a/app/services/notifications_twitch.py
+++ b/app/services/notifications_twitch.py
@@ -123,7 +123,7 @@ def unsubscribe_streamer(interaction: discord.Interaction, cogs: Dict[str, Any])
 
 def compose_notification_message(notification: Dict[str, Any], streamer: str) -> str:
     messages = notification.get("notification_messages").get("value")
-    stream_link = f"https://twitch.tv/{streamer}"
+    stream_link = f"https://www.twitch.tv/{streamer}"
     random_message = random.choice(messages.split(";")).lstrip()
 
     return parse_streamer_message(random_message, streamer, stream_link)
diff --git a/app/views/manager.py b/app/views/manager.py
index f7d7d2a..f19f7b5 100644
--- a/app/views/manager.py
+++ b/app/views/manager.py
@@ -188,4 +188,4 @@ async def history_callback(self, interaction: discord.Interaction):
         desc = parse_history_desc(interaction, self.command_key)
         pagination_view = PaginationView(interaction, title, desc, data, sep=4)
 
-        await pagination_view.send()
+        await pagination_view.send(ephemeral=True)
diff --git a/app/views/pagination.py b/app/views/pagination.py
index d8549e1..6e3c624 100644
--- a/app/views/pagination.py
+++ b/app/views/pagination.py
@@ -30,11 +30,11 @@ def __init__(
 
         super().__init__()
 
-    async def send(self):
+    async def send(self, ephemeral: bool = False):
         if hasattr(self, "select"):
             self.select.update()
 
-        await self.interaction.response.send_message(view=self)
+        await self.interaction.response.send_message(view=self, ephemeral=ephemeral)
         await self.update_message(self.get_current_page_data())
 
     def create_embed(self, data):
diff --git a/app/webhooks/twitch.py b/app/webhooks/twitch.py
index 55ad366..59f99c3 100644
--- a/app/webhooks/twitch.py
+++ b/app/webhooks/twitch.py
@@ -16,7 +16,6 @@ def twitch_webhook():
     data = request.json
 
     if bot.twitch.check_request_is_a_challenge(request):
-        logger.info('Twitch webhook challenge received', log_type=logconstants.COMMAND_INFO_TYPE)
         return data['challenge']
 
     if data.get('subscription', {}).get('type') == 'stream.online':