Merge branch 'master' into plugin

Author: fourjr

.pylintrc

@@ -71,6 +71,15 @@ disable=raw-checker-failed,
         metaclass-assignment,
         missing-docstring,   # No doc-string
         no-name-in-module,   # No name 'file' in module 'core'
+        fixme,
+        too-many-public-methods,
+        too-many-locals,
+        too-many-statements,
+        too-many-branches,
+        too-many-instance-attributes,
+        too-many-arguments,
+        too-few-public-methods,
+        too-many-lines
 
 
 # Enable the message, report, category or checker with the given id(s). You can
@@ -356,7 +365,8 @@ good-names=i,
            id,
            db,
            f,
-           dt
+           dt,
+           c
 
 # Include a hint for the correct naming format with invalid-name.
 include-naming-hint=yes

CHANGELOG.md

@@ -4,6 +4,29 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+# v2.12.5
+
+### Fixed
+
+- `config del` command will now work properly on selfhosted db bots.
+
+
+# v2.12.4
+
+### Added
+- Named colors are now supported! Over 900 different common color names are recognized. A list of color names can be found in [core/_color_data.py](https://github.com/kyb3r/modmail/blob/master/core/_color_data.py).
+  - Named colors can be set the same way as hex. But this can only be done through `?config set`, which means database modifications will not work.
+  - For example: `?config set main_color yellowish green`.
+- New config var `main_color` allows you to customize the main Modmail color (as requested by many). Defaults to Discord `blurple`.
+
+# v2.12.3
+
+### Fixed
+- Patched a bug where `?logs` sub-commands were accessible by anyone.
+- Patched a bug where an error was raised if there was an open thread where the recipient had left the server.
+
+Huge thanks to Sasiko for reporting these issues.
+
 # v2.12.2
 
 ### Fixed
@@ -25,6 +48,7 @@ In the future, the Modmail API (https://modmail.tk) will be deprecated. This is
 - A lot of painful code cleanup, which is good for us (the devs), but shouldn't affect you.
 - The appearance of the `logs` command. Should be clearer with better info now.
 - Bot owners get access to all commands regardless of server permissions.
+- Blocked users no longer receive a message, only the blocked emoji will be sent.
 
 ### Added
 

README.md

@@ -1,70 +1,69 @@
 <div align="center">
-    <img src='https://i.imgur.com/o558Qnq.png' align='center'>
-    <br>
-    <strong><i>A simple and functional Modmail bot for Discord.</i></strong>
-    <br>
-    <br>
-
-
-<a href="https://heroku.com/deploy?template=https://github.com/kyb3r/modmail">
-    <img src="https://img.shields.io/badge/deploy_to-heroku-997FBC.svg?style=for-the-badge" />
-</a>
-
-
-<a href="https://discord.gg/j5e9p8w">
-    <img src="https://img.shields.io/discord/515071617815019520.svg?style=for-the-badge&colorB=7289DA" alt="Support" />
-</a>
-
-
-
-<a href="https://github.com/kyb3r/modmail/">
-    <img src="https://api.modmail.tk/badges/instances.svg" alt="Bot instances" />
-</a>
-
+  <img src="https://i.imgur.com/o558Qnq.png" align="center">
+  <br>
+  <strong><i>A simple and functional Modmail bot for Discord.</i></strong>
+  <br>
+  <br>
+    
+  <a href="https://heroku.com/deploy?template=https://github.com/kyb3r/modmail">
+    <img src="https://img.shields.io/badge/deploy_to-heroku-997FBC.svg?style=for-the-badge">
+  </a>
+  
+  <a href="https://discord.gg/j5e9p8w">
+    <img src="https://img.shields.io/discord/515071617815019520.svg?style=for-the-badge&colorB=7289DA" alt="Support">
+  </a>
+  
+  <a href="https://github.com/kyb3r/modmail/">
+    <img src="https://api.modmail.tk/badges/instances.svg" alt="Bot instances">
+  </a>
+  
+  <a href="https://patreon.com/kyber">
+    <img src="https://img.shields.io/badge/patreon-donate-orange.svg?style=for-the-badge" alt="Python 3.7">
+  </a>
+  
+  <a href="https://github.com/kyb3r/modmail/blob/master/LICENSE">
+    <img src="https://img.shields.io/badge/license-mit-e74c3c.svg?style=for-the-badge" alt="MIT License">
+  </a>
+</div>
 
-<a href="https://patreon.com/kyber">
-  <img src="https://img.shields.io/badge/patreon-donate-orange.svg?style=for-the-badge" alt="Python 3.7" />
-</a>
+---
 
+## How Does Modmail Work?
 
-<a href="https://github.com/kyb3r/modmail/blob/master/LICENSE">
-  <img src="https://img.shields.io/badge/license-mit-e74c3c.svg?style=for-the-badge" alt="MIT License" />
-</a>
+<img src="https://i.imgur.com/GGukNDs.png" align="right" height="350">
 
-</div>
-<br>
+When a user sends a direct message to the bot, a channel is created within an isolated category. This channel is where messages will be relayed. To reply to the message, simply use the command `?reply` in the channel. A full list of commands can be found in the [wiki](https://github.com/kyb3r/modmail/wiki) or by using the `?help` command.
 
-## How does it work?
+## Installation
 
+Currently, the easiest and fastest way to set up the bot is by using Heroku, which is a service that offers a free plan for hosting applications. If you choose to install the bot using Heroku, you will not need to download anything. The [**installation guide**](https://github.com/kyb3r/modmail/wiki/Installation) will guide you through the entire installation process. If you run into any problems, join our [Discord server](https://discord.gg/etJNHCQ) for help and support. Even if you don't have any issues, you should come and check out our awesome Discord community! :wink:
 
-<img src='https://i.imgur.com/GGukNDs.png' align='right' height=300>
+---
 
-When a user sends a direct message to the bot, a channel is created within an isolated category. This channel is where messages will be relayed. To reply to the message, simply use the command `reply` in the channel. See a full list of commands in the [wiki](https://github.com/kyb3r/modmail/wiki).
+# Notable Features
 
+## Customizability
 
-## Installation
+Modmail has a range of configuration variables that you can dynamically alter with the `?config` command. You can use them to change the different aspects of the bot, for example, the embed color, responses, reactions, status, etc. Snippets and custom command aliases are also supported. Snippets are shortcuts for predefined messages that you can send. Add or remove snippets with the `?snippets` command. The level of customization is ever growing thanks to our exceptional contributors.
 
-Currently the easiest and fastest way to set up the bot is using Heroku which is a service that offers a free plan for hosting applications. If you choose to install the bot using Heroku, you will not need to download anything. Read the **[installation guide](https://github.com/kyb3r/modmail/wiki/Installation)**. If you ran into any problems, join our [discord server](https://discord.gg/etJNHCQ) for help and support. Even if you don't have any issues, you should come and check out our awesome Discord community! :wink:
+## Linked Messages
 
-## Notable Features
+<img src="https://i.imgur.com/6L9aaNw.png" align="right" height="350">
 
+Have you sent something with the `?reply` command by accident? Don't fret, you can delete your original message, and the bot will automatically delete the corresponding message sent to the recipient of the thread!  You can also use the `?edit` command to edit a message you sent.
 
-### Customizability
-There is a range of config variables you can dynamically change with the `config` command to change the appearance of the bot. For example embed color, responses, reactions, status etc. Snippets and custom command aliases are also supported, snippets are shortcuts for predefined messages that you can send. Add and remove snippets with the `snippets` command. The list of things you can change is ever growing thanks to the community for code contributions.
+## Thread Logs
 
-### Linked Messages
-<img src='https://i.imgur.com/6L9aaNw.png' height=300 align='right'></img>
+Thread conversations are automatically logged with a generated viewable website of the complete thread. Logs are rendered with styled HTML and presented in an aesthetically pleasing way—it blends seamlessly with the mobile version of Discord. An example of a logged conversation: https://logs.modmail.tk/02032d65a6f3
 
-Did you accidentally send something you didn't mean to with the `reply` command? Don't fret, if you delete the original message on your side, this bot automatically deletes the corresponding message that was sent to the recipient of the thread!  This also works when you use the `edit` command to edit a message you have sent.
+## Automatic Updates
 
-### Thread Logs
+The bot checks for new updates every hour and will automatically update to the newest version. Modmail is under active development, which means that you can always look forward to new and useful features! To disable this functionality, for example, when you customized your fork, you can do so by adding a `disable_autoupdates` config variable and set it to `yes` or `true`. 
 
-Thread conversations are automatically logged and a log link is provided with each thread. Logs are rendered with HTML and are presented in an aesthetically pleasing way, exactly like on discord, this especially integrates seamlessly with the mobile version of discord. Here's a link to an [example](https://logs.modmail.tk/02032d65a6f3).
+---
 
-### Automatic Updates
-The bot checks for new updates every hour and automatically updates to a newer version if found. This bot is under active development so you can always look forward to new, useful features! If you do not want this functionality, for example, if you want to make changes to your fork, you can do so by adding a `disable_autoupdates` config variable. 
+# Contributing
 
-## Contributing
-This project is licenced under MIT. If you have ideas for commands create an issue or pull request. Contributions are always welcome, whether it be documentation improvements or new functionality, please feel free to create a pull request.
+This project is licenced under MIT. If you have any new ideas, create an issue or a pull request. Contributions to Modmail are always welcome, whether it be improvements to the documentation or new functionality, please feel free make the change.
 
 If you use Modmail and love it, consider supporting me on **[Patreon](https://www.patreon.com/kyber)** :heart:

bot.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__version__ = '2.12.2'
+__version__ = '2.12.5'
 
 import asyncio
 import os
@@ -126,7 +126,10 @@ def _load_extensions(self):
                 continue
             cog = f'cogs.{file[:-3]}'
             print(Fore.CYAN + f'Loading {cog}' + Style.RESET_ALL)
-            self.load_extension(cog)
+            try:
+                self.load_extension(cog)
+            except Exception:
+                print(f'Failed to load {cog}')
 
     async def is_owner(self, user):
         allowed = {int(x) for x in
@@ -239,6 +242,19 @@ def recipient_color(self):
         else:
             return color
 
+    @property
+    def main_color(self):
+        color = self.config.get('main_color')
+        if not color:
+            return discord.Color.blurple()
+        try:
+            color = int(color.lstrip('#'), base=16)
+        except ValueError:
+            print('Invalid main_color provided')
+            return discord.Color.blurple()
+        else:
+            return color
+
     async def on_connect(self):
         print(LINE)
         print(Fore.CYAN, end='')
@@ -485,13 +501,13 @@ async def on_guild_channel_delete(self, channel):
             return
 
         if not isinstance(channel, discord.TextChannel):
-            if self.config.get('main_category_id') == channel.id:
+            if int(self.config.get('main_category_id')) == channel.id:
                 await self.config.update({
                     'main_category_id': None
                 })
             return
 
-        if self.config.get('log_channel_id') == channel.id:
+        if int(self.config.get('log_channel_id')) == channel.id:
             await self.config.update({
                 'log_channel_id': None
             })
@@ -637,6 +653,8 @@ async def autoupdate_loop(self):
         if self.self_hosted and not self.config.get('github_access_token'):
             print('Github access token not found.')
             print(Fore.CYAN + 'Autoupdates disabled.' + Style.RESET_ALL)
+            print('GitHub access token not found.')
+            print('Autoupdates disabled.')
             print(LINE)
             return
 
@@ -656,7 +674,7 @@ async def autoupdate_loop(self):
                 embed.set_footer(text=f"Updating Modmail v{self.version} "
                                       f"-> v{metadata['latest_version']}")
 
-                changelog = await ChangeLog.from_repo(self)
+                changelog = await Changelog.from_url(self)
                 latest = changelog.latest_version
                 embed.description = latest.description
                 for name, value in latest.fields.items():