dshellInterpreter 0.2.13.13__py3-none-any.whl → 0.2.13.15__py3-none-any.whl

Dshell/DISCORD_COMMANDS/dshell_interaction.py

@@ -1,21 +1,43 @@
 __all__ = [
-    'dshell_respond_interaction'
+    'dshell_respond_interaction',
+    'dshell_defer_interaction'
 ]
 
 from types import NoneType
-from discord import Interaction, Embed
+from discord import Interaction, Embed, AllowedMentions
 from pycordViews import EasyModifiedViews
 
+from .utils.utils_message import utils_autorised_mentions
 
-async def dshell_respond_interaction(ctx: Interaction, content: str = None, delete=None, mention: bool = None, embeds=None, view=None):
+async def dshell_respond_interaction(ctx: Interaction,
+                                     content: str = None,
+                                     delete=None,
+                                     global_mentions: bool = None,
+                                     everyone_mention: bool = True,
+                                     roles_mentions: bool = True,
+                                     users_mentions: bool = True,
+                                     reply_mention: bool = False,
+                                     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)} !')
 
-    mention_author = mention if mention is not None else False
+    if not isinstance(hide, bool):
+        raise Exception(f'Hide parameter must be a boolean, not {type(hide)} !')
+
+    allowed_mentions = utils_autorised_mentions(global_mentions,
+                                                everyone_mention,
+                                                roles_mentions,
+                                                users_mentions,
+                                                reply_mention)
 
     from .._DshellParser.ast_nodes import ListNode
 
@@ -29,14 +51,29 @@ async def dshell_respond_interaction(ctx: Interaction, content: str = None, dele
         embeds = ListNode([embeds])
 
     if not isinstance(view, (EasyModifiedViews, NoneType)):
-        raise Exception(f'Channel must be an UI or None, not {type(view)} !')
+        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=not mention_author,
+                                     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,11 +1,11 @@
 from re import search
 
-from discord import Embed, Message, Interaction
+from discord import Embed, Message
 from discord.ext import commands
 
 from pycordViews import EasyModifiedViews
 
-from .utils.utils_message import utils_get_message
+from .utils.utils_message import utils_get_message, utils_autorised_mentions
 from .._utils import NoneType
 
 __all__ = [
@@ -23,7 +23,17 @@ __all__ = [
 ]
 
 
-async def dshell_send_message(ctx: Message, message=None, delete=None, channel=None, embeds=None, view=None) -> int:
+async def dshell_send_message(ctx: Message,
+                              message=None,
+                              delete=None,
+                              channel=None,
+                              global_mentions: bool = None,
+                              everyone_mention: bool = True,
+                              roles_mentions: bool = True,
+                              users_mentions: bool = True,
+                              reply_mention: bool = False,
+                              embeds=None,
+                              view=None) -> int:
     """
     Sends a message on Discord
     """
@@ -32,6 +42,7 @@ async def dshell_send_message(ctx: Message, message=None, delete=None, channel=N
         raise Exception(f'Delete parameter must be a number (seconds) or None, not {type(delete)} !')
 
     channel_to_send = ctx.channel if channel is None else ctx.channel.guild.get_channel(channel)
+    allowed_mentions = utils_autorised_mentions(global_mentions, everyone_mention, roles_mentions, users_mentions, reply_mention)
 
     if channel_to_send is None:
         raise Exception(f'Channel {channel} not found!')
@@ -53,12 +64,22 @@ async def dshell_send_message(ctx: Message, message=None, delete=None, channel=N
     sended_message = await channel_to_send.send(message,
                                                 delete_after=delete,
                                                 embeds=embeds,
+                                                allowed_mentions=allowed_mentions,
                                                 view=view)
 
     return sended_message.id
 
 
-async def dshell_respond_message(ctx: Message, message=None, content: str = None, delete=None, mention: bool = None, embeds=None):
+async def dshell_respond_message(ctx: Message,
+                                 message=None,
+                                 content: str = None,
+                                 global_mentions: bool = None,
+                                 everyone_mention: bool = True,
+                                 roles_mentions: bool = True,
+                                 users_mentions: bool = True,
+                                 reply_mention: bool = False,
+                                 delete=None,
+                                 embeds=None):
     """
     Responds to a message on Discord
     """
@@ -66,7 +87,8 @@ async def dshell_respond_message(ctx: Message, message=None, content: str = None
         raise Exception(f'Delete parameter must be a number (seconds) or None, not {type(delete)} !')
 
     respond_message = ctx if message is None else utils_get_message(ctx, message)  # builds a reference to the message (even if it doesn't exist)
-    mention_author = mention if mention is not None else False
+    autorised_mentions = utils_autorised_mentions(global_mentions, everyone_mention, roles_mentions, users_mentions, reply_mention)
+    mention_author = True if reply_mention else False
 
     from .._DshellParser.ast_nodes import ListNode
 
@@ -82,6 +104,7 @@ async def dshell_respond_message(ctx: Message, message=None, content: str = None
     sended_message = await respond_message.reply(
                                      content=str(content),
                                      mention_author=mention_author,
+                                     allowed_mentions=autorised_mentions,
                                      delete_after=delete,
                                      embeds=embeds)
 
@@ -119,7 +142,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
     """
@@ -130,18 +153,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/DISCORD_COMMANDS/utils/utils_message.py

@@ -1,4 +1,4 @@
-from discord import Message, PartialMessage
+from discord import Message, PartialMessage, AllowedMentions
 from typing import Union
 from re import search
 
@@ -26,3 +26,43 @@ def utils_get_message(ctx: Message, message: Union[int, str]) -> PartialMessage:
         return ctx.guild.get_channel(channel_id).get_partial_message(message_id)
 
     raise Exception(f"Message must be an integer or a string, not {type(message)} !")
+
+
+def utils_autorised_mentions(global_mentions: bool = None,
+                            everyone_mention: bool = True,
+                            roles_mentions: bool = True,
+                            users_mentions: bool = True,
+                            reply_mention: bool = False) -> Union[bool, 'AllowedMentions']:
+    """
+    Returns the AllowedMentions object based on the provided parameters.
+    If global_mentions is set to True or False, it overrides all other parameters.
+    """
+
+    from discord import AllowedMentions
+
+    if not isinstance(global_mentions, (type(None), bool)):
+        raise Exception(f'Mention parameter must be a boolean or None, not {type(global_mentions)} !')
+
+    if not isinstance(everyone_mention, bool):
+        raise Exception(f'Everyone mention parameter must be a boolean, not {type(everyone_mention)} !')
+
+    if not isinstance(roles_mentions, bool):
+        raise Exception(f'Roles mention parameter must be a boolean, not {type(roles_mentions)} !')
+
+    if not isinstance(users_mentions, bool):
+        raise Exception(f'Users mention parameter must be a boolean, not {type(users_mentions)} !')
+
+    if not isinstance(reply_mention, bool):
+        raise Exception(f'Reply mention parameter must be a boolean, not {type(reply_mention)} !')
+
+    if global_mentions is True:
+        return AllowedMentions.all()
+
+    elif global_mentions is False:
+        return AllowedMentions.none()
+
+    else:
+        return AllowedMentions(everyone=everyone_mention,
+                               roles=roles_mentions,
+                               users=users_mentions,
+                               replied_user=reply_mention)

Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -40,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

@@ -31,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

{dshellinterpreter-0.2.13.13.dist-info → dshellinterpreter-0.2.13.15.dist-info}/METADATA

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

@@ -2,25 +2,25 @@ 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=qpNe3oE5VyLCmOeCjWlt0rvaSBv2yrkmJgrRswrNOZM,15721
-Dshell/DISCORD_COMMANDS/dshell_interaction.py,sha256=MH0E7cxaZFoaFxZnKNrbv9vwr0ARUsuoy6ECyq2FnFA,1499
+Dshell/DISCORD_COMMANDS/dshell_interaction.py,sha256=Gac3J9sCcPRHApIgSoS5MRAMJ0Hd7I-YywVQI0s26p0,3229
 Dshell/DISCORD_COMMANDS/dshell_member.py,sha256=5Iw-2dydhYMZOw2nx0svZP9JpZWHOXC0qkL9tClJHtw,8840
-Dshell/DISCORD_COMMANDS/dshell_message.py,sha256=9bVEgQlAAuERl5Q9hV9sD8FWLRLPSwEsct_Qym2Dh3E,7597
+Dshell/DISCORD_COMMANDS/dshell_message.py,sha256=zcWl6Y1W31h9MTHS-j9tLDwcrRiE_wGOu78zu2k0y9I,9101
 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_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=b4_qgOaCfF6U3Pk_LO0yhXm3TY1HZjvfJhxUNUfB24E,27013
+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=vK7O84tlpLe9qXUsCqKOP3NozXZzQOdPwthD7PD7AIA,5797
+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=RrJA2XpcFH2vS6SnRIn5Own_uL5orIDvpq74t8xD3og,7350
-dshellinterpreter-0.2.13.13.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
-dshellinterpreter-0.2.13.13.dist-info/METADATA,sha256=RcYSGYACjZQY21bDRa-4wdXd2oaSKFtADaYRncEfIT8,1152
-dshellinterpreter-0.2.13.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dshellinterpreter-0.2.13.13.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
-dshellinterpreter-0.2.13.13.dist-info/RECORD,,
+dshellinterpreter-0.2.13.15.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
+dshellinterpreter-0.2.13.15.dist-info/METADATA,sha256=ly2oZrfOh1aGwRLfDgpQQRry_UBjK7l3EUa1SbTzgyc,1152
+dshellinterpreter-0.2.13.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dshellinterpreter-0.2.13.15.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
+dshellinterpreter-0.2.13.15.dist-info/RECORD,,