improve multi-page pagination dropdown and titles

Author: fourjr

cogs/modmail.py

@@ -1637,8 +1637,6 @@ async def contact(
     async def blocked(self, ctx):
         """Retrieve a list of blocked users."""
 
-        embeds = [discord.Embed(title="Blocked Users", color=self.bot.main_color, description="")]
-
         roles = []
         users = []
         now = ctx.message.created_at
@@ -1700,43 +1698,54 @@ async def blocked(self, ctx):
             if role:
                 roles.append((role.mention, reason))
 
+        user_embeds = [discord.Embed(title="Blocked Users", color=self.bot.main_color, description="")]
+
         if users:
-            embed = embeds[0]
+            embed = user_embeds[0]
 
             for mention, reason in users:
                 line = mention + f" - {reason or 'No Reason Provided'}\n"
                 if len(embed.description) + len(line) > 2048:
                     embed = discord.Embed(
-                        title="Blocked Users (Continued)",
+                        title="Blocked Users",
                         color=self.bot.main_color,
                         description=line,
                     )
-                    embeds.append(embed)
+                    user_embeds.append(embed)
                 else:
                     embed.description += line
         else:
-            embeds[0].description = "Currently there are no blocked users."
+            user_embeds[0].description = "Currently there are no blocked users."
+
+        if len(user_embeds) > 1:
+            for n, em in enumerate(user_embeds):
+                em.title = f'{em.title} [{n + 1}]'
 
-        embeds.append(discord.Embed(title="Blocked Roles", color=self.bot.main_color, description=""))
+        role_embeds = [discord.Embed(title="Blocked Roles", color=self.bot.main_color, description="")]
 
         if roles:
-            embed = embeds[-1]
+            embed = role_embeds[-1]
 
             for mention, reason in roles:
                 line = mention + f" - {reason or 'No Reason Provided'}\n"
                 if len(embed.description) + len(line) > 2048:
+                    role_embeds[-1].set_author()
                     embed = discord.Embed(
-                        title="Blocked Roles (Continued)",
+                        title="Blocked Roles",
                         color=self.bot.main_color,
                         description=line,
                     )
-                    embeds.append(embed)
+                    role_embeds.append(embed)
                 else:
                     embed.description += line
         else:
-            embeds[-1].description = "Currently there are no blocked roles."
+            role_embeds[-1].description = "Currently there are no blocked roles."
 
-        session = EmbedPaginatorSession(ctx, *embeds)
+        if len(role_embeds) > 1:
+            for n, em in enumerate(role_embeds):
+                em.title = f'{em.title} [{n + 1}]'
+
+        session = EmbedPaginatorSession(ctx, *user_embeds, *role_embeds)
 
         await session.run()
 

cogs/utility.py

@@ -89,15 +89,19 @@ async def format_cog_help(self, cog, *, no_cog=False):
 
             embed.add_field(name="Commands", value=format_ or "No commands.")
 
-            continued = " (Continued)" if embeds else ""
             name = cog.qualified_name + " - Help" if not no_cog else "Miscellaneous Commands"
-            embed.set_author(name=name + continued, icon_url=bot.user.display_avatar.url)
+            embed.set_author(name=name, icon_url=bot.user.display_avatar.url)
 
             embed.set_footer(
                 text=f'Type "{prefix}{self.command_attrs["name"]} command" '
                 "for more info on a specific command."
             )
             embeds.append(embed)
+
+        if len(embeds) > 1:
+            for n, em in enumerate(embeds):
+                em.set_author(name=f'{em.author.name} [{n + 1}]', icon_url=em.author.icon_url)
+
         return embeds
 
     def process_help_msg(self, help_: str):

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):
-        async with ctx.typing():
-            return await func(self, ctx, *args, **kwargs)
+        await ctx.typing()
+        return await func(self, ctx, *args, **kwargs)
 
     return wrapper