dshellInterpreter 0.2.9.3__py3-none-any.whl → 0.2.10__py3-none-any.whl

Dshell/DISCORD_COMMANDS/__init__.py

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

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)} !")

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.3.dist-info → dshellinterpreter-0.2.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 0.2.9.3
+Version: 0.2.10
 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.3.dist-info → dshellinterpreter-0.2.10.dist-info}/RECORD

@@ -1,11 +1,14 @@
 Dshell/__init__.py,sha256=pGd94FPy8kVXH_jH566HhApQPhbPfMPnZXzH_0dPWh0,93
 Dshell/_utils.py,sha256=PJ3fwn8IMqUMnW9oTwfr9v4--rzHIhhLQoVVqjwjoJU,23
-Dshell/DISCORD_COMMANDS/__init__.py,sha256=yQU0BPUEeGm6RuR96OSqNEBfw0B-Es51mukxSvY9KEc,171
+Dshell/DISCORD_COMMANDS/__init__.py,sha256=8JPQ-6-s8PkaacmOfQgyczUiLM6rUSceHEJ60oNSis0,173
 Dshell/DISCORD_COMMANDS/dshell_channel.py,sha256=__vRngQD0USGBuJIuvHQckrtbhbufn5etaqXgNS90IA,16124
 Dshell/DISCORD_COMMANDS/dshell_member.py,sha256=5Iw-2dydhYMZOw2nx0svZP9JpZWHOXC0qkL9tClJHtw,8840
 Dshell/DISCORD_COMMANDS/dshell_message.py,sha256=KoR5hLQiGdkmBjMUJvdItsGximA0mUJ2MmNGV_1-1b8,6942
 Dshell/DISCORD_COMMANDS/dshell_pastbin.py,sha256=TkWFGRRTvhhJgvwkDFx9Fz4UM2UUFwxyq0laMVx0mUk,881
 Dshell/DISCORD_COMMANDS/dshell_role.py,sha256=t_yRZRD0FKE2gT4dIDIsHz2PSZZztDVEkkqkG_OkNh4,5002
+Dshell/DISCORD_COMMANDS/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+Dshell/DISCORD_COMMANDS/utils/utils_message.py,sha256=Pn0ljyeCvRfY4tlWHrSbIsxSFZZ5J4lDaeVme3WHp9o,1239
+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=sYQ9qIVjRedwkfITEeVAFN0RdHjiY7RGO6z0j4D7eno,23072
 Dshell/_DshellParser/__init__.py,sha256=ONDfhZMvClqP_6tE8SLjp-cf3pXL-auQYnfYRrHZxC4,56
@@ -15,8 +18,8 @@ Dshell/_DshellTokenizer/__init__.py,sha256=LIQSRhDx2B9pmPx5ADMwwD0Xr9ybneVLhHH8q
 Dshell/_DshellTokenizer/dshell_keywords.py,sha256=yBTXKBCb7NZa-DGDeeyIZrl_CS1Y4WCmwshUdBHQhlo,5642
 Dshell/_DshellTokenizer/dshell_token_type.py,sha256=gYIb2XN2YcgeRgmar_rBDS5CGmwfmxihu8mOW_d6lbE,1533
 Dshell/_DshellTokenizer/dshell_tokenizer.py,sha256=LZGs4Ytuyx9Galazqtz32lS4Mmu9yZya1B7AzFQAQOk,7150
-dshellinterpreter-0.2.9.3.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
-dshellinterpreter-0.2.9.3.dist-info/METADATA,sha256=gjSAX_QOCyVUbZF32EtwsgH7rCloSrA2Z6SsLItCt9w,1122
-dshellinterpreter-0.2.9.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dshellinterpreter-0.2.9.3.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
-dshellinterpreter-0.2.9.3.dist-info/RECORD,,
+dshellinterpreter-0.2.10.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
+dshellinterpreter-0.2.10.dist-info/METADATA,sha256=3ksf5VcfE7VEKmYXh_8CuW4i0Vql2OvgRimERoe66bw,1121
+dshellinterpreter-0.2.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dshellinterpreter-0.2.10.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
+dshellinterpreter-0.2.10.dist-info/RECORD,,