Resolve git requests.

Author: lorenzo132

cogs/modmail.py

@@ -16,7 +16,7 @@
 from dateutil import parser
 
 from core import checks
-from core.models import DMDisabled, PermissionLevel, SimilarCategoryConverter, getLogger
+from core.models import DMDisabled, PermissionLevel, SimilarCategoryConverter, UnseenFormatter, getLogger
 from core.paginator import EmbedPaginatorSession
 from core.thread import Thread
 from core.time import UserFriendlyTime, human_timedelta
@@ -583,9 +583,9 @@ async def args(self, ctx, *, name: str.lower = None):
         if not self.bot.args:
             embed = discord.Embed(
                 color=self.bot.error_color,
-                description="You dont have any args at the moment.",
+                description="You don't have any args at the moment.",
             )
-            embed.set_footer(text=f'Check "{self.bot.prefix}help args add" to add an arg.')
+            embed.set_footer(text=f'See "{self.bot.prefix}help args add" for how to add an arg.')
             embed.set_author(
                 name="Args",
                 icon_url=self.bot.get_guild_icon(guild=ctx.guild, size=128),
@@ -626,7 +626,7 @@ async def args_add(self, ctx, name: str.lower, *, value: commands.clean_content)
         """
         Add an arg.
 
-        Simply to add an arg, do: ```
+        To add an arg, simply do: ```
         {prefix}args add name value
         ```
         """
@@ -1723,7 +1723,7 @@ async def reply(self, ctx, *, msg: str = ""):
         """
 
         if self.bot.args:
-            msg = self.bot.formatter.format(msg, **self.bot.args)
+            msg = UnseenFormatter().format(msg, **self.bot.args)
 
         if len(msg) > 4096:
             return await ctx.send(

core/models.py

@@ -388,14 +388,13 @@ def get_field(self, field_name, args, kwargs):
 
 
 class UnseenFormatter(Formatter):
-    def get_value(self, key, args, kwds):
-        if isinstance(key, str):
-            try:
-                return kwds[key]
-            except KeyError:
-                return "{" + key + "}"
-        else:
-            return super().get_value(key, args, kwds)
+    def get_field(self, field_name, args, kwargs):
+        """Resolve only complete field names and preserve unknown fields."""
+        if field_name in kwargs:
+            return kwargs[field_name], field_name
+        if field_name.isdecimal():
+            return super().get_field(field_name, args, kwargs)
+        return "{" + field_name + "}", field_name
 
 
 class SimilarCategoryConverter(commands.CategoryChannelConverter):