dshellInterpreter 0.2.11__tar.gz → 0.2.13__tar.gz

{dshellinterpreter-0.2.11 → dshellinterpreter-0.2.13}/Dshell/DISCORD_COMMANDS/dshell_channel.py

@@ -103,22 +103,22 @@ async def dshell_create_text_channel(ctx: Message,
                                      slowmode=MISSING,
                                      topic=MISSING,
                                      nsfw=MISSING,
-                                     permission: dict[Union[Member, Role], PermissionOverwrite] = MISSING,
+                                     permissions: dict[Union[Member, Role], PermissionOverwrite] = MISSING,
                                      reason=None):
     """
     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)
@@ -129,7 +129,7 @@ async def dshell_create_text_channel(ctx: Message,
                                                           slowmode_delay=slowmode,
                                                           topic=topic,
                                                           nsfw=nsfw,
-                                                          overwrites=permission,
+                                                          overwrites=permissions,
                                                           reason=reason)
 
     return created_channel.id
@@ -140,15 +140,15 @@ async def dshell_create_voice_channel(ctx: Message,
                                       category=None,
                                       position=MISSING,
                                       bitrate=MISSING,
-                                      permission: dict[Union[Member, Role], PermissionOverwrite] = MISSING,
+                                      permissions: dict[Union[Member, Role], PermissionOverwrite] = MISSING,
                                       reason=None):
     """
     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)
@@ -157,7 +157,7 @@ async def dshell_create_voice_channel(ctx: Message,
                                                            category=channel_category,
                                                            position=position,
                                                            bitrate=bitrate,
-                                                           overwrites=permission,
+                                                           overwrites=permissions,
                                                            reason=reason)
 
     return created_channel.id
@@ -210,22 +210,22 @@ async def dshell_edit_text_channel(ctx: Message,
                                    slowmode=MISSING,
                                    topic=MISSING,
                                    nsfw=MISSING,
-                                   permission: dict[Union[Member, Role], PermissionOverwrite] = MISSING,
+                                   permissions: dict[Union[Member, Role], PermissionOverwrite] = MISSING,
                                    reason=None):
     """
     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)
@@ -238,7 +238,7 @@ async def dshell_edit_text_channel(ctx: Message,
                                slowmode_delay=slowmode if slowmode is not MISSING else channel_to_edit.slowmode_delay,
                                topic=topic if topic is not MISSING else channel_to_edit.topic,
                                nsfw=nsfw if nsfw is not MISSING else channel_to_edit.nsfw,
-                               overwrites=permission if permission is not MISSING else channel_to_edit.overwrites,
+                               overwrites=permissions if permissions is not MISSING else channel_to_edit.overwrites,
                                reason=reason)
 
     return channel_to_edit.id
@@ -249,15 +249,15 @@ async def dshell_edit_voice_channel(ctx: Message,
                                     name=None,
                                     position=MISSING,
                                     bitrate=MISSING,
-                                    permission: dict[Union[Member, Role], PermissionOverwrite] = MISSING,
+                                    permissions: dict[Union[Member, Role], PermissionOverwrite] = MISSING,
                                     reason=None):
     """
     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)
@@ -268,7 +268,7 @@ async def dshell_edit_voice_channel(ctx: Message,
     await channel_to_edit.edit(name=name if name is not None else channel_to_edit.name,
                                position=position if position is not MISSING else channel_to_edit.position,
                                bitrate=bitrate if bitrate is not MISSING else channel_to_edit.bitrate,
-                               overwrites=permission if permission is not MISSING else channel_to_edit.overwrites,
+                               overwrites=permissions if permissions is not MISSING else channel_to_edit.overwrites,
                                reason=reason)
 
     return channel_to_edit.id
@@ -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 !")

{dshellinterpreter-0.2.11 → dshellinterpreter-0.2.13}/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.11/dshellInterpreter.egg-info → dshellinterpreter-0.2.13}/PKG-INFO

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

{dshellinterpreter-0.2.11 → dshellinterpreter-0.2.13/dshellInterpreter.egg-info}/PKG-INFO

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

{dshellinterpreter-0.2.11 → dshellinterpreter-0.2.13}/setup.py

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