dshellInterpreter 0.2.10.6__py3-none-any.whl → 0.2.12__py3-none-any.whl

Dshell/DISCORD_COMMANDS/dshell_channel.py

@@ -109,16 +109,16 @@ async def dshell_create_text_channel(ctx: Message,
     Creates a text channel on the server
     """
 
-    if not isinstance(position, _MissingSentinel) and not isinstance(position, int):
+    if not isinstance(position, (_MissingSentinel, int)):
         raise Exception(f"Position must be an integer, not {type(position)} !")
 
-    if not isinstance(slowmode, _MissingSentinel) and not isinstance(slowmode, int):
+    if not isinstance(slowmode, (_MissingSentinel, int)):
         raise Exception(f"Slowmode must be an integer, not {type(slowmode)} !")
 
-    if not isinstance(topic, _MissingSentinel) and not isinstance(topic, str):
+    if not isinstance(topic, (_MissingSentinel, str)):
         raise Exception(f"Topic must be a string, not {type(topic)} !")
 
-    if not isinstance(nsfw, _MissingSentinel) and not isinstance(nsfw, bool):
+    if not isinstance(nsfw, (_MissingSentinel, bool)):
         raise Exception(f"NSFW must be a boolean, not {type(nsfw)} !")
 
     channel_category = ctx.channel.category if category is None else ctx.channel.guild.get_channel(category)
@@ -145,10 +145,10 @@ async def dshell_create_voice_channel(ctx: Message,
     """
     Creates a voice channel on the server
     """
-    if not isinstance(position, _MissingSentinel) and not isinstance(position, int):
+    if not isinstance(position, (_MissingSentinel, int)):
         raise Exception(f"Position must be an integer, not {type(position)} !")
 
-    if not isinstance(bitrate, _MissingSentinel) and not isinstance(bitrate, int):
+    if not isinstance(bitrate, (_MissingSentinel, int)):
         raise Exception(f"Bitrate must be an integer, not {type(bitrate)} !")
 
     channel_category = ctx.channel.category if category is None else ctx.channel.guild.get_channel(category)
@@ -216,16 +216,16 @@ async def dshell_edit_text_channel(ctx: Message,
     Edits a text channel on the server
     """
 
-    if not isinstance(position, _MissingSentinel) and not isinstance(position, int):
+    if not isinstance(position, (_MissingSentinel, int)):
         raise Exception(f"Position must be an integer, not {type(position)} !")
 
-    if not isinstance(slowmode, _MissingSentinel) and not isinstance(slowmode, int):
+    if not isinstance(slowmode, (_MissingSentinel, int)):
         raise Exception(f"Slowmode must be an integer, not {type(slowmode)} !")
 
-    if not isinstance(topic, _MissingSentinel) and not isinstance(topic, str):
+    if not isinstance(topic, (_MissingSentinel, str)):
         raise Exception(f"Topic must be a string, not {type(topic)} !")
 
-    if not isinstance(nsfw, _MissingSentinel) and not isinstance(nsfw, bool):
+    if not isinstance(nsfw, (_MissingSentinel, bool)):
         raise Exception(f"NSFW must be a boolean, not {type(nsfw)} !")
 
     channel_to_edit = ctx.channel if channel is None else ctx.channel.guild.get_channel(channel)
@@ -254,10 +254,10 @@ async def dshell_edit_voice_channel(ctx: Message,
     """
     Edits a voice channel on the server
     """
-    if not isinstance(position, _MissingSentinel) and not isinstance(position, int):
+    if not isinstance(position, (_MissingSentinel, int)):
         raise Exception(f"Position must be an integer, not {type(position)} !")
 
-    if not isinstance(bitrate, _MissingSentinel) and not isinstance(bitrate, int):
+    if not isinstance(bitrate, (_MissingSentinel, int)):
         raise Exception(f"Bitrate must be an integer, not {type(bitrate)} !")
 
     channel_to_edit = ctx.channel if channel is None else ctx.channel.guild.get_channel(channel)
@@ -292,19 +292,19 @@ async def dshell_create_thread_message(ctx: Message,
     if not isinstance(name, str):
         raise Exception(f"Name must be a string, not {type(name)} !")
 
-    if not isinstance(archive, _MissingSentinel) and not isinstance(archive, int):
+    if not isinstance(archive, (_MissingSentinel, int)):
         raise Exception(f"Auto archive duration must be an integer, not {type(archive)} !")
 
     if not isinstance(archive, _MissingSentinel) and archive not in (60, 1440, 4320, 10080):
         raise Exception("Auto archive duration must be one of the following values: 60, 1440, 4320, 10080 !")
 
-    if not isinstance(slowmode, _MissingSentinel) and not isinstance(slowmode, int):
+    if not isinstance(slowmode, (_MissingSentinel, int)):
         raise Exception(f"Slowmode delay must be an integer, not {type(slowmode)} !")
 
     if not isinstance(slowmode, _MissingSentinel) and slowmode < 0:
         raise Exception("Slowmode delay must be a positive integer !")
 
-    thread = await message.create_thread(name=name,
+    thread = await message.fetch().create_thread(name=name,
                                          auto_archive_duration=archive,
                                          slowmode_delay=slowmode)
 
@@ -326,16 +326,16 @@ async def dshell_edit_thread(ctx: Message,
 
     thread = await utils_get_thread(ctx, thread)
 
-    if not isinstance(name, _MissingSentinel) and not isinstance(name, str):
+    if not isinstance(name, (_MissingSentinel, str)):
         raise Exception(f"Name must be a string, not {type(name)} !")
 
-    if not isinstance(archive, _MissingSentinel) and not isinstance(archive, int):
+    if not isinstance(archive, (_MissingSentinel, int)):
         raise Exception(f"Auto archive duration must be an integer, not {type(archive)} !")
 
     if not isinstance(archive, _MissingSentinel) and archive not in (60, 1440, 4320, 10080):
         raise Exception("Auto archive duration must be one of the following values: 60, 1440, 4320, 10080 !")
 
-    if not isinstance(slowmode, _MissingSentinel) and not isinstance(slowmode, int):
+    if not isinstance(slowmode, (_MissingSentinel, int)):
         raise Exception(f"Slowmode delay must be an integer, not {type(slowmode)} !")
 
     if not isinstance(slowmode, _MissingSentinel) and slowmode < 0:
@@ -355,7 +355,7 @@ 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)
+    message = await utils_get_message(ctx, message).fetch()
 
     if not hasattr(message, 'thread'):
         return None
@@ -376,7 +376,7 @@ 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)
+    thread = await utils_get_message(ctx, thread).fetch()
 
     if not hasattr(thread, 'thread'):
         raise Exception("The specified message does not have a thread !")

Dshell/DISCORD_COMMANDS/dshell_message.py

@@ -25,7 +25,7 @@ async def dshell_send_message(ctx: Message, message=None, delete=None, channel=N
     """
     Sends a message on Discord
     """
-    return -1
+
     if delete is not None and not isinstance(delete, (int, float)):
         raise Exception(f'Delete parameter must be a number (seconds) or None, not {type(delete)} !')
 

Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -338,6 +338,7 @@ def regroupe_commandes(body: list[Token], interpreter: DshellInterpreteur) -> li
                     type_=DTT.SEPARATOR, value=body[i].value, position=body[i].position)
                 ] + body[i + 1:], interpreter
             )  # add a sub-dictionary for sub-commands
+            i += len(body[i:])
             # return list_tokens
 
         elif (body[i].type == DTT.SEPARATOR and

{dshellinterpreter-0.2.10.6.dist-info → dshellinterpreter-0.2.12.dist-info}/METADATA

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

{dshellinterpreter-0.2.10.6.dist-info → dshellinterpreter-0.2.12.dist-info}/RECORD

@@ -1,16 +1,16 @@
 Dshell/__init__.py,sha256=pGd94FPy8kVXH_jH566HhApQPhbPfMPnZXzH_0dPWh0,93
 Dshell/_utils.py,sha256=PJ3fwn8IMqUMnW9oTwfr9v4--rzHIhhLQoVVqjwjoJU,23
 Dshell/DISCORD_COMMANDS/__init__.py,sha256=8JPQ-6-s8PkaacmOfQgyczUiLM6rUSceHEJ60oNSis0,173
-Dshell/DISCORD_COMMANDS/dshell_channel.py,sha256=__vRngQD0USGBuJIuvHQckrtbhbufn5etaqXgNS90IA,16124
+Dshell/DISCORD_COMMANDS/dshell_channel.py,sha256=BTZIouT_481UdQVB5XGzVSU1P6K49ZCHQEMG8hwS8eA,15711
 Dshell/DISCORD_COMMANDS/dshell_member.py,sha256=5Iw-2dydhYMZOw2nx0svZP9JpZWHOXC0qkL9tClJHtw,8840
-Dshell/DISCORD_COMMANDS/dshell_message.py,sha256=9ITf4GkcE_OvE4kFnwsDaQ7OxDlqOHmD7f2xQ-PrJ2Q,6975
+Dshell/DISCORD_COMMANDS/dshell_message.py,sha256=GipL24mP6iWnzfp6bNoXnn_ULJFbjrnpl-ROyAN2TAQ,6962
 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=euHuRbj-kTCBd4yUyx5kV2el5UQfuXZ50IwxeAMHhGE,23163
+Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=PF3pyDdRCSJDMtnBfCKVYeWRbHRdkJYlJOtb_JoUghQ,23195
 Dshell/_DshellParser/__init__.py,sha256=ONDfhZMvClqP_6tE8SLjp-cf3pXL-auQYnfYRrHZxC4,56
 Dshell/_DshellParser/ast_nodes.py,sha256=heOMQzAchQ8UroQaMSfU_6SYEXw-nme0jGcoVkCXPUs,15284
 Dshell/_DshellParser/dshell_parser.py,sha256=RxS5GgmTel10pH9HII0X_8XZnVyIQGd9ThZZcZDpEqc,15545
@@ -18,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.10.6.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
-dshellinterpreter-0.2.10.6.dist-info/METADATA,sha256=P6fV9zHl7oChQs1yb2Yy8BOIanUcjZcxjHAsyWb29yc,1123
-dshellinterpreter-0.2.10.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dshellinterpreter-0.2.10.6.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
-dshellinterpreter-0.2.10.6.dist-info/RECORD,,
+dshellinterpreter-0.2.12.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
+dshellinterpreter-0.2.12.dist-info/METADATA,sha256=q5NC1nXj1L8XtgcujDD6NbG-FvU5c1JtIX8J3dec9pc,1121
+dshellinterpreter-0.2.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dshellinterpreter-0.2.12.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
+dshellinterpreter-0.2.12.dist-info/RECORD,,