Add arbitrary perms to cmds

Author: ApproxNeo

modules/genius/genius.py

@@ -4,6 +4,7 @@
     component_callback,
     slash_command,
     slash_option,
+    slash_permission
 )
 from dis_snek.models.context import InteractionContext
 from dis_snek.models.discord_objects.embed import EmbedAttachment, EmbedField
@@ -18,6 +19,7 @@
 from storage.genius import Genius
 from utils.config import GUILD, PARTICIPANT_ROLE, MAX_TICKETS, ADMIN_ROLE
 from utils.embeds import GENIUS_BAR
+from utils.perms import NOT_EVERYBODY, ADMIN_ONLY, BOT_DEV_ONLY
 
 
 class GeniusBar(Scale):
@@ -35,14 +37,14 @@ async def on_ready(self):
 
 
     @slash_command(
-        name="genius", 
-        sub_cmd_name="setup",
-        sub_cmd_description="Setup the Genius Bar in a text channel")
+        name="genius_setup", 
+        description="Setup the Genius Bar in a text channel")
     @slash_option(
         "channel",
         "ChannelID of channel to set up Genius Bar",
         OptionTypes.CHANNEL,
         required=True)
+    @slash_permission(NOT_EVERYBODY, BOT_DEV_ONLY)
     async def genius_setup(self, ctx: InteractionContext, channel):
         await ctx.defer()
 
@@ -60,9 +62,9 @@ async def genius_setup(self, ctx: InteractionContext, channel):
 
 
     @slash_command(
-        name="genius", 
-        sub_cmd_name="kill",
-        sub_cmd_description="Kill all occupied and currently queued tickets")
+        name="genius_kill", 
+        description="Kill all occupied and currently queued tickets")
+    @slash_permission(NOT_EVERYBODY, BOT_DEV_ONLY)
     async def genius_kill(self, ctx):
         await ctx.defer()
 

modules/nerfgun/nerfgun.py

@@ -6,6 +6,7 @@
     component_callback,
     slash_command,
     slash_option,
+    slash_permission
 )
 from dis_snek.models.context import InteractionContext
 from dis_snek.models.discord_objects.channel import GuildText
@@ -14,8 +15,10 @@
 from dis_snek.models.enums import ButtonStyles
 
 from storage.nerf import Nerf
+from utils.config import BOT_DEV_ROLE
 
 from utils.embeds import NERF_GUN
+from utils.perms import ADMIN_ONLY, BOT_DEV_ONLY, NOT_EVERYBODY
 
 
 class Nerfgun(Scale):
@@ -32,9 +35,8 @@ async def on_ready(self):
             await self._update_leaderboard()
 
     @slash_command(
-        name="nerf",
-        sub_cmd_name="setup",
-        sub_cmd_description="Setup the Nerf Gun queue in a specified text channel"
+        name="nerf_setup",
+        description="Setup the Nerf Gun queue in a specified text channel"
     )
     @slash_option(
         "queuechannel",
@@ -48,6 +50,7 @@ async def on_ready(self):
         OptionTypes.CHANNEL,
         required=True,
     )
+    @slash_permission(NOT_EVERYBODY, BOT_DEV_ONLY)
     async def nerf_setup(self, ctx: InteractionContext, queuechannel, boardchannel):
         await ctx.defer()
 
@@ -100,10 +103,10 @@ async def _setup_leaderboard_channel(self, boardchannel):
         self.nerf.set_leaderboard_message(leaderboard_msg)
 
     @slash_command(
-        name="nerf",
-        sub_cmd_name="next",
-        sub_cmd_description="Call up the next individual in the queue"
+        name="nerf_next",
+        description="Call up the next individual in the queue"
     )
+    @slash_permission(NOT_EVERYBODY, ADMIN_ONLY)
     async def nerf_next(self, ctx: InteractionContext):
         if self.nerf.queue_is_empty():
             await ctx.send("Queue currently empty!")
@@ -167,9 +170,8 @@ async def _update_queue(self):
         await self.nerf.queue_msg.edit(text)
 
     @slash_command(
-        name="nerf",
-        sub_cmd_name="score",
-        sub_cmd_description="Score a player"
+        name="nerf_score",
+        description="Score a player"
     )
     @slash_option(
         "score",
@@ -183,6 +185,7 @@ async def _update_queue(self):
         OptionTypes.USER,
         required=False
     )
+    @slash_permission(NOT_EVERYBODY, ADMIN_ONLY)
     async def nerf_score(self, ctx: InteractionContext, score, player = None):
         await ctx.defer()
 

utils/perms.py

@@ -0,0 +1,24 @@
+from dis_snek.models.application_commands import Permission
+from utils.config import BOT_DEV_ROLE, ADMIN_ROLE, PARTICIPANT_ROLE, GUILD
+
+NOT_EVERYBODY = Permission(
+    id=PARTICIPANT_ROLE,
+    guild_id=GUILD,
+    type=1,
+    permission=False
+)
+
+ADMIN_ONLY = Permission(
+    id=ADMIN_ROLE,
+    guild_id=GUILD,
+    type=1,
+    permission=True
+
+)
+
+BOT_DEV_ONLY = Permission(
+    id=BOT_DEV_ROLE,
+    guild_id=GUILD,
+    type=1,
+    permission=True
+)