From 0d965c539074dad447b6101504ba9af18bcc780d Mon Sep 17 00:00:00 2001
From: Charles P <charles.pingard@viacesi.fr>
Date: Thu, 2 Nov 2023 17:47:26 +0100
Subject: [PATCH] :recycle: refactor(yt_tracking_rm): merge 'youtu.be' and
 'youtube.com' logics

---
 .../youtubeTrackingRemover.py                 | 46 +++++++------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/plugins/youtubeTrackingRemover/youtubeTrackingRemover.py b/plugins/youtubeTrackingRemover/youtubeTrackingRemover.py
index 430312b9..77624a8f 100644
--- a/plugins/youtubeTrackingRemover/youtubeTrackingRemover.py
+++ b/plugins/youtubeTrackingRemover/youtubeTrackingRemover.py
@@ -46,8 +46,9 @@ async def on_message(self, message: discord.Message):
             return
 
         # check if message contains a youtube.com link
-        regex = r'(https?://(?:www\.)?youtube\.com/watch\?[^\s]+)'
-        matches = re.findall(regex, message.content)
+        regex_full = r'(https?://(?:www\.)?youtube\.com/watch\?[^\s]+)'
+        regex_short = r'(https?://(?:www\.)?youtu\.be/[^\s]+)'
+        matches = re.findall(regex_full, message.content) + re.findall(regex_short, message.content)
 
         content = message.content
         for match in matches:
@@ -55,39 +56,25 @@ async def on_message(self, message: discord.Message):
             query_params = parse_qs(parsed_url.query)
             new_match = match
 
-            # replace the link with a link with only the video id
-            if 'v' in query_params:
+            # retrieve videoid
+            if parsed_url.hostname in ['youtu.be','www.youtu.be']:
+                video_id = parsed_url.path[1:]
+                new_match = parsed_url.scheme + '://' + parsed_url.hostname + '/' + video_id
+                separator = '?'
+            elif parsed_url.hostname in ['youtube.com','www.youtube.com'] and 'v' in query_params:
                 video_id = query_params['v'][0]
-                new_match = f'https://www.youtube.com/watch?v={video_id}'
+                new_match = parsed_url.scheme + '://' + parsed_url.hostname + '/watch?v=' + video_id
+                separator = '&'
+            else:
+                continue
 
             # re-add `time` and `t` parameters
             if 't' in query_params:
                 time = query_params['t'][0]
-                new_match = new_match + f'&t={time}'
+                new_match += separator + f't={time}'
             elif 'time' in query_params:
                 time = query_params['time'][0]
-                new_match = new_match + f'&time={time}'
-
-            content = content.replace(match, f'{new_match}')
-
-        # check for youtu.be links
-        regex = r'(https?://(?:www\.)?youtu\.be/[^\s]+)'
-        matches = re.findall(regex, message.content)
-
-        for match in matches:
-            parsed_url = urlparse(match)
-            query_params = parse_qs(parsed_url.query)
-
-            # remove every parameters
-            new_match = match.split('?')[0]
-
-            # re-add `time` and `t` parameters
-            if 't' in query_params:
-                time = query_params['t'][0]
-                new_match = new_match + f'?t={time}'
-            elif 'time' in query_params:
-                time = query_params['time'][0]
-                new_match = new_match + f'?time={time}'
+                new_match += separator + f'time={time}'
 
             content = content.replace(match, f'{new_match}')
 
@@ -106,7 +93,8 @@ async def on_message(self, message: discord.Message):
                                              wait=True)
 
         # add the view
-        await webhook_message.edit(view=YoutubeTrackingRemoverView(self.bot, webhook_message, webhook, message.author.id))
+        await webhook_message.edit(
+            view=YoutubeTrackingRemoverView(self.bot, webhook_message, webhook, message.author.id))
 
         # delete the original message
         await message.delete()