dshellInterpreter 0.2.19.1__tar.gz → 0.2.19.3__tar.gz

{dshellinterpreter-0.2.19.1 → dshellinterpreter-0.2.19.3}/Dshell/DISCORD_COMMANDS/dshell_message.py

@@ -6,6 +6,7 @@ from discord.ext import commands
 from pycordViews import EasyModifiedViews
 
 from .utils.utils_message import utils_get_message, utils_autorised_mentions
+from .._DshellInterpreteur.cached_messages import dshell_cached_messages
 from .._utils import NoneType
 
 __all__ = [
@@ -167,7 +168,9 @@ async def dshell_edit_message(ctx: Message, message, new_content=None, embeds=No
     return edit_message.id
 
 
-async def dshell_get_history_messages(ctx: Message, channel=None, limit=None) -> "ListNode":
+async def dshell_get_history_messages(ctx: Message,
+                                      channel=None,
+                                      limit=None) -> "ListNode":
     """
     Searches for messages matching a regex in a channel
     """
@@ -182,13 +185,16 @@ async def dshell_get_history_messages(ctx: Message, channel=None, limit=None) ->
 
     from .._DshellParser.ast_nodes import ListNode
 
+    cached_messages = dshell_cached_messages.get()
     messages = ListNode([])
     async for message in search_channel.history(limit=limit):
-        messages.add(message.id)
+        message_id = message.id
+        messages.add(message_id)
+        cached_messages[message_id] = message
 
     if not messages:
         raise commands.CommandError(f"No messages in {search_channel.mention}.")
-
+    dshell_cached_messages.set(cached_messages)
     return messages
 
 

dshellinterpreter-0.2.19.3/Dshell/DISCORD_COMMANDS/utils/__init__.py

@@ -0,0 +1,8 @@
+from .utils_thread import *
+from .utils_message import *
+from .utils_list import *
+from .utils_global import *
+from .utils_permissions import *
+from .utils_member import *
+from .utils_string import *
+from .utils_list import *

{dshellinterpreter-0.2.19.1 → dshellinterpreter-0.2.19.3}/Dshell/DISCORD_COMMANDS/utils/utils_message.py

@@ -1,16 +1,24 @@
 from discord import Message, PartialMessage, AllowedMentions
-from typing import Union
+from typing import Union, Optional
 from re import search
 
-def utils_get_message(ctx: Message, message: Union[int, str]) -> PartialMessage:
+from ..._DshellInterpreteur.cached_messages import dshell_cached_messages
+
+def utils_get_message(ctx: Message, message: Union[int, str]) -> Union[PartialMessage]:
     """
     Returns the message object of the specified message ID or link.
     Message is only available in the same server as the command and in the same channel.
     If the message is a link, it must be in the format: https://discord.com/channels/{guild_id}/{channel_id}/{message_id}
     """
+    cached_messages = dshell_cached_messages.get()
 
     if isinstance(message, int):
-        return ctx.channel.get_partial_message(message)
+        if message in cached_messages:
+            return cached_messages[message]
+
+        cached_messages[message] = ctx.channel.get_partial_message(message)
+        dshell_cached_messages.set(cached_messages)
+        return cached_messages[message]
 
     elif isinstance(message, str):
         match = search(r'https://discord\.com/channels/(\d+)/(\d+)/(\d+)', message)
@@ -23,7 +31,9 @@ def utils_get_message(ctx: Message, message: Union[int, str]) -> PartialMessage:
         if guild_id != ctx.guild.id:
             raise Exception("The message must be from the same server as the command !")
 
-        return ctx.guild.get_channel(channel_id).get_partial_message(message_id)
+        cached_messages[message_id] = ctx.guild.get_channel(channel_id).get_partial_message(message_id)
+        dshell_cached_messages.set(cached_messages)
+        return cached_messages[message_id]
 
     raise Exception(f"Message must be an integer or a string, not {type(message)} !")
 
@@ -40,7 +50,7 @@ def utils_autorised_mentions(global_mentions: bool = None,
 
     from discord import AllowedMentions
 
-    if not isinstance(global_mentions, (type(None), bool)):
+    if global_mentions is not None and not isinstance(global_mentions, bool):
         raise Exception(f'Mention parameter must be a boolean or None, not {type(global_mentions)} !')
 
     if not isinstance(everyone_mention, bool):
@@ -65,4 +75,22 @@ def utils_autorised_mentions(global_mentions: bool = None,
         return AllowedMentions(everyone=everyone_mention,
                                roles=roles_mentions,
                                users=users_mentions,
-                               replied_user=reply_mention)
+                               replied_user=reply_mention)
+
+async def utils_get_author_id_message(ctx: Message, message: Optional[int] = None):
+    """
+    Return author ID of the message given (or ctx if message=None)
+    :param ctx: 
+    :param message: message ID
+    :return: 
+    """
+    if message is not None and not isinstance(message, int):
+        raise Exception(f'Message parameter must be an integer or None, not {type(message)} !')
+
+    target_message = ctx
+    if message is not None:
+        try:
+            target_message = await utils_get_message(ctx, message).fetch()
+        except:
+            raise Exception(f"[message_author] Author ID message to get is not found !")
+    return target_message.author.id

{dshellinterpreter-0.2.19.1 → dshellinterpreter-0.2.19.3}/Dshell/DISCORD_COMMANDS/utils/utils_permissions.py

@@ -1,11 +1,9 @@
-from typing import Union, TYPE_CHECKING
+from typing import Union
 from discord import Guild, Member, Role, Permissions, PermissionOverwrite
 
-from ..._DshellParser.ast_nodes import ListNode
 from .utils_global import utils_what_discord_type_is, DiscordType
 
 class DshellPermissions:
-
     def __init__(self, target: dict[str, list[int]]):
         """
         Creates a Dshell permissions object.
@@ -13,7 +11,7 @@ class DshellPermissions:
         Expected parameters: “allow”, “deny”, ‘members’, “roles”.
         For “members” and “roles”, values must be ID ListNodes.
         """
-        self.target: dict[str, Union[ListNode, int]] = target
+        self.target: dict[str, Union["ListNode", int]] = target
 
     @staticmethod
     def get_member(guild, member_id: int) -> Member:
@@ -46,6 +44,7 @@ class DshellPermissions:
         :param guild: The Discord server
         :return: A dictionary of PermissionOverwrite objects with members and roles as keys
         """
+        from ..._DshellParser.ast_nodes import ListNode
         permissions: dict[Union[Member, Role, None], PermissionOverwrite] = {}
         target_keys = self.target.keys()
 

{dshellinterpreter-0.2.19.1 → dshellinterpreter-0.2.19.3}/Dshell/_DshellInterpreteur/__init__.py

@@ -1,2 +1,3 @@
 from .dshell_interpreter import *
 from .errors import *
+from .cached_messages import dshell_cached_messages

dshellinterpreter-0.2.19.3/Dshell/_DshellInterpreteur/cached_messages.py

@@ -0,0 +1,4 @@
+from contextvars import ContextVar
+
+# used to save all viewed messages in the current scoop
+dshell_cached_messages = ContextVar('dshell_cached_messages')

{dshellinterpreter-0.2.19.1 → dshellinterpreter-0.2.19.3}/Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -1,4 +1,4 @@
-from asyncio import sleep, create_task
+from asyncio import sleep
 from re import findall
 from typing import TypeVar, Union, Any, Optional, Callable
 from copy import deepcopy
@@ -18,6 +18,7 @@ from .._DshellTokenizer.dshell_keywords import *
 from .._DshellTokenizer.dshell_token_type import DshellTokenType as DTT
 from .._DshellTokenizer.dshell_token_type import Token
 from .._DshellTokenizer.dshell_tokenizer import DshellTokenizer
+from .cached_messages import dshell_cached_messages
 
 All_nodes = TypeVar('All_nodes', IfNode, LoopNode, ElseNode, ElifNode, ArgsCommandNode, VarNode)
 context = TypeVar('context', AutoShardedBot, Message, PrivateChannel, Interaction)
@@ -49,18 +50,26 @@ class DshellInterpreteur:
             '__ret__': None,  # environment variables, '__ret__' is used to store the return value of commands
 
             '__author__': message.author.id,
+            '__author_name__': 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,
+            '__author_add_reaction__': None, # Can be overwritten by add vars_env parameter to get the author on message add event reaction
+            '__author_remove_reaction__': None, # Can be overwritten by add vars_env parameter to get the author on message remove event reaction
 
             '__message__': message.content,
             '__message_content__': message.content,
             '__message_id__': message.id,
             '__message_author__': message.author.id,
             '__message_before__': message.content,  # same as __message__, but before edit. Can be overwritten by add vars_env parameter
+            '__message_created_at__': str(message.created_at),
+            '__message_edited_at__': str(message.edited_at),
+            '__message_reactions__': ListNode([str(reaction.emoji) for reaction in message.reactions]),
+            '__message_add_reaction__': None, # Can be overwritten by add vars_env parameter to get the reaction added on message add event reaction
+            '__message_remove_reaction__': None, # Can be overwritten by add vars_env parameter to get the reaction removed on message remove event reaction
             '__message_url__': message.jump_url if hasattr(message, 'jump_url') else None,
             '__last_message__': message.channel.last_message_id,
 
@@ -93,8 +102,9 @@ class DshellInterpreteur:
         } if message is not None and not debug else {'__ret__': None} # {} is used in debug mode, when ctx is None
         if vars_env is not None: # add the variables to the environment
             self.env.update(vars_env)
-        self.vars = vars if vars is not None else ''
+        self.vars = vars or ''
         self.ctx: context = ctx
+        dshell_cached_messages.set(dict()) # save all messages view in the current scoop
         if debug:
             print_ast(self.ast)
 
@@ -198,6 +208,8 @@ class DshellInterpreteur:
                 else:
                     raise DshellInterpreterStopExecution()
 
+        dshell_cached_messages.reset()
+
     async def eval_data_token(self, token: Token):
         """
         Eval a data token and returns its value in Python.

{dshellinterpreter-0.2.19.1 → dshellinterpreter-0.2.19.3}/Dshell/_DshellParser/ast_nodes.py

@@ -548,7 +548,7 @@ class ListNode(ASTNode):
         """
         self.iterable: list[Any] = body
         self.len_iterable: int = len(body)
-        self.iterateur_count: int = 0
+        self.iterator_count: int = 0
 
     def to_dict(self):
         """
@@ -564,8 +564,8 @@ class ListNode(ASTNode):
         """
         Add a value to the list.
         """
-        if self.len_iterable > 10000:
-            raise PermissionError('The list is too long, it must not exceed 10,000 elements !')
+        if self.len_iterable > 1000:
+            raise PermissionError('The list is too long, it must not exceed 1000 elements !')
 
         self.iterable.append(value)
         self.len_iterable += 1
@@ -612,7 +612,7 @@ class ListNode(ASTNode):
         """
         self.iterable = []
         self.len_iterable = 0
-        self.iterateur_count = 0
+        self.iterator_count = 0
 
     def sort(self, reverse: bool = False):
         """
@@ -654,12 +654,12 @@ class ListNode(ASTNode):
         :return: an element from the list.
         """
 
-        if self.iterateur_count >= self.len_iterable:
-            self.iterateur_count = 0
+        if self.iterator_count >= self.len_iterable:
+            self.iterator_count = 0
             raise StopIteration()
 
-        v = self.iterable[self.iterateur_count]
-        self.iterateur_count += 1
+        v = self.iterable[self.iterator_count]
+        self.iterator_count += 1
         return v
 
     def __len__(self):

{dshellinterpreter-0.2.19.1 → dshellinterpreter-0.2.19.3}/Dshell/_DshellTokenizer/dshell_keywords.py

@@ -28,8 +28,20 @@ dshell_keyword: set[str] = {
 dshell_discord_keyword: set[str] = {
     'embed', '#embed', 'field', 'perm', 'permission', '#perm', '#permission', 'ui', '#ui', 'button', 'select'
 }
+
+async def dshell_debug(ctx, x):
+    """
+    Print all x parameter
+    :param ctx:
+    :param x:
+    :return:
+    """
+    print(x)
+    return x
+
 dshell_commands: dict[str, Callable] = {
 
+    "debug": dshell_debug,
     ## global utils
     'random': utils_random,
 
@@ -161,57 +173,3 @@ dshell_logical_operators: dict[str, tuple[Callable, int]] = {
 dshell_operators: dict[str, tuple[Callable, int]] = dshell_logical_operators.copy()
 dshell_operators.update(dshell_logical_word_operators)
 dshell_operators.update(dshell_mathematical_operators)
-
-'''
-C_create_var = "var"
-    C_obligate_var = "ovar" # makes variables mandatory
-
-    # guild
-    C_create_channel = "cc"
-    C_create_voice_channel = "cvc"
-    C_create_forum_channel = "cfc"
-    C_create_category = "cca"
-    C_create_role = "cr"
-
-    C_delete_channel = "dc"
-    C_delete_category = "dca"
-    C_delete_role = "dr"
-
-    C_edit_channel = "ec"
-    C_edit_voice_channel = "evc"
-    C_edit_forum_channel = "efc"
-    C_edit_category = "eca"
-    C_edit_role = "er"
-    C_edit_guild = "eg"
-
-    # forum
-    C_edit_ForumTag = "eft"
-    C_create_thread = "ct"
-    C_delete_tread = "dt"
-
-    # member
-    C_edit_nickname = "en"
-    C_ban_member = "bm"
-    C_unban_member = "um"
-    C_kick_member = "km"
-    C_timeout_member = "tm"
-    C_move_member = "mm"
-    C_add_roles = "ar"
-    C_remove_roles = "rr"
-
-    # message
-    C_send_message = "sm"
-    C_respond_message = "rm"
-    C_edit_message = "em"
-    C_send_user_message = "sum"
-    C_delete_message = "dm"
-    C_purge_message = "pm"
-    C_create_embed = "e"
-    C_regex = "regex"
-    C_add_emoji = "ae"
-    C_remove_emoji = "re"
-    C_clear_emoji = "ce"
-    C_remove_reaction = "rre"
-
-    # button
-    C_create_button = "b"'''

{dshellinterpreter-0.2.19.1/dshellInterpreter.egg-info → dshellinterpreter-0.2.19.3}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 0.2.19.1
+Version: 0.2.19.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.19.1 → dshellinterpreter-0.2.19.3}/dshellInterpreter.egg-info/SOURCES.txt

@@ -19,6 +19,7 @@ Dshell/DISCORD_COMMANDS/utils/utils_permissions.py
 Dshell/DISCORD_COMMANDS/utils/utils_string.py
 Dshell/DISCORD_COMMANDS/utils/utils_thread.py
 Dshell/_DshellInterpreteur/__init__.py
+Dshell/_DshellInterpreteur/cached_messages.py
 Dshell/_DshellInterpreteur/dshell_interpreter.py
 Dshell/_DshellInterpreteur/errors.py
 Dshell/_DshellParser/__init__.py

{dshellinterpreter-0.2.19.1 → dshellinterpreter-0.2.19.3}/setup.py

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

dshellinterpreter-0.2.19.1/Dshell/DISCORD_COMMANDS/utils/__init__.py

@@ -1,4 +0,0 @@
-from .utils_thread import *
-from .utils_message import *
-from .utils_list import *
-from .utils_global import *