Skip to content

Commit b5bbe01

Browse files
committed
Strip slash from selfhosted log url
1 parent 5f0f293 commit b5bbe01

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

cogs/modmail.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ async def logs(self, ctx, *, member: Union[discord.Member, discord.User, obj]=No
347347

348348
key = entry['_id']
349349
closer = entry['closer']['name']
350-
log_url = f"https://logs.modmail.tk/{key}" if not self.bot.selfhosted else self.bot.config.log_url + f'/logs/{key}'
350+
log_url = f"https://logs.modmail.tk/{key}" if not self.bot.selfhosted else self.bot.config.log_url.strip('/') + f'/logs/{key}'
351351

352352
truncate = lambda c: c[:47].strip() + '...' if len(c) > 50 else c
353353

core/clients.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ async def get_log_url(self, recipient, channel, creator):
233233
'messages': []
234234
})
235235

236-
return f'{self.app.config.log_url}/logs/{key}'
236+
return f"{self.app.config.log_url.strip('/')}/logs/{key}"
237237

238238
async def get_config(self):
239239
conf = await self.db.config.find_one({'bot_id': self.app.user.id})

core/thread.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,9 @@ async def _close(self, closer, silent=False, delete_channel=True,
103103
return
104104

105105
if self.bot.selfhosted:
106-
log_url = f'{self.bot.config.log_url}/logs/{log_data["key"]}'
106+
log_url = f"{self.bot.config.log_url.strip('/')}/logs/{log_data["key"]}"
107107
else:
108-
log_url = f"https://logs.modmail.tk/" \
109-
f"{log_data['key']}"
108+
log_url = f"https://logs.modmail.tk/{log_data['key']}"
110109

111110
user = self.recipient.mention if self.recipient else f'`{self.id}`'
112111

0 commit comments

Comments
 (0)