dshellInterpreter 1.2.0.8__tar.gz → 1.2.0.9__tar.gz

{dshellinterpreter-1.2.0.8 → dshellinterpreter-1.2.0.9}/Dshell/DISCORD_COMMANDS/dshell_channel.py

@@ -353,10 +353,7 @@ async def dshell_create_thread_message(ctx: Message,
 
     _CMD = "ct"
 
-    if message is None:
-        message = ctx.id
-
-    message = utils_get_message(ctx, message)
+    message = ctx if message is None else await utils_get_message(ctx, message)
 
     _validate_required_string(name, "Name", _CMD)
 
@@ -372,12 +369,7 @@ async def dshell_create_thread_message(ctx: Message,
     if isinstance(slowmode, IntNode) and slowmode < 0:
         raise Exception("Slowmode delay must be a positive integer !")
 
-    if isinstance(message, PartialMessage):
-        m = await message.fetch()
-    else:
-        m = message
-
-    thread = await m.create_thread(name=name,
+    thread = await message.create_thread(name=name,
                     auto_archive_duration=archive,
                     slowmode_delay=slowmode)
 
@@ -430,14 +422,7 @@ async def dshell_get_thread(ctx: Message, message: Optional[Union[IntNode, StrNo
 
     _CMD = "gt"
 
-    if message is None:
-        message = ctx.id
-
-    target_message = utils_get_message(ctx, message)
-    if isinstance(target_message, PartialMessage):
-        message = await target_message.fetch()
-    else:
-        message = target_message
+    message = ctx if message is None else await utils_get_message(ctx, message)
 
     # Return None if message doesn't have thread attribute (not raising error for this case)
     if not hasattr(message, 'thread'):
@@ -460,24 +445,17 @@ async def dshell_delete_thread(ctx: Message,
 
     _CMD = "dt"
 
-    if thread is None:
-        thread = ctx.id
-
-    target_message = utils_get_message(ctx, thread)
-    if isinstance(target_message, PartialMessage):
-        thread = await target_message.fetch()
-    else:
-        thread = target_message
+    target_message = ctx if thread is None else await utils_get_message(ctx, thread)
 
     _validate_has_attribute(thread, 'thread', f"[{_CMD}] The specified message does not have a thread !")
     _validate_optional_string(reason, "reason", _CMD)
 
-    if thread.thread is None:
+    if target_message.thread is None:
         raise Exception("The specified message does not have a thread !")
 
-    await thread.thread.delete(reason=reason)
+    await target_message.thread.delete(reason=reason)
 
-    return IntNode(thread.thread.id)
+    return IntNode(target_message.thread.id)
 
 async def dshell_create_category(ctx: Message,
                                    name: StrNode,

{dshellinterpreter-1.2.0.8 → dshellinterpreter-1.2.0.9}/Dshell/DISCORD_COMMANDS/dshell_file.py

@@ -23,7 +23,7 @@ async def dshell_get_message_files(ctx: Message, message: Union[StrNode, IntNode
     :return:
     """
 
-    target_message = ctx if message is None else utils_get_message(ctx, message)
+    target_message = ctx if message is None else await utils_get_message(ctx, message)
 
     attachments_list: ListNode = ListNode([], bypass_limit_elt=True)
 

{dshellinterpreter-1.2.0.8 → dshellinterpreter-1.2.0.9}/Dshell/DISCORD_COMMANDS/dshell_message.py

@@ -1,3 +1,5 @@
+from pycordViews import EasyModifiedViews
+
 from Dshell.full_import import (Message,
                            PartialMessage,
                                 File)
@@ -124,7 +126,7 @@ async def dshell_respond_message(ctx: Message,
     _validate_required_bool(users_mentions, "Users mentions", _CMD)
     _validate_required_bool(reply_mention, "Reply mention", _CMD)
 
-    respond_message = ctx if message is None else utils_get_message(ctx, message)  # builds a reference to the message (even if it doesn't exist)
+    respond_message = ctx if message is None else await utils_get_message(ctx, message)  # builds a reference to the message (even if it doesn't exist)
     autorised_mentions = utils_autorised_mentions(global_mentions, everyone_mention, roles_mentions, users_mentions, reply_mention)
     mention_author = True if reply_mention else False
 
@@ -157,7 +159,7 @@ async def dshell_delete_message(ctx: Message,
     """
     _CMD = "dm"
 
-    delete_message = ctx if message is None else utils_get_message(ctx, message)
+    delete_message = ctx if message is None else await utils_get_message(ctx, message)
 
     _validate_optional_int(delay, "delay", _CMD)
     _validate_optional_string(reason, "reason", _CMD)
@@ -198,26 +200,33 @@ async def dshell_purge_message(ctx: Message,
 
 async def dshell_edit_message(ctx: Message,
                               message,
-                              new_content: Optional[StrNode]=None,
+                              content: Optional[StrNode]=None,
                               embeds: Optional[EmbedNode]=None,
-                              view=None,
-                              files: Optional[FileNode]=None) -> IntNode:
+                              view: Optional[EasyModifiedViews]=None,
+                              files: Optional[FileNode]=None,
+                              keep: BoolNode = BoolNode(1)) -> IntNode:
     """
     Edits a message
     """
     _CMD = "em"
 
-    edit_message = utils_get_message(ctx, message)
+    edit_message = await utils_get_message(ctx, message)
+    
 
     _validate_optional_embed(embeds, "embeds", _CMD)
     _validate_optional_view(view, "view", _CMD)
-    _validate_optional_string(new_content, "new_content", _CMD)
+    _validate_optional_string(content, "content", _CMD)
+    _validate_required_bool(keep, "keep", _CMD)
 
     final_files: Optional[list[File]] = utils_check_files_arguments(_CMD, files)
 
     embeds = utils_check_embeds_arguments(_CMD, embeds)
 
-    await edit_message.edit(content=new_content, embeds=embeds, view=view, files=final_files)
+    await edit_message.edit(content=content, 
+                            embeds=embeds, 
+                            view=view, 
+                            files=final_files, 
+                            attachments=edit_message.attachments if keep else [])
 
     return IntNode(edit_message.id)
 
@@ -226,7 +235,7 @@ async def dshell_add_reactions(ctx: Message, reactions: Union[StrNode, ListNode]
     Adds reactions to a message
     """
     _CMD = "ar"
-    message = ctx if message is None else utils_get_message(ctx, message)
+    message = ctx if message is None else await utils_get_message(ctx, message)
 
     if isinstance(reactions, StrNode):
         reactions = (reactions,)
@@ -243,7 +252,7 @@ async def dshell_remove_reactions(ctx: Message, reactions: Union[ListNode, StrNo
     Removes reactions from a message
     """
     _CMD = "rr"
-    message = ctx if message is None else utils_get_message(ctx, message)
+    message = ctx if message is None else await utils_get_message(ctx, message)
 
     if isinstance(reactions, StrNode):
         reactions = [reactions]
@@ -258,10 +267,7 @@ async def dshell_clear_message_reactions(ctx: Message, message: Optional[Union[I
     """
     Clear all reaction on the target message
     """
-    message = ctx if message is None else utils_get_message(ctx, message)
-
-    if message is None:
-        raise Exception(f'Message not found !')
+    message = ctx if message is None else await utils_get_message(ctx, message)
 
     await message.clear_reactions()
 
@@ -275,7 +281,7 @@ async def dshell_clear_one_reactions(ctx: Message, message: Union[IntNode, StrNo
     if not isinstance(emoji, StrNode):
         raise Exception(f'Emoji must be StrNode, not {type(emoji)}')
 
-    target_message = ctx if message is None else utils_get_message(ctx, message)
+    target_message = ctx if message is None else await utils_get_message(ctx, message)
 
     await target_message.clear_reaction(emoji)
 
@@ -286,7 +292,7 @@ async def dshell_pin_message(ctx: Message, message: Union[IntNode, StrNode]=None
     Pin a message
     """
 
-    target_message = ctx if message is None else utils_get_message(ctx, message)
+    target_message = ctx if message is None else await utils_get_message(ctx, message)
 
     await target_message.pin()
 
@@ -299,7 +305,7 @@ async def dshell_unpin_message(ctx: Message, message: Optional[Union[IntNode, St
 
     _CMD = "upinm"
 
-    target_message = ctx if message is None else utils_get_message(ctx, message)
+    target_message = ctx if message is None else await utils_get_message(ctx, message)
 
     _validate_optional_string(reason, "Reason", _CMD)
 
@@ -341,17 +347,9 @@ async def dshell_get_content_message(ctx: Message, message: Optional[Union[IntNo
     Get the content of a message
     """
 
-    target_message = ctx if message is None else utils_get_message(ctx, message)
-
-    if isinstance(target_message, PartialMessage):
-        try:
-            fetch_target_message = await target_message.fetch()
-        except:
-            raise Exception(f'Message not found !')
-    else:
-        fetch_target_message = target_message
+    target_message = ctx if message is None else await utils_get_message(ctx, message)
 
-    return StrNode(fetch_target_message.content)
+    return StrNode(target_message.content)
 
 
 async def dshell_get_author_id_message(ctx: Message, message: Optional[Union[IntNode, StrNode]] = None):
@@ -363,15 +361,7 @@ async def dshell_get_author_id_message(ctx: Message, message: Optional[Union[Int
     """
     _CMD = "gma"
 
-    target_message = ctx
-    if message is not None:
-        target_message = utils_get_message(ctx, message)
-
-        if isinstance(target_message, PartialMessage):
-            try:
-                target_message = await target_message.fetch()
-            except:
-                raise Exception(f"[message_author] Author ID message to get is not found !")
+    target_message = ctx if message is None else await utils_get_message(ctx, message)
 
     return IntNode(target_message.author.id)
 
@@ -383,7 +373,7 @@ async def dshell_get_message_link(ctx: Message, message: Union[IntNode, StrNode]
     :return:
     """
 
-    target_message = utils_get_message(ctx, message)
+    target_message = await utils_get_message(ctx, message)
 
     return StrNode(target_message.jump_url)
 
@@ -396,19 +386,11 @@ async def dshell_get_message_category_id(ctx: Message, message: Optional[Union[I
     """
     _CMD = "gmc"
 
-    target_message = ctx
-    if message is not None:
-        target_message = utils_get_message(ctx, message)
-
-        if isinstance(target_message, PartialMessage):
-            try:
-                target_message = await target_message.fetch()
-            except:
-                raise Exception(f"[category_message] Message ID to get is not found !")
+    target_message = ctx if message is None else await utils_get_message(ctx, message)
 
     return IntNode(target_message.channel.category.id) if target_message.channel.category is not None else IntNode(0)
 
-async def dshell_get_message_attachments(ctx: Message, message: Optional[Union[InterruptedError, StrNode]] = None):
+async def dshell_get_message_attachments(ctx: Message, message: Optional[Union[IntNode, StrNode]] = None):
     """
     Return the attachments of a message given its ID
     :param ctx:
@@ -419,15 +401,7 @@ async def dshell_get_message_attachments(ctx: Message, message: Optional[Union[I
 
     _validate_optional_int(message, "Message parameter", _CMD)
 
-    target_message = ctx
-    if message is not None:
-        target_message = utils_get_message(ctx, message)
-
-        if isinstance(target_message, PartialMessage):
-            try:
-                target_message = await target_message.fetch()
-            except:
-                raise Exception(f"[attachments_message] Message ID to get is not found !")
+    target_message = ctx if message is None else await utils_get_message(ctx, message)
 
     attachments = ListNode([])
 
@@ -447,7 +421,6 @@ async def dshell_get_channel_pined_messages(ctx: Message, channel: Optional[IntN
 
     pinned_messages = await channel_to_check.pins()
 
-
     messages_list = ListNode([])
 
     cached_messages = dshell_cached_messages.get()
@@ -468,15 +441,7 @@ async def dshell_is_message_system(ctx: Message, message: Optional[Union[IntNode
 
     _validate_optional_int(message, "Message parameter", _CMD)
 
-    target_message = ctx
-    if message is not None:
-        target_message = utils_get_message(ctx, message)
-
-        if isinstance(target_message, PartialMessage):
-            try:
-                target_message = await target_message.fetch()
-            except:
-                raise Exception(f"[is_system_message] Message ID to get is not found !")
+    target_message = ctx if message is None else await utils_get_message(ctx, message)
 
     return BoolNode(target_message.is_system())
 
@@ -506,8 +471,7 @@ async def dshell_scan_message(ctx: Message,
 
     target_channel = ctx.channel if channel is None else ctx.guild.get_channel(channel)
 
-    if target_channel is None:
-        raise Exception(f"Channel with ID {channel} not found in guild {ctx.guild.name}.")
+    _validate_not_none(target_channel, f"Channel {channel} not found in guild {ctx.guild.name} !")
 
     if regex is not None:
         try:

{dshellinterpreter-1.2.0.8 → dshellinterpreter-1.2.0.9}/Dshell/DISCORD_COMMANDS/utils/utils_message.py

@@ -2,7 +2,10 @@ from Dshell.full_import import (Message,
                             PartialMessage,
                             AllowedMentions,
                                 search,
-                                Optional)
+                                Optional,
+                                NotFound,
+                                Forbidden,
+                                HTTPException)
 
 from ...DshellInterpreteur.cached_messages import dshell_cached_messages
 from ...DshellParser.ast_nodes import StrNode, BoolNode, IntNode
@@ -12,7 +15,7 @@ from Dshell.full_import import Union
 from .utils_type_validation import (_validate_optional_bool,
                                     _validate_required_bool)
 
-def utils_get_message(ctx: Message, message: Union[IntNode, StrNode]) -> Union[PartialMessage, Message]:
+async def utils_get_message(ctx: Message, message: Union[IntNode, StrNode]) -> Message:
     """
     Récupère l'objet message Discord à partir d'un ID ou d'un lien.
     
@@ -42,7 +45,7 @@ def utils_get_message(ctx: Message, message: Union[IntNode, StrNode]) -> Union[P
         if message in cached_messages:
             return cached_messages[message]
 
-        cached_messages[message] = ctx.channel.get_partial_message(message)
+        cached_messages[message] = await utils_fetch_partial_message(ctx.channel.get_partial_message(message))
         dshell_cached_messages.set(cached_messages)
         return cached_messages[message]
 
@@ -60,13 +63,37 @@ def utils_get_message(ctx: Message, message: Union[IntNode, StrNode]) -> Union[P
         channel = ctx.guild.get_channel(channel_id)
         if channel is None:
             raise Exception(f"Channel with ID {channel_id} not found in guild {ctx.guild.name}.")
-        cached_messages[message_id] = channel.get_partial_message(message_id)
+        cached_messages[message_id] = await utils_fetch_partial_message(channel.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)} !")
 
 
+async def utils_fetch_partial_message(partial_message: Union[Message, PartialMessage]) -> Message:
+    """
+    Fetch le message et renvoie une instance de Message s'il existe
+    :param ctx:
+    :param partial_message:
+    :return:
+    """
+
+    if not isinstance(partial_message, PartialMessage):
+        if isinstance(partial_message, Message):
+            return partial_message
+        raise Exception(f"Expected a PartialMessage or Message, got '{type(partial_message)}' !")
+
+    try:
+        message = await partial_message.fetch()
+    except NotFound:
+        raise Exception(f"Message '{partial_message.id}' not found !")
+    except Forbidden:
+        raise Exception(f"I don't have the permission to fetch the message '{partial_message.id}' !")
+    except HTTPException:
+        raise Exception(f"An internal error occurred when i try to fetch the message '{partial_message.id}'. Please, contact the support if this problem persists !")
+    return message
+
+
 def utils_autorised_mentions(global_mentions: Optional[BoolNode] = None,
                             everyone_mention: BoolNode = BoolNode(1),
                             roles_mentions: BoolNode = BoolNode(1),

{dshellinterpreter-1.2.0.8/dshellInterpreter.egg-info → dshellinterpreter-1.2.0.9}/PKG-INFO

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

{dshellinterpreter-1.2.0.8 → dshellinterpreter-1.2.0.9/dshellInterpreter.egg-info}/PKG-INFO

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

{dshellinterpreter-1.2.0.8 → dshellinterpreter-1.2.0.9}/setup.py

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