dshellInterpreter 0.2.14.4__py3-none-any.whl → 0.2.15.0__py3-none-any.whl

Dshell/DISCORD_COMMANDS/dshell_interaction.py

@@ -64,7 +64,7 @@ async def dshell_respond_interaction(ctx: Interaction,
 
     return sended_message.id
 
-async def dshell_defer_interaction(ctx: Interaction, hide: bool = False) -> bool:
+async def dshell_defer_interaction(ctx: Interaction) -> bool:
     """
     Defer a message interaction on Discord
     """
@@ -72,10 +72,7 @@ async def dshell_defer_interaction(ctx: Interaction, hide: bool = False) -> bool
     if not isinstance(ctx, Interaction):
         raise Exception(f'Respond to an interaction must be used in an interaction context, not {type(ctx)} !')
 
-    if not isinstance(hide, bool):
-        raise Exception(f'Hide parameter must be a boolean, not {type(hide)} !')
-
-    await ctx.response.defer(ephemeral=hide)
+    await ctx.response.defer()
 
     return True
 

Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -139,10 +139,18 @@ class DshellInterpreteur:
                     self.env[node.name.value] = eval_expression_inline(first_node, self)
 
                 elif isinstance(first_node, EmbedNode):
-                    self.env[node.name.value] = build_embed(first_node.body, first_node.fields, self)
+                    # rebuild the embed if it already exists
+                    if node.name.value in self.env and isinstance(self.env[node.name.value], Embed):
+                        self.env[node.name.value] = rebuild_embed(self.env[node.name.value], first_node.body, first_node.fields, self)
+                    else:
+                        self.env[node.name.value] = build_embed(first_node.body, first_node.fields, self)
 
                 elif isinstance(first_node, PermissionNode):
-                    self.env[node.name.value] = build_permission(first_node.body, self)
+                    # rebuild the permissions if it already exists
+                    if node.name.value in self.env and isinstance(self.env[node.name.value], dict):
+                        self.env[node.name.value].update(build_permission(first_node.body, self))
+                    else:
+                        self.env[node.name.value] = build_permission(first_node.body, self)
 
                 elif isinstance(first_node, UiNode):
                     # rebuild the UI if it already exists
@@ -410,9 +418,9 @@ def length(variable : LengthNode) -> int:
     else:
         return len(variable.body.value)
 
-def build_embed(body: list[Token], fields: list[FieldEmbedNode], interpreter: DshellInterpreteur) -> Embed:
+def build_embed_args(body: list[Token], fields: list[FieldEmbedNode], interpreter: DshellInterpreteur) -> tuple[dict, list[dict]]:
     """
-    Builds an embed from the command information.
+    Builds the arguments for an embed from the command information.
     """
     args_main_embed: dict[str, list[Any]] = regroupe_commandes(body, interpreter)[0]
     args_main_embed.pop('*')  # remove unspecified parameters for the embed
@@ -430,12 +438,39 @@ def build_embed(body: list[Token], fields: list[FieldEmbedNode], interpreter: Ds
     if 'color' in args_main_embed:
         args_main_embed['color'] = build_colour(args_main_embed['color'])  # convert color to Colour object or int
 
+    return args_main_embed, args_fields
+
+def build_embed(body: list[Token], fields: list[FieldEmbedNode], interpreter: DshellInterpreteur) -> Embed:
+    """
+    Builds an embed from the command information.
+    """
+
+    args_main_embed, args_fields = build_embed_args(body, fields, interpreter)
     embed = Embed(**args_main_embed)  # build the main embed
     for field in args_fields:
         embed.add_field(**field)  # add all fields
 
     return embed
 
+def rebuild_embed(embed: Embed, body: list[Token], fields: list[FieldEmbedNode], interpreter: DshellInterpreteur) -> Embed:
+    """
+    Rebuilds an embed from an existing embed and the command information.
+    """
+    args_main_embed, args_fields = build_embed_args(body, fields, interpreter)
+
+    for key, value in args_main_embed.items():
+        if key == 'color':
+            embed.colour = value
+        else:
+            setattr(embed, key, value)
+
+    if args_fields:
+        embed.clear_fields()
+        for field in args_fields:
+            embed.add_field(**field)
+
+    return embed
+
 def build_colour(color: Union[int, ListNode]) -> Union[Colour, int]:
     """
     Builds a Colour object from an integer or a ListNode.

Dshell/_DshellParser/dshell_parser.py

@@ -51,8 +51,6 @@ def parse(token_lines: list[list[Token]], start_node: ASTNode) -> tuple[list[AST
         last_block = blocks[-1]
 
         if first_token_line.type == DTT.COMMAND:  # si le token est une comande
-            if len(tokens_by_line) <= 1:
-                raise Exception(f'[{first_token_line.value.upper()}] take one or more arguments on line {first_token_line.position} !')
             body = tokens_by_line[1:]  # on récupère ses arguments
             last_block.body.append(CommandNode(first_token_line.value,
                                                ArgsCommandNode(body)))  # on ajoute la commande au body du dernier bloc

{dshellinterpreter-0.2.14.4.dist-info → dshellinterpreter-0.2.15.0.dist-info}/METADATA

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

@@ -2,7 +2,7 @@ Dshell/__init__.py,sha256=pGd94FPy8kVXH_jH566HhApQPhbPfMPnZXzH_0dPWh0,93
 Dshell/_utils.py,sha256=PJ3fwn8IMqUMnW9oTwfr9v4--rzHIhhLQoVVqjwjoJU,23
 Dshell/DISCORD_COMMANDS/__init__.py,sha256=87-YpGU74m-m7AqUQni7PGbw73JRlioQkywW_61Whms,208
 Dshell/DISCORD_COMMANDS/dshell_channel.py,sha256=PDXpxrRRWPSucdp_3ITJk0Ur3coneRJKWEl2i7GZ2EM,15696
-Dshell/DISCORD_COMMANDS/dshell_interaction.py,sha256=gYojAOH5hl-ZL6Y1lEb87-H9MtOa8sb_VAV4_iiYfWA,3649
+Dshell/DISCORD_COMMANDS/dshell_interaction.py,sha256=5FA8JZ2_v98ZzOZl6EKyjo_fUQC7FuK6C6hij6ZSP30,3495
 Dshell/DISCORD_COMMANDS/dshell_member.py,sha256=5Iw-2dydhYMZOw2nx0svZP9JpZWHOXC0qkL9tClJHtw,8840
 Dshell/DISCORD_COMMANDS/dshell_message.py,sha256=zcWl6Y1W31h9MTHS-j9tLDwcrRiE_wGOu78zu2k0y9I,9101
 Dshell/DISCORD_COMMANDS/dshell_pastbin.py,sha256=H0tUJOwdzYBXvxqipK3mzoNZUKrSLcVm4EZlWbBRScs,796
@@ -11,16 +11,16 @@ Dshell/DISCORD_COMMANDS/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 Dshell/DISCORD_COMMANDS/utils/utils_message.py,sha256=cQvJ15f49ddOjybARwkJKNFe3ITYQciF-pZHERFPkr0,2964
 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=ndzWyXLnB8py_JgT1av5FyxlDmhisXrE0gFDN_WtVDA,30842
+Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=dxXhKGCQR8dKSuMRXlWyuBT_ufETdeUao29jNZD-ci4,32429
 Dshell/_DshellParser/__init__.py,sha256=ONDfhZMvClqP_6tE8SLjp-cf3pXL-auQYnfYRrHZxC4,56
 Dshell/_DshellParser/ast_nodes.py,sha256=fU6BVe6w78ZhYib7SGR7iAfTqWqS2kvwZ0d4wMxxOHk,18366
-Dshell/_DshellParser/dshell_parser.py,sha256=ZSSRheiNNR1zumxBK_tqlnUPjJ7ZIE6S-K5aJPp4TjM,21887
+Dshell/_DshellParser/dshell_parser.py,sha256=YUFfBbFQ1ApOCyVhx-0nJ6S6W5MOBG6YabbkM43BKVw,21708
 Dshell/_DshellTokenizer/__init__.py,sha256=LIQSRhDx2B9pmPx5ADMwwD0Xr9ybneVLhHH8qrJWw_s,172
 Dshell/_DshellTokenizer/dshell_keywords.py,sha256=7oeSKLXCsPRpyU31skCerOUMzd2cdm-GwofpmgTPkD0,5961
 Dshell/_DshellTokenizer/dshell_token_type.py,sha256=gYIb2XN2YcgeRgmar_rBDS5CGmwfmxihu8mOW_d6lbE,1533
 Dshell/_DshellTokenizer/dshell_tokenizer.py,sha256=RrJA2XpcFH2vS6SnRIn5Own_uL5orIDvpq74t8xD3og,7350
-dshellinterpreter-0.2.14.4.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
-dshellinterpreter-0.2.14.4.dist-info/METADATA,sha256=kFBBIBn8Czy7-Bd9XV7frBNHXioNSO3SF6zBkQNgTFs,1151
-dshellinterpreter-0.2.14.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dshellinterpreter-0.2.14.4.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
-dshellinterpreter-0.2.14.4.dist-info/RECORD,,
+dshellinterpreter-0.2.15.0.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
+dshellinterpreter-0.2.15.0.dist-info/METADATA,sha256=k50VoOmZbcYvsLijpnpLgnjrzsdqfU23BXjnAoN-cQo,1151
+dshellinterpreter-0.2.15.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dshellinterpreter-0.2.15.0.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
+dshellinterpreter-0.2.15.0.dist-info/RECORD,,