Implement selfhosted logs fully

Author: kyb3r

app.py

@@ -10,14 +10,16 @@
 
 @app.listener('before_server_start')
 async def init(app, loop):
-    app.db = AsyncIOMotorClient(os.getenv('MONGO_URI')).modmail
+    app.db = AsyncIOMotorClient(os.getenv('MONGO_URI')).modmail_bot
 
-app.get('/')
+@app.get('/')
 async def index(request):
-    return response.json('Welcome!')
+    return response.text('Welcome! This simple webserver is used to display your modmail logs.')
 
-@app.get('/<key>')
+@app.get('/logs/<key>')
 async def getlogsfile(request, key):
+    print(key)
+
     log = await app.db.logs.find_one({'key': key})
 
     if log is None:

bot.py

@@ -35,6 +35,8 @@
 import aiohttp
 from discord.ext import commands
 from discord.ext.commands.view import StringView
+from motor.motor_asyncio import AsyncIOMotorClient
+
 from colorama import init, Fore, Style
 import emoji
 
@@ -59,6 +61,8 @@ def __init__(self):
         self.session = aiohttp.ClientSession(loop=self.loop)
         self.config = ConfigManager(self)
         self.selfhosted = bool(self.config.get('mongo_uri'))
+        if self.selfhosted:
+            self.db = AsyncIOMotorClient(self.config.mongo_uri).modmail_bot
         self.modmail_api = SelfhostedClient(self) if self.selfhosted else ModmailApiClient(self)
         self.data_task = self.loop.create_task(self.data_loop())
         self.autoupdate_task = self.loop.create_task(self.autoupdate_loop())
@@ -161,8 +165,11 @@ async def get_pre(bot, message):
     async def on_connect(self):
         print(line + Fore.RED + Style.BRIGHT)
         if not self.selfhosted:
+            print('Mode: using api.modmail.tk')
             await self.validate_api_token()
             print(line)
+        else:
+            print('Mode: selfhosting logs.')
         print(Fore.CYAN + 'Connected to gateway.')
         await self.config.refresh()
         status = self.config.get('status')
@@ -405,7 +412,7 @@ async def autoupdate_loop(self):
             print('Github access token not found.')
             print('Autoupdates disabled.')
             return 
-            
+
         while True:
             metadata = await self.modmail_api.get_metadata()
 

cogs/modmail.py

@@ -343,9 +343,9 @@ async def logs(self, ctx, *, member: Union[discord.Member, discord.User, obj]=No
             time = date.strftime(r'%H:%M')
 
             key = entry['key']
-            user_id = entry['user_id']
+            user_id = entry.get('user_id')
             closer = entry['closer']['name']
-            log_url = f"https://logs.modmail.tk/{user_id}/{key}"
+            log_url = f"https://logs.modmail.tk/{user_id}/{key}" if not self.bot.selfhosted else self.bot.config.log_url + f'/logs/{key}'
 
             truncate = lambda c: c[:47].strip() + '...' if len(c) > 50 else c
 

core/clients.py

@@ -187,8 +187,8 @@ def __init__(self, bot):
             }
 
     @property
-    def db(self)
-        return self.bot.db 
+    def db(self):
+        return self.app.db 
 
     @property 
     def logs(self):
@@ -234,15 +234,19 @@ async def get_log_url(self, recipient, channel, creator):
             'messages': []
             })
 
-        return f'https://{self.app.config.log_domain}/logs/{key}'
+        return f'{self.app.config.log_url}/logs/{key}'
 
     async def get_config(self):
-        return await self.db.config.find_one({})
+        conf = await self.db.config.find_one({'bot_id': self.app.user.id})
+        if conf is None:
+            await self.db.config.insert_one({'bot_id': self.app.user.id})
+            return {'bot_id': self.app.user.id}
+        return conf
 
     async def update_config(self, data):
         valid_keys = self.app.config.valid_keys - self.app.config.protected_keys
         data = {k: v for k, v in data.items() if k in valid_keys}
-        return await self.db.config.find_one_and_replace({}, data)
+        return await self.db.config.update_one({'bot_id': self.app.user.id}, {'$set': data})
 
     async def append_log(self, message, channel_id=''):
         channel_id = str(channel_id) or str(message.channel.id)
@@ -269,19 +273,24 @@ async def append_log(self, message, channel_id=''):
         )
 
     async def post_log(self, channel_id, payload):
-        await self.logs.find_one_and_replace({'channel_id': channel_id}, payload)
+        log = await self.logs.find_one_and_update(
+            {'channel_id': str(channel_id)},
+            {'$set': {key: payload[key] for key in payload}},
+            return_document=ReturnDocument.AFTER
+        )
+        return log
 
     async def update_repository(self):
         user = await Github.login(self.app)
         data = await user.update_repository()
         return {'data': data}
 
-    def get_user_info(self):
+    async def get_user_info(self):
         user = await Github.login(self.app)
         return {
             'user': {
                 'username': user.username,
                 'avatar_url': user.avatar_url,
                 'url': user.url
             }
-
+        }

core/config.py

@@ -17,7 +17,7 @@ class ConfigManager:
 
     protected_keys = {
         'token', 'owners', 'modmail_api_token', 'guild_id', 'modmail_guild_id', 
-        'mongo_uri', 'github_access_token', 'log_domain'
+        'mongo_uri', 'github_access_token', 'log_url'
         }
 
     valid_keys = allowed_to_change_in_command.union(internal_keys).union(protected_keys)
@@ -50,8 +50,6 @@ def populate_cache(self):
             data = {k.lower(): v for k, v in data.items() if k.lower() in self.valid_keys}
             self.cache = data
 
-        self.bot.loop.create_task(self.refresh())
-
     async def update(self, data=None):
         """Updates the config with data from the cache"""
         self._modified = False

core/thread.py

@@ -73,7 +73,11 @@ async def close(self, *, closer, after=0, silent=False, delete_channel=True, mes
         if isinstance(log_data, str):
             print(log_data) # errored somehow on server
 
-        log_url = f"https://logs.modmail.tk/{log_data['user_id']}/{log_data['key']}"
+        if self.bot.selfhosted:
+            log_url = f'{self.bot.config.log_url}/logs/{log_data["key"]}'
+        else:
+            log_url = f"https://logs.modmail.tk/{log_data['user_id']}/{log_data['key']}" 
+
         user = self.recipient.mention if self.recipient else f'`{self.id}`'
 
         if log_data['messages']: