Merge from "master"

Author: Taaku18

README.md

@@ -57,13 +57,13 @@ Heroku is a container based cloud platform that currently offers a free plan to
 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.
 
 ### Linked Messages
-<img src='https://i.imgur.com/eo3CwLm.png' height=300 align='right'></img>
+<img src='https://i.imgur.com/6L9aaNw.png' height=300 align='right'></img>
 
 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.
 
 ### Thread Logs
 
-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.
+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. Heres 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. 

cogs/modmail.py

@@ -347,6 +347,7 @@ async def nsfw(self, ctx):
 
     @commands.command()
     async def loglink(self, ctx):
+        """Return the link to the current thread's logs."""
         thread = await self.bot.threads.find(channel=ctx.channel)
         if thread:
             log_link = await self.bot.api.get_log_link(ctx.channel.id)
@@ -446,6 +447,14 @@ async def reply(self, ctx, *, msg=''):
 
     @commands.command()
     async def anonreply(self, ctx, *, msg=''):
+        """Reply to a thread anonymously. 
+        
+        You can edit the anonymous user's name,
+        avatar and tag using the config command.
+
+        Edit the `anon_username`, `anon_avatar_url`
+        and `anon_tag` config variables to do so.
+        """
         ctx.message.content = msg
         thread = await self.bot.threads.find(channel=ctx.channel)
         if thread:

core/thread.py

@@ -70,6 +70,8 @@ def ready(self):
     def ready(self, flag):
         if flag:
             self._ready_event.set()
+        else:
+            self._ready_event.clear()
 
     def _close_after(self, closer, silent, delete_channel, message):
         return self.bot.loop.create_task(
@@ -335,6 +337,7 @@ async def send(self, message, destination=None,
 
         prioritize_uploads = any(i[1] is not None for i in images)
 
+        additional_images = []
         additional_count = 1
 
         for att in images:  # TODO: Logic needs review
@@ -346,12 +349,20 @@ async def send(self, message, destination=None,
                 embed.set_image(url=att[0])
                 embedded_image = True
             elif att[1] is not None:
-                link = f'[{att[1]}]({att[0]})'
-                embed.add_field(
-                    name=f'Additional Image upload ({additional_count})',
-                    value=link,
-                    inline=False
+                if note:
+                    color = discord.Color.blurple()
+                elif from_mod:
+                    color = self.bot.mod_color
+                else:
+                    color = self.bot.recipient_color
+
+                img_embed = discord.Embed(color=color)
+                img_embed.set_image(url=att[0])
+                img_embed.set_footer(
+                    text=f'Additional Image Upload ({additional_count})'
                 )
+                img_embed.timestamp = message.created_at
+                additional_images.append(destination.send(embed=img_embed))
                 additional_count += 1
 
         file_upload_count = 1
@@ -393,6 +404,11 @@ async def send(self, message, destination=None,
 
         await destination.send(mentions, embed=embed)
 
+        if additional_images:
+            self.ready = False 
+            await asyncio.gather(*additional_images)
+            self.ready = True
+
         if delete_message:
             try:
                 await message.delete()