dshellInterpreter 0.2.13.9__tar.gz → 0.2.13.11__tar.gz

{dshellinterpreter-0.2.13.9 → dshellinterpreter-0.2.13.11}/Dshell/DISCORD_COMMANDS/dshell_message.py

@@ -1,8 +1,7 @@
 from re import search
 
-from discord import Embed, Message
+from discord import Embed, Message, Interaction
 from discord.ext import commands
-from discord.abc import Messageable
 
 from pycordViews import EasyModifiedViews
 
@@ -12,6 +11,7 @@ from .._utils import NoneType
 __all__ = [
     'dshell_send_message',
     'dshell_respond_message',
+    'dshell_respond_interaction',
     'dshell_delete_message',
     'dshell_purge_message',
     'dshell_edit_message',
@@ -42,7 +42,10 @@ async def dshell_send_message(ctx: Message, message=None, delete=None, channel=N
     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 isinstance(embeds, Embed):
+    if embeds is None:
+        embeds = ListNode([])
+
+    elif isinstance(embeds, Embed):
         embeds = ListNode([embeds])
 
     if not isinstance(view, (EasyModifiedViews, NoneType)):
@@ -68,15 +71,15 @@ async def dshell_respond_message(ctx: Message, message=None, content: str = None
 
     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])
 
-    else:
-        raise Exception(f'Embeds must be a list of Embed objects or a single Embed object, not {type(embeds)} !')
-
     sended_message = await respond_message.reply(
                                      content=str(content),
                                      mention_author=mention_author,
@@ -85,6 +88,39 @@ 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
@@ -123,11 +159,16 @@ async def dshell_edit_message(ctx: Message, message, new_content=None, embeds=No
     """
     edit_message = utils_get_message(ctx, message)
 
+    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 = []
+        embeds = ListNode([])
 
     elif isinstance(embeds, Embed):
-        embeds = [embeds]
+        embeds = ListNode([embeds])
 
     await edit_message.edit(content=new_content, embeds=embeds)
 

{dshellinterpreter-0.2.13.9 → dshellinterpreter-0.2.13.11}/Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -19,7 +19,7 @@ from .._DshellTokenizer.dshell_token_type import Token
 from .._DshellTokenizer.dshell_tokenizer import DshellTokenizer
 
 All_nodes = TypeVar('All_nodes', IfNode, LoopNode, ElseNode, ElifNode, ArgsCommandNode, VarNode, IdentOperationNode)
-context = TypeVar('context', AutoShardedBot, Message, PrivateChannel)
+context = TypeVar('context', AutoShardedBot, Message, PrivateChannel, Interaction)
 ButtonStyleValues: tuple = tuple(i.name for i in ButtonStyle)
 
 class DshellInterpreteur:
@@ -37,24 +37,25 @@ class DshellInterpreteur:
         :param vars: Optional dictionary of variables to initialize in the interpreter's environment.
         """
         self.ast: list[ASTNode] = parse(DshellTokenizer(code).start(), StartNode([]))[0]
+        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__': ctx.channel.guild.name,
-            '__channel__': ctx.channel.name,
-            '__author__': ctx.author.name,
-            '__author_display_name__': ctx.author.display_name,
-            '__author_avatar__': ctx.author.display_avatar.url if ctx.author.display_avatar else None,
-            '__author_discriminator__': ctx.author.discriminator,
-            '__author_bot__': ctx.author.bot,
-            '__author_nick__': ctx.author.nick if hasattr(ctx.author, 'nick') else None,
-            '__author_id__': ctx.author.id,
-            '__message__': ctx.content,
-            '__message_id__': ctx.id,
-            '__channel_name__': ctx.channel.name,
-            '__channel_type__': ctx.channel.type.name if hasattr(ctx.channel, 'type') else None,
-            '__channel_id__': ctx.channel.id,
-            '__private_channel__': isinstance(ctx.channel, PrivateChannel),
-        } if ctx is not None else {}
+            '__guild__': message.channel.guild.name,
+            '__channel__': message.channel.name,
+            '__author__': message.author.name,
+            '__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_id__': message.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 {}
         self.vars = vars if vars is not None else ''
         self.ctx: context = ctx
         if debug:
@@ -473,7 +474,7 @@ async def ui_button_callback(button: Button, interaction: Interaction, data: dic
             '__private_channel__': isinstance(interaction.channel, PrivateChannel),
         }
         local_env.update(data)
-        x = DshellInterpreteur(code, interaction.message, debug=False)
+        x = DshellInterpreteur(code, interaction, debug=False)
         x.env.update(local_env)
         await x.execute()
     else:

{dshellinterpreter-0.2.13.9 → dshellinterpreter-0.2.13.11}/Dshell/_DshellTokenizer/dshell_keywords.py

@@ -30,6 +30,7 @@ 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

{dshellinterpreter-0.2.13.9/dshellInterpreter.egg-info → dshellinterpreter-0.2.13.11}/PKG-INFO

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

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

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