fix typing

Author: fourjr

bot.py

@@ -1227,7 +1227,7 @@ async def on_typing(self, channel, user, _):
             thread = await self.threads.find(recipient=user)
 
             if thread:
-                await thread.channel.trigger_typing()
+                await thread.channel.typing()
         else:
             if not self.config.get("mod_typing"):
                 return
@@ -1237,7 +1237,7 @@ async def on_typing(self, channel, user, _):
                 for user in thread.recipients:
                     if await self.is_blocked(user):
                         continue
-                    await user.trigger_typing()
+                    await user.typing()
 
     async def handle_reaction_events(self, payload):
         user = self.get_user(payload.user_id)
@@ -1508,7 +1508,7 @@ async def on_error(self, event_method, *args, **kwargs):
 
     async def on_command_error(self, context, exception):
         if isinstance(exception, (commands.BadArgument, commands.BadUnionArgument)):
-            await context.trigger_typing()
+            await context.typing()
             await context.send(embed=discord.Embed(color=self.error_color, description=str(exception)))
         elif isinstance(exception, commands.CommandNotFound):
             logger.warning("CommandNotFound: %s", exception)

cogs/modmail.py

@@ -1158,7 +1158,7 @@ async def logs(self, ctx, *, user: User = None):
         `user` may be a user ID, mention, or name.
         """
 
-        await ctx.trigger_typing()
+        await ctx.typing()
 
         if not user:
             thread = ctx.thread
@@ -1268,7 +1268,7 @@ async def logs_search(self, ctx, limit: Optional[int] = None, *, query):
         Provide a `limit` to specify the maximum number of logs the bot should find.
         """
 
-        await ctx.trigger_typing()
+        await ctx.typing()
 
         entries = await self.bot.api.search_by_text(query, limit)
 

core/thread.py

@@ -1134,7 +1134,7 @@ def lottie_to_png(data):
             logger.info("Sending a message to %s when DM disabled is set.", self.recipient)
 
         try:
-            await destination.trigger_typing()
+            await destination.typing()
         except discord.NotFound:
             logger.warning("Channel not found.")
             raise

core/utils.py

@@ -397,8 +397,8 @@ def format_description(i, names):
 def trigger_typing(func):
     @functools.wraps(func)
     async def wrapper(self, ctx: commands.Context, *args, **kwargs):
-        await ctx.trigger_typing()
-        return await func(self, ctx, *args, **kwargs)
+        async with ctx.typing():
+            return await func(self, ctx, *args, **kwargs)
 
     return wrapper