Update close-cmd branch with master (#123)

* Add support for multiple image and file attachments

* Add support for custom sent emoji and blocked emoji resolves #112

* Fix emoji handling

* Fixed a bug where blocked users are still able to message modmail

* Improve about command style

* Increment version

* Fix changelog version parsing

* Add changelog docstring

* Add dhooks to requirements for eval stuff

* Add discord server badge

* Update README.md

added forks badge

* Use blurple color

* Use stars instead

* Let anyone use alias invoked eval commands

* Add an instances badge

* Update README.md

* Update README.md

* Update README.md

* Remove the first desc

* Update README.md

* Add patreon in readme

* Update README.md

* Improve logs format

* Update README.md

* Rainbow colors + patreon

* Change order

Author: kyb3r

CHANGELOG.md

@@ -4,6 +4,20 @@ 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.0.10
+
+### Security
+- Fix a bug where blocked users were still able to message modmail.
+
+# v2.0.9
+
+### Added 
+- Support for custom blocked emoji and sent emoji
+- Use the `config set blocked_emoji` or `sent_emoji` commands.
+
+### Quick Fix
+- Support multiple image and file attachments in one message
+- This is only possible on mobile so its good to handle it in code.
 
 # v2.0.8
 

README.md

@@ -1,31 +1,39 @@
-<h1 align="center">Discord Mod Mail Bot</h1>
-
 <div align="center">
-    <strong><i>A simple and functional modmail bot.</i></strong>
+    <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="">
-  <img src="https://img.shields.io/badge/python-3.7-7289DA.svg?style=for-the-badge" alt="Travis" />
+
+<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-7289DA.svg?style=for-the-badge" alt="Travis" />
+  <img src="https://img.shields.io/badge/license-mit-e74c3c.svg?style=for-the-badge" alt="MIT License" />
 </a>
 
 
 </div>
 <br>
-<div align="center">
-    This is an open source discord bot made by kyb3r and improved upon suggestions by the users! It enables server members to DM it, the messages then get relayed to the server moderators who can then respond through the bot. In essence this bot serves as a means for members to easily communicate with server leadership in an organised manner.
-
-</div>
 
 ## How does it work?
 
@@ -52,3 +60,5 @@ The bot checks for new updates every hour and automatically updates to a newer v
 
 ## 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.
+
+I have also set up a [Patreon](https://www.patreon.com/kyber), so if you want to support the development of Modmail, you now can :smile:

bot.py

@@ -22,19 +22,21 @@
 SOFTWARE.
 """
 
-__version__ = '2.0.8'
+__version__ = '2.0.10'
 
 import asyncio
 import textwrap
 import datetime
 import os
 import re
+from types import SimpleNamespace
 
 import discord
 import aiohttp
 from discord.ext import commands
 from discord.ext.commands.view import StringView
 from colorama import init, Fore, Style
+import emoji
 
 from core.api import Github, ModmailApiClient
 from core.thread import ThreadManager
@@ -183,10 +185,29 @@ async def on_ready(self):
             await self.threads.populate_cache()
 
 
+
     async def process_modmail(self, message):
         """Processes messages sent to the bot."""
 
-        reaction = '🚫' if message.author.id in self.blocked_users else '✅'
+        ctx = SimpleNamespace(bot=self, guild=self.modmail_guild)
+        converter = commands.EmojiConverter()
+
+        blocked_emoji = self.config.get('blocked_emoji', '🚫')
+        sent_emoji = self.config.get('sent_emoji', '✅')
+
+        if blocked_emoji not in emoji.UNICODE_EMOJI:
+            try:
+                blocked_emoji = await converter.convert(ctx, blocked_emoji.strip(':'))
+            except:
+                pass
+
+        if sent_emoji not in emoji.UNICODE_EMOJI:
+            try:
+                sent_emoji = await converter.convert(ctx, sent_emoji.strip(':'))
+            except:
+                pass
+
+        reaction = blocked_emoji if str(message.author.id) in self.blocked_users else sent_emoji
 
         try:
             await message.add_reaction(reaction)
@@ -199,7 +220,7 @@ async def process_modmail(self, message):
             description='You have been blocked from using modmail.'
         )
 
-        if message.author.id in self.blocked_users:
+        if str(message.author.id) in self.blocked_users:
             await message.author.send(embed=blocked_em)
         else:
             thread = await self.threads.find_or_create(message.author)
@@ -238,9 +259,10 @@ async def get_context(self, message, *, cls=commands.Context):
         ctx.invoked_with = invoker
         ctx.prefix = self.prefix  # Sane prefix (No mentions)
         ctx.command = self.all_commands.get(invoker)
-
-        # if hasattr(ctx, '_alias_invoked'):
-        #     ctx.command.checks = None # Let anyone use the command.
+        
+        if ctx.command is self.get_command('eval') and hasattr(ctx, '_alias_invoked'):
+            # ctx.command.checks = None # Let anyone use the command.
+            pass
 
         return ctx
 

cogs/modmail.py

@@ -13,6 +13,9 @@ class Modmail:
 
     def __init__(self, bot):
         self.bot = bot
+    
+    def obj(arg):
+        return discord.Object(int(arg))
 
     @commands.command()
     @trigger_typing
@@ -137,7 +140,7 @@ async def nsfw(self, ctx):
     @commands.command()
     @commands.has_permissions(manage_messages=True)
     @trigger_typing
-    async def logs(self, ctx, *, member: Union[discord.Member, discord.User]=None):
+    async def logs(self, ctx, *, member: Union[discord.Member, discord.User, obj]=None):
         """Shows a list of previous modmail thread logs of a member."""
 
         if not member:
@@ -147,13 +150,15 @@ async def logs(self, ctx, *, member: Union[discord.Member, discord.User]=None):
 
         user = member or thread.recipient
 
+        icon_url = getattr(user, 'avatar_url', 'https://cdn.discordapp.com/embed/avatars/0.png')
+
         logs = await self.bot.modmail_api.get_user_logs(user.id)
 
         if not any(not e['open'] for e in logs):
             return await ctx.send('This user has no previous logs.')
 
         em = discord.Embed(color=discord.Color.green())
-        em.set_author(name='Previous Logs', icon_url=user.avatar_url)
+        em.set_author(name='Previous Logs', icon_url=icon_url)
 
         embeds = [em]
 
@@ -166,20 +171,31 @@ async def logs(self, ctx, *, member: Union[discord.Member, discord.User]=None):
         for index, entry in enumerate(closed_logs):
             if len(embeds[-1].fields) == 3:
                 em = discord.Embed(color=discord.Color.green())
-                em.set_author(name='Previous Logs', icon_url=user.avatar_url)
+                em.set_author(name='Previous Logs', icon_url=icon_url)
                 embeds.append(em)
 
             date = dateutil.parser.parse(entry['created_at'])
+
             new_day = date.strftime(r'%d %b %Y')
+            time = date.strftime(r'%H:%M')
 
             key = entry['key']
             user_id = entry['user_id']
             log_url = f"https://logs.modmail.tk/{user_id}/{key}"
 
-            fmt += f"[`{key}`]({log_url})\n"
+            truncate = lambda c: c[:47] + '...' if len(c) > 50 else c
+
+            if entry['messages']:
+                short_desc = truncate(entry['messages'][0]['content']) or 'No content'
+            else:
+                short_desc = 'No content'
+
+            fmt += f"[`[{time}]{key}`]({log_url}) - {short_desc}\n"
+
+            print(fmt)
 
             if current_day != new_day or index == len(closed_logs) - 1:
-                embeds[-1].add_field(name=current_day, value=fmt)
+                embeds[-1].add_field(name=current_day, value=fmt, inline=False)
                 current_day = new_day
                 fmt = ''
 
@@ -252,9 +268,6 @@ async def contact(self, ctx, *, user: Union[discord.Member, discord.User]):
 
         await ctx.send(embed=em)
 
-    def obj(arg):
-        return discord.Object(int(arg))
-
     @commands.command()
     @trigger_typing
     @commands.has_permissions(manage_channels=True)
@@ -308,7 +321,7 @@ async def block(self, ctx, user: Union[discord.Member, discord.User, obj]=None,
             await self.bot.config.update()
 
             em.title = 'Success'
-            em.description = f'{mention} is now blocked ' + f'for `{reason}`' if reason else ''
+            em.description = f'{mention} is now blocked ' + (f'for `{reason}`' if reason else '')
 
             await ctx.send(embed=em)
         else:

cogs/utility.py

@@ -156,21 +156,22 @@ async def help(self, ctx, *, command: str=None):
     @commands.command()
     @trigger_typing
     async def changelog(self, ctx):
+        '''Show a paginated changelog of the bot.'''
         changelog = await ChangeLog.from_repo(self.bot)
         p = PaginatorSession(ctx, *changelog.embeds)
         await p.run()
 
-    @commands.command()
+    @commands.command(aliases=['bot', 'info'])
     @trigger_typing
     async def about(self, ctx):
         """Shows information about the bot."""
         em = discord.Embed(color=discord.Color.green(), timestamp=datetime.datetime.utcnow())
-        em.set_author(name='Mod Mail - Information', icon_url=self.bot.user.avatar_url)
+        em.set_author(name='Mod Mail - About', icon_url=self.bot.user.avatar_url)
         em.set_thumbnail(url=self.bot.user.avatar_url)
 
-        em.description = 'This is an open source discord bot made by kyb3r and '\
-                         'improved upon suggestions by the users! This bot serves as a means for members to '\
-                         'easily communicate with server leadership in an organised manner.'
+        em.description = 'This is an open source discord bot that serves'\
+                        ' as a means for members to easily communicate with'\
+                        ' server leadership in an organised manner.'
 
         try:
             async with self.bot.session.get('https://api.modmail.tk/metadata') as resp:

core/changelog.py

@@ -42,7 +42,7 @@ def embed(self):
 class ChangeLog:
 
     changelog_url = 'https://raw.githubusercontent.com/kyb3r/modmail/master/CHANGELOG.md'
-    regex = re.compile(r'# (v\d\.\d\.\d)([\S\s]*?(?=# v))')
+    regex = re.compile(r'# (v\d+\.\d+\.\d+)([\S\s]*?(?=# v))')
 
     def __init__(self, bot, text):
         self.bot = bot 

core/config.py

@@ -8,7 +8,7 @@ class ConfigManager:
 
     allowed_to_change_in_command = {
         'status', 'log_channel_id', 'mention', 'disable_autoupdates', 'prefix',
-        'main_category_id'
+        'main_category_id', 'sent_emoji', 'blocked_emoji'
         }
 
     internal_keys = {

core/thread.py

@@ -146,21 +146,39 @@ async def send(self, message, destination=None, from_mod=False, delete_message=T
         em.set_author(name=str(author), icon_url=author.avatar_url, url=message.jump_url)  # store message id in hidden url
 
         image_types = ['.png', '.jpg', '.gif', '.jpeg', '.webp']
-        is_image_url = lambda u: any(urlparse(u.lower()).path.endswith(x) for x in image_types)
+        is_image_url = lambda u, _: any(urlparse(u.lower()).path.endswith(x) for x in image_types)
 
         delete_message = not bool(message.attachments)
-        attachments = list(filter(lambda a: not is_image_url(a.url), message.attachments))
 
-        image_urls = [a.url for a in message.attachments]
-        image_urls.extend(re.findall(r'(https?://[^\s]+)', message.content))
-        image_urls = list(filter(is_image_url, image_urls))
+        attachments = [(a.url, a.filename) for a in message.attachments]
+        
+        images = [x for x in attachments if is_image_url(*x)]
+        attachments = [x for x in attachments if not is_image_url(*x)]
+
+        image_links = [(link, None) for link in re.findall(r'(https?://[^\s]+)', message.content)]
+        image_links = [x for x in image_links if is_image_url(*x)]
+        images.extend(image_links)
+
+        embedded_image = False
 
-        if image_urls:
-            em.set_image(url=image_urls[0])
+        prioritize_uploads = any(i[1] is not None for i in images)
+
+        additional_count = 1
+
+        for att in images:
+            if is_image_url(*att) and not embedded_image and att[1] if prioritize_uploads else True:
+                em.set_image(url=att[0])
+                embedded_image = True
+            elif att[1] is not None:
+                link = f'[{att[1]}]({att[0]})'
+                em.add_field(name=f'Additional Image upload ({additional_count})', value=link, inline=False)
+                additional_count += 1
+        
+        file_upload_count = 1
 
-        if attachments:
-            att = attachments[0]
-            em.add_field(name='File Attachment', value=f'[{att.filename}]({att.url})')
+        for att in attachments:
+            em.add_field(name=f'File upload ({file_upload_count})', value=f'[{att[1]}]({att[0]})')
+            file_upload_count += 1
 
         if from_mod:
             em.color = discord.Color.green()

requirements.txt

@@ -3,4 +3,6 @@ colorama
 cachetools
 python-dateutil
 python-box
-colorthief
+colorthief
+emoji
+dhooks