Merge branch 'mbaruh/autoreview' of https://github.com/python-discord/bot into mbaruh/autoreview

25 files changed, 174 insertions, 229 deletions

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..176a458f9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text=auto
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6c97e8784..e6826e09b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ on:
   workflow_run:
     workflows: ["Lint & Test"]
     branches:
-      - master
+      - main
     types:
       - completed
 
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0caf02308..8b809b777 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -4,7 +4,7 @@ on:
   workflow_run:
     workflows: ["Build"]
     branches:
-      - master
+      - main
     types:
       - completed
 
diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
index 6fa8e8333..95bed2e14 100644
--- a/.github/workflows/lint-test.yml
+++ b/.github/workflows/lint-test.yml
@@ -3,7 +3,7 @@ name: Lint & Test
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 
 
diff --git a/.github/workflows/sentry_release.yml b/.github/workflows/sentry_release.yml
index b8d92e90a..f6a1e1f0e 100644
--- a/.github/workflows/sentry_release.yml
+++ b/.github/workflows/sentry_release.yml
@@ -3,14 +3,14 @@ name: Create Sentry release
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   create_sentry_release:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@master
+        uses: actions/checkout@main
 
       - name: Create a Sentry.io release
         uses: tclindner/[email protected]
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1597592ca..52500a282 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -7,8 +7,6 @@ repos:
       - id: check-yaml
         args: [--unsafe] # Required due to custom constructors (e.g. !ENV)
       - id: end-of-file-fixer
-      - id: mixed-line-ending
-        args: [--fix=lf]
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
   - repo: https://github.com/pre-commit/pygrep-hooks
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index be591d17e..addab32ff 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing to one of Our Projects
 
-Our projects are open-source and are automatically deployed whenever commits are pushed to the `master` branch on each repository, so we've created a set of guidelines in order to keep everything clean and in working order.
+Our projects are open-source and are automatically deployed whenever commits are pushed to the `main` branch on each repository, so we've created a set of guidelines in order to keep everything clean and in working order.
 
 Note that contributions may be rejected on the basis of a contributor failing to follow these guidelines.
 
@@ -8,7 +8,7 @@ Note that contributions may be rejected on the basis of a contributor failing to
 
 1. **No force-pushes** or modifying the Git history in any way.
 2. If you have direct access to the repository, **create a branch for your changes** and create a pull request for that branch. If not, create a branch on a fork of the repository and create a pull request from there.
-    * It's common practice for a repository to reject direct pushes to `master`, so make branching a habit!
+    * It's common practice for a repository to reject direct pushes to `main`, so make branching a habit!
     * If PRing from your own fork, **ensure that "Allow edits from maintainers" is checked**. This gives permission for maintainers to commit changes directly to your fork, speeding up the review process.
 3. **Adhere to the prevailing code style**, which we enforce using [`flake8`](http://flake8.pycqa.org/en/latest/index.html) and [`pre-commit`](https://pre-commit.com/).
     * Run `flake8` and `pre-commit` against your code [**before** you push it](https://soundcloud.com/lemonsaurusrex/lint-before-you-push). Your commit will be rejected by the build server if it fails to lint.
@@ -18,7 +18,7 @@ Note that contributions may be rejected on the basis of a contributor failing to
     * Avoid making minor commits for fixing typos or linting errors. Since you've already set up a `pre-commit` hook to run the linting pipeline before a commit, you shouldn't be committing linting issues anyway.
     * A more in-depth guide to writing great commit messages can be found in Chris Beam's [*How to Write a Git Commit Message*](https://chris.beams.io/posts/git-commit/)
 5. **Avoid frequent pushes to the main repository**. This goes for PRs opened against your fork as well. Our test build pipelines are triggered every time a push to the repository (or PR) is made. Try to batch your commits until you've finished working for that session, or you've reached a point where collaborators need your commits to continue their own work. This also provides you the opportunity to amend commits for minor changes rather than having to commit them on their own because you've already pushed.
-    * This includes merging master into your branch. Try to leave merging from master for after your PR passes review; a maintainer will bring your PR up to date before merging. Exceptions to this include: resolving merge conflicts, needing something that was pushed to master for your branch, or something was pushed to master that could potentionally affect the functionality of what you're writing.
+    * This includes merging main into your branch. Try to leave merging from main for after your PR passes review; a maintainer will bring your PR up to date before merging. Exceptions to this include: resolving merge conflicts, needing something that was pushed to main for your branch, or something was pushed to main that could potentionally affect the functionality of what you're writing.
 6. **Don't fight the framework**. Every framework has its flaws, but the frameworks we've picked out have been carefully chosen for their particular merits. If you can avoid it, please resist reimplementing swathes of framework logic - the work has already been done for you!
 7. If someone is working on an issue or pull request, **do not open your own pull request for the same task**. Instead, collaborate with the author(s) of the existing pull request. Duplicate PRs opened without communicating with the other author(s) and/or PyDis staff will be closed. Communication is key, and there's no point in two separate implementations of the same thing.
     * One option is to fork the other contributor's repository and submit your changes to their branch with your own pull request. We suggest following these guidelines when interacting with their repository as well.
diff --git a/README.md b/README.md
index ac45e6340..9df905dc8 100644
--- a/README.md
+++ b/README.md
@@ -12,11 +12,11 @@ and other tools to help keep the server running like a well-oiled machine.
 
 Read the [Contributing Guide](https://pythondiscord.com/pages/contributing/bot/) on our website if you're interested in helping out.
 
-[1]: https://github.com/python-discord/bot/workflows/Lint%20&%20Test/badge.svg?branch=master
-[2]: https://github.com/python-discord/bot/actions?query=workflow%3A%22Lint+%26+Test%22+branch%3Amaster
-[3]: https://github.com/python-discord/bot/workflows/Build/badge.svg?branch=master
-[4]: https://github.com/python-discord/bot/actions?query=workflow%3ABuild+branch%3Amaster
-[5]: https://github.com/python-discord/bot/workflows/Deploy/badge.svg?branch=master
-[6]: https://github.com/python-discord/bot/actions?query=workflow%3ADeploy+branch%3Amaster
-[7]: https://raw.githubusercontent.com/python-discord/branding/master/logos/badge/badge_github.svg
+[1]: https://github.com/python-discord/bot/workflows/Lint%20&%20Test/badge.svg?branch=main
+[2]: https://github.com/python-discord/bot/actions?query=workflow%3A%22Lint+%26+Test%22+branch%3Amain
+[3]: https://github.com/python-discord/bot/workflows/Build/badge.svg?branch=main
+[4]: https://github.com/python-discord/bot/actions?query=workflow%3ABuild+branch%3Amain
+[5]: https://github.com/python-discord/bot/workflows/Deploy/badge.svg?branch=main
+[6]: https://github.com/python-discord/bot/actions?query=workflow%3ADeploy+branch%3Amain
+[7]: https://raw.githubusercontent.com/python-discord/branding/main/logos/badge/badge_github.svg
 [8]: https://discord.gg/python
diff --git a/bot/exts/backend/branding/_constants.py b/bot/exts/backend/branding/_constants.py
index dbc7615f2..ca8e8c5f5 100644
--- a/bot/exts/backend/branding/_constants.py
+++ b/bot/exts/backend/branding/_constants.py
@@ -42,7 +42,7 @@ SERVER_ICONS = "server_icons"
 
 BRANDING_URL = "https://api.github.com/repos/python-discord/branding/contents"
 
-PARAMS = {"ref": "master"}  # Target branch
+PARAMS = {"ref": "main"}  # Target branch
 HEADERS = {"Accept": "application/vnd.github.v3+json"}  # Ensure we use API v3
 
 # A GitHub token is not necessary for the cog to operate,
diff --git a/bot/exts/backend/logging.py b/bot/exts/backend/logging.py
index 94fa2b139..823f14ea4 100644
--- a/bot/exts/backend/logging.py
+++ b/bot/exts/backend/logging.py
@@ -29,7 +29,7 @@ class Logging(Cog):
             url="https://github.com/python-discord/bot",
             icon_url=(
                 "https://raw.githubusercontent.com/"
-                "python-discord/branding/master/logos/logo_circle/logo_circle_large.png"
+                "python-discord/branding/main/logos/logo_circle/logo_circle_large.png"
             )
         )
 
diff --git a/bot/exts/filters/webhook_remover.py b/bot/exts/filters/webhook_remover.py
index 08fe94055..f11fc8912 100644
--- a/bot/exts/filters/webhook_remover.py
+++ b/bot/exts/filters/webhook_remover.py
@@ -14,7 +14,7 @@ WEBHOOK_URL_RE = re.compile(r"((?:https?://)?discord(?:app)?\.com/api/webhooks/\
 ALERT_MESSAGE_TEMPLATE = (
     "{user}, looks like you posted a Discord webhook URL. Therefore, your "
     "message has been removed. Your webhook may have been **compromised** so "
-    "please re-create the webhook **immediately**. If you believe this was "
+    "please re-create the webhook **immediately**. If you believe this was a "
     "mistake, please let us know."
 )
 
diff --git a/bot/exts/help_channels/_cog.py b/bot/exts/help_channels/_cog.py
index 6abf99810..1c730dce9 100644
--- a/bot/exts/help_channels/_cog.py
+++ b/bot/exts/help_channels/_cog.py
@@ -54,7 +54,7 @@ class HelpChannels(commands.Cog):
     * Contains channels which aren't in use
     * Channels are used to refill the Available category
 
-    Help channels are named after the chemical elements in `bot/resources/elements.json`.
+    Help channels are named after the foods in `bot/resources/foods.json`.
     """
 
     def __init__(self, bot: Bot):
diff --git a/bot/exts/help_channels/_name.py b/bot/exts/help_channels/_name.py
index 728234b1e..061f855ae 100644
--- a/bot/exts/help_channels/_name.py
+++ b/bot/exts/help_channels/_name.py
@@ -14,11 +14,11 @@ log = logging.getLogger(__name__)
 
 def create_name_queue(*categories: discord.CategoryChannel) -> deque:
     """
-    Return a queue of element names to use for creating new channels.
+    Return a queue of food names to use for creating new channels.
 
     Skip names that are already in use by channels in `categories`.
     """
-    log.trace("Creating the chemical element name queue.")
+    log.trace("Creating the food name queue.")
 
     used_names = _get_used_names(*categories)
 
@@ -31,7 +31,7 @@ def create_name_queue(*categories: discord.CategoryChannel) -> deque:
 
 def _get_names() -> t.List[str]:
     """
-    Return a truncated list of prefixed element names.
+    Return a truncated list of prefixed food names.
 
     The amount of names is configured with `HelpChannels.max_total_channels`.
     The prefix is configured with `HelpChannels.name_prefix`.
@@ -39,10 +39,10 @@ def _get_names() -> t.List[str]:
     count = constants.HelpChannels.max_total_channels
     prefix = constants.HelpChannels.name_prefix
 
-    log.trace(f"Getting the first {count} element names from JSON.")
+    log.trace(f"Getting the first {count} food names from JSON.")
 
-    with Path("bot/resources/elements.json").open(encoding="utf-8") as elements_file:
-        all_names = json.load(elements_file)
+    with Path("bot/resources/foods.json").open(encoding="utf-8") as foods_file:
+        all_names = json.load(foods_file)
 
     if prefix:
         return [prefix + name for name in all_names[:count]]
diff --git a/bot/exts/info/codeblock/_parsing.py b/bot/exts/info/codeblock/_parsing.py
index e35fbca22..73fd11b94 100644
--- a/bot/exts/info/codeblock/_parsing.py
+++ b/bot/exts/info/codeblock/_parsing.py
@@ -103,6 +103,9 @@ def _is_python_code(content: str) -> bool:
     """Return True if `content` is valid Python consisting of more than just expressions."""
     log.trace("Checking if content is Python code.")
     try:
+        # Remove null bytes because they cause ast.parse to raise a ValueError.
+        content = content.replace("\x00", "")
+
         # Attempt to parse the message into an AST node.
         # Invalid Python code will raise a SyntaxError.
         tree = ast.parse(content)
diff --git a/bot/exts/info/information.py b/bot/exts/info/information.py
index 92ddf0fbd..c54ca96bf 100644
--- a/bot/exts/info/information.py
+++ b/bot/exts/info/information.py
@@ -64,7 +64,8 @@ class Information(Cog):
 
         defcon_info = ""
         if cog := self.bot.get_cog("Defcon"):
-            defcon_info = f"Defcon threshold: {humanize_delta(cog.threshold)}\n"
+            threshold = humanize_delta(cog.threshold) if cog.threshold else "-"
+            defcon_info = f"Defcon threshold: {threshold}\n"
 
         verification = f"Verification level: {ctx.guild.verification_level.name}\n"
 
diff --git a/bot/exts/info/pypi.py b/bot/exts/info/pypi.py
index 8fe249c8a..2e42e7d6b 100644
--- a/bot/exts/info/pypi.py
+++ b/bot/exts/info/pypi.py
@@ -8,15 +8,15 @@ from discord.ext.commands import Cog, Context, command
 from discord.utils import escape_markdown
 
 from bot.bot import Bot
-from bot.constants import Colours, NEGATIVE_REPLIES
+from bot.constants import Colours, NEGATIVE_REPLIES, RedirectOutput
 
 URL = "https://pypi.org/pypi/{package}/json"
-FIELDS = ("author", "requires_python", "summary", "license")
 PYPI_ICON = "https://cdn.discordapp.com/emojis/766274397257334814.png"
 
 PYPI_COLOURS = itertools.cycle((Colours.yellow, Colours.blue, Colours.white))
 
-ILLEGAL_CHARACTERS = re.compile(r"[^a-zA-Z0-9-.]+")
+ILLEGAL_CHARACTERS = re.compile(r"[^-_.a-zA-Z0-9]+")
+INVALID_INPUT_DELETE_DELAY = RedirectOutput.delete_delay
 
 log = logging.getLogger(__name__)
 
@@ -30,48 +30,47 @@ class PyPi(Cog):
     @command(name="pypi", aliases=("package", "pack"))
     async def get_package_info(self, ctx: Context, package: str) -> None:
         """Provide information about a specific package from PyPI."""
-        embed = Embed(
-            title=random.choice(NEGATIVE_REPLIES),
-            colour=Colours.soft_red
-        )
+        embed = Embed(title=random.choice(NEGATIVE_REPLIES), colour=Colours.soft_red)
         embed.set_thumbnail(url=PYPI_ICON)
 
-        if (character := re.search(ILLEGAL_CHARACTERS, package)) is not None:
-            embed.description = f"Illegal character passed into command: '{escape_markdown(character.group(0))}'"
-            await ctx.send(embed=embed)
-            return
+        error = True
+
+        if characters := re.search(ILLEGAL_CHARACTERS, package):
+            embed.description = f"Illegal character(s) passed into command: '{escape_markdown(characters.group(0))}'"
 
-        async with self.bot.http_session.get(URL.format(package=package)) as response:
-            if response.status == 404:
-                embed.description = "Package could not be found."
+        else:
+            async with self.bot.http_session.get(URL.format(package=package)) as response:
+                if response.status == 404:
+                    embed.description = "Package could not be found."
 
-            elif response.status == 200 and response.content_type == "application/json":
-                response_json = await response.json()
-                info = response_json["info"]
+                elif response.status == 200 and response.content_type == "application/json":
+                    response_json = await response.json()
+                    info = response_json["info"]
 
-                embed.title = f"{info['name']} v{info['version']}"
-                embed.url = info['package_url']
-                embed.colour = next(PYPI_COLOURS)
+                    embed.title = f"{info['name']} v{info['version']}"
 
-                for field in FIELDS:
-                    field_data = info[field]
+                    embed.url = info["package_url"]
+                    embed.colour = next(PYPI_COLOURS)
 
-                    # Field could be completely empty, in some cases can be a string with whitespaces, or None.
-                    if field_data and not field_data.isspace():
-                        if '\n' in field_data and field == "license":
-                            field_data = field_data.split('\n')[0]
+                    summary = escape_markdown(info["summary"])
 
-                        embed.add_field(
-                            name=field.replace("_", " ").title(),
-                            value=escape_markdown(field_data),
-                            inline=False,
-                        )
+                    # Summary could be completely empty, or just whitespace.
+                    if summary and not summary.isspace():
+                        embed.description = summary
+                    else:
+                        embed.description = "No summary provided."
 
-            else:
-                embed.description = "There was an error when fetching your PyPi package."
-                log.trace(f"Error when fetching PyPi package: {response.status}.")
+                    error = False
 
-        await ctx.send(embed=embed)
+                else:
+                    embed.description = "There was an error when fetching your PyPi package."
+                    log.trace(f"Error when fetching PyPi package: {response.status}.")
+
+        if error:
+            await ctx.send(embed=embed, delete_after=INVALID_INPUT_DELETE_DELAY)
+            await ctx.message.delete(delay=INVALID_INPUT_DELETE_DELAY)
+        else:
+            await ctx.send(embed=embed)
 
 
 def setup(bot: Bot) -> None:
diff --git a/bot/exts/info/source.py b/bot/exts/info/source.py
index 7b41352d4..49e74f204 100644
--- a/bot/exts/info/source.py
+++ b/bot/exts/info/source.py
@@ -97,7 +97,7 @@ class BotSource(commands.Cog):
         else:
             file_location = Path(filename).relative_to(Path.cwd()).as_posix()
 
-        url = f"{URLs.github_bot_repo}/blob/master/{file_location}{lines_extension}"
+        url = f"{URLs.github_bot_repo}/blob/main/{file_location}{lines_extension}"
 
         return url, file_location, first_line_no or None
 
diff --git a/bot/exts/moderation/defcon.py b/bot/exts/moderation/defcon.py
index bd16289b9..bab95405c 100644
--- a/bot/exts/moderation/defcon.py
+++ b/bot/exts/moderation/defcon.py
@@ -157,9 +157,9 @@ class Defcon(Cog):
 
         await ctx.send(embed=embed)
 
-    @defcon_group.command(aliases=('t', 'd'))
+    @defcon_group.command(name="threshold", aliases=('t', 'd'))
     @has_any_role(*MODERATION_ROLES)
-    async def threshold(
+    async def threshold_command(
         self, ctx: Context, threshold: Union[DurationDelta, int], expiry: Optional[Expiry] = None
     ) -> None:
         """
diff --git a/bot/exts/moderation/infraction/_utils.py b/bot/exts/moderation/infraction/_utils.py
index e766c1e5c..a98b4828b 100644
--- a/bot/exts/moderation/infraction/_utils.py
+++ b/bot/exts/moderation/infraction/_utils.py
@@ -22,7 +22,6 @@ INFRACTION_ICONS = {
     "voice_ban": (Icons.voice_state_red, Icons.voice_state_green),
 }
 RULES_URL = "https://pythondiscord.com/pages/rules"
-APPEALABLE_INFRACTIONS = ("ban", "mute", "voice_ban")
 
 # Type aliases
 UserObject = t.Union[discord.Member, discord.User]
@@ -31,8 +30,12 @@ Infraction = t.Dict[str, t.Union[str, int, bool]]
 
 APPEAL_EMAIL = "[email protected]"
 
-INFRACTION_TITLE = f"Please review our rules over at {RULES_URL}"
-INFRACTION_APPEAL_FOOTER = f"To appeal this infraction, send an e-mail to {APPEAL_EMAIL}"
+INFRACTION_TITLE = "Please review our rules"
+INFRACTION_APPEAL_EMAIL_FOOTER = f"To appeal this infraction, send an e-mail to {APPEAL_EMAIL}"
+INFRACTION_APPEAL_MODMAIL_FOOTER = (
+    'If you would like to discuss or appeal this infraction, '
+    'send a message to the ModMail bot'
+)
 INFRACTION_AUTHOR_NAME = "Infraction information"
 
 INFRACTION_DESCRIPTION_TEMPLATE = (
@@ -71,13 +74,13 @@ async def post_user(ctx: Context, user: UserSnowflake) -> t.Optional[dict]:
 
 
 async def post_infraction(
-    ctx: Context,
-    user: UserSnowflake,
-    infr_type: str,
-    reason: str,
-    expires_at: datetime = None,
-    hidden: bool = False,
-    active: bool = True
+        ctx: Context,
+        user: UserSnowflake,
+        infr_type: str,
+        reason: str,
+        expires_at: datetime = None,
+        hidden: bool = False,
+        active: bool = True
 ) -> t.Optional[dict]:
     """Posts an infraction to the API."""
     if isinstance(user, (discord.Member, discord.User)) and user.bot:
@@ -150,11 +153,11 @@ async def get_active_infraction(
 
 
 async def notify_infraction(
-    user: UserObject,
-    infr_type: str,
-    expires_at: t.Optional[str] = None,
-    reason: t.Optional[str] = None,
-    icon_url: str = Icons.token_removed
+        user: UserObject,
+        infr_type: str,
+        expires_at: t.Optional[str] = None,
+        reason: t.Optional[str] = None,
+        icon_url: str = Icons.token_removed
 ) -> bool:
     """DM a user about their new infraction and return True if the DM is successful."""
     log.trace(f"Sending {user} a DM about their {infr_type} infraction.")
@@ -178,17 +181,18 @@ async def notify_infraction(
     embed.title = INFRACTION_TITLE
     embed.url = RULES_URL
 
-    if infr_type in APPEALABLE_INFRACTIONS:
-        embed.set_footer(text=INFRACTION_APPEAL_FOOTER)
+    embed.set_footer(
+        text=INFRACTION_APPEAL_EMAIL_FOOTER if infr_type == 'Ban' else INFRACTION_APPEAL_MODMAIL_FOOTER
+    )
 
     return await send_private_embed(user, embed)
 
 
 async def notify_pardon(
-    user: UserObject,
-    title: str,
-    content: str,
-    icon_url: str = Icons.user_verified
+        user: UserObject,
+        title: str,
+        content: str,
+        icon_url: str = Icons.user_verified
 ) -> bool:
     """DM a user about their pardoned infraction and return True if the DM is successful."""
     log.trace(f"Sending {user} a DM about their pardoned infraction.")
diff --git a/bot/exts/utils/utils.py b/bot/exts/utils/utils.py
index eb92dfca7..a5d6f69b9 100644
--- a/bot/exts/utils/utils.py
+++ b/bot/exts/utils/utils.py
@@ -14,6 +14,7 @@ from bot.converters import Snowflake
 from bot.decorators import in_whitelist
 from bot.pagination import LinePaginator
 from bot.utils import messages
+from bot.utils.checks import has_no_roles_check
 from bot.utils.time import time_since
 
 log = logging.getLogger(__name__)
@@ -156,18 +157,22 @@ class Utils(Cog):
 
     @command(aliases=("snf", "snfl", "sf"))
     @in_whitelist(channels=(Channels.bot_commands,), roles=STAFF_ROLES)
-    async def snowflake(self, ctx: Context, snowflake: Snowflake) -> None:
+    async def snowflake(self, ctx: Context, *snowflakes: Snowflake) -> None:
         """Get Discord snowflake creation time."""
-        created_at = snowflake_time(snowflake)
-        embed = Embed(
-            description=f"**Created at {created_at}** ({time_since(created_at, max_units=3)}).",
-            colour=Colour.blue()
-        )
-        embed.set_author(
-            name=f"Snowflake: {snowflake}",
-            icon_url="https://github.com/twitter/twemoji/blob/master/assets/72x72/2744.png?raw=true"
-        )
-        await ctx.send(embed=embed)
+        if len(snowflakes) > 1 and await has_no_roles_check(ctx, *STAFF_ROLES):
+            raise BadArgument("Cannot process more than one snowflake in one invocation.")
+
+        for snowflake in snowflakes:
+            created_at = snowflake_time(snowflake)
+            embed = Embed(
+                description=f"**Created at {created_at}** ({time_since(created_at, max_units=3)}).",
+                colour=Colour.blue()
+            )
+            embed.set_author(
+                name=f"Snowflake: {snowflake}",
+                icon_url="https://github.com/twitter/twemoji/blob/master/assets/72x72/2744.png?raw=true"
+            )
+            await ctx.send(embed=embed)
 
     @command(aliases=("poll",))
     @has_any_role(*MODERATION_ROLES)
diff --git a/bot/resources/elements.json b/bot/resources/elements.json
deleted file mode 100644
index a3ac5b99f..000000000
--- a/bot/resources/elements.json
+++ /dev/null
@@ -1,119 +0,0 @@
-[
-    "hydrogen",
-    "helium",
-    "lithium",
-    "beryllium",
-    "boron",
-    "carbon",
-    "nitrogen",
-    "oxygen",
-    "fluorine",
-    "neon",
-    "sodium",
-    "magnesium",
-    "aluminium",
-    "silicon",
-    "phosphorus",
-    "sulfur",
-    "chlorine",
-    "argon",
-    "potassium",
-    "calcium",
-    "scandium",
-    "titanium",
-    "vanadium",
-    "chromium",
-    "manganese",
-    "iron",
-    "cobalt",
-    "nickel",
-    "copper",
-    "zinc",
-    "gallium",
-    "germanium",
-    "arsenic",
-    "bromine",
-    "krypton",
-    "rubidium",
-    "strontium",
-    "yttrium",
-    "zirconium",
-    "niobium",
-    "molybdenum",
-    "technetium",
-    "ruthenium",
-    "rhodium",
-    "palladium",
-    "silver",
-    "cadmium",
-    "indium",
-    "tin",
-    "antimony",
-    "tellurium",
-    "iodine",
-    "xenon",
-    "caesium",
-    "barium",
-    "lanthanum",
-    "cerium",
-    "praseodymium",
-    "neodymium",
-    "promethium",
-    "samarium",
-    "europium",
-    "gadolinium",
-    "terbium",
-    "dysprosium",
-    "holmium",
-    "erbium",
-    "thulium",
-    "ytterbium",
-    "lutetium",
-    "hafnium",
-    "tantalum",
-    "tungsten",
-    "rhenium",
-    "osmium",
-    "iridium",
-    "platinum",
-    "gold",
-    "mercury",
-    "thallium",
-    "lead",
-    "bismuth",
-    "polonium",
-    "astatine",
-    "radon",
-    "francium",
-    "radium",
-    "actinium",
-    "thorium",
-    "protactinium",
-    "uranium",
-    "neptunium",
-    "plutonium",
-    "americium",
-    "curium",
-    "berkelium",
-    "californium",
-    "einsteinium",
-    "fermium",
-    "mendelevium",
-    "nobelium",
-    "lawrencium",
-    "rutherfordium",
-    "dubnium",
-    "seaborgium",
-    "bohrium",
-    "hassium",
-    "meitnerium",
-    "darmstadtium",
-    "roentgenium",
-    "copernicium",
-    "nihonium",
-    "flerovium",
-    "moscovium",
-    "livermorium",
-    "tennessine",
-    "oganesson"
-]
diff --git a/bot/resources/foods.json b/bot/resources/foods.json
new file mode 100644
index 000000000..61d9ea98f
--- /dev/null
+++ b/bot/resources/foods.json
@@ -0,0 +1,52 @@
+[
+    "apple",
+    "avocado",
+    "bagel",
+    "banana",
+    "bread",
+    "broccoli",
+    "burrito",
+    "cake",
+    "candy",
+    "carrot",
+    "cheese",
+    "cherries",
+    "chestnut",
+    "chili",
+    "chocolate",
+    "coconut",
+    "coffee",
+    "cookie",
+    "corn",
+    "croissant",
+    "cupcake",
+    "donut",
+    "dumpling",
+    "falafel",
+    "grapes",
+    "honey",
+    "kiwi",
+    "lemon",
+    "lollipop",
+    "mango",
+    "mushroom",
+    "orange",
+    "pancakes",
+    "peanut",
+    "pear",
+    "pie",
+    "pineapple",
+    "popcorn",
+    "potato",
+    "pretzel",
+    "ramen",
+    "rice",
+    "salad",
+    "spaghetti",
+    "stew",
+    "strawberry",
+    "sushi",
+    "taco",
+    "tomato",
+    "watermelon"
+]
diff --git a/config-default.yml b/config-default.yml
index 3dbc7bd6b..49d7f84ac 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -89,8 +89,8 @@ style:
 
         filtering: "https://cdn.discordapp.com/emojis/472472638594482195.png"
 
-        green_checkmark: "https://raw.githubusercontent.com/python-discord/branding/master/icons/checkmark/green-checkmark-dist.png"
-        green_questionmark: "https://raw.githubusercontent.com/python-discord/branding/master/icons/checkmark/green-question-mark-dist.png"
+        green_checkmark: "https://raw.githubusercontent.com/python-discord/branding/main/icons/checkmark/green-checkmark-dist.png"
+        green_questionmark: "https://raw.githubusercontent.com/python-discord/branding/main/icons/checkmark/green-question-mark-dist.png"
         guild_update: "https://cdn.discordapp.com/emojis/469954765141442561.png"
 
         hash_blurple: "https://cdn.discordapp.com/emojis/469950142942806017.png"
@@ -360,8 +360,8 @@ urls:
     discord_api:        &DISCORD_API "https://discordapp.com/api/v7/"
     discord_invite_api: !JOIN [*DISCORD_API, "invites"]
 
-    # Misc URLs
-    bot_avatar:      "https://raw.githubusercontent.com/discord-python/branding/master/logos/logo_circle/logo_circle.png"
+    # Misc URLsw
+    bot_avatar:      "https://raw.githubusercontent.com/python-discord/branding/main/logos/logo_circle/logo_circle.png"
     github_bot_repo: "https://github.com/python-discord/bot"
 
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 0002d1d56..8afdd6ef1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -57,8 +57,7 @@ services:
       - web
       - redis
       - snekbox
+    env_file:
+      - .env
     environment:
-      BOT_TOKEN: ${BOT_TOKEN}
       BOT_API_KEY: badbot13m0n8f570f942013fc818f234916ca531
-      REDDIT_CLIENT_ID: ${REDDIT_CLIENT_ID}
-      REDDIT_SECRET: ${REDDIT_SECRET}
diff --git a/tests/bot/exts/moderation/infraction/test_utils.py b/tests/bot/exts/moderation/infraction/test_utils.py
index 5b62463e0..ee9ff650c 100644
--- a/tests/bot/exts/moderation/infraction/test_utils.py
+++ b/tests/bot/exts/moderation/infraction/test_utils.py
@@ -146,7 +146,7 @@ class ModerationUtilsTests(unittest.IsolatedAsyncioTestCase):
                     name=utils.INFRACTION_AUTHOR_NAME,
                     url=utils.RULES_URL,
                     icon_url=Icons.token_removed
-                ).set_footer(text=utils.INFRACTION_APPEAL_FOOTER),
+                ).set_footer(text=utils.INFRACTION_APPEAL_MODMAIL_FOOTER),
                 "send_result": True
             },
             {
@@ -164,9 +164,11 @@ class ModerationUtilsTests(unittest.IsolatedAsyncioTestCase):
                     name=utils.INFRACTION_AUTHOR_NAME,
                     url=utils.RULES_URL,
                     icon_url=Icons.token_removed
-                ),
+                ).set_footer(text=utils.INFRACTION_APPEAL_MODMAIL_FOOTER),
                 "send_result": False
             },
+            # Note that this test case asserts that the DM that *would* get sent to the user is formatted
+            # correctly, even though that message is deliberately never sent.
             {
                 "args": (self.user, "note", None, None, Icons.defcon_denied),
                 "expected_output": Embed(
@@ -182,7 +184,7 @@ class ModerationUtilsTests(unittest.IsolatedAsyncioTestCase):
                     name=utils.INFRACTION_AUTHOR_NAME,
                     url=utils.RULES_URL,
                     icon_url=Icons.defcon_denied
-                ),
+                ).set_footer(text=utils.INFRACTION_APPEAL_MODMAIL_FOOTER),
                 "send_result": False
             },
             {
@@ -200,7 +202,7 @@ class ModerationUtilsTests(unittest.IsolatedAsyncioTestCase):
                     name=utils.INFRACTION_AUTHOR_NAME,
                     url=utils.RULES_URL,
                     icon_url=Icons.defcon_denied
-                ).set_footer(text=utils.INFRACTION_APPEAL_FOOTER),
+                ).set_footer(text=utils.INFRACTION_APPEAL_MODMAIL_FOOTER),
                 "send_result": False
             },
             {
@@ -218,7 +220,7 @@ class ModerationUtilsTests(unittest.IsolatedAsyncioTestCase):
                     name=utils.INFRACTION_AUTHOR_NAME,
                     url=utils.RULES_URL,
                     icon_url=Icons.defcon_denied
-                ).set_footer(text=utils.INFRACTION_APPEAL_FOOTER),
+                ).set_footer(text=utils.INFRACTION_APPEAL_MODMAIL_FOOTER),
                 "send_result": True
             }
         ]