dshellInterpreter 0.2.16.1__py3-none-any.whl → 0.2.17.0__py3-none-any.whl

Dshell/DISCORD_COMMANDS/utils/utils_global.py

@@ -127,7 +127,7 @@ async def utils_get_roles(ctx: Message, value: int):
 
     guild = ctx.guild
 
-    what_is = utils_what_discord_type_is(ctx, value)
+    what_is, member = utils_what_discord_type_is(ctx, value)
 
     if what_is == DiscordType.UNKNOWN:
         raise ValueError(f"{value} member not found in guild {guild.name}")
@@ -136,4 +136,4 @@ async def utils_get_roles(ctx: Message, value: int):
         raise TypeError(f"value must be a member id in roles command, not {what_is}")
 
     from ..._DshellParser.ast_nodes import ListNode
-    return ListNode([i.id for i in guild.get_member(value).roles])
+    return ListNode([i.id for i in member.roles])

Dshell/DISCORD_COMMANDS/utils/utils_member.py

@@ -5,7 +5,7 @@ from discord import Message, PermissionOverwrite
 
 from .utils_global import utils_what_discord_type_is, DiscordType
 
-async def utils_has_permissions(ctx: Message, member: int, permission: PermissionOverwrite) -> bool:
+async def utils_has_permissions(ctx: Message, member: int, permission: dict[None, PermissionOverwrite]) -> bool:
     """
     Return True if the member has the specified permissions.
     :param member:
@@ -16,12 +16,15 @@ async def utils_has_permissions(ctx: Message, member: int, permission: Permissio
     if not isinstance(member, int):
         raise TypeError(f"member must be an int in has_perms command, not {type(member)}")
 
-    if not isinstance(permission, PermissionOverwrite):
+    if not isinstance(permission, dict):
         raise TypeError(f"permissions must be a permission bloc in has_perms command, not {type(permission)}")
 
+    if None not in permission:
+        raise ValueError(f"permissions must have simple 'allow' permission in has_perms command, not {permission.keys()}")
+
     discord_type, member = utils_what_discord_type_is(ctx, member)
 
     if discord_type != DiscordType.MEMBER:
         raise ValueError(f"No member found with ID {member} in has_perms command.")
 
-    return (member.guild_permissions & permission.pair()[0]) == permission.pair()[0]
+    return (member.guild_permissions & permission[None].pair()[0]) == permission[None].pair()[0]

Dshell/DISCORD_COMMANDS/utils/utils_permissions.py

@@ -39,7 +39,7 @@ class DshellPermissions:
             return instance
         raise ValueError(f"No role found with ID {role_id} in perm command.")
 
-    def get_permission_overwrite(self, guild: Guild) -> dict[Union[Member, Role], PermissionOverwrite]:
+    def get_permission_overwrite(self, guild: Guild) -> dict[Union[Member, Role, None], PermissionOverwrite]:
         """
         Returns a PermissionOverwrite object with member and role permissions.
         If no members or roles are specified, it returns a PermissionOverwrite with None key.

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.1.dist-info → dshellinterpreter-0.2.17.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 0.2.16.1
+Version: 0.2.17.0
 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.1.dist-info → dshellinterpreter-0.2.17.0.dist-info}/RECORD

@@ -8,14 +8,14 @@ Dshell/DISCORD_COMMANDS/dshell_message.py,sha256=zcWl6Y1W31h9MTHS-j9tLDwcrRiE_wG
 Dshell/DISCORD_COMMANDS/dshell_pastbin.py,sha256=H0tUJOwdzYBXvxqipK3mzoNZUKrSLcVm4EZlWbBRScs,796
 Dshell/DISCORD_COMMANDS/dshell_role.py,sha256=t_yRZRD0FKE2gT4dIDIsHz2PSZZztDVEkkqkG_OkNh4,5002
 Dshell/DISCORD_COMMANDS/utils/__init__.py,sha256=-amNcYysjgx3YDpDSnbQmJhnm3lbJere9K9aDH-YnJg,115
-Dshell/DISCORD_COMMANDS/utils/utils_global.py,sha256=TRqKx8FBEJ4cAFfscN-ohx3ySq9tuGI16UAAnZgB5qw,4222
+Dshell/DISCORD_COMMANDS/utils/utils_global.py,sha256=48WpW4Vkdz1ITjCQzmnqKej-1kE71CTY0fB65k2OyWw,4213
 Dshell/DISCORD_COMMANDS/utils/utils_list.py,sha256=zqImMWvD-1UnbPP1TZewnvZpq7qs1sOTT1YhbJ5I8h8,3160
-Dshell/DISCORD_COMMANDS/utils/utils_member.py,sha256=PbZk4Rzz87mktvJPTIvR2f0sXdMylzUWWM6vGEx2efk,998
+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=N1Ttn-n1qG87AuOuz5Dlw-mEk8io5ogxxbhiuGmBtgA,3461
+Dshell/DISCORD_COMMANDS/utils/utils_permissions.py,sha256=qfuD_kvzf2J8gHAB4lPO0eOsCjEN-Z3mBTGLEyUoJlk,3467
 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.1.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
-dshellinterpreter-0.2.16.1.dist-info/METADATA,sha256=0YtsSJdMbvebXArTm2kTLsPOH1UrGPp-x-0gjhWCHKU,1151
-dshellinterpreter-0.2.16.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dshellinterpreter-0.2.16.1.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
-dshellinterpreter-0.2.16.1.dist-info/RECORD,,
+dshellinterpreter-0.2.17.0.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
+dshellinterpreter-0.2.17.0.dist-info/METADATA,sha256=J8b00rglHz6PwrT6eXudHrMygBS7-bXgSna0zUZ74eo,1151
+dshellinterpreter-0.2.17.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dshellinterpreter-0.2.17.0.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
+dshellinterpreter-0.2.17.0.dist-info/RECORD,,