dshellInterpreter 0.2.19.3__py3-none-any.whl → 0.2.19.5__py3-none-any.whl

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

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
 

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

Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -208,8 +208,6 @@ 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.3.dist-info → dshellinterpreter-0.2.19.5.dist-info}/METADATA

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

@@ -1,23 +1,23 @@
 Dshell/__init__.py,sha256=gEgfeYoyHn4bUepMd0F-MSx36rR8WgQGxNpgDKo2qbA,136
 Dshell/_utils.py,sha256=PJ3fwn8IMqUMnW9oTwfr9v4--rzHIhhLQoVVqjwjoJU,23
 Dshell/DISCORD_COMMANDS/__init__.py,sha256=87-YpGU74m-m7AqUQni7PGbw73JRlioQkywW_61Whms,208
-Dshell/DISCORD_COMMANDS/dshell_channel.py,sha256=Dy2RnoGzxZGNFvD6QErP74NdVXtfgu55w2ARJEmuUGI,18695
+Dshell/DISCORD_COMMANDS/dshell_channel.py,sha256=d3eqGZb-gITc-1GIjs1YJmNSDl7p7tCQhwPWjDAlHtk,19069
 Dshell/DISCORD_COMMANDS/dshell_interaction.py,sha256=5FA8JZ2_v98ZzOZl6EKyjo_fUQC7FuK6C6hij6ZSP30,3495
 Dshell/DISCORD_COMMANDS/dshell_member.py,sha256=5Iw-2dydhYMZOw2nx0svZP9JpZWHOXC0qkL9tClJHtw,8840
-Dshell/DISCORD_COMMANDS/dshell_message.py,sha256=1fRbHduh44ovxjulFGepRqS9YBHAFvj_QovQL0NDt6E,9426
+Dshell/DISCORD_COMMANDS/dshell_message.py,sha256=54QmduZooXm8GJ9bzb2kkHPgcFzFeVUeBXy-zoJuuH0,9568
 Dshell/DISCORD_COMMANDS/dshell_pastbin.py,sha256=H0tUJOwdzYBXvxqipK3mzoNZUKrSLcVm4EZlWbBRScs,796
 Dshell/DISCORD_COMMANDS/dshell_role.py,sha256=t_yRZRD0FKE2gT4dIDIsHz2PSZZztDVEkkqkG_OkNh4,5002
 Dshell/DISCORD_COMMANDS/utils/__init__.py,sha256=X5F-fFCXD8Y7sia0b2q-7Fr1-MJj-aL5EupT-bAejzc,234
 Dshell/DISCORD_COMMANDS/utils/utils_global.py,sha256=G_gH9iF6roT-0QR2FUZj6_P1ADr06JrxZgELOy9yIP8,4768
 Dshell/DISCORD_COMMANDS/utils/utils_list.py,sha256=zqImMWvD-1UnbPP1TZewnvZpq7qs1sOTT1YhbJ5I8h8,3160
 Dshell/DISCORD_COMMANDS/utils/utils_member.py,sha256=1EoHooxwijc7AFJGnuae3ccjQk0x69MELtZ5ES5abLY,1165
-Dshell/DISCORD_COMMANDS/utils/utils_message.py,sha256=IPSjvEvJ_8UY3PfAVMlgj6AJthLCRfpZRL1aV8D7SrU,4139
+Dshell/DISCORD_COMMANDS/utils/utils_message.py,sha256=OZEsil6yG-PYT4vHFCjTWa3gziwDE-vFfPny4Us3Nb0,4314
 Dshell/DISCORD_COMMANDS/utils/utils_permissions.py,sha256=wBtdKRLkNSgKgfu7tURdiehdcO-npXUvnVx9D82HudM,3593
 Dshell/DISCORD_COMMANDS/utils/utils_string.py,sha256=2LvJG_PR_VkPdnsw0vKNTwhEQGNog-3gFd_rZIUpGKc,4709
 Dshell/DISCORD_COMMANDS/utils/utils_thread.py,sha256=tVl4msEwrWHY-0AytI6eY3JSs-eIFUigDSJfK9mT1ww,1457
 Dshell/_DshellInterpreteur/__init__.py,sha256=87b2ljRcSbs2Wbebn72eAiOGTF5ye6qud5w3cP4sCgk,111
 Dshell/_DshellInterpreteur/cached_messages.py,sha256=BJuITd--iITD95MMuwCWVo2HPPlolIZ5FZVSLkTLVD4,156
-Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=B0MUD1v1NPjq5-acR3OG9QZt9J3zmk8vmPw836JT7jY,30848
+Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=VwaBOx_rV1PMEYzkRPl62ZYbd-6Nk6_oCvdoKnYblXM,30806
 Dshell/_DshellInterpreteur/errors.py,sha256=0PJz_VYZfNZeKR_PEHxw3tRkgKNNUerV0wwrq2r1luA,250
 Dshell/_DshellParser/__init__.py,sha256=ONDfhZMvClqP_6tE8SLjp-cf3pXL-auQYnfYRrHZxC4,56
 Dshell/_DshellParser/ast_nodes.py,sha256=vsY_-uGqbB03Bi556QnRM98kx6oOeJFMe9TaAX2Zcz0,19627
@@ -26,8 +26,8 @@ Dshell/_DshellTokenizer/__init__.py,sha256=LIQSRhDx2B9pmPx5ADMwwD0Xr9ybneVLhHH8q
 Dshell/_DshellTokenizer/dshell_keywords.py,sha256=jPNUVJ4egBVQ3yMx0Tv0fOS3WHwPJA4XbB4OUy-5uCg,6266
 Dshell/_DshellTokenizer/dshell_token_type.py,sha256=bkug7eBKjYofkOGmwzPnAH9rQlU14cO0PelZbT0kGoQ,1544
 Dshell/_DshellTokenizer/dshell_tokenizer.py,sha256=aSXdzEyhqoYYLpMLsLwRpeQPp84PA1F5cjm9O1EYBQs,7350
-dshellinterpreter-0.2.19.3.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
-dshellinterpreter-0.2.19.3.dist-info/METADATA,sha256=IHENtj1cHWzGUm8SK8PpJE1C4djGOGDRCeUdr3yOyWQ,1151
-dshellinterpreter-0.2.19.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dshellinterpreter-0.2.19.3.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
-dshellinterpreter-0.2.19.3.dist-info/RECORD,,
+dshellinterpreter-0.2.19.5.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
+dshellinterpreter-0.2.19.5.dist-info/METADATA,sha256=g9RE3IiveerLDkEfNC6Y988oMDfLLQp4Q-4dfOA1qo8,1151
+dshellinterpreter-0.2.19.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dshellinterpreter-0.2.19.5.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
+dshellinterpreter-0.2.19.5.dist-info/RECORD,,