Merge branch 'master' of https://github.com/verixx/modmail

Author: kyb3r

Procfile

@@ -1 +1,2 @@
-worker: python bot.py
+worker: python bot.py
+web: python app.py

app.py

@@ -0,0 +1,31 @@
+import os 
+
+from sanic import Sanic, response
+from motor.motor_asyncio import AsyncIOMotorClient
+import aiohttp
+
+from core.models import LogEntry 
+
+app = Sanic(__name__)
+
+@app.listener('before_server_start')
+async def init(app, loop):
+    app.db = AsyncIOMotorClient(os.getenv('MONGO_URI')).modmail_bot
+
+@app.get('/')
+async def index(request):
+    return response.text('Welcome! This simple website is used to display your modmail logs.')
+
+@app.get('/logs/<key>')
+async def getlogsfile(request, key):
+    """Returned the plain text rendered log entry"""
+
+    log = await app.db.logs.find_one({'key': key})
+
+    if log is None:
+        return response.text('Not Found', status=404)
+    else:
+        return response.text(str(LogEntry(log)))
+
+if __name__ == '__main__':
+    app.run(host='0.0.0.0', port=os.getenv('PORT'))

bot.py

@@ -35,10 +35,12 @@
 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
 
-from core.api import Github, ModmailApiClient
+from core.clients import Github, ModmailApiClient, SelfhostedClient
 from core.thread import ThreadManager
 from core.config import ConfigManager
 from core.changelog import ChangeLog
@@ -58,7 +60,10 @@ def __init__(self):
         self.threads = ThreadManager(self)
         self.session = aiohttp.ClientSession(loop=self.loop)
         self.config = ConfigManager(self)
-        self.modmail_api = ModmailApiClient(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())
         self._add_commands()
@@ -158,9 +163,16 @@ async def get_pre(bot, message):
         return [bot.prefix, f'<@{bot.user.id}> ', f'<@!{bot.user.id}> ']
 
     async def on_connect(self):
-        print(line + Fore.RED + Style.BRIGHT)
-        await self.validate_api_token()
         print(line)
+        print(Fore.CYAN, end='')
+        if not self.selfhosted:
+            print('MODE: Using the Modmail API')
+            print(line)
+            await self.validate_api_token()
+            print(line)
+        else:
+            print('Mode: Selfhosting logs.')
+            print(line)
         print(Fore.CYAN + 'Connected to gateway.')
         await self.config.refresh()
         status = self.config.get('status')
@@ -355,12 +367,16 @@ async def validate_api_token(self):
         try:
             self.config.modmail_api_token
         except KeyError:
+            print(Fore.RED + Style.BRIGHT, end='')
             print('MODMAIL_API_TOKEN not found.')
             print('Set a config variable called MODMAIL_API_TOKEN with a token from https://dashboard.modmail.tk')
+            print('If you want to selfhost logs, input a MONGO_URI config variable.')
+            print('A modmail api token is not needed if you are selfhosting logs.')
             valid = False
         else:
             valid = await self.modmail_api.validate_token()
             if not valid:
+                print(Fore.RED + Style.BRIGHT, end='')
                 print('Invalid MODMAIL_API_TOKEN - get one from https://dashboard.modmail.tk')
         finally:
             if not valid:
@@ -393,11 +409,18 @@ async def data_loop(self):
             await asyncio.sleep(3600)
 
     async def autoupdate_loop(self):
-        while True:
-            if self.config.get('disable_autoupdates'):
-                await asyncio.sleep(3600)
-                continue
+        await self.wait_until_ready()
 
+        if self.config.get('disable_autoupdates'):
+            print('Autoupdates disabled.')
+            return 
+
+        if self.selfhosted and not self.config.get('github_access_token'):
+            print('Github access token not found.')
+            print('Autoupdates disabled.')
+            return 
+
+        while True:
             metadata = await self.modmail_api.get_metadata()
 
             if metadata['latest_version'] != self.version:

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