merge from master

Author: Taaku18

CHANGELOG.md

@@ -4,6 +4,38 @@ 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.17.1
+
+### What's new?
+
+Stricter fallback genesis embed search.
+
+### What's changed?
+How modmail checks if a channel is a thread: 
+
+1. First the bot checks if the channel topic is in the format `User ID: xxxx`, this means it is a thread.
+2. If a channel topic is not found, the bot searches through message history of a channel to find the thread creation embed. This step should never yield a thread for a normal user, but in the case of a another bot messing up the channel topic (happened to a user before) this extra step was added. 
+
+
+# v2.17.0
+
+### What's new?
+
+Added a config option `reply_without_command` which when present, enables the bot to forward any message sent in a thread channel to the recipient. (Replying without using a command)
+
+To enable this functionality, do `?config set reply_without_command true` and to disable it, use `?config del reply_without_command`.
+
+
+### Changed
+
+The `move` command now only requires `manage_messages` perms instead of `manage_channels`
+
+# v2.16.1
+
+### Fixed
+
+An issue where a scheduled close would not execute over a long period of time if the recipient no shares any servers with the bot.
+
 # v2.16.0
 
 ### What's changed?
@@ -13,6 +45,8 @@ If you're still using api.modmail.tk, you will need to migrate to the self-hoste
 option ASAP. Your bot will not work unless you switch to the self-hosted option. Refer to the 
 installation tutorial for information regarding self-hosted Modmail.
 
+If a member leaves/joins (again) while they are a recipient of a thread, a message will be sent to notify you that this has occured.
+
 # v2.15.1
 
 ### Fixed

bot.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__version__ = '2.16.0'
+__version__ = '2.17.1'
 
 import asyncio
 import logging
@@ -392,25 +392,23 @@ async def on_ready(self):
                      datetime.utcnow()).total_seconds()
             if after < 0:
                 after = 0
-            recipient = self.get_user(int(recipient_id))
 
-            thread = await self.threads.find(recipient=recipient)
+            thread = await self.threads.find(recipient_id=int(recipient_id))
 
             if not thread:
-                # If the recipient is gone or channel is deleted
+                # If the channel is deleted
                 self.config.closures.pop(str(recipient_id))
                 await self.config.update()
                 continue
 
-            # TODO: Low priority,
-            #  Retrieve messages/replies when bot is down, from history?
             await thread.close(
                 closer=self.get_user(items['closer_id']),
                 after=after,
                 silent=items['silent'],
                 delete_channel=items['delete_channel'],
                 message=items['message']
             )
+
         logger.info(LINE)
 
     async def convert_emoji(self, name):
@@ -605,7 +603,10 @@ async def on_message(self, message):
 
         thread = await self.threads.find(channel=ctx.channel)
         if thread is not None:
-            await self.api.append_log(message, type_='internal')
+            if self.config.get('reply_without_command'):
+                await thread.reply(message)
+            else:
+                await self.api.append_log(message, type_='internal')
         elif ctx.invoked_with:
             exc = commands.CommandNotFound(
                 'Command "{}" is not found'.format(ctx.invoked_with)
@@ -698,6 +699,24 @@ async def on_guild_channel_delete(self, channel):
             return
 
         await thread.close(closer=mod, silent=True, delete_channel=False)
+    
+    async def on_member_remove(self, member):
+        thread = await self.threads.find(recipient=member)
+        if thread:
+            em = discord.Embed(
+                description='The recipient has left the server.',
+                color=discord.Color.red()
+                )
+            await thread.channel.send(embed=em)
+    
+    async def on_member_join(self, member):
+        thread = await self.threads.find(recipient=member)
+        if thread:
+            em = discord.Embed(
+                description='The recipient has joined the server.',
+                color=self.mod_color
+                )
+            await thread.channel.send(embed=em)
 
     async def on_message_delete(self, message):
         """Support for deleting linked messages"""
@@ -742,6 +761,8 @@ async def on_command_error(self, context, exception):
                                  command=str(context.command))
         elif isinstance(exception, commands.CommandNotFound):
             logger.warning(error('CommandNotFound: ' + str(exception)))
+        elif isinstance(exception, commands.CheckFailure):
+            logger.warning(error('CheckFailure: ' + str(exception)))
         else:
             logger.error(error('Unexpected exception:'), exc_info=exception)
 
@@ -830,5 +851,5 @@ async def autoupdate_loop(self):
     if os.name != 'nt':
         import uvloop
         uvloop.install()
-    bot = ModmailBot()  # pylint: disable=invalid-name
+    bot = ModmailBot()
     bot.run()

cogs/modmail.py

@@ -142,7 +142,7 @@ async def del_(self, ctx, *, name: str.lower):
         await ctx.send(embed=embed)
 
     @commands.command()
-    @checks.has_permissions(manage_channels=True)
+    @checks.has_permissions(manage_messages=True)
     async def move(self, ctx, *, category: discord.CategoryChannel):
         """Moves a thread to a specified category."""
         thread = ctx.thread

core/checks.py

@@ -1,4 +1,8 @@
+import logging
 from discord.ext import commands
+from core.utils import error
+
+logger = logging.getLogger('Modmail')
 
 
 def has_permissions(**perms):
@@ -33,11 +37,17 @@ async def predicate(ctx):
 
         resolved = ctx.channel.permissions_for(ctx.author)
 
-        return resolved.administrator or all(
+        has_perm = resolved.administrator or all(
             getattr(resolved, name, None) == value
             for name, value in perms.items()
         )
 
+        if not has_perm:
+            restrictions = ', '.join(f'{name.replace("_", " ").title()} ({"yes" if value else "no"})'
+                                     for name, value in perms.items())
+            logger.error(error(f'Command `{ctx.command.qualified_name}` processes '
+                               f'the following restrictions(s): {restrictions}.'))
+        return has_perm
     return commands.check(predicate)
 
 

core/config.py

@@ -19,7 +19,7 @@ class ConfigManager(ConfigManagerABC):
 
         # bot settings
         'main_category_id', 'disable_autoupdates', 'prefix', 'mention',
-        'main_color', 'user_typing', 'mod_typing', 'account_age', 
+        'main_color', 'user_typing', 'mod_typing', 'account_age', 'reply_without_command',
 
         # logging
         'log_channel_id',

core/models.py

@@ -363,7 +363,8 @@ def __getitem__(self, item: str) -> 'ThreadABC':
     @abc.abstractmethod
     async def find(self, *,
                    recipient: typing.Union[Member, User] = None,
-                   channel: TextChannel = None) -> \
+                   channel: TextChannel = None,
+                   recipient_id: int = None) -> \
             typing.Optional['ThreadABC']:
         raise NotImplementedError
 

core/thread.py

@@ -357,7 +357,7 @@ async def reply(self, message, anonymous=False):
             tasks.append(message.channel.send(
                 embed=discord.Embed(
                     color=discord.Color.red(),
-                    description='Your message could not be delivered because '
+                    description='Your message could not be delivered as '
                                 'the recipient is only accepting direct '
                                 'messages from friends, or the bot was '
                                 'blocked by the recipient.'
@@ -478,7 +478,7 @@ async def send(self, message, destination=None,
             ):
                 embed.set_image(url=att[0])
                 if att[1]:
-                    embed.add_field(name='Image', value=f'[**{att[1]}**]({att[0]})')
+                    embed.add_field(name='Image', value=f'[{att[1]}]({att[0]})')
                 embedded_image = True
             elif att[1] is not None:
                 if note:
@@ -583,22 +583,26 @@ def __iter__(self):
     def __getitem__(self, item):
         return self.cache[item]
 
-    async def find(self, *, recipient=None, channel=None):
+    async def find(self, *, recipient=None, channel=None, recipient_id=None):
         """Finds a thread from cache or from discord channel topics."""
         if recipient is None and channel is not None:
             return await self._find_from_channel(channel)
 
         thread = None
+
+        if recipient:
+            recipient_id = recipient.id
+
         try:
-            thread = self.cache[recipient.id]
+            thread = self.cache[recipient_id]
         except KeyError:
             channel = discord.utils.get(
                 self.bot.modmail_guild.text_channels,
-                topic=f'User ID: {recipient.id}'
+                topic=f'User ID: {recipient_id}'
             )
             if channel:
                 thread = Thread(self, recipient, channel)
-                self.cache[recipient.id] = thread
+                self.cache[recipient_id] = thread
                 thread.ready = True
         return thread
 
@@ -619,6 +623,8 @@ async def _find_from_channel(self, channel):
         elif channel.topic is None:
             try:
                 async for message in channel.history(limit=100):
+                    if message.author != self.bot.user:
+                        continue
                     if message.embeds:
                         embed = message.embeds[0]
                         if embed.footer.text: