diff --git a/cogs/modmail.py b/cogs/modmail.py index 198dd4726e..7690466af1 100644 --- 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 index dc6f80c3e8..d377b2886e 100644 --- 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 index ea62328738..8416200d12 100644 --- 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}`'