dshellInterpreter 0.2.9.4__tar.gz → 0.2.10.1__tar.gz

{dshellinterpreter-0.2.9.4 → dshellinterpreter-0.2.10.1}/Dshell/DISCORD_COMMANDS/__init__.py

@@ -3,5 +3,4 @@ from .dshell_message import *
 from .dshell_member import *
 from .dshell_pastbin import *
 from .dshell_role import *
-from .utils.utils_thread import *
-from .utils.utils_message import *
+from .utils import *

{dshellinterpreter-0.2.9.4 → dshellinterpreter-0.2.10.1}/Dshell/DISCORD_COMMANDS/dshell_message.py

@@ -1,7 +1,8 @@
 from re import search
 
-from discord import Embed, Message, NotFound
+from discord import Embed, Message
 from discord.ext import commands
+from discord.abc import Messageable
 
 from .utils.utils_message import utils_get_message
 
@@ -71,8 +72,9 @@ async def dshell_respond_message(ctx: Message, message=None, content: str = None
     else:
         raise Exception(f'Embeds must be a list of Embed objects or a single Embed object, not {type(embeds)} !')
 
-    sended_message = await ctx.reply(reference=respond_message,
-                                     content=content,
+    sended_message = await Messageable.send(
+                                     content=str(content),
+                                     reference=respond_message,
                                      mention_author=mention_author,
                                      delete_after=delete,
                                      embeds=embeds)

dshellinterpreter-0.2.10.1/Dshell/DISCORD_COMMANDS/utils/utils_message.py

@@ -0,0 +1,28 @@
+from discord import Message, PartialMessage
+from typing import Union
+from re import search
+
+def utils_get_message(ctx: Message, message: Union[int, str]) -> 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}
+    """
+
+    if isinstance(message, int):
+        return ctx.channel.get_partial_message(message)
+
+    elif isinstance(message, str):
+        match = search(r'https://discord\.com/channels/(\d+)/(\d+)/(\d+)', message)
+        if not match:
+            raise Exception("Invalid message link format. Use a valid Discord message link.")
+        guild_id = int(match.group(1))
+        channel_id = int(match.group(2))
+        message_id = int(match.group(3))
+
+        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)
+
+    raise Exception(f"Message must be an integer or a string, not {type(message)} !")

dshellinterpreter-0.2.10.1/Dshell/DISCORD_COMMANDS/utils/utils_thread.py

@@ -0,0 +1,35 @@
+from discord import Message, Thread
+from discord.errors import NotFound
+
+from typing import Union
+from re import search
+
+
+async def utils_get_thread(ctx: Message, thread: Union[int, str]) -> Thread:
+    """
+    Returns the thread object of the specified thread ID or link.
+    Thread is only available in the same server as the command and in the same channel.
+    If the thread is a link, it must be in the format: https://discord.com/channels/{guild_id}/{channel_id}/{message_id}
+    """
+
+    if isinstance(thread, int):
+        return ctx.channel.get_thread(thread)
+
+    elif isinstance(thread, str):
+        match = search(r'https://discord\.com/channels/(\d+)/(\d+)(/\d+)?', thread)
+        if not match:
+            raise Exception("Invalid thread link format. Use a valid Discord thread link.")
+        guild_id = int(match.group(1))
+        message_id = int(match.group(2))
+        channel_id = ctx.channel.id if len(match.groups()) == 3 else ctx.channel.id
+
+        if guild_id != ctx.guild.id:
+            raise Exception("The thread must be from the same server as the command !")
+
+        try:
+            c = await ctx.guild.get_channel(channel_id).fetch_message(message_id)
+            return c.thread
+        except NotFound:
+            raise Exception(f"Thread with ID {message_id} not found in channel {channel_id} !")
+
+    raise Exception(f"Thread must be an integer or a string, not {type(thread)} !")

{dshellinterpreter-0.2.9.4/dshellInterpreter.egg-info → dshellinterpreter-0.2.10.1}/PKG-INFO

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

{dshellinterpreter-0.2.9.4 → dshellinterpreter-0.2.10.1/dshellInterpreter.egg-info}/PKG-INFO

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

{dshellinterpreter-0.2.9.4 → dshellinterpreter-0.2.10.1}/dshellInterpreter.egg-info/SOURCES.txt

@@ -9,6 +9,9 @@ Dshell/DISCORD_COMMANDS/dshell_member.py
 Dshell/DISCORD_COMMANDS/dshell_message.py
 Dshell/DISCORD_COMMANDS/dshell_pastbin.py
 Dshell/DISCORD_COMMANDS/dshell_role.py
+Dshell/DISCORD_COMMANDS/utils/__init__.py
+Dshell/DISCORD_COMMANDS/utils/utils_message.py
+Dshell/DISCORD_COMMANDS/utils/utils_thread.py
 Dshell/_DshellInterpreteur/__init__.py
 Dshell/_DshellInterpreteur/dshell_interpreter.py
 Dshell/_DshellParser/__init__.py

{dshellinterpreter-0.2.9.4 → dshellinterpreter-0.2.10.1}/setup.py

@@ -5,15 +5,19 @@ with open("README.md", "r") as fh:
 
 setup(
     name="dshellInterpreter",
-    version="0.2.9.4",
+    version="0.2.10.1",
     author="Chronos",
     author_email="vagabonwalybi@gmail.com",
     description="A Discord bot interpreter for creating custom commands and automations.",
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/BOXERRMD/Dshell_Interpreter",
-    packages=["Dshell", "Dshell._DshellInterpreteur", "Dshell._DshellTokenizer", "Dshell._DshellParser",
-              "Dshell.DISCORD_COMMANDS"],
+    packages=["Dshell",
+              "Dshell._DshellInterpreteur",
+              "Dshell._DshellTokenizer",
+              "Dshell._DshellParser",
+              "Dshell.DISCORD_COMMANDS",
+              "Dshell.DISCORD_COMMANDS.utils"],
     install_requires=["py-cord==2.6.1", "requests"],
     classifiers=[
         "Programming Language :: Python :: 3",