dshellInterpreter 0.2.19.4__tar.gz → 0.2.19.5__tar.gz

{dshellinterpreter-0.2.19.4 → dshellinterpreter-0.2.19.5}/Dshell/DISCORD_COMMANDS/dshell_channel.py

@@ -2,7 +2,7 @@ from asyncio import sleep
 from re import search
 from typing import Union
 
-from discord import MISSING, PermissionOverwrite, Member, Role, Message, CategoryChannel
+from discord import MISSING, PermissionOverwrite, Member, Role, Message, CategoryChannel, PartialMessage
 from discord.utils import _MissingSentinel
 
 from .utils.utils_message import utils_get_message
@@ -320,7 +320,11 @@ 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 !")
 
-    m = await message.fetch()
+    if isinstance(message, PartialMessage):
+        m = await message.fetch()
+    else:
+        m = message
+
     thread = await m.create_thread(name=name,
                     auto_archive_duration=archive,
                     slowmode_delay=slowmode)
@@ -372,7 +376,11 @@ async def dshell_get_thread(ctx: Message, message: Union[int, str] = None):
     if message is None:
         message = ctx.id
 
-    message = await utils_get_message(ctx, message).fetch()
+    target_message = utils_get_message(ctx, message)
+    if isinstance(target_message, PartialMessage):
+        message = await target_message.fetch()
+    else:
+        message = target_message
 
     if not hasattr(message, 'thread'):
         return None
@@ -393,7 +401,11 @@ async def dshell_delete_thread(ctx: Message, thread: Union[int, str] = None, rea
     if thread is None:
         thread = ctx.id
 
-    thread = await utils_get_message(ctx, thread).fetch()
+    target_message = utils_get_message(ctx, thread)
+    if isinstance(target_message, PartialMessage):
+        thread = await target_message.fetch()
+    else:
+        thread = target_message
 
     if not hasattr(thread, 'thread'):
         raise Exception("The specified message does not have a thread !")

{dshellinterpreter-0.2.19.4 → dshellinterpreter-0.2.19.5}/Dshell/DISCORD_COMMANDS/dshell_message.py

@@ -1,6 +1,6 @@
 from re import search
 
-from discord import Embed, Message
+from discord import Embed, Message, PartialMessage
 from discord.ext import commands
 
 from pycordViews import EasyModifiedViews
@@ -258,10 +258,13 @@ async def dshell_get_content_message(ctx: Message, message=None):
 
     target_message = ctx if message is None else utils_get_message(ctx, message)
 
-    try:
-        fetch_target_message = await target_message.fetch()
-    except:
-        raise Exception(f'Message not found !')
+    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
 
     return fetch_target_message.content
 

{dshellinterpreter-0.2.19.4 → dshellinterpreter-0.2.19.5}/Dshell/DISCORD_COMMANDS/utils/utils_message.py

@@ -4,7 +4,7 @@ from re import search
 
 from ..._DshellInterpreteur.cached_messages import dshell_cached_messages
 
-def utils_get_message(ctx: Message, message: Union[int, str]) -> Union[PartialMessage]:
+def utils_get_message(ctx: Message, message: Union[int, str]) -> Union[PartialMessage, Message]:
     """
     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.
@@ -89,8 +89,14 @@ async def utils_get_author_id_message(ctx: Message, message: Optional[int] = Non
 
     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 !")
+        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 !")
+        else:
+            target_message = ctx
+
     return target_message.author.id

{dshellinterpreter-0.2.19.4/dshellInterpreter.egg-info → dshellinterpreter-0.2.19.5}/PKG-INFO

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

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

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