dshellInterpreter 0.2.13.13__tar.gz → 0.2.13.14__tar.gz

dshellinterpreter-0.2.13.14/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

{dshellinterpreter-0.2.13.13 → dshellinterpreter-0.2.13.14}/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
@@ -119,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
     """
@@ -130,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
     """

{dshellinterpreter-0.2.13.13 → dshellinterpreter-0.2.13.14}/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:

{dshellinterpreter-0.2.13.13 → dshellinterpreter-0.2.13.14}/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}")

{dshellinterpreter-0.2.13.13 → dshellinterpreter-0.2.13.14}/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/dshellInterpreter.egg-info → dshellinterpreter-0.2.13.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 0.2.13.13
+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.13 → dshellinterpreter-0.2.13.14/dshellInterpreter.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 0.2.13.13
+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.13 → dshellinterpreter-0.2.13.14}/setup.py

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

dshellinterpreter-0.2.13.13/Dshell/DISCORD_COMMANDS/dshell_interaction.py

@@ -1,42 +0,0 @@
-__all__ = [
-    'dshell_respond_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, 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
-