dshellInterpreter 0.2.16.1__tar.gz → 0.2.17.0__tar.gz

{dshellinterpreter-0.2.16.1 → dshellinterpreter-0.2.17.0}/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])

{dshellinterpreter-0.2.16.1 → dshellinterpreter-0.2.17.0}/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]

{dshellinterpreter-0.2.16.1 → dshellinterpreter-0.2.17.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.

{dshellinterpreter-0.2.16.1 → dshellinterpreter-0.2.17.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.1/dshellInterpreter.egg-info → dshellinterpreter-0.2.17.0}/PKG-INFO

@@ -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 → dshellinterpreter-0.2.17.0/dshellInterpreter.egg-info}/PKG-INFO

@@ -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 → dshellinterpreter-0.2.17.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name="dshellInterpreter",
-    version="0.2.16.1",
+    version="0.2.17.0",
     author="Chronos",
     author_email="vagabonwalybi@gmail.com",
     description="A Discord bot interpreter for creating custom commands and automations.",