dshellInterpreter 0.2.14.1__py3-none-any.whl → 0.2.14.3__py3-none-any.whl

Dshell/DISCORD_COMMANDS/dshell_channel.py

@@ -304,9 +304,10 @@ async def dshell_create_thread_message(ctx: Message,
     if not isinstance(slowmode, _MissingSentinel) and slowmode < 0:
         raise Exception("Slowmode delay must be a positive integer !")
 
-    thread = await message.fetch().create_thread(name=name,
-                                         auto_archive_duration=archive,
-                                         slowmode_delay=slowmode)
+    m = await message.fetch()
+    thread = await m.create_thread(name=name,
+                    auto_archive_duration=archive,
+                    slowmode_delay=slowmode)
 
     return thread.id
 

Dshell/DISCORD_COMMANDS/dshell_interaction.py

@@ -1,6 +1,7 @@
 __all__ = [
     'dshell_respond_interaction',
-    'dshell_defer_interaction'
+    'dshell_defer_interaction',
+    'dshell_delete_original_message'
 ]
 
 from types import NoneType
@@ -76,4 +77,16 @@ async def dshell_defer_interaction(ctx: Interaction, hide: bool = False) -> bool
 
     await ctx.response.defer(ephemeral=hide)
 
-    return True
+    return True
+
+async def dshell_delete_original_message(ctx: Interaction) -> int:
+    """
+    Delete the original message of an 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)} !')
+
+    await ctx.delete_original_message()
+
+    return ctx.message.id

Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -1,10 +1,9 @@
 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 EasyModifiedViews
+from pycordViews.views.errors import CustomIDNotFound
 
 from discord import AutoShardedBot, Embed, Colour, PermissionOverwrite, Permissions, Guild, Member, Role, Message, Interaction, ButtonStyle
 from discord.ui import Button
@@ -146,7 +145,11 @@ class DshellInterpreteur:
                     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)
+                    # rebuild the UI if it already exists
+                    if node.name.value in self.env and isinstance(self.env[node.name.value], EasyModifiedViews):
+                        self.env[node.name.value] = rebuild_ui(first_node, self.env[node.name.value], self)
+                    else:
+                        self.env[node.name.value] = build_ui(first_node, self)
 
                 elif isinstance(first_node, LengthNode):
                     self.env[node.name.value] = length(first_node)
@@ -448,37 +451,77 @@ def build_colour(color: Union[int, ListNode]) -> Union[Colour, int]:
     else:
         raise TypeError(f"Color must be an integer or a ListNode, not {type(color)} !")
 
-
-def build_ui(ui_node: UiNode, interpreter: DshellInterpreteur) -> EasyModifiedViews:
+def build_ui_parameters(ui_node: UiNode, interpreter: DshellInterpreteur):
     """
-    Builds a UI component from the UiNode.
+    Builds the parameters for 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:
-        args_button: dict[str, list[Any]] = regroupe_commandes(component.body, interpreter, normalise=True)[0]
+    for ident_component in range(len(ui_node.buttons)):
+        args_button: dict[str, list[Any]] = \
+        regroupe_commandes(ui_node.buttons[ident_component].body, interpreter, normalise=True)[0]
         args_button.pop('--*', ())
 
         code = args_button.pop('code', None)
         style = args_button.pop('style', 'primary').lower()
+        custom_id = args_button.pop('custom_id', str(ident_component))
+
+        if not isinstance(custom_id, str):
+            raise TypeError(f"Button custom_id must be a string, not {type(custom_id)} !")
+
         if style not in ButtonStyleValues:
             raise ValueError(f"Button style must be one of {', '.join(ButtonStyleValues)}, not '{style}' !")
+
+        args_button['custom_id'] = custom_id
         args_button['style'] = ButtonStyle[style]
         args = args_button.pop('*', ())
-        b = Button(*args, **args_button)
+        yield args, args_button, code
+
+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()
 
-        custom_id = ''.join(choice(ascii_letters + digits) for _ in range(20))
-        b.custom_id = custom_id
+    for args, args_button, code in build_ui_parameters(ui_node, interpreter):
+        b = Button(**args_button)
 
         view.add_items(b)
-        view.set_callable(custom_id, _callable=ui_button_callback, data={'code': code})
+        view.set_callable(b.custom_id, _callable=ui_button_callback, data={'code': code})
+
+    return view
+
+def rebuild_ui(ui_node : UiNode, view: EasyModifiedViews, interpreter: DshellInterpreteur) -> EasyModifiedViews:
+    """
+    Rebuilds a UI component from an existing EasyModifiedViews.
+    :param view:
+    :param interpreter:
+    :return:
+    """
+    for args, args_button, code in build_ui_parameters(ui_node, interpreter):
+        try:
+            ui = view.get_ui(args_button['custom_id'])
+        except CustomIDNotFound:
+            raise ValueError(f"Button with custom_id '{args_button['custom_id']}' not found in the view !")
+
+        ui.view.label = args_button.get('label', ui.view.label)
+        ui.view.style = args_button.get('style', ui.view.style)
+        ui.view.emoji = args_button.get('emoji', ui.view.emoji)
+        ui.view.disabled = args_button.get('disabled', ui.view.disabled)
+        ui.view.url = args_button.get('url', ui.view.url)
+        ui.view.row = args_button.get('row', ui.view.row)
+        new_code = code if code is not None else view.get_callable_data(args_button['custom_id'])['code']
+        view.set_callable(args_button['custom_id'], _callable=ui_button_callback, data={'code': args_button.get('code', code)})
 
     return view
 
+
 async def ui_button_callback(button: Button, interaction: Interaction, data: dict[str, Any]):
     """
     Callback for UI buttons.
@@ -488,7 +531,6 @@ async def ui_button_callback(button: Button, interaction: Interaction, data: dic
     :param data:
     :return:
     """
-    print(data)
     code = data.pop('code', None)
     if code is not None:
         local_env = {

Dshell/_DshellTokenizer/dshell_keywords.py

@@ -37,6 +37,7 @@ dshell_commands: dict[str, Callable] = {
 
     "sri": dshell_respond_interaction,  # respond to an interaction
     "sdi": dshell_defer_interaction,  # defer an interaction
+    "dom": dshell_delete_original_message,  # delete original interaction message
 
     "cc": dshell_create_text_channel,  # create channel
     "cvc": dshell_create_voice_channel,  # create voice channel

{dshellinterpreter-0.2.14.1.dist-info → dshellinterpreter-0.2.14.3.dist-info}/METADATA

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

{dshellinterpreter-0.2.14.1.dist-info → dshellinterpreter-0.2.14.3.dist-info}/RECORD

@@ -1,8 +1,8 @@
 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=Gac3J9sCcPRHApIgSoS5MRAMJ0Hd7I-YywVQI0s26p0,3229
+Dshell/DISCORD_COMMANDS/dshell_channel.py,sha256=PDXpxrRRWPSucdp_3ITJk0Ur3coneRJKWEl2i7GZ2EM,15696
+Dshell/DISCORD_COMMANDS/dshell_interaction.py,sha256=gYojAOH5hl-ZL6Y1lEb87-H9MtOa8sb_VAV4_iiYfWA,3649
 Dshell/DISCORD_COMMANDS/dshell_member.py,sha256=5Iw-2dydhYMZOw2nx0svZP9JpZWHOXC0qkL9tClJHtw,8840
 Dshell/DISCORD_COMMANDS/dshell_message.py,sha256=zcWl6Y1W31h9MTHS-j9tLDwcrRiE_wGOu78zu2k0y9I,9101
 Dshell/DISCORD_COMMANDS/dshell_pastbin.py,sha256=H0tUJOwdzYBXvxqipK3mzoNZUKrSLcVm4EZlWbBRScs,796
@@ -11,16 +11,16 @@ Dshell/DISCORD_COMMANDS/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 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=RHDCLtZ66cqlvy6VKMKHWV3eL26V-CKcQEEN-2TUzhc,28857
+Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=u89gS8ekT2PJ9ml5CN_T9XXjwNkU7Pw3VrqkMVBeCdQ,30902
 Dshell/_DshellParser/__init__.py,sha256=ONDfhZMvClqP_6tE8SLjp-cf3pXL-auQYnfYRrHZxC4,56
 Dshell/_DshellParser/ast_nodes.py,sha256=fU6BVe6w78ZhYib7SGR7iAfTqWqS2kvwZ0d4wMxxOHk,18366
 Dshell/_DshellParser/dshell_parser.py,sha256=ZSSRheiNNR1zumxBK_tqlnUPjJ7ZIE6S-K5aJPp4TjM,21887
 Dshell/_DshellTokenizer/__init__.py,sha256=LIQSRhDx2B9pmPx5ADMwwD0Xr9ybneVLhHH8qrJWw_s,172
-Dshell/_DshellTokenizer/dshell_keywords.py,sha256=euTckA4AsWBfBGMnFFi1YVz8dvXY1HNsQjNWtvARMR8,5878
+Dshell/_DshellTokenizer/dshell_keywords.py,sha256=7oeSKLXCsPRpyU31skCerOUMzd2cdm-GwofpmgTPkD0,5961
 Dshell/_DshellTokenizer/dshell_token_type.py,sha256=gYIb2XN2YcgeRgmar_rBDS5CGmwfmxihu8mOW_d6lbE,1533
 Dshell/_DshellTokenizer/dshell_tokenizer.py,sha256=RrJA2XpcFH2vS6SnRIn5Own_uL5orIDvpq74t8xD3og,7350
-dshellinterpreter-0.2.14.1.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
-dshellinterpreter-0.2.14.1.dist-info/METADATA,sha256=R-ZsMvWTCwL1mjgcm6jbohdIYEooLu8WxXcQPl-zK9o,1151
-dshellinterpreter-0.2.14.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dshellinterpreter-0.2.14.1.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
-dshellinterpreter-0.2.14.1.dist-info/RECORD,,
+dshellinterpreter-0.2.14.3.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
+dshellinterpreter-0.2.14.3.dist-info/METADATA,sha256=nLlUFCpjuFHxsm5NGiDfTD3mNSW3oEdO2cSdnC_JrPQ,1151
+dshellinterpreter-0.2.14.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dshellinterpreter-0.2.14.3.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
+dshellinterpreter-0.2.14.3.dist-info/RECORD,,