dshellInterpreter 0.2.13.12__py3-none-any.whl → 0.2.13.14__py3-none-any.whl

Dshell/DISCORD_COMMANDS/__init__.py

@@ -3,4 +3,5 @@ from .dshell_message import *
 from .dshell_member import *
 from .dshell_pastbin import *
 from .dshell_role import *
+from .dshell_interaction import *
 from .utils import *

Dshell/DISCORD_COMMANDS/dshell_interaction.py

@@ -0,0 +1,67 @@
+__all__ = [
+    'dshell_respond_interaction',
+    'dshell_defer_interaction'
+]
+
+from types import NoneType
+from discord import Interaction, Embed
+from pycordViews import EasyModifiedViews
+
+
+async def dshell_respond_interaction(ctx: Interaction, content: str = None, delete=None, mentions: bool = None, hide: bool = False, embeds=None, view=None) -> int:
+    """
+    Responds to a message interaction on Discord
+    """
+
+    if not isinstance(ctx, Interaction):
+        raise Exception(f'Respond to an interaction must be used in an interaction context, not {type(ctx)} !')
+
+    if delete is not None and not isinstance(delete, (int, float)):
+        raise Exception(f'Delete parameter must be a number (seconds) or None, not {type(delete)} !')
+
+    if not isinstance(mentions, (NoneType, bool)):
+        raise Exception(f'Mention parameter must be a boolean or None, not {type(mentions)} !')
+
+    if not isinstance(hide, bool):
+        raise Exception(f'Hide parameter must be a boolean, not {type(hide)} !')
+
+    allowed_mentions = mentions if mentions is not None else False
+
+    from .._DshellParser.ast_nodes import ListNode
+
+    if not isinstance(embeds, (ListNode, Embed, NoneType)):
+        raise Exception(f'Embeds must be a list of Embed objects or a single Embed object, not {type(embeds)} !')
+
+    if embeds is None:
+        embeds = ListNode([])
+
+    elif isinstance(embeds, Embed):
+        embeds = ListNode([embeds])
+
+    if not isinstance(view, (EasyModifiedViews, NoneType)):
+        raise Exception(f'View must be an UI bloc or None, not {type(view)} !')
+
+    sended_message = await ctx.response.send_message(
+                                     content=str(content),
+                                     ephemeral=hide,
+                                     allowed_mentions=allowed_mentions,
+                                     delete_after=delete,
+                                     embeds=embeds,
+                                     view=view)
+
+    return sended_message.id
+
+async def dshell_defer_interaction(ctx: Interaction, hide: bool = False) -> bool:
+    """
+    Defer a message interaction on Discord
+    """
+
+    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)
+
+    return True

Dshell/DISCORD_COMMANDS/dshell_message.py

@@ -1,4 +1,5 @@
 from re import search
+from tkinter import Listbox
 
 from discord import Embed, Message, Interaction
 from discord.ext import commands
@@ -11,7 +12,6 @@ from .._utils import NoneType
 __all__ = [
     'dshell_send_message',
     'dshell_respond_message',
-    'dshell_respond_interaction',
     'dshell_delete_message',
     'dshell_purge_message',
     'dshell_edit_message',
@@ -88,39 +88,6 @@ async def dshell_respond_message(ctx: Message, message=None, content: str = None
 
     return sended_message.id
 
-async def dshell_respond_interaction(ctx: Interaction, content: str = None, delete=None, mention: bool = None, embeds=None, view=None):
-    """
-    Responds to a message interaction on Discord
-    """
-
-    if delete is not None and not isinstance(delete, (int, float)):
-        raise Exception(f'Delete parameter must be a number (seconds) or None, not {type(delete)} !')
-
-    mention_author = mention if mention is not None else False
-
-    from .._DshellParser.ast_nodes import ListNode
-
-    if not isinstance(embeds, (ListNode, Embed, NoneType)):
-        raise Exception(f'Embeds must be a list of Embed objects or a single Embed object, not {type(embeds)} !')
-
-    if embeds is None:
-        embeds = ListNode([])
-
-    elif isinstance(embeds, Embed):
-        embeds = ListNode([embeds])
-
-    if not isinstance(view, (EasyModifiedViews, NoneType)):
-        raise Exception(f'Channel must be an UI or None, not {type(view)} !')
-
-    sended_message = await ctx.response.send_message(
-                                     content=str(content),
-                                     ephemeral=not mention_author,
-                                     delete_after=delete,
-                                     embeds=embeds,
-                                     view=view)
-
-    return sended_message.id
-
 async def dshell_delete_message(ctx: Message, message=None, reason=None, delay=0):
     """
     Deletes a message
@@ -153,7 +120,7 @@ async def dshell_purge_message(ctx: Message, message_number: int, channel=None,
     await purge_channel.purge(limit=message_number, reason=reason)
 
 
-async def dshell_edit_message(ctx: Message, message, new_content=None, embeds=None):
+async def dshell_edit_message(ctx: Message, message, new_content=None, embeds=None, view=None) -> int:
     """
     Edits a message
     """
@@ -164,18 +131,21 @@ async def dshell_edit_message(ctx: Message, message, new_content=None, embeds=No
     if not isinstance(embeds, (ListNode, Embed, NoneType)):
         raise Exception(f'Embeds must be a list of Embed objects or a single Embed object, not {type(embeds)} !')
 
+    if not isinstance(view, (EasyModifiedViews, NoneType)):
+        raise Exception(f'View must be an UI bloc or None, not {type(view)} !')
+
     if embeds is None:
         embeds = ListNode([])
 
     elif isinstance(embeds, Embed):
         embeds = ListNode([embeds])
 
-    await edit_message.edit(content=new_content, embeds=embeds)
+    await edit_message.edit(content=new_content, embeds=embeds, view=view)
 
     return edit_message.id
 
 
-async def dshell_get_hystory_messages(ctx: Message, channel=None, limit=None):
+async def dshell_get_hystory_messages(ctx: Message, channel=None, limit=None) -> "ListNode":
     """
     Searches for messages matching a regex in a channel
     """

Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -21,7 +21,6 @@ from .._DshellTokenizer.dshell_tokenizer import DshellTokenizer
 All_nodes = TypeVar('All_nodes', IfNode, LoopNode, ElseNode, ElifNode, ArgsCommandNode, VarNode, IdentOperationNode)
 context = TypeVar('context', AutoShardedBot, Message, PrivateChannel, Interaction)
 ButtonStyleValues: tuple = tuple(i.name for i in ButtonStyle)
-print(ButtonStyleValues)
 
 class DshellInterpreteur:
     """
@@ -41,22 +40,34 @@ class DshellInterpreteur:
         message = ctx.message if isinstance(ctx, Interaction) else ctx
         self.env: dict[str, Any] = {
             '__ret__': None,  # environment variables, '__ret__' is used to store the return value of commands
-            '__guild__': message.channel.guild.name,
-            '__channel__': message.channel.name,
-            '__author__': message.author.name,
+
+            '__author__': message.author.id,
             '__author_display_name__': message.author.display_name,
             '__author_avatar__': message.author.display_avatar.url if message.author.display_avatar else None,
             '__author_discriminator__': message.author.discriminator,
             '__author_bot__': message.author.bot,
             '__author_nick__': message.author.nick if hasattr(message.author, 'nick') else None,
             '__author_id__': message.author.id,
+
             '__message__': message.content,
+            '__message_content__': message.content,
             '__message_id__': message.id,
+            '__message_url__': message.jump_url if hasattr(message, 'jump_url') else None,
+
+            '__channel__': message.channel.id,
             '__channel_name__': message.channel.name,
             '__channel_type__': message.channel.type.name if hasattr(message.channel, 'type') else None,
             '__channel_id__': message.channel.id,
             '__private_channel__': isinstance(message.channel, PrivateChannel),
-        } if message is not None else {}
+
+            '__guild__': message.channel.guild.id,
+            '__guild_name__': message.channel.guild.name,
+            '__guild_id__': message.channel.guild.id,
+            '__guild_member_count__': message.channel.guild.member_count,
+            '__guild_icon__': message.channel.guild.icon.url if message.channel.guild.icon else None,
+            '__guild_owner_id__': message.channel.guild.owner_id,
+            '__guild_description__': message.channel.guild.description,
+        } if message is not None or not debug else {} # {} is used in debug mode, when ctx is None
         self.vars = vars if vars is not None else ''
         self.ctx: context = ctx
         if debug:

Dshell/_DshellParser/dshell_parser.py

@@ -393,3 +393,23 @@ def print_ast(ast: list[ASTNode], decalage: int = 0):
 
         elif isinstance(i, ParamNode):
             print(f"{' ' * decalage}PARAM -> {i.body}")
+
+        elif isinstance(i, UiNode):
+            print(f"{' ' * decalage}UI ->")
+            print_ast(i.buttons, decalage + 5)
+            print_ast(i.selects, decalage + 5)
+
+        elif isinstance(i, UiButtonNode):
+            print(f"{' ' * decalage}BUTTON -> {i.body}")
+
+        elif isinstance(i, UiSelectNode):
+            print(f"{' ' * decalage}SELECT -> {i.body}")
+
+        elif isinstance(i, SleepNode):
+            print(f"{' ' * decalage}SLEEP -> {i.body}")
+
+        elif isinstance(i, EndNode):
+            print(f"{' ' * decalage}END -> ...")
+
+        else:
+            print(f"{' ' * decalage}UNKNOWN NODE {i}")

Dshell/_DshellTokenizer/dshell_keywords.py

@@ -15,6 +15,7 @@ from ..DISCORD_COMMANDS.dshell_member import *
 from ..DISCORD_COMMANDS.dshell_message import *
 from ..DISCORD_COMMANDS.dshell_pastbin import *
 from ..DISCORD_COMMANDS.dshell_role import *
+from ..DISCORD_COMMANDS.dshell_interaction import *
 
 dshell_keyword: set[str] = {
     'if', 'else', 'elif', 'loop', '#end', 'var', '#loop', '#if', 'sleep', 'param', '#param'
@@ -30,11 +31,13 @@ dshell_commands: dict[str, Callable] = {
     "sm": dshell_send_message,  # send message
     "spm": dshell_send_private_message,  # send private message
     "srm": dshell_respond_message,  # respond to a message
-    "sri": dshell_respond_interaction,  # respond to an interaction
     "dm": dshell_delete_message,
     "pm": dshell_purge_message,
     "em": dshell_edit_message,  # edit message
 
+    "sri": dshell_respond_interaction,  # respond to an interaction
+    "di": dshell_defer_interaction,  # defer an interaction
+
     "cc": dshell_create_text_channel,  # create channel
     "cvc": dshell_create_voice_channel,  # create voice channel
     "dc": dshell_delete_channel,  # delete channel

Dshell/_DshellTokenizer/dshell_tokenizer.py

@@ -14,9 +14,9 @@ from .dshell_token_type import Token
 MASK_CHARACTER = '§'
 
 table_regex: dict[DTT, Pattern] = {
-    DTT.COMMENT: compile(r"::(.*?)"),
     DTT.ENGLOBE_SEPARATOR: compile(rf"--\*\w+\s*(.*?)\s*(?=--|$)"),
-    DTT.STR: compile(r'"(.*?)"', flags=DOTALL),
+    DTT.STR: compile(r'"((?:[^\\"]|\\.)*)"', flags=DOTALL),
+    DTT.COMMENT: compile(r"::(.*?)$"),
     DTT.LIST: compile(r"\[(.*?)\]"),
     DTT.CALL_ARGS: compile(r"\((.*?)\)"),
     DTT.MENTION: compile(r'<(?:@!?|@&|#)([0-9]+)>'),
@@ -76,23 +76,26 @@ class DshellTokenizer:
                         token = Token(token_type, match.group(1), (line_number, start_match))  # on enregistre son token
                         tokens_par_ligne.append(token)
 
-                    if token_type in (
-                            DTT.LIST,
-                            DTT.CALL_ARGS):  # si c'est un regroupement de donnée, on tokenize ce qu'il contient
-                        result = self.tokenizer([token.value])
-                        token.value = result[0] if len(
-                            result) > 0 else result  # gère si la structure de donnée est vide ou non
+                        if token_type == DTT.STR:
+                            token.value = token.value.replace(r'\"', '"')
 
-                        for token_in_list in token.value:
-                            token_in_list.position = (line_number, token_in_list.position[1])
+                        if token_type in (
+                                DTT.LIST,
+                                DTT.CALL_ARGS):  # si c'est un regroupement de donnée, on tokenize ce qu'il contient
+                            result = self.tokenizer([token.value])
+                            token.value = result[0] if len(
+                                result) > 0 else result  # gère si la structure de donnée est vide ou non
 
-                        for token_in_line in range(len(tokens_par_ligne)-1):
-                            if tokens_par_ligne[token_in_line].position[1] > start_match:
-                                str_tokens_in_list = tokens_par_ligne[token_in_line:-1]
-                                tokens_par_ligne = tokens_par_ligne[:token_in_line] + [tokens_par_ligne[-1]]
-                                token.value.extend(str_tokens_in_list)
-                                token.value.sort(key=lambda t: t.position[1])  # trie les tokens par rapport à leur position
-                                break
+                            for token_in_list in token.value:
+                                token_in_list.position = (line_number, token_in_list.position[1])
+
+                            for token_in_line in range(len(tokens_par_ligne)-1):
+                                if tokens_par_ligne[token_in_line].position[1] > start_match:
+                                    str_tokens_in_list = tokens_par_ligne[token_in_line:-1]
+                                    tokens_par_ligne = tokens_par_ligne[:token_in_line] + [tokens_par_ligne[-1]]
+                                    token.value.extend(str_tokens_in_list)
+                                    token.value.sort(key=lambda t: t.position[1])  # trie les tokens par rapport à leur position
+                                    break
 
                     len_match = len(match.group(0))  # longueur du match trouvé
                     ligne = ligne[:start_match] + (MASK_CHARACTER * len_match) + ligne[
@@ -112,6 +115,7 @@ class DshellTokenizer:
         str]:
         """
         Sépare les commandes en une liste en respectant les chaînes entre guillemets.
+        Echapper les caractères regroupants avec un antislash (\) pour les inclure dans la chaîne.
         :param commande: La chaîne de caractères à découper.
         :param global_split: Le séparateur utilisé (par défaut '\n').
         :param garder_carractere_regroupant: Si False, enlève les guillemets autour des chaînes.
@@ -121,14 +125,13 @@ class DshellTokenizer:
 
         commandes: str = commande.strip()
         remplacement_temporaire = '[REMPLACER]'
-        entre_caractere_regroupant = findall(fr'({carractere_regroupant}.*?{carractere_regroupant})', commandes,
-                                             flags=DOTALL)  # repère les parties entre guillemets et les save
-
-        # current_command_text = [i[1: -1] for i in
-        # entre_carractere_regroupant.copy()]  # enregistre les parties entre guillemets pour cette commande
+        pattern_find_regrouped_part = compile(fr'({carractere_regroupant}(?:[^\\{carractere_regroupant}]|\\.)*{carractere_regroupant})', flags=DOTALL)
+        entre_caractere_regroupant = findall(pattern_find_regrouped_part, commandes)  # repère les parties entre guillemets et les save
 
-        res = sub(fr'({carractere_regroupant}.*?{carractere_regroupant})', remplacement_temporaire, commandes,
-                  flags=DOTALL)  # remplace les parties entre guillemets
+        res = sub(pattern_find_regrouped_part,
+                  remplacement_temporaire,
+                  commandes,
+                  )  # remplace les parties entre guillemets
 
         res = res.split(global_split)  # split les commandes sans les guillemets
 

{dshellinterpreter-0.2.13.12.dist-info → dshellinterpreter-0.2.13.14.dist-info}/METADATA

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

{dshellinterpreter-0.2.13.12.dist-info → dshellinterpreter-0.2.13.14.dist-info}/RECORD

@@ -1,25 +1,26 @@
 Dshell/__init__.py,sha256=pGd94FPy8kVXH_jH566HhApQPhbPfMPnZXzH_0dPWh0,93
 Dshell/_utils.py,sha256=PJ3fwn8IMqUMnW9oTwfr9v4--rzHIhhLQoVVqjwjoJU,23
-Dshell/DISCORD_COMMANDS/__init__.py,sha256=8JPQ-6-s8PkaacmOfQgyczUiLM6rUSceHEJ60oNSis0,173
+Dshell/DISCORD_COMMANDS/__init__.py,sha256=87-YpGU74m-m7AqUQni7PGbw73JRlioQkywW_61Whms,208
 Dshell/DISCORD_COMMANDS/dshell_channel.py,sha256=qpNe3oE5VyLCmOeCjWlt0rvaSBv2yrkmJgrRswrNOZM,15721
+Dshell/DISCORD_COMMANDS/dshell_interaction.py,sha256=f1DsMeMcI8t_54x-a9mW2pF5RSxNV0hf0ZV-Dt7p_qk,2540
 Dshell/DISCORD_COMMANDS/dshell_member.py,sha256=5Iw-2dydhYMZOw2nx0svZP9JpZWHOXC0qkL9tClJHtw,8840
-Dshell/DISCORD_COMMANDS/dshell_message.py,sha256=uwE3T-Bqduqp3r4FkJ3fXVMEG-pAJGeGA2wkEhjavB0,8964
+Dshell/DISCORD_COMMANDS/dshell_message.py,sha256=VsZk-scVn-OgIKNYFCtWnAf5WowG2ODTa_pNG2ZEZgI,7813
 Dshell/DISCORD_COMMANDS/dshell_pastbin.py,sha256=TkWFGRRTvhhJgvwkDFx9Fz4UM2UUFwxyq0laMVx0mUk,881
 Dshell/DISCORD_COMMANDS/dshell_role.py,sha256=t_yRZRD0FKE2gT4dIDIsHz2PSZZztDVEkkqkG_OkNh4,5002
 Dshell/DISCORD_COMMANDS/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 Dshell/DISCORD_COMMANDS/utils/utils_message.py,sha256=Pn0ljyeCvRfY4tlWHrSbIsxSFZZ5J4lDaeVme3WHp9o,1239
 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=0PSoLIXDoQLuWGHGaBv3h0sq-ajNnGg57v4WSRaAeCk,27039
+Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=ukWRqOYU9pmflnlxF8tgOuuU5I0dSXf5t95R4D2AJtc,27650
 Dshell/_DshellParser/__init__.py,sha256=ONDfhZMvClqP_6tE8SLjp-cf3pXL-auQYnfYRrHZxC4,56
 Dshell/_DshellParser/ast_nodes.py,sha256=CXUG0rIJNh4jzMCgCcRqmQwU0WQoESQ-5FkuVtZZndM,17717
-Dshell/_DshellParser/dshell_parser.py,sha256=73eKwY7iBzBtL6n2IxJcvtSz0xkfE5y1qEffZ2YfXXY,16913
+Dshell/_DshellParser/dshell_parser.py,sha256=bNdqNV3A7VEv-hK9CVSDwFFKgS2oPX_7P5uc7TfK2xA,17559
 Dshell/_DshellTokenizer/__init__.py,sha256=LIQSRhDx2B9pmPx5ADMwwD0Xr9ybneVLhHH8qrJWw_s,172
-Dshell/_DshellTokenizer/dshell_keywords.py,sha256=upwwXwS0OaYhDTAnXSpem2-L4boMEYRncKK315Z5rwI,5744
+Dshell/_DshellTokenizer/dshell_keywords.py,sha256=FY9iByZkNSI4r2M6LCDjjx65awZ_iQyFeOvjYmeK-6A,5860
 Dshell/_DshellTokenizer/dshell_token_type.py,sha256=gYIb2XN2YcgeRgmar_rBDS5CGmwfmxihu8mOW_d6lbE,1533
-Dshell/_DshellTokenizer/dshell_tokenizer.py,sha256=LZGs4Ytuyx9Galazqtz32lS4Mmu9yZya1B7AzFQAQOk,7150
-dshellinterpreter-0.2.13.12.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
-dshellinterpreter-0.2.13.12.dist-info/METADATA,sha256=2uFhzKyF6S3Ojbla85JXOM7XQou4W6TRh6I-owhJ304,1152
-dshellinterpreter-0.2.13.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dshellinterpreter-0.2.13.12.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
-dshellinterpreter-0.2.13.12.dist-info/RECORD,,
+Dshell/_DshellTokenizer/dshell_tokenizer.py,sha256=RrJA2XpcFH2vS6SnRIn5Own_uL5orIDvpq74t8xD3og,7350
+dshellinterpreter-0.2.13.14.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
+dshellinterpreter-0.2.13.14.dist-info/METADATA,sha256=8e63xZyweFZwrMI-n2DduWjtScIDHp_WelngI3zoD-A,1152
+dshellinterpreter-0.2.13.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dshellinterpreter-0.2.13.14.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
+dshellinterpreter-0.2.13.14.dist-info/RECORD,,