dshellInterpreter 0.2.16.2__py3-none-any.whl → 0.2.17.1__py3-none-any.whl

Dshell/DISCORD_COMMANDS/utils/utils_permissions.py

@@ -63,7 +63,10 @@ class DshellPermissions:
             for role_id in (
                     self.target['roles'] if isinstance(self.target['roles'], ListNode) else [
                         self.target['roles']]):  # allow a single ID
-                role = self.get_role(guild, role_id)
+                if role_id == guild.id:  # @everyone role
+                    role = guild.default_role
+                else:
+                    role = self.get_role(guild, role_id)
                 permissions[role] = PermissionOverwrite.from_pair(
                     allow=Permissions(permissions=self.target.get('allow', 0)),
                     deny=Permissions(permissions=self.target.get('deny', 0))

Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -28,13 +28,19 @@ class DshellInterpreteur:
     Make what you want with Dshell code to interact with Discord !
     """
 
-    def __init__(self, code: str, ctx: context, debug: bool = False, vars: Optional[str] = None):
+    def __init__(self, code: str, ctx: context,
+                 debug: bool = False,
+                 vars: Optional[str] = None,
+                 vars_env: Optional[dict[str, Any]] = None):
         """
         Interpreter Dshell code
         :param code: The code to interpret. Each line must end with a newline character, except SEPARATOR and SUB_SEPARATOR tokens.
         :param ctx: The context in which the code is executed. It can be a Discord bot, a message, or a channel.
-        :param debug: If True, prints the AST of the code.
+        :param debug: If True, prints the AST of the code and put the ctx to None.
         :param vars: Optional dictionary of variables to initialize in the interpreter's environment.
+        :param vars_env: Optional dictionary of additional environment variables to add to the interpreter's environment.
+
+        Note: __message_before__ (message content before edit) can be overwritten by vars_env parameter.
         """
         self.ast: list[ASTNode] = parse(DshellTokenizer(code).start(), StartNode([]))[0]
         message = ctx.message if isinstance(ctx, Interaction) else ctx
@@ -50,6 +56,8 @@ class DshellInterpreteur:
             '__author_id__': message.author.id,
 
             '__message__': message.content,
+            '__message_author__': message.author.id,
+            '__message_before__': message.content,  # same as __message__, but before edit. Can be overwritten by add vars_env parameter
             '__message_content__': message.content,
             '__message_id__': message.id,
             '__message_url__': message.jump_url if hasattr(message, 'jump_url') else None,
@@ -81,6 +89,8 @@ class DshellInterpreteur:
             '__guild_channels_count__': len(message.channel.guild.channels),
 
         } if message is not None and not debug else {} # {} is used in debug mode, when ctx is None
+        if vars_env is not None: # add the variables to the environment
+            self.env.update(vars_env)
         self.vars = vars if vars is not None else ''
         self.ctx: context = ctx
         if debug:

{dshellinterpreter-0.2.16.2.dist-info → dshellinterpreter-0.2.17.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 0.2.16.2
+Version: 0.2.17.1
 Summary: A Discord bot interpreter for creating custom commands and automations.
 Home-page: https://github.com/BOXERRMD/Dshell_Interpreter
 Author: Chronos

{dshellinterpreter-0.2.16.2.dist-info → dshellinterpreter-0.2.17.1.dist-info}/RECORD

@@ -12,10 +12,10 @@ Dshell/DISCORD_COMMANDS/utils/utils_global.py,sha256=48WpW4Vkdz1ITjCQzmnqKej-1kE
 Dshell/DISCORD_COMMANDS/utils/utils_list.py,sha256=zqImMWvD-1UnbPP1TZewnvZpq7qs1sOTT1YhbJ5I8h8,3160
 Dshell/DISCORD_COMMANDS/utils/utils_member.py,sha256=1EoHooxwijc7AFJGnuae3ccjQk0x69MELtZ5ES5abLY,1165
 Dshell/DISCORD_COMMANDS/utils/utils_message.py,sha256=cQvJ15f49ddOjybARwkJKNFe3ITYQciF-pZHERFPkr0,2964
-Dshell/DISCORD_COMMANDS/utils/utils_permissions.py,sha256=qfuD_kvzf2J8gHAB4lPO0eOsCjEN-Z3mBTGLEyUoJlk,3467
+Dshell/DISCORD_COMMANDS/utils/utils_permissions.py,sha256=Gi6vpCA2yXUZ20OCay5dkX6HeN4LglVROwcvTWVCsKg,3600
 Dshell/DISCORD_COMMANDS/utils/utils_thread.py,sha256=tVl4msEwrWHY-0AytI6eY3JSs-eIFUigDSJfK9mT1ww,1457
 Dshell/_DshellInterpreteur/__init__.py,sha256=xy5-J-R3YmY99JF3NBHTRRLsComFxpjnCA5xacISctU,35
-Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=Us9eLIUbaKC5rRkPRjGWHlX9ZEFNYeOnwEW_w7LwPhI,28665
+Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=mO2UCzcc7-6IFtmo_63U_G6NI1RzMvKGbpE0yfgjOd0,29321
 Dshell/_DshellParser/__init__.py,sha256=ONDfhZMvClqP_6tE8SLjp-cf3pXL-auQYnfYRrHZxC4,56
 Dshell/_DshellParser/ast_nodes.py,sha256=S2byqd02RMC-ILCX-ZS8zhwOBIBtvMtQ4ESnljjsWmA,18748
 Dshell/_DshellParser/dshell_parser.py,sha256=KD2ZbKYa1nnvroKmN8fIRD2exXre54Qx_roEBrTV7Mo,18588
@@ -23,8 +23,8 @@ Dshell/_DshellTokenizer/__init__.py,sha256=LIQSRhDx2B9pmPx5ADMwwD0Xr9ybneVLhHH8q
 Dshell/_DshellTokenizer/dshell_keywords.py,sha256=crzX16IbcYCVqxgzz3NvN0-FzKtBjZcZQvtHqdxhDGk,6787
 Dshell/_DshellTokenizer/dshell_token_type.py,sha256=gYIb2XN2YcgeRgmar_rBDS5CGmwfmxihu8mOW_d6lbE,1533
 Dshell/_DshellTokenizer/dshell_tokenizer.py,sha256=AJnUocD6hbU6wvjRAN5uDha5QQieTwXlHzZVtgRGaZQ,7307
-dshellinterpreter-0.2.16.2.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
-dshellinterpreter-0.2.16.2.dist-info/METADATA,sha256=EfKRsFozLGg77g8qtXSv1-zkBSMmzImGggnRR0GZwaY,1151
-dshellinterpreter-0.2.16.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dshellinterpreter-0.2.16.2.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
-dshellinterpreter-0.2.16.2.dist-info/RECORD,,
+dshellinterpreter-0.2.17.1.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
+dshellinterpreter-0.2.17.1.dist-info/METADATA,sha256=zTtAbaovo4DYxGON4zaqLWFAx9Ai7pZCMZS-hI2dURE,1151
+dshellinterpreter-0.2.17.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dshellinterpreter-0.2.17.1.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
+dshellinterpreter-0.2.17.1.dist-info/RECORD,,