Merge branch 'nh-server:main' into main

cogs/assistance.py

@@ -152,7 +152,7 @@ async def invite(self, ctx: KurisuContext, name: str = ""):
             if self.filters.approved_invites:
                 return await ctx.send(f"Valid server names are: {', '.join(ai.alias for ai in self.filters.approved_invites.values())}")
             else:
-                return await ctx.send("There is no approved servers!")
+                return await ctx.send("There are no approved servers!")
 
         invite = self.filters.get_invite_named(name)
 
@@ -260,6 +260,14 @@ async def ot(self, ctx: GuildContext):
         """Reminds user where they are. (4) Helper+ only"""
         await self.send_channel_warn(ctx, self.bot.channels['off-topic'])
 
+    @commands.guild_only()
+    @commands.command(hidden=True)
+    async def pretendo(self, ctx: GuildContext):
+        """information about pretendo so people stop asking"""
+        await ctx.send("You are in the Nintendo Homebrew Discord server. We have **no official affiliation** with Pretendo.\n"
+                       "There are no Pretendo staff members here. We do not know how to get you unbanned. Ban appeals should be directed [here](<https://forum.pretendo.network>).\n"
+                       "The Pretendo Discord server is located [here](<https://discord.gg/DThgbba>). Detailed instructions for installing Pretendo can be found [here](<https://pretendo.network/docs/install>).")
+
 
 add_md_files_as_commands(Assistance)
 add_md_files_as_commands(Assistance, join(Assistance.data_dir, 'tutorial'), namespace=Assistance.tutorial)  # type: ignore

cogs/soap.py

@@ -89,7 +89,7 @@ async def createsoap(self, ctx: GuildContext, helpee: discord.Member):
                            "  - The label also may be under the battery.\n"
                            "  - If you still can't find it, please request further assistance.\n"
                            "10. Please wait for further instructions.\n"
-                           "### Don't have access to a computer?\n"
+                           "## Don't have access to a computer?\n"
                            "There is a way to submit your `essential.exefs` using only your hacked 3DS and a WiFi connection, but it's _not preferred_ compared to the above instructions.\n"
                            "If you need more information about this remote submission method, please let us know in this channel.")
         await self.bot.channels['mod-logs'].send(f"⭕️ **🧼 access granted**: {ctx.author.mention} granted access to 🧼 channel to {helpee.mention}")