Merge branch 'master' into status

Author: kyb3r

CHANGELOG.md

@@ -4,15 +4,27 @@ 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).
 
-# 2.13.6
+# 2.13.7
 
 ### Added
+
+- The ability to enable typing interactions. 
+
+If you want the bot to type in the thread channel if the user is also typing, add the config variable `user_typing`, the value doesnt matter, just it's presence. use `config del` to disable the functionality. The same thing in reverse is also possible, if you want the use to see the bot type when someone is typing in the thread channel add the `mod_typing` config variable. 
+
 - New `status` command, change the bot's status to `online`, `idle`, `dnd`, `invisible`, or `offline`.
   - To remove the status (change it back to default), use `status clear`.
   - This also introduces a new internal configuration variable: `status`. Possible values are `online`, `idle`, `dnd`, `invisible`, and `offline`.
+  
 ### Changed
 - The internals for `activity` has drastically changed to accommodate the new `status` command.  
 
+# 2.13.6
+
+### Fixed
+
+Fixed a bug in the contact command where the response message did not send.
+
 # 2.13.5
 
 ### Added

bot.py

@@ -542,6 +542,20 @@ async def on_message(self, message):
                 'Command "{}" is not found'.format(ctx.invoked_with)
             )
             self.dispatch('command_error', ctx, exc)
+    
+    async def on_typing(self, channel, user, when):
+        if isinstance(channel, discord.DMChannel):
+            if not self.config.get('user_typing'):
+                return
+            thread = await self.threads.find(recipient=user)
+            if thread:
+                await thread.channel.trigger_typing()
+        else:
+            if not self.config.get('mod_typing'):
+                return
+            thread = await self.threads.find(channel=channel)
+            if thread and thread.recipient:
+                await thread.recipient.trigger_typing()
 
     async def on_guild_channel_delete(self, channel):
         if channel.guild != self.modmail_guild:

cogs/modmail.py

@@ -602,7 +602,11 @@ async def edit(self, ctx, message_id: Optional[int] = None,
     async def contact(self, ctx,
                       category: Optional[discord.CategoryChannel] = None, *,
                       user: Union[discord.Member, discord.User]):
-        """Create a thread with a specified member."""
+        """Create a thread with a specified member.
+        
+        If the optional category argument is passed, the thread
+        will be created in the specified category.
+        """
 
         if user.bot:
             embed = discord.Embed(
@@ -622,6 +626,7 @@ async def contact(self, ctx,
         else:
             thread = self.bot.threads.create(user, creator=ctx.author,
                                              category=category)
+            await thread.wait_until_ready()
             embed = discord.Embed(
                 title='Created thread',
                 description=f'Thread started in {thread.channel.mention} '

core/config.py

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