Add support to change log url prefix

Author: kyb3r

cogs/modmail.py

@@ -1,5 +1,6 @@
 import asyncio
 import re
+import os
 from datetime import datetime
 from typing import Optional, Union
 from types import SimpleNamespace as param
@@ -381,7 +382,11 @@ def format_log_embeds(self, logs, avatar_url):
 
             created_at = parser.parse(entry['created_at'])
 
-            log_url = self.bot.config.log_url.strip('/') + f'/logs/{key}'
+            prefix = os.getenv('LOG_URL_PREFIX', '/logs')
+                prefix = ''
+
+
+            log_url = self.bot.config.log_url.strip('/') + f'{prefix}/{key}'
 
             username = entry['recipient']['name'] + '#'
             username += entry['recipient']['discriminator']

core/clients.py

@@ -1,3 +1,4 @@
+import os
 import logging
 import secrets
 from datetime import datetime
@@ -14,6 +15,9 @@
 
 logger = logging.getLogger('Modmail')
 
+prefix = os.getenv('LOG_URL_PREFIX', '/logs')
+if prefix == 'NONE':
+    prefix = ''
 
 class ApiClient:
     """
@@ -288,7 +292,7 @@ async def get_log(self, channel_id):
 
     async def get_log_link(self, channel_id):
         doc = await self.get_log(channel_id)
-        return f"{self.bot.config.log_url.strip('/')}/logs/{doc['key']}"
+        return f"{self.bot.config.log_url.strip('/')}{prefix}/{doc['key']}"
 
     async def create_log_entry(self, recipient, channel, creator):
         key = secrets.token_hex(6)
@@ -318,7 +322,7 @@ async def create_log_entry(self, recipient, channel, creator):
             'messages': []
         })
 
-        return f"{self.bot.config.log_url.strip('/')}/logs/{key}"
+        return f"{self.bot.config.log_url.strip('/')}{prefix}/{key}"
 
     async def get_config(self):
         conf = await self.db.config.find_one({'bot_id': self.bot.user.id})

core/thread.py

@@ -1,6 +1,7 @@
 import asyncio
 import logging
 import re
+import os
 import string
 import typing
 from datetime import datetime, timedelta
@@ -221,7 +222,9 @@ async def _close(self, closer, silent=False, delete_channel=True,
         })
 
         if log_data is not None and isinstance(log_data, dict):
-            log_url = f"{self.bot.config.log_url.strip('/')}/logs/{log_data['key']}"
+            prefix = os.getenv('LOG_URL_PREFIX', '/logs')
+            if prefix == 'NONE': prefix = ''
+            log_url = f"{self.bot.config.log_url.strip('/')}{prefix}/{log_data['key']}"
 
             if log_data['messages']:
                 content = str(log_data['messages'][0]['content'])