Merge from master

Author: Taaku18

CHANGELOG.md

@@ -4,6 +4,18 @@ 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.19.0
+
+### What's new?
+
+- New config variable `guild_age`, similar to `account_age`, `guild_age` sets a limit as to how long a user has to wait after they joined the server to message Modmail.
+- `guild_age` can be set the same way as `account_age`.
+
+# v2.18.5
+
+Fix help command bug when using external plugins.
+
 # v2.18.4
 
 Fix the teams permission bug.
@@ -64,7 +76,6 @@ When updating to this version, all prior permission settings with guild-based pe
 
 - The help message no longer conceals inaccessible commands due to check failures.
 
-
 # v2.17.2
 
 ### Changed

README.md

@@ -8,7 +8,9 @@
   <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://github.com/kyb3r/modmail/">	
+    <img src="https://api.modmail.tk/badges/instances.svg" alt="Bot instances">	
+  </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>
@@ -22,7 +24,6 @@
   </a>
 </div>
 
----
 
 ## How Does Modmail Work?
 
@@ -36,23 +37,16 @@ Currently, the easiest and fastest way to set up the bot is by using Heroku, whi
 
 Interactive installation: [**https://taaku18.github.io/modmail/installation**](https://taaku18.github.io/modmail/installation)
 
----
 
 # Notable Features
 
 ## Customizability
 
-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.
-
-## Linked Messages
-
-<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.
+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. The level of customization is ever growing thanks to our exceptional contributors.
 
 ## Thread Logs
 
-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://modmail-logs.herokuapp.com/logs/02032d65a6f3.
+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. You have the ability to query and search through logs using the bot via commands. An example of a logged conversation: https://logs.modmail.tk/example.
 
 # Contributing
 

bot.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__version__ = '2.18.4'
+__version__ = '2.19.0'
 
 import asyncio
 import logging
@@ -467,8 +467,10 @@ async def retrieve_emoji(self):
     async def process_modmail(self, message):
         """Processes messages sent to the bot."""
         sent_emoji, blocked_emoji = await self.retrieve_emoji()
+        now = datetime.utcnow()
 
         account_age = self.config.get('account_age')
+        guild_age = self.config.get('guild_age')
         if account_age is None:
             account_age = isodate.duration.Duration()
         else:
@@ -483,19 +485,41 @@ async def process_modmail(self, message):
                 await self.config.update()
                 account_age = isodate.duration.Duration()
 
+        if guild_age is None:
+            guild_age = isodate.duration.Duration()
+        else:
+            try:
+                guild_age = isodate.parse_duration(guild_age)
+            except isodate.ISO8601Error:
+                logger.warning('The guild join age limit needs to be a '
+                               'ISO-8601 duration formatted duration string '
+                               f'greater than 0 days, not "%s".', str(guild_age))
+                del self.config.cache['guild_age']
+                await self.config.update()
+                guild_age = isodate.duration.Duration()
+
         reason = self.blocked_users.get(str(message.author.id))
         if reason is None:
             reason = ''
+
         try:
             min_account_age = message.author.created_at + account_age
         except ValueError as e:
             logger.warning(e.args[0])
             del self.config.cache['account_age']
             await self.config.update()
-            min_account_age = message.author.created_at
+            min_account_age = now
 
-        if min_account_age > datetime.utcnow():
-            # user account has not reached the required time
+        try:
+            min_guild_age = self.guild.get_member(message.author.id).joined_at + guild_age
+        except ValueError as e:
+            logger.warning(e.args[0])
+            del self.config.cache['guild_age']
+            await self.config.update()
+            min_guild_age = now
+
+        if min_account_age > now:
+            # User account has not reached the required time
             reaction = blocked_emoji
             changed = False
             delta = human_timedelta(min_account_age)
@@ -514,6 +538,26 @@ async def process_modmail(self, message):
                     color=discord.Color.red()
                 ))
 
+        elif min_guild_age > now:
+            # User has not stayed in the guild for long enough
+            reaction = blocked_emoji
+            changed = False
+            delta = human_timedelta(min_guild_age)
+
+            if str(message.author.id) not in self.blocked_users:
+                new_reason = f'System Message: Recently Joined. Required to wait for {delta}.'
+                self.config.blocked[str(message.author.id)] = new_reason
+                await self.config.update()
+                changed = True
+
+            if reason.startswith('System Message: Recently Joined.') or changed:
+                await message.channel.send(embed=discord.Embed(
+                    title='Message not sent!',
+                    description=f'Your must wait for {delta} '
+                    f'before you can contact {self.user.mention}.',
+                    color=discord.Color.red()
+                ))
+
         elif str(message.author.id) in self.blocked_users:
             reaction = blocked_emoji
             if reason.startswith('System Message: New Account.'):
@@ -524,8 +568,7 @@ async def process_modmail(self, message):
             else:
                 end_time = re.search(r'%(.+?)%$', reason)
                 if end_time is not None:
-                    after = (datetime.fromisoformat(end_time.group(1)) -
-                             datetime.utcnow()).total_seconds()
+                    after = (datetime.fromisoformat(end_time.group(1)) - now).total_seconds()
                     if after <= 0:
                         # No longer blocked
                         reaction = sent_emoji
@@ -922,7 +965,7 @@ async def metadata_loop(self):
 
             try:
                 await self.session.post('https://api.modmail.tk/metadata', json=data)
-                logger.debug(info('Posted metadata'))
+                logger.debug(info('Uploading metadata to Modmail server.'))
             except:
                 pass
 

cogs/utility.py

@@ -23,7 +23,7 @@
 from core.decorators import github_access_token_required, trigger_typing
 from core.models import Bot, InvalidConfigError, PermissionLevel
 from core.paginator import PaginatorSession, MessagePaginatorSession
-from core.utils import cleanup_code, info, error, User
+from core.utils import cleanup_code, info, error, User, get_perm_level
 
 logger = logging.getLogger('Modmail')
 
@@ -34,22 +34,13 @@ class Utility:
     def __init__(self, bot: Bot):
         self.bot = bot
 
-    @staticmethod
-    def get_perms_required(cmd) -> PermissionLevel:
-        for c in cmd.checks:
-            perm_level = getattr(c, 'permission_level',
-                                 PermissionLevel.INVALID)
-            if perm_level is not PermissionLevel.INVALID:
-                return perm_level
-        return PermissionLevel.INVALID
-
     async def format_cog_help(self, ctx, cog):
         """Formats the text for a cog help"""
 
         prefix = self.bot.prefix
 
         fmts = ['']
-        for perm_level, cmd in sorted(((self.get_perms_required(c), c) for c in self.bot.commands),
+        for perm_level, cmd in sorted(((get_perm_level(c), c) for c in self.bot.commands),
                                       key=itemgetter(0)):
             if cmd.instance is cog and not cmd.hidden:
                 if perm_level is PermissionLevel.INVALID:
@@ -93,7 +84,7 @@ async def format_command_help(self, cmd):
 
         prefix = self.bot.prefix
 
-        perm_level = self.get_perms_required(cmd)
+        perm_level = get_perm_level(cmd)
         if perm_level is not PermissionLevel.INVALID:
             perm_level = f'{perm_level.name} [{perm_level}]'
         else:

core/config.py

@@ -19,7 +19,8 @@ class ConfigManager(ConfigManagerABC):
 
         # bot settings
         'main_category_id', 'disable_autoupdates', 'prefix', 'mention',
-        'main_color', 'user_typing', 'mod_typing', 'account_age', 'reply_without_command',
+        'main_color', 'user_typing', 'mod_typing', 'account_age', 'guild_age',
+        'reply_without_command',
 
         # logging
         'log_channel_id',
@@ -71,7 +72,7 @@ class ConfigManager(ConfigManagerABC):
     }
 
     time_deltas = {
-        'account_age'
+        'account_age', 'guild_age'
     }
 
     valid_keys = allowed_to_change_in_command | internal_keys | protected_keys

core/utils.py

@@ -6,6 +6,7 @@
 from discord.ext import commands
 
 from colorama import Fore, Style
+from core.models import PermissionLevel
 
 
 def info(*msgs):
@@ -187,6 +188,17 @@ def match_user_id(text: str) -> int:
     return -1
 
 
+def get_perm_level(cmd) -> PermissionLevel:
+    for c in cmd.checks:
+        perm = getattr(c, 'permission_level', None)
+        if perm is not None:
+            return perm
+    for c in cmd.checks:
+        if 'is_owner' in str(c):
+            return PermissionLevel.OWNER
+    return PermissionLevel.INVALID
+
+
 async def ignore(coro):
     try:
         await coro