Strip slash from selfhosted log url

modmail-dev · Jan 20, 2019 · b5bbe01 · b5bbe01
1 parent 5f0f293
commit b5bbe01
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/cogs/modmail.py b/cogs/modmail.py
@@ -347,7 +347,7 @@ async def logs(self, ctx, *, member: Union[discord.Member, discord.User, obj]=No
 
             key = entry['_id']
             closer = entry['closer']['name']
-            log_url = f"https://logs.modmail.tk/{key}" if not self.bot.selfhosted else self.bot.config.log_url + f'/logs/{key}'
+            log_url = f"https://logs.modmail.tk/{key}" if not self.bot.selfhosted else self.bot.config.log_url.strip('/') + f'/logs/{key}'
 
             truncate = lambda c: c[:47].strip() + '...' if len(c) > 50 else c
 

diff --git a/core/clients.py b/core/clients.py
@@ -233,7 +233,7 @@ async def get_log_url(self, recipient, channel, creator):
             'messages': []
         })
 
-        return f'{self.app.config.log_url}/logs/{key}'
+        return f"{self.app.config.log_url.strip('/')}/logs/{key}"
 
     async def get_config(self):
         conf = await self.db.config.find_one({'bot_id': self.app.user.id})

diff --git a/core/thread.py b/core/thread.py
@@ -103,10 +103,9 @@ async def _close(self, closer, silent=False, delete_channel=True,
             return
 
         if self.bot.selfhosted:
-            log_url = f'{self.bot.config.log_url}/logs/{log_data["key"]}'
+            log_url = f"{self.bot.config.log_url.strip('/')}/logs/{log_data["key"]}"
         else:
-            log_url = f"https://logs.modmail.tk/" \
-                      f"{log_data['key']}"
+            log_url = f"https://logs.modmail.tk/{log_data['key']}"
 
         user = self.recipient.mention if self.recipient else f'`{self.id}`'