Recast is_restricted() to a bool

[mudpy.git] / mudpy / misc.py

diff --git a/mudpy/misc.py b/mudpy/misc.py
index babd42f..c0f73a1 100644 (file)
--- a/mudpy/misc.py
+++ b/mudpy/misc.py
@@ -186,29 +186,33 @@ class Element:
 
     def is_restricted(self):
         """Boolean check whether command is administrative or debugging."""
-        return(self.get("administrative", False))
+        return bool(self.get("administrative") or self.get("debugging"))
 
     def is_admin(self):
         """Boolean check whether an actor is controlled by an admin owner."""
-        return(self.owner and self.owner.is_admin())
+        return self.owner and self.owner.is_admin()
 
     def can_run(self, command):
         """Check if the user can run this command object."""
 
         # has to be in the commands group
         if command not in self.universe.groups["command"].values():
-            return(False)
+            return False
+
+        # debugging commands are not allowed outside debug mode
+        if command.get("debugging") and not self.universe.debug_mode():
+            return False
 
         # avatars of administrators can run any command
         if self.is_admin():
-            return(True)
+            return True
 
         # everyone can run non-administrative commands
         if not command.is_restricted():
-            return(True)
+            return True
 
         # otherwise the command cannot be run by this actor
-        return(False)
+        return False
 
     def update_location(self):
         """Make sure the location's contents contain this element."""
@@ -481,6 +485,10 @@ class Universe:
         if fallback not in self.files:
             mudpy.data.Data(fallback, self, flags=flags)
 
+    def debug_mode(self):
+        """Boolean method to indicate whether unsafe debugging is enabled."""
+        return self.groups["mudpy"]["limit"].get("debug", False)
+
 
 class User:
 
@@ -569,7 +577,7 @@ class User:
         self.remove()
 
         # get rid of the old user object
-        del(self)
+        del self
 
         # create a new user object
         new_user = User()
@@ -633,7 +641,7 @@ class User:
 
                 # take this one out of the list and delete
                 self.remove()
-                del(self)
+                del self
                 return_value = True
                 break
 
@@ -1005,7 +1013,7 @@ class User:
 
     def is_admin(self):
         """Boolean check whether user's account is an admin."""
-        return(self.account.get("administrator", False))
+        return self.account.get("administrator", False)
 
 
 def broadcast(message, add_prompt=True):
@@ -2112,6 +2120,8 @@ def setup():
     log("Running version: %s" % universe.versions.version, 1)
     log("Initial directory: %s" % universe.startdir, 1)
     log("Command line: %s" % " ".join(sys.argv), 1)
+    if universe.debug_mode():
+        log("WARNING: Unsafe debugging mode is enabled!", 6)
 
     # pass the initialized universe back
     return universe