CHANGES:

- Do not restrict_commands for the bot owner by default. You can re-enable that by setting restrict_owner to true in your nodes.yaml

Author: karel26

MULTINODE.md

@@ -187,6 +187,9 @@ Node2:  # node where I do not have full control
   # ...
 ```
 
+> [!NOTE]
+> Unless you specify `restrict_owner: true` in nodes.yaml, the owner of the bot can still run restricted commands.
+
 ### Moving a Server from one Node / Instance to another
 Each server is loosely coupled to an instance on a node. You can migrate a server to another instance though, by using
 the `/server migrate` command. 

README.md

@@ -351,6 +351,7 @@ NODENAME:                       # this will usually be your hostname
   use_upnp: true                # The bot will auto-detect if there is a UPnP IGD available and configure this setting initially for you! If you do NOT want to use UPnP, even IF it is available, put this to false.
   nodestats: true               # Enable/disable node statistics (database pool and event queue sizes), default: true
   restrict_commands: true       # Disable commands that can affect the integrity of the server. Default: false (see MULTINODE.md)
+  restrict_owner: false         # If set to true, the owner of the bot can also not run restricted commands. Default: false (see MULTINODE.md)
   database:                     # Optional: It might be that you need to use different IPs to connect to the same database server. This is the place you could do that.
     url: postgres://USER:PASSWORD@DB-IP:DB-PORT/DB-NAME   # The bot will auto-move the database password from here to a secret place and replace it with SECRET.
     pool_min: 5                 # min size of the DB pool, default is 5
@@ -500,7 +501,7 @@ This is your Discord-bot configuration.
 
 ```yaml
 token: SECRET_DISCORD_TOKEN                     # Your TOKEN, as received from the discord developer portal. The bot will auto-move this to a secret place.
-owner: 1122334455667788                         # The ID of your bot user. Right-click, select "Copy User ID".
+owner: 1122334455667788                         # The Discord ID of the owner. Right-click on your Discord user, select "Copy User ID". If unsure, use the bot user.
 automatch: true                                 # Use the bot's auto-matching functionality (see below), default is false.
 autoban: false                                  # Use the bot's auto-ban functionality (see below), default is false.
 autorole:                                       # Automatically give roles to people, depending on conditions (see below). The roles need to be set up in your Discord server.

core/utils/discord.py

@@ -487,7 +487,11 @@ async def wrapper(interaction: Interaction):
 
 
 def is_restricted(interaction: discord.Interaction) -> bool:
-    return interaction.client.node.locals.get('restrict_commands', False)
+    if interaction.client.node.locals.get('restrict_commands', False):
+        if not interaction.client.node.locals.get('restrict_owner', False) and interaction.user.id == interaction.client.owner_id:
+            return False
+        return True
+    return False
 
 def restricted_check(interaction: discord.Interaction) -> bool:
     return not is_restricted(interaction)

schemas/nodes_schema.yaml

@@ -12,6 +12,7 @@ mapping:
       slow_system: {type: bool, nullable: false}
       nodestats: {type: bool, nullable: false}
       restrict_commands: {type: bool, nullable: false}
+      restrict_owner: {type: bool, nullable: false}
       cluster:
         type: map
         nullable: false