Fix log url prefix

Signed-off-by: Taaku18 <[email protected]>

Author: Taaku18

cogs/modmail.py

@@ -570,16 +570,12 @@ def format_log_embeds(self, logs, avatar_url):
         title = f"Total Results Found ({len(logs)})"
 
         for entry in logs:
-
-            key = entry["key"]
-
             created_at = parser.parse(entry["created_at"])
 
-            prefix = self.bot.config["log_url_prefix"]
-            if prefix == "NONE":
-                prefix = ""
-
-            log_url = self.bot.config["log_url"].strip("/") + f"{prefix}/{key}"
+            prefix = self.bot.config['log_url_prefix'].strip('/')
+            if prefix == 'NONE':
+                prefix = ''
+            log_url = f"{self.bot.config['log_url'].strip('/')}{'/' + prefix if prefix else ''}/{entry['key']}"
 
             username = entry["recipient"]["name"] + "#"
             username += entry["recipient"]["discriminator"]

core/clients.py

@@ -99,7 +99,10 @@ async def get_log(self, channel_id: Union[str, int]) -> dict:
     async def get_log_link(self, channel_id: Union[str, int]) -> str:
         doc = await self.get_log(channel_id)
         logger.debug("Retrieving log link for channel %s.", channel_id)
-        return f"{self.bot.config['log_url'].strip('/')}{self.bot.config['log_url_prefix']}/{doc['key']}"
+        prefix = self.bot.config['log_url_prefix'].strip('/')
+        if prefix == 'NONE':
+            prefix = ''
+        return f"{self.bot.config['log_url'].strip('/')}{'/' + prefix if prefix else ''}/{doc['key']}"
 
     async def create_log_entry(
         self, recipient: Member, channel: TextChannel, creator: Member
@@ -135,7 +138,10 @@ async def create_log_entry(
             }
         )
         logger.debug("Created a log entry, key %s.", key)
-        return f"{self.bot.config['log_url'].strip('/')}{self.bot.config['log_url_prefix']}/{key}"
+        prefix = self.bot.config['log_url_prefix'].strip('/')
+        if prefix == 'NONE':
+            prefix = ''
+        return f"{self.bot.config['log_url'].strip('/')}{'/' + prefix if prefix else ''}/{key}"
 
     async def get_config(self) -> dict:
         conf = await self.db.config.find_one({"bot_id": self.bot.user.id})

core/thread.py

@@ -338,12 +338,10 @@ async def _close(
         )
 
         if isinstance(log_data, dict):
-            prefix = self.bot.config["log_url_prefix"]
-            if prefix == "NONE":
-                prefix = ""
-            log_url = (
-                f"{self.bot.config['log_url'].strip('/')}{prefix}/{log_data['key']}"
-            )
+            prefix = self.bot.config['log_url_prefix'].strip('/')
+            if prefix == 'NONE':
+                prefix = ''
+            log_url = f"{self.bot.config['log_url'].strip('/')}{'/' + prefix if prefix else ''}/{log_data['key']}"
 
             if log_data["messages"]:
                 content = str(log_data["messages"][0]["content"])