dshellInterpreter 0.2.12__tar.gz → 0.2.13.1__tar.gz

{dshellinterpreter-0.2.12 → dshellinterpreter-0.2.13.1}/Dshell/DISCORD_COMMANDS/dshell_channel.py

@@ -103,7 +103,7 @@ async def dshell_create_text_channel(ctx: Message,
                                      slowmode=MISSING,
                                      topic=MISSING,
                                      nsfw=MISSING,
-                                     permission: dict[Union[Member, Role], PermissionOverwrite] = MISSING,
+                                     permissions: dict[Union[Member, Role], PermissionOverwrite] = MISSING,
                                      reason=None):
     """
     Creates a text channel on the server
@@ -129,7 +129,7 @@ async def dshell_create_text_channel(ctx: Message,
                                                           slowmode_delay=slowmode,
                                                           topic=topic,
                                                           nsfw=nsfw,
-                                                          overwrites=permission,
+                                                          overwrites=permissions,
                                                           reason=reason)
 
     return created_channel.id
@@ -140,7 +140,7 @@ async def dshell_create_voice_channel(ctx: Message,
                                       category=None,
                                       position=MISSING,
                                       bitrate=MISSING,
-                                      permission: dict[Union[Member, Role], PermissionOverwrite] = MISSING,
+                                      permissions: dict[Union[Member, Role], PermissionOverwrite] = MISSING,
                                       reason=None):
     """
     Creates a voice channel on the server
@@ -157,7 +157,7 @@ async def dshell_create_voice_channel(ctx: Message,
                                                            category=channel_category,
                                                            position=position,
                                                            bitrate=bitrate,
-                                                           overwrites=permission,
+                                                           overwrites=permissions,
                                                            reason=reason)
 
     return created_channel.id
@@ -210,7 +210,7 @@ async def dshell_edit_text_channel(ctx: Message,
                                    slowmode=MISSING,
                                    topic=MISSING,
                                    nsfw=MISSING,
-                                   permission: dict[Union[Member, Role], PermissionOverwrite] = MISSING,
+                                   permissions: dict[Union[Member, Role], PermissionOverwrite] = MISSING,
                                    reason=None):
     """
     Edits a text channel on the server
@@ -238,7 +238,7 @@ async def dshell_edit_text_channel(ctx: Message,
                                slowmode_delay=slowmode if slowmode is not MISSING else channel_to_edit.slowmode_delay,
                                topic=topic if topic is not MISSING else channel_to_edit.topic,
                                nsfw=nsfw if nsfw is not MISSING else channel_to_edit.nsfw,
-                               overwrites=permission if permission is not MISSING else channel_to_edit.overwrites,
+                               overwrites=permissions if permissions is not MISSING else channel_to_edit.overwrites,
                                reason=reason)
 
     return channel_to_edit.id
@@ -249,7 +249,7 @@ async def dshell_edit_voice_channel(ctx: Message,
                                     name=None,
                                     position=MISSING,
                                     bitrate=MISSING,
-                                    permission: dict[Union[Member, Role], PermissionOverwrite] = MISSING,
+                                    permissions: dict[Union[Member, Role], PermissionOverwrite] = MISSING,
                                     reason=None):
     """
     Edits a voice channel on the server
@@ -268,7 +268,7 @@ async def dshell_edit_voice_channel(ctx: Message,
     await channel_to_edit.edit(name=name if name is not None else channel_to_edit.name,
                                position=position if position is not MISSING else channel_to_edit.position,
                                bitrate=bitrate if bitrate is not MISSING else channel_to_edit.bitrate,
-                               overwrites=permission if permission is not MISSING else channel_to_edit.overwrites,
+                               overwrites=permissions if permissions is not MISSING else channel_to_edit.overwrites,
                                reason=reason)
 
     return channel_to_edit.id

{dshellinterpreter-0.2.12 → dshellinterpreter-0.2.13.1}/Dshell/DISCORD_COMMANDS/dshell_message.py

@@ -4,7 +4,10 @@ from discord import Embed, Message
 from discord.ext import commands
 from discord.abc import Messageable
 
+from pycordViews import EasyModifiedViews
+
 from .utils.utils_message import utils_get_message
+from .._utils import NoneType
 
 __all__ = [
     'dshell_send_message',
@@ -21,7 +24,7 @@ __all__ = [
 ]
 
 
-async def dshell_send_message(ctx: Message, message=None, delete=None, channel=None, embeds=None):
+async def dshell_send_message(ctx: Message, message=None, delete=None, channel=None, embeds=None, view=None) -> int:
     """
     Sends a message on Discord
     """
@@ -36,18 +39,19 @@ async def dshell_send_message(ctx: Message, message=None, delete=None, channel=N
 
     from .._DshellParser.ast_nodes import ListNode
 
-    if embeds is None:
-        embeds = ListNode([])
+    if not isinstance(embeds, (ListNode, Embed)):
+        raise Exception(f'Embeds must be a list of Embed objects or a single Embed object, not {type(embeds)} !')
 
-    elif isinstance(embeds, Embed):
+    if 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)} !')
+    if not isinstance(channel_to_send, (EasyModifiedViews, NoneType)):
+        raise Exception(f'Channel must be an UI or None, not {type(channel_to_send)} !')
 
     sended_message = await channel_to_send.send(message,
                                                 delete_after=delete,
-                                                embeds=embeds)
+                                                embeds=embeds,
+                                                view=view)
 
     return sended_message.id
 

{dshellinterpreter-0.2.12 → dshellinterpreter-0.2.13.1}/Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -1,9 +1,13 @@
 from asyncio import sleep
 from re import findall
 from typing import TypeVar, Union, Any, Optional, Callable
+from random import choice
+from string import ascii_letters, digits
 from copy import deepcopy
+from pycordViews import SelectMenu, EasyModifiedViews
 
 from discord import AutoShardedBot, Embed, Colour, PermissionOverwrite, Permissions, Guild, Member, Role, Message
+from discord.ui import Button
 from discord.abc import PrivateChannel
 
 from .._DshellParser.ast_nodes import *
@@ -120,6 +124,9 @@ class DshellInterpreteur:
                 elif isinstance(first_node, PermissionNode):
                     self.env[node.name.value] = build_permission(first_node.body, self)
 
+                elif isinstance(first_node, UiNode):
+                    self.env[node.name.value] = build_ui(first_node, self)
+
                 else:
                     self.env[node.name.value] = eval_expression(node.body, self)
 
@@ -401,6 +408,59 @@ def build_colour(color: Union[int, ListNode]) -> Union[Colour, int]:
         raise TypeError(f"Color must be an integer or a ListNode, not {type(color)} !")
 
 
+def build_ui(ui_node: UiNode, interpreter: DshellInterpreteur) -> EasyModifiedViews:
+    """
+    Builds a UI component from the UiNode.
+    Can accept buttons and select menus.
+    :param ui_node:
+    :param interpreter:
+    :return:
+    """
+    view = EasyModifiedViews()
+
+    for component in ui_node.buttons:
+        b = Button
+        args_button: dict[str, list[Any]] = regroupe_commandes(component.body, interpreter)[0]
+        args_button.pop('--*', ())
+        code = args_button.pop('code', None)
+        args = args_button.pop('*', ())
+        b(*args, **args_button)
+
+        custom_id = ''.join(choice(ascii_letters + digits) for _ in range(20))
+        b.custom_id = custom_id
+
+        view.add_items(b)
+        view.set_callable(custom_id, _callable=ui_button_callback, data={'code': code})
+
+    return view
+
+async def ui_button_callback(button, interaction, data):
+    code = data.pop('code', None)
+    local_env = {}
+    if code is not None:
+        local_env = {
+            '__ret__': None,
+            '__guild__': interaction.guild.name if interaction.guild else None,
+            '__channel__': interaction.channel.name if interaction.channel else None,
+            '__author__': interaction.user.name,
+            '__author_display_name__': interaction.user.display_name,
+            '__author_avatar__': interaction.user.display_avatar.url if interaction.user.display_avatar else None,
+            '__author_discriminator__': interaction.user.discriminator,
+            '__author_bot__': interaction.user.bot,
+            '__author_nick__': interaction.user.nick if hasattr(interaction.user, 'nick') else None,
+            '__author_id__': interaction.user.id,
+            '__message__': interaction.message.content if hasattr(interaction.message, 'content') else None,
+            '__message_id__': interaction.message.id if hasattr(interaction.message, 'id') else None,
+            '__channel_name__': interaction.channel.name if interaction.channel else None,
+            '__channel_type__': interaction.channel.type.name if hasattr(interaction.channel, 'type') else None,
+            '__channel_id__': interaction.channel.id if interaction.channel else None,
+            '__private_channel__': isinstance(interaction.channel, PrivateChannel),
+        }
+        local_env.update(data)
+    x = DshellInterpreteur(code, interaction, debug=False)
+    x.env.update(local_env)
+    await x.execute()
+
 def build_permission(body: list[Token], interpreter: DshellInterpreteur) -> dict[
     Union[Member, Role], PermissionOverwrite]:
     """

{dshellinterpreter-0.2.12 → dshellinterpreter-0.2.13.1}/Dshell/_DshellParser/ast_nodes.py

@@ -20,7 +20,10 @@ __all__ = [
     'IdentOperationNode',
     'ListNode',
     'PermissionNode',
-    'ParamNode'
+    'ParamNode',
+    'UiNode',
+    'UiButtonNode',
+    'UiSelectNode'
 ]
 
 
@@ -439,6 +442,85 @@ class ParamNode(ASTNode):
         }
 
 
+class UiButtonNode(ASTNode):
+    """
+    Node representing a UI button component in the AST.
+    This is used to define button elements for commands in Dshell.
+    """
+
+    def __init__(self, body: list[Token]):
+        """
+        :param body: list of tokens representing the button component
+        """
+        self.body = body
+
+    def __repr__(self):
+        return f"<UI BUTTON> - {self.body}"
+
+    def to_dict(self):
+        """
+        Convert the UiButtonNode to a dictionary representation.
+        :return: Dictionary representation of the UiButtonNode.
+        """
+        return {
+            "type": "UiButtonNode",
+            "body": [token.to_dict() for token in self.body]
+        }
+
+class UiSelectNode(ASTNode):
+    """
+    Node representing a UI select component in the AST.
+    This is used to define select elements for commands in Dshell.
+    """
+
+    def __init__(self, body: list[Token]):
+        """
+        :param body: list of tokens representing the select component
+        """
+        self.body = body
+
+    def __repr__(self):
+        return f"<UI SELECT> - {self.body}"
+
+    def to_dict(self):
+        """
+        Convert the UiSelectNode to a dictionary representation.
+        :return: Dictionary representation of the UiSelectNode.
+        """
+        return {
+            "type": "UiSelectNode",
+            "body": [token.to_dict() for token in self.body]
+        }
+
+class UiNode(ASTNode):
+    """
+    Node representing a UI component in the AST.
+    This is used to define UI elements for commands in Dshell.
+    """
+
+    def __init__(self, body, buttons: Optional[list[UiButtonNode]] = None,
+                 selects: Optional[list[UiSelectNode]] = None):
+        """
+        :param body: list of tokens representing the UI component
+        """
+        self.body = body
+        self.buttons = buttons or []
+        self.selects = selects or []
+
+    def __repr__(self):
+        return f"<UI> - {self.buttons}\n\n - {self.selects}"
+
+    def to_dict(self):
+        """
+        Convert the UiNode to a dictionary representation.
+        :return: Dictionary representation of the UiNode.
+        """
+        return {
+            "type": "UiNode",
+            "buttons": [token.to_dict() for token in self.buttons],
+            "selects": [token.to_dict() for token in self.selects],
+        }
+
 class ListNode(ASTNode):
     """
     Node representing a list structure in the AST.

{dshellinterpreter-0.2.12 → dshellinterpreter-0.2.13.1}/Dshell/_DshellParser/dshell_parser.py

@@ -24,6 +24,9 @@ from .ast_nodes import (ASTNode,
                         FieldEmbedNode,
                         PermissionNode,
                         ParamNode,
+                        UiNode,
+                        UiButtonNode,
+                        UiSelectNode,
                         StartNode)
 from .._DshellTokenizer import dshell_operators
 from .._DshellTokenizer.dshell_token_type import DshellTokenType as DTT
@@ -185,6 +188,33 @@ def parse(token_lines: list[list[Token]], start_node: ASTNode) -> tuple[list[AST
                 blocks.pop()
                 return blocks, pointeur
 
+            elif first_token_line.value == 'ui':
+                ui_node = UiNode([])
+                var_node = VarNode(tokens_by_line[1], body=[ui_node])
+                last_block.body.append(var_node)
+                _, p = parse(token_lines[pointeur + 1:], ui_node)
+                pointeur += p + 1
+
+            elif first_token_line.value == '#ui':
+                if not isinstance(last_block, UiNode):
+                    raise SyntaxError(f'[#UI] No UI open on line {first_token_line.position} !')
+                blocks.pop()
+                return blocks, pointeur
+
+            elif first_token_line.value == 'button':
+                if not isinstance(last_block, UiNode):
+                    raise SyntaxError(f'[BUTTON] No UI open on line {first_token_line.position} !')
+                button_node = UiButtonNode(tokens_by_line[1:])
+                last_block.body.append(button_node)
+                pointeur += 1
+
+            elif first_token_line.value == 'select':
+                if not isinstance(last_block, UiNode):
+                    raise SyntaxError(f'[SELECT] No UI open on line {first_token_line.position} !')
+                select_node = UiSelectNode(tokens_by_line[1:])
+                last_block.body.append(select_node)
+                pointeur += 1
+
         ############################## AUTRE ##############################
 
         elif first_token_line.type == DTT.IDENT:

{dshellinterpreter-0.2.12 → dshellinterpreter-0.2.13.1}/Dshell/_DshellTokenizer/dshell_keywords.py

@@ -21,7 +21,7 @@ dshell_keyword: set[str] = {
 }
 
 dshell_discord_keyword: set[str] = {
-    'embed', '#embed', 'field', 'perm', 'permission', '#perm', '#permission'
+    'embed', '#embed', 'field', 'perm', 'permission', '#perm', '#permission', 'ui', '#ui', 'button', 'select'
 }
 dshell_commands: dict[str, Callable] = {
 

{dshellinterpreter-0.2.12/dshellInterpreter.egg-info → dshellinterpreter-0.2.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 0.2.12
+Version: 0.2.13.1
 Summary: A Discord bot interpreter for creating custom commands and automations.
 Home-page: https://github.com/BOXERRMD/Dshell_Interpreter
 Author: Chronos
@@ -17,6 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: py-cord==2.6.1
 Requires-Dist: requests
+Requires-Dist: pycordviews
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{dshellinterpreter-0.2.12 → dshellinterpreter-0.2.13.1/dshellInterpreter.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 0.2.12
+Version: 0.2.13.1
 Summary: A Discord bot interpreter for creating custom commands and automations.
 Home-page: https://github.com/BOXERRMD/Dshell_Interpreter
 Author: Chronos
@@ -17,6 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: py-cord==2.6.1
 Requires-Dist: requests
+Requires-Dist: pycordviews
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{dshellinterpreter-0.2.12 → dshellinterpreter-0.2.13.1}/dshellInterpreter.egg-info/requires.txt

@@ -1,2 +1,3 @@
 py-cord==2.6.1
 requests
+pycordviews

{dshellinterpreter-0.2.12 → dshellinterpreter-0.2.13.1}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name="dshellInterpreter",
-    version="0.2.12",
+    version="0.2.13.1",
     author="Chronos",
     author_email="vagabonwalybi@gmail.com",
     description="A Discord bot interpreter for creating custom commands and automations.",
@@ -18,7 +18,7 @@ setup(
               "Dshell._DshellParser",
               "Dshell.DISCORD_COMMANDS",
               "Dshell.DISCORD_COMMANDS.utils"],
-    install_requires=["py-cord==2.6.1", "requests"],
+    install_requires=["py-cord==2.6.1", "requests", "pycordviews"],
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: MIT License",