Fixed typos

Author: Taaku18

.dockerignore

@@ -93,6 +93,7 @@ celerybeat-schedule
 .venv
 env/
 venv/
+venv2/
 ENV/
 env.bak/
 venv.bak/

.gitignore

@@ -93,6 +93,7 @@ celerybeat-schedule
 .venv
 env/
 venv/
+venv2/
 ENV/
 env.bak/
 venv.bak/

cogs/modmail.py

@@ -100,10 +100,10 @@ async def setup(self, ctx):
         )
 
         embed.add_field(
-            name="Thanks for using the bot!",
+            name="Thanks for using our bot!",
             value="If you like what you see, consider giving the "
-            "[repo a star](https://github.com/kyb3r/modmail) :star: or if you are "
-            "feeling generous, check us out on [Patreon](https://patreon.com/kyber)!",
+            "[repo a star](https://github.com/kyb3r/modmail) :star: and if you are "
+            "feeling extra generous, buy us coffee on [Patreon](https://patreon.com/kyber) :heart:!",
         )
 
         embed.set_footer(text=f'Type "{self.bot.prefix}help" for a complete list of commands.')
@@ -115,8 +115,8 @@ async def setup(self, ctx):
         await self.bot.config.update()
         await ctx.send(
             "**Successfully set up server.**\n"
-            "Consider setting permission levels "
-            "to give access to roles or users the ability to use Modmail.\n\n"
+            "Consider setting permission levels to give access to roles "
+            "or users the ability to use Modmail.\n\n"
             f"Type:\n- `{self.bot.prefix}permissions` and `{self.bot.prefix}permissions add` "
             "for more info on setting permissions.\n"
             f"- `{self.bot.prefix}config help` for a list of available customizations."
@@ -162,7 +162,7 @@ async def snippet(self, ctx, *, name: str.lower = None):
             embed = discord.Embed(
                 color=self.bot.error_color, description="You dont have any snippets at the moment."
             )
-            embed.set_footer(text=f"Do {self.bot.prefix}help snippet for more commands.")
+            embed.set_footer(text=f'Check "{self.bot.prefix}help snippet" to add a snippet.')
             embed.set_author(name="Snippets", icon_url=ctx.guild.icon_url)
             return await ctx.send(embed=embed)
 
@@ -211,7 +211,7 @@ async def snippet_add(self, ctx, name: str.lower, *, value: commands.clean_conte
             embed = discord.Embed(
                 title="Error",
                 color=self.bot.error_color,
-                description=f"An alias with the same name already exists: `{name}`.",
+                description=f"An alias that shares the same name exists: `{name}`.",
             )
             return await ctx.send(embed=embed)
 
@@ -397,15 +397,15 @@ async def notify(
         """
         Notify a user or role when the next thread message received.
 
-        Once a thread message is received, `user_or_role` will only be pinged once.
+        Once a thread message is received, `user_or_role` will be pinged once.
 
         Leave `user_or_role` empty to notify yourself.
         `@here` and `@everyone` can be substituted with `here` and `everyone`.
         `user_or_role` may be a user ID, mention, name. role ID, mention, name, "everyone", or "here".
         """
         mention = self.parse_user_or_role(ctx, user_or_role)
         if mention is None:
-            raise commands.BadArgument(f"{user_or_role} is not a valid role.")
+            raise commands.BadArgument(f"{user_or_role} is not a valid user or role.")
 
         thread = ctx.thread
 
@@ -482,7 +482,7 @@ async def subscribe(
         """
         mention = self.parse_user_or_role(ctx, user_or_role)
         if mention is None:
-            raise commands.BadArgument(f"{user_or_role} is not a valid role.")
+            raise commands.BadArgument(f"{user_or_role} is not a valid user or role.")
 
         thread = ctx.thread
 
@@ -539,7 +539,7 @@ async def unsubscribe(
             await self.bot.config.update()
             embed = discord.Embed(
                 color=self.bot.main_color,
-                description=f"{mention} is now unsubscribed to this thread.",
+                description=f"{mention} is now unsubscribed from this thread.",
             )
         return await ctx.send(embed=embed)
 
@@ -649,7 +649,7 @@ async def logs(self, ctx, *, user: User = None):
             )
             return await ctx.send(embed=embed)
 
-        logs = reversed([e for e in logs if not e["open"]])
+        logs = reversed([log for log in logs if not log["open"]])
 
         embeds = self.format_log_embeds(logs, avatar_url=icon_url)
 
@@ -678,7 +678,7 @@ async def logs_closed_by(self, ctx, *, user: User = None):
         if not embeds:
             embed = discord.Embed(
                 color=self.bot.error_color,
-                description="No log entries have been found for that query",
+                description="No log entries have been found for that query.",
             )
             return await ctx.send(embed=embed)
 
@@ -838,8 +838,8 @@ async def edit(self, ctx, message_id: Optional[int] = None, *, message: str):
         """
         Edit a message that was sent using the reply or anonreply command.
 
-        If no `message_id` is provided, the
-        last message sent by a staff will be edited.
+        If no `message_id` is provided,
+        the last message sent by a staff will be edited.
         """
         thread = ctx.thread
 
@@ -1037,7 +1037,7 @@ async def block(self, ctx, user: Optional[User] = None, *, after: UserFriendlyTi
             elif after is None:
                 raise commands.MissingRequiredArgument(SimpleNamespace(name="user"))
             else:
-                raise commands.BadArgument(f'User "{after.arg}" not found')
+                raise commands.BadArgument(f'User "{after.arg}" not found.')
 
         mention = getattr(user, "mention", f"`{user.id}`")
 
@@ -1069,8 +1069,8 @@ async def block(self, ctx, user: Optional[User] = None, *, after: UserFriendlyTi
             old_reason = msg.strip().rstrip(".")
             embed = discord.Embed(
                 title="Success",
-                description=f"{mention} was previously blocked "
-                f"{old_reason}.\n{mention} is now blocked {reason}",
+                description=f"{mention} was previously blocked {old_reason}.\n"
+                f"{mention} is now blocked {reason}",
                 color=self.bot.main_color,
             )
         else:
@@ -1116,14 +1116,14 @@ async def unblock(self, ctx, *, user: User = None):
                 reason = msg[16:].strip().rstrip(".") or "no reason"
                 embed = discord.Embed(
                     title="Success",
-                    description=f"{mention} was previously blocked internally "
-                    f"{reason}.\n{mention} is no longer blocked.",
+                    description=f"{mention} was previously blocked internally {reason}.\n"
+                    f"{mention} is no longer blocked.",
                     color=self.bot.main_color,
                 )
                 embed.set_footer(
                     text="However, if the original system block reason still applies, "
-                    f"{name} will be automatically blocked again. Use "
-                    f'"{self.bot.prefix}blocked whitelist {user.id}" to whitelist the user.'
+                    f"{name} will be automatically blocked again. "
+                    f'Use "{self.bot.prefix}blocked whitelist {user.id}" to whitelist the user.'
                 )
             else:
                 embed = discord.Embed(
@@ -1156,7 +1156,7 @@ async def delete(self, ctx, message_id: Optional[int] = None):
             try:
                 message_id = int(message_id)
             except ValueError:
-                raise commands.BadArgument("An integer message ID needs to be specified.")
+                raise commands.BadArgument("A message ID needs to be specified.")
 
         linked_message_id = await self.find_linked_message(ctx, message_id)
 

cogs/utility.py

@@ -184,8 +184,8 @@ async def send_error_message(self, error):
                 for i, val in enumerate(values, start=1):
                     embed.description += f"\n{i}: {escape_markdown(val)}"
             embed.set_footer(
-                text=f'Type "{self.clean_prefix}{self.command_attrs["name"]} alias" for more '
-                "details on aliases."
+                text=f'Type "{self.clean_prefix}{self.command_attrs["name"]} alias" '
+                "for more details on aliases."
             )
             return await self.get_destination().send(embed=embed)
 
@@ -237,7 +237,7 @@ def cog_unload(self):
     async def changelog(self, ctx, version: str.lower = ""):
         """Shows the changelog of the Modmail."""
         changelog = await Changelog.from_url(self.bot)
-        version = version.lstrip("vV") if version else changelog.latest_version.version
+        version = version.lstrip("v") if version else changelog.latest_version.version
 
         try:
             index = [v.version for v in changelog.versions].index(version)
@@ -264,7 +264,7 @@ async def changelog(self, ctx, version: str.lower = ""):
                     f"View the changelog here: {changelog.latest_version.changelog_url}#v{version[::2]}"
                 )
 
-    @commands.command(aliases=["bot", "info"])
+    @commands.command(aliases=["info"])
     @checks.has_permissions(PermissionLevel.REGULAR)
     @utils.trigger_typing
     async def about(self, ctx):
@@ -345,7 +345,7 @@ async def sponsors(self, ctx):
     @checks.has_permissions(PermissionLevel.OWNER)
     @utils.trigger_typing
     async def debug(self, ctx):
-        """Shows the recent application-logs of the bot."""
+        """Shows the recent application logs of the bot."""
 
         log_file_name = self.bot.token.split(".")[0]
 
@@ -368,23 +368,23 @@ async def debug(self, ctx):
 
         messages = []
 
-        # Using Scala formatting because it's similar to Python for exceptions
+        # Using Haskell formatting because it's similar to Python for exceptions
         # and it does a fine job formatting the logs.
-        msg = "```Scala\n"
+        msg = "```Haskell\n"
 
         for line in logs.splitlines(keepends=True):
-            if msg != "```Scala\n":
+            if msg != "```Haskell\n":
                 if len(line) + len(msg) + 3 > 2000:
                     msg += "```"
                     messages.append(msg)
-                    msg = "```Scala\n"
+                    msg = "```Haskell\n"
             msg += line
             if len(msg) + 3 > 2000:
                 msg = msg[:1993] + "[...]```"
                 messages.append(msg)
-                msg = "```Scala\n"
+                msg = "```Haskell\n"
 
-        if msg != "```Scala\n":
+        if msg != "```Haskell\n":
             msg += "```"
             messages.append(msg)
 
@@ -1043,7 +1043,7 @@ async def alias_add(self, ctx, name: str.lower, *, value):
                     else:
                         embed.description = (
                             "The command you are attempting to point "
-                            f"to n step {i} does not exist: `{linked_command}`."
+                            f"to in step {i} does not exist: `{linked_command}`."
                         )
 
                     return await ctx.send(embed=embed)
@@ -1266,7 +1266,7 @@ async def permissions_add(
         - `{prefix}perms add command "plugin enabled" @role`
         - `{prefix}perms add command help 984301093849028`
 
-        Do not ping `@everyone` for granting permission to everyone, use "everyone" or "all" instead,
+        Do not ping `@everyone` for granting permission to everyone, use "everyone" or "all" instead.
         """
 
         if type_ not in {"command", "level"}:
@@ -1342,7 +1342,7 @@ async def permissions_remove(
         - `{prefix}perms remove override block`
         - `{prefix}perms remove override "snippet add"`
 
-        Do not ping `@everyone` for granting permission to everyone, use "everyone" or "all" instead,
+        Do not ping `@everyone` for granting permission to everyone, use "everyone" or "all" instead.
         """
         if type_ not in {"command", "level", "override"} or (
             type_ != "override" and user_or_role is None
@@ -1484,7 +1484,7 @@ async def permissions_get(
         - `{prefix}perms get override block`
         - `{prefix}perms get override permissions add`
 
-        Do not ping `@everyone` for granting permission to everyone, use "everyone" or "all" instead,
+        Do not ping `@everyone` for granting permission to everyone, use "everyone" or "all" instead.
         """
 
         if name is None and user_or_role not in {"command", "level", "override"}:

core/time.py

@@ -120,9 +120,9 @@ def convert(self, ctx, argument):
             # so let me handle the 'now' case
             if argument.endswith(" from now"):
                 argument = argument[:-9].strip()
-            # handles "for xxx hours"
-            if argument.startswith("for "):
-                argument = argument[4:].strip()
+            # handles "in xxx hours"
+            if argument.startswith("in "):
+                argument = argument[3:].strip()
 
             elements = calendar.nlp(argument, sourceTime=self.now)
             if elements is None or not elements:

pyproject.toml

@@ -9,6 +9,7 @@ exclude = '''
     | \.git
     | \.venv
     | venv
+    | venv2
     | _build
     | build
     | dist