Removed api

Author: Taaku18

bot.py

@@ -31,6 +31,7 @@
 import sys
 
 from datetime import datetime
+from pkg_resources import parse_version
 from types import SimpleNamespace
 
 import discord
@@ -45,7 +46,7 @@
 from motor.motor_asyncio import AsyncIOMotorClient
 
 from core.changelog import Changelog
-from core.clients import ModmailApiClient, SelfHostedClient, PluginDatabaseClient
+from core.clients import SelfHostedClient, PluginDatabaseClient
 from core.config import ConfigManager
 from core.utils import info, error
 from core.models import Bot
@@ -104,14 +105,10 @@ def __init__(self):
 
         self._configure_logging()
 
-        if self.self_hosted:
-            self._db = AsyncIOMotorClient(self.config.mongo_uri).modmail_bot
-            self._api = SelfHostedClient(self)
-        else:
-            self._api = ModmailApiClient(self)
+        self._db = AsyncIOMotorClient(self.config.mongo_uri).modmail_bot
+        self._api = SelfHostedClient(self)
         self.plugin_db = PluginDatabaseClient(self)
 
-        self.data_task = self.loop.create_task(self.data_loop())
         self.autoupdate_task = self.loop.create_task(self.autoupdate_loop())
         self._load_extensions()
         self.owner = None
@@ -144,10 +141,6 @@ def version(self):
     def db(self):
         return self._db
 
-    @property
-    def self_hosted(self):
-        return bool(self.config.get('mongo_uri', ''))
-
     @property
     def api(self):
         return self._api
@@ -210,12 +203,6 @@ def run(self, *args, **kwargs):
         except Exception:
             logger.critical(error('Fatal exception'), exc_info=True)
         finally:
-            try:
-                self.data_task.cancel()
-                self.loop.run_until_complete(self.data_task)
-            except asyncio.CancelledError:
-                logger.debug('data_task has been cancelled')
-
             try:
                 self.autoupdate_task.cancel()
                 self.loop.run_until_complete(self.autoupdate_task)
@@ -345,15 +332,8 @@ def main_color(self):
 
     async def on_connect(self):
         logger.info(LINE)
-        if not self.self_hosted:
-            logger.info(info('MODE: Using the Modmail API'))
-            logger.info(LINE)
-            await self.validate_api_token()
-            logger.info(LINE)
-        else:
-            logger.info(info('Mode: Self-hosting logs.'))
-            await self.validate_database_connection()
-            logger.info(LINE)
+        await self.validate_database_connection()
+        logger.info(LINE)
         logger.info(info('Connected to gateway.'))
 
         await self.config.refresh()
@@ -784,32 +764,6 @@ def overwrites(ctx):
                 )
         return overwrites
 
-    async def validate_api_token(self):
-        try:
-            self.config.modmail_api_token
-        except KeyError:
-            logger.critical(error(f'MODMAIL_API_TOKEN not found.'))
-            logger.critical(error('Set a config variable called '
-                                  'MODMAIL_API_TOKEN with a token from '
-                                  'https://dashboard.modmail.tk.'))
-            logger.critical(error('If you want to self-host logs, '
-                                  'input a MONGO_URI config variable.'))
-            logger.critical(error('A Modmail API token is not needed '
-                                  'if you are self-hosting logs.'))
-
-            return await self.logout()
-        else:
-            valid = await self.api.validate_token()
-            if not valid:
-                logger.critical(error('Invalid MODMAIL_API_TOKEN - get one '
-                                      'from https://dashboard.modmail.tk'))
-                return await self.logout()
-
-        user = await self.api.get_user_info()
-        username = user['user']['username']
-        logger.info(info('Validated token.'))
-        logger.info(info('GitHub user: ' + username))
-
     async def validate_database_connection(self):
         try:
             await self.db.command('buildinfo')
@@ -821,32 +775,6 @@ async def validate_database_connection(self):
         else:
             logger.info(info('Successfully connected to the database.'))
 
-    async def data_loop(self):
-        await self.wait_until_ready()
-        self.owner = (await self.application_info()).owner
-
-        while not self.is_closed():
-            data = {
-                "owner_name": str(self.owner),
-                "owner_id": self.owner.id,
-                "bot_id": self.user.id,
-                "bot_name": str(self.user),
-                "avatar_url": self.user.avatar_url,
-                "guild_id": self.guild_id,
-                "guild_name": self.guild.name,
-                "member_count": len(self.guild.members),
-                "uptime": (datetime.utcnow() -
-                           self.start_time).total_seconds(),
-                "latency": f'{self.ws.latency * 1000:.4f}',
-                "version": self.version,
-                # TODO: change to `self_hosted`
-                "selfhosted": self.self_hosted,
-                "last_updated": str(datetime.utcnow())
-            }
-
-            await self.api.post_metadata(data)
-            await asyncio.sleep(3600)
-
     async def autoupdate_loop(self):
         await self.wait_until_ready()
 
@@ -855,16 +783,19 @@ async def autoupdate_loop(self):
             logger.info(LINE)
             return
 
-        if self.self_hosted and not self.config.get('github_access_token'):
+        if not self.config.get('github_access_token'):
             logger.warning(info('GitHub access token not found.'))
             logger.warning(info('Autoupdates disabled.'))
             logger.info(LINE)
             return
 
+        logger.info(info('Autoupdate loop started.'))
+
         while not self.is_closed():
-            metadata = await self.api.get_metadata()
+            changelog = await Changelog.from_url(self)
+            latest = changelog.latest_version
 
-            if metadata['latest_version'] != self.version:
+            if parse_version(self.version) < parse_version(latest.version):
                 data = await self.api.update_repository()
 
                 embed = discord.Embed(color=discord.Color.green())
@@ -875,10 +806,8 @@ async def autoupdate_loop(self):
                                  icon_url=user['avatar_url'],
                                  url=user['url'])
                 embed.set_footer(text=f"Updating Modmail v{self.version} "
-                                      f"-> v{metadata['latest_version']}")
+                                      f"-> v{latest.version}")
 
-                changelog = await Changelog.from_url(self)
-                latest = changelog.latest_version
                 embed.description = latest.description
                 for name, value in latest.fields.items():
                     embed.add_field(name=name, value=value)

cogs/modmail.py

@@ -372,11 +372,7 @@ def format_log_embeds(self, logs, avatar_url):
 
             created_at = parser.parse(entry['created_at'])
 
-            log_url = (
-                f"https://logs.modmail.tk/{key}"
-                if not self.bot.self_hosted else
-                self.bot.config.log_url.strip('/') + f'/logs/{key}'
-            )
+            log_url = self.bot.config.log_url.strip('/') + f'/logs/{key}'
 
             username = entry['recipient']['name'] + '#'
             username += entry['recipient']['discriminator']
@@ -443,14 +439,6 @@ async def logs(self, ctx, *, member: User = None):
     @checks.has_permissions(manage_messages=True)
     async def closed_by(self, ctx, *, user: User = None):
         """Returns all logs closed by a user."""
-        if not self.bot.self_hosted:
-            embed = discord.Embed(
-                color=discord.Color.red(),
-                description='This command only works if '
-                            'you are self-hosting your logs.'
-                )
-            return await ctx.send(embed=embed)
-
         user = user or ctx.author
 
         query = {
@@ -485,14 +473,6 @@ async def search(self, ctx, limit: Optional[int] = None, *, query):
 
         await ctx.trigger_typing()
 
-        if not self.bot.self_hosted:
-            embed = discord.Embed(
-                color=discord.Color.red(),
-                description='This command only works if you '
-                            'are self-hosting your logs.'
-                )
-            return await ctx.send(embed=embed)
-
         query = {
             'guild_id': str(self.bot.guild_id),
             'open': False,

cogs/utility.py

@@ -7,6 +7,7 @@
 from difflib import get_close_matches
 from io import StringIO
 from json import JSONDecodeError
+from pkg_resources import parse_version
 from textwrap import indent
 
 import discord
@@ -203,19 +204,8 @@ async def about(self, ctx):
         desc += 'an organised manner.'
         embed.description = desc
 
-        url = 'https://api.modmail.tk/metadata'
-        async with self.bot.session.get(url) as resp:
-            try:
-                meta = await resp.json()
-            except (JSONDecodeError, ClientResponseError):
-                meta = None
-
         embed.add_field(name='Uptime', value=self.bot.uptime)
-        if meta:
-            embed.add_field(name='Instances', value=meta['instances'])
-        else:
-            embed.add_field(name='Latency',
-                            value=f'{self.bot.latency * 1000:.2f} ms')
+        embed.add_field(name='Latency', value=f'{self.bot.latency * 1000:.2f} ms')
 
         embed.add_field(name='Version',
                         value=f'[`{self.bot.version}`]'
@@ -225,12 +215,13 @@ async def about(self, ctx):
 
         footer = f'Bot ID: {self.bot.user.id}'
 
-        if meta:
-            if self.bot.version != meta['latest_version']:
-                footer = ("A newer version is available "
-                          f"v{meta['latest_version']}")
-            else:
-                footer = 'You are up to date with the latest version.'
+        changelog = await Changelog.from_url(self.bot)
+        latest = changelog.latest_version
+
+        if parse_version(self.bot.version) < parse_version(latest.version):
+            footer = f"A newer version is available v{latest.version}"
+        else:
+            footer = 'You are up to date with the latest version.'
 
         embed.add_field(name='GitHub',
                         value='https://github.com/kyb3r/modmail',
@@ -364,18 +355,19 @@ async def github(self, ctx):
     @trigger_typing
     async def update(self, ctx):
         """Updates the bot, this only works with heroku users."""
-        metadata = await self.bot.api.get_metadata()
+        changelog = await Changelog.from_url(self.bot)
+        latest = changelog.latest_version
 
         desc = (f'The latest version is [`{self.bot.version}`]'
                 '(https://github.com/kyb3r/modmail/blob/master/bot.py#L25)')
 
-        embed = Embed(
-            title='Already up to date',
-            description=desc,
-            color=self.bot.main_color
-        )
+        if parse_version(self.bot.version) >= parse_version(latest.version):
+            embed = Embed(
+                title='Already up to date',
+                description=desc,
+                color=self.bot.main_color
+            )
 
-        if metadata['latest_version'] == self.bot.version:
             data = await self.bot.api.get_user_info()
             if not data.get('error'):
                 user = data['user']
@@ -387,19 +379,17 @@ async def update(self, ctx):
 
             commit_data = data['data']
             user = data['user']
-            embed.title = None
-            embed.set_author(name=user['username'],
-                             icon_url=user['avatar_url'],
-                             url=user['url'])
-            embed.set_footer(text=f'Updating Modmail v{self.bot.version} '
-                                  f"-> v{metadata['latest_version']}")
 
             if commit_data:
+                embed = Embed(color=self.bot.main_color)
+
+                embed.set_footer(text=f'Updating Modmail v{self.bot.version} '
+                                      f'-> v{latest.version}')
+
                 embed.set_author(name=user['username'] + ' - Updating bot',
                                  icon_url=user['avatar_url'],
                                  url=user['url'])
-                changelog = await Changelog.from_url(self.bot)
-                latest = changelog.latest_version
+
                 embed.description = latest.description
                 for name, value in latest.fields.items():
                     embed.add_field(name=name, value=value)
@@ -409,8 +399,14 @@ async def update(self, ctx):
                 embed.add_field(name='Merge Commit',
                                 value=f'[`{short_sha}`]({html_url})')
             else:
-                embed.description = ('Already up to date '
-                                     'with master repository.')
+                embed = Embed(
+                    title='Already up to date with master repository.',
+                    description='No further updates required',
+                    color=self.bot.main_color
+                )
+                embed.set_author(name=user['username'],
+                                 icon_url=user['avatar_url'],
+                                 url=user['url'])
 
         return await ctx.send(embed=embed)
 

core/changelog.py

@@ -36,14 +36,14 @@ class Version:
 
     def __init__(self, bot: Bot, version: str, lines: str):
         self.bot = bot
-        self.version = version
+        self.version = version.lstrip('vV')
         self.lines = [x for x in lines.splitlines() if x]
         self.fields = defaultdict(str)
         self.description = ''
         self.parse()
 
     def __repr__(self) -> str:
-        return f'Version({self.version}, description="{self.description}")'
+        return f'Version(v{self.version}, description="{self.description}")'
 
     def parse(self) -> None:
         """
@@ -66,7 +66,7 @@ def embed(self) -> Embed:
         """
         embed = Embed(color=Color.green(), description=self.description)
         embed.set_author(
-            name=f'{self.version} - Changelog',
+            name=f'v{self.version} - Changelog',
             icon_url=self.bot.user.avatar_url,
         )
 
@@ -150,8 +150,3 @@ async def from_url(cls, bot: Bot, url: str = '') -> 'Changelog':
         url = url or cls.CHANGELOG_URL
         resp = await bot.session.get(url)
         return cls(bot, await resp.text())
-
-
-if __name__ == '__main__':
-    with open('../CHANGELOG.md') as f:
-        print(Changelog(..., f.read()).latest_version)