Change admin command permissions

commands/dev_member_commands.py

@@ -8,6 +8,7 @@ import discord
 from discord import app_commands
 
 from core import sheets
+from core.admin import bot_admin_check
 import strings as S
 from core.member_sync import announce_birthday, sync_member, today_local
 
@@ -167,7 +168,7 @@ def register_dev_member_commands(
 
     @tree.command(name="check", description=S.CMD["check"])
     @app_commands.guild_only()
-    @app_commands.default_permissions(manage_roles=True)
+    @bot_admin_check()
     async def cmd_check(interaction: discord.Interaction):
         await interaction.response.defer(ephemeral=True)
 
@@ -281,7 +282,7 @@ def register_dev_member_commands(
 
     @tree.command(name="member", description=S.CMD["member"])
     @app_commands.guild_only()
-    @app_commands.default_permissions(manage_roles=True)
+    @bot_admin_check()
     async def cmd_member(interaction: discord.Interaction, user: discord.Member):
         row = sheets.find_member(user.id, user.name)
         if row is None:

commands/economy_admin_commands.py

@@ -8,6 +8,7 @@ import discord
 from discord import app_commands
 
 from core import economy
+from core.admin import bot_admin_check
 import strings as S
 
 
@@ -29,7 +30,7 @@ def register_economy_admin_commands(
 ) -> None:
     @tree.command(name="adminseason", description=S.CMD["adminseason"])
     @app_commands.guild_only()
-    @app_commands.default_permissions(manage_guild=True)
+    @bot_admin_check()
     @app_commands.describe(top_n=S.OPT["adminseason_top_n"])
     async def cmd_adminseason(interaction: discord.Interaction, top_n: int = 10):
         await interaction.response.defer(ephemeral=True)
@@ -73,7 +74,7 @@ def register_economy_admin_commands(
         kogus=S.OPT["admincoins_kogus"],
         põhjus=S.OPT["admin_põhjus"],
     )
-    @app_commands.default_permissions(manage_guild=True)
+    @bot_admin_check()
     async def cmd_admincoins(interaction: discord.Interaction, kasutaja: discord.Member, kogus: int, põhjus: str):
         if kogus == 0:
             await interaction.response.send_message(S.ERR["admincoins_zero"], ephemeral=True)
@@ -112,7 +113,7 @@ def register_economy_admin_commands(
         minutid=S.OPT["adminjail_minutid"],
         põhjus=S.OPT["admin_põhjus"],
     )
-    @app_commands.default_permissions(manage_guild=True)
+    @bot_admin_check()
     async def cmd_adminjail(interaction: discord.Interaction, kasutaja: discord.Member, minutid: int, põhjus: str):
         if minutid <= 0:
             await interaction.response.send_message(S.ERR["positive_duration"], ephemeral=True)
@@ -133,7 +134,7 @@ def register_economy_admin_commands(
     @tree.command(name="adminunjail", description=S.CMD["adminunjail"])
     @app_commands.guild_only()
     @app_commands.describe(kasutaja=S.OPT["admin_kasutaja"])
-    @app_commands.default_permissions(manage_guild=True)
+    @bot_admin_check()
     async def cmd_adminunjail(interaction: discord.Interaction, kasutaja: discord.Member):
         await economy.do_admin_unjail(kasutaja.id, interaction.user.id)
         await interaction.response.send_message(
@@ -148,7 +149,7 @@ def register_economy_admin_commands(
         kasutaja=S.OPT["admin_kasutaja"],
         põhjus=S.OPT["admin_põhjus"],
     )
-    @app_commands.default_permissions(manage_guild=True)
+    @bot_admin_check()
     async def cmd_adminban(interaction: discord.Interaction, kasutaja: discord.Member, põhjus: str):
         if bot.user and kasutaja.id == bot.user.id:
             await interaction.response.send_message(S.ERR["admin_ban_bot"], ephemeral=True)
@@ -164,7 +165,7 @@ def register_economy_admin_commands(
     @tree.command(name="adminunban", description=S.CMD["adminunban"])
     @app_commands.guild_only()
     @app_commands.describe(kasutaja=S.OPT["admin_kasutaja"])
-    @app_commands.default_permissions(manage_guild=True)
+    @bot_admin_check()
     async def cmd_adminunban(interaction: discord.Interaction, kasutaja: discord.Member):
         await economy.do_admin_unban(kasutaja.id, interaction.user.id)
         await interaction.response.send_message(
@@ -179,7 +180,7 @@ def register_economy_admin_commands(
         kasutaja=S.OPT["admin_kasutaja"],
         põhjus=S.OPT["admin_põhjus"],
     )
-    @app_commands.default_permissions(manage_guild=True)
+    @bot_admin_check()
     async def cmd_adminreset(interaction: discord.Interaction, kasutaja: discord.Member, põhjus: str):
         if bot.user and kasutaja.id == bot.user.id:
             await interaction.response.send_message(S.ERR["admin_reset_bot"], ephemeral=True)
@@ -195,7 +196,7 @@ def register_economy_admin_commands(
     @tree.command(name="adminview", description=S.CMD["adminview"])
     @app_commands.guild_only()
     @app_commands.describe(kasutaja=S.OPT["admin_kasutaja"])
-    @app_commands.default_permissions(manage_guild=True)
+    @bot_admin_check()
     async def cmd_adminview(interaction: discord.Interaction, kasutaja: discord.Member):
         res = await economy.do_admin_inspect(kasutaja.id)
         data = res["data"]
@@ -238,7 +239,7 @@ def register_economy_admin_commands(
         kogus=S.OPT["adminexp_kogus"],
         põhjus=S.OPT["admin_põhjus"],
     )
-    @app_commands.default_permissions(manage_guild=True)
+    @bot_admin_check()
     async def cmd_adminexp(interaction: discord.Interaction, kasutaja: discord.Member, kogus: int, põhjus: str):
         if kogus == 0:
             await interaction.response.send_message(S.ERR["admincoins_zero"], ephemeral=True)
@@ -281,7 +282,7 @@ def register_economy_admin_commands(
         ese=S.OPT["adminitem_ese"],
         tegevus=S.OPT["adminitem_tegevus"],
     )
-    @app_commands.default_permissions(manage_guild=True)
+    @bot_admin_check()
     async def cmd_adminitem(interaction: discord.Interaction, kasutaja: discord.Member, ese: str, tegevus: str):
         action = tegevus.strip().lower()
         if action not in ("anna", "eemalda"):

commands/ops_admin_commands.py

@@ -13,6 +13,7 @@ from pathlib import Path
 import discord
 from discord import app_commands
 
+from core.admin import bot_admin_check
 import strings as S
 
 
@@ -32,7 +33,7 @@ def register_ops_admin_commands(
 ) -> None:
     @tree.command(name="status", description=S.CMD["status"])
     @app_commands.guild_only()
-    @app_commands.default_permissions(manage_guild=True)
+    @bot_admin_check()
     async def cmd_status(interaction: discord.Interaction):
         mem = process.memory_info()
         cpu = process.cpu_percent(interval=0.1)
@@ -95,7 +96,7 @@ def register_ops_admin_commands(
 
     @tree.command(name="sync", description=S.CMD["sync"])
     @app_commands.guild_only()
-    @app_commands.default_permissions(manage_guild=True)
+    @bot_admin_check()
     async def cmd_sync(interaction: discord.Interaction):
         await interaction.response.defer(ephemeral=True)
         tree.copy_global_to(guild=guild_obj)
@@ -107,7 +108,7 @@ def register_ops_admin_commands(
 
     @tree.command(name="restart", description=S.CMD["restart"])
     @app_commands.guild_only()
-    @app_commands.default_permissions(manage_guild=True)
+    @bot_admin_check()
     async def cmd_restart(interaction: discord.Interaction):
         restart_file.write_text(json.dumps({"channel_id": interaction.channel_id}), encoding="utf-8")
         await interaction.response.send_message(S.MSG_RESTARTING, ephemeral=True)
@@ -117,7 +118,7 @@ def register_ops_admin_commands(
 
     @tree.command(name="shutdown", description=S.CMD["shutdown"])
     @app_commands.guild_only()
-    @app_commands.default_permissions(manage_guild=True)
+    @bot_admin_check()
     async def cmd_shutdown(interaction: discord.Interaction):
         await interaction.response.send_message(S.MSG_SHUTTING_DOWN, ephemeral=True)
         log.info("/shutdown triggered by %s", interaction.user)
@@ -125,7 +126,7 @@ def register_ops_admin_commands(
 
     @tree.command(name="pause", description=S.CMD["pause"])
     @app_commands.guild_only()
-    @app_commands.default_permissions(manage_guild=True)
+    @bot_admin_check()
     async def cmd_pause(interaction: discord.Interaction):
         paused = not get_paused()
         set_paused(paused)