Add hotpatches to main

jarvis/cogs/ctc2.py

@@ -20,7 +20,7 @@ from naff.models.naff.cooldowns import Buckets
 
 from jarvis.utils import build_embed
 
-guild_ids = [862402786116763668]  # [578757004059738142, 520021794380447745, 862402786116763668]
+guild_ids = [578757004059738142, 520021794380447745, 862402786116763668]
 
 valid = re.compile(r"[\w\s\-\\/.!@#$%^*()+=<>,\u0080-\U000E0FFF]*")
 invites = re.compile(

jarvis/cogs/dbrand.py

@@ -17,7 +17,7 @@ from jarvis.config import JarvisConfig
 from jarvis.data.dbrand import shipping_lookup
 from jarvis.utils import build_embed
 
-guild_ids = [862402786116763668]  # [578757004059738142, 520021794380447745, 862402786116763668]
+guild_ids = [578757004059738142, 520021794380447745, 862402786116763668]
 
 
 class DbrandCog(Extension):

jarvis/cogs/dev.py

@@ -275,6 +275,7 @@ class DevCog(Extension):
     @slash_command(name="cloc", description="Get JARVIS lines of code")
     @cooldown(bucket=Buckets.CHANNEL, rate=1, interval=30)
     async def _cloc(self, ctx: InteractionContext) -> None:
+        await ctx.defer()
         output = subprocess.check_output(  # noqa: S603, S607
             ["tokei", "-C", "--sort", "code"]
         ).decode("UTF-8")
@@ -292,7 +293,7 @@ class DevCog(Extension):
                 file_bytes.write(raw)
                 file_bytes.seek(0)
                 tokei = File(file_bytes, file_name="tokei.png")
-                await ctx.send(content=f"```ansi\n{capture.get()}\n```", file=tokei)
+                await ctx.send(file=tokei)
 
 
 def setup(bot: Client) -> None:

jarvis/cogs/util.py

@@ -83,7 +83,7 @@ class UtilCog(Extension):
 
     @slash_command(name="rchk", description="Robot Camo HK416")
     async def _rchk(self, ctx: InteractionContext) -> None:
-        await ctx.send(content=hk)
+        await ctx.send(content=hk, ephemeral=True)
 
     @slash_command(
         name="rcauto",
@@ -111,7 +111,7 @@ class UtilCog(Extension):
         elif len(to_send) == 0:
             await ctx.send("No valid text found", ephemeral=True)
         else:
-            await ctx.send(to_send)
+            await ctx.send(to_send, ephemeral=True)
 
     @slash_command(name="avatar", description="Get a user avatar")
     @slash_option(

jarvis/cogs/verify.py

@@ -40,7 +40,6 @@ class VerifyCog(Extension):
     @slash_command(name="verify", description="Verify that you've read the rules")
     @cooldown(bucket=Buckets.USER, rate=1, interval=30)
     async def _verify(self, ctx: InteractionContext) -> None:
-        await ctx.defer()
         role = await Setting.find_one(q(guild=ctx.guild.id, setting="verified"))
         if not role:
             message = await ctx.send("This guild has not enabled verification", ephemeral=True)

run.py

@@ -1,4 +1,8 @@
 """Main run file for J.A.R.V.I.S."""
+import nest_asyncio
+
+nest_asyncio.apply()
+
 import asyncio
 
 from jarvis import run