dshellInterpreter 0.2.18.2__py3-none-any.whl → 0.2.18.4__py3-none-any.whl

Dshell/DISCORD_COMMANDS/dshell_channel.py

@@ -215,6 +215,8 @@ async def dshell_edit_text_channel(ctx: Message,
     """
     Edits a text channel on the server
     """
+    if name is not None and not isinstance(name, str):
+        raise Exception(f"Name must be a string, not {type(name)} !")
 
     if not isinstance(position, (_MissingSentinel, int)):
         raise Exception(f"Position must be an integer, not {type(position)} !")

Dshell/DISCORD_COMMANDS/utils/utils_string.py

@@ -138,7 +138,7 @@ async def utils_regex_sub(ctx: Message, regex: str, replace: str, content: str =
 
     return sub(regex, replace, content if content is not None else ctx.content)
 
-async def utils_regex_search(ctx: Message, regex: str, content: str = None) -> bool:
+async def utils_regex_search(ctx: Message, regex: str, content: str = None) -> str:
     """
     Search for a regex in a string.
     :param regex:
@@ -152,4 +152,6 @@ async def utils_regex_search(ctx: Message, regex: str, content: str = None) -> b
     if content is not None and not isinstance(content, str):
         raise Exception(f"Content must be a string, not {type(content)}!")
 
-    return bool(search(regex, content if content is not None else ctx.content))
+    result = search(regex, content if content is not None else ctx.content)
+
+    return result.group() if result else ''

Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -382,6 +382,7 @@ def regroupe_commandes(body: list[Token], interpreter: DshellInterpreteur, norma
     n = len(body)
     list_tokens: list[dict] = [tokens]
 
+    tokens_valide = (DTT.IDENT, DTT.COMMAND)
     i = 0
     while i < n:
 
@@ -389,7 +390,7 @@ def regroupe_commandes(body: list[Token], interpreter: DshellInterpreteur, norma
             body[i].value = body[i].value.lower()
 
         if body[i].type == DTT.SEPARATOR and body[
-            i + 1].type == DTT.IDENT:  # Check if it's a separator and if the next token is an IDENT
+            i + 1].type in tokens_valide:  # Check if it's a separator and if the next token is an IDENT
             current_arg = body[i + 1].value  # change the current argument. It will be impossible to return to '*'
             tokens[current_arg] = ''  # create a key/value pair for it
             i += 2  # skip the IDENT after the separator since it has just been processed
@@ -406,7 +407,7 @@ def regroupe_commandes(body: list[Token], interpreter: DshellInterpreteur, norma
 
         elif (body[i].type == DTT.SEPARATOR and
               (body[i + 1].type == DTT.MATHS_OPERATOR and body[i + 1].value == '*') and
-              body[i + 2].type == DTT.IDENT and
+              body[i + 2].type in tokens_valide and
               body[i + 3].type == DTT.ENGLOBE_SEPARATOR):
             current_arg = body[i + 2].value  # change the current argument
             tokens['--*'][current_arg] = body[i + 3].value

{dshellinterpreter-0.2.18.2.dist-info → dshellinterpreter-0.2.18.4.dist-info}/METADATA

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

{dshellinterpreter-0.2.18.2.dist-info → dshellinterpreter-0.2.18.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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=PDXpxrRRWPSucdp_3ITJk0Ur3coneRJKWEl2i7GZ2EM,15696
+Dshell/DISCORD_COMMANDS/dshell_channel.py,sha256=XK7ZcM4HVIUU6UZSDVhmBE6oLhcG9cEcCTrKpPzy_0s,15823
 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=SI8w3tuVGNsNa4OW9h08POjhmHjUVpSUAi_0a4XBAF4,9095
@@ -13,10 +13,10 @@ Dshell/DISCORD_COMMANDS/utils/utils_list.py,sha256=zqImMWvD-1UnbPP1TZewnvZpq7qs1
 Dshell/DISCORD_COMMANDS/utils/utils_member.py,sha256=1EoHooxwijc7AFJGnuae3ccjQk0x69MELtZ5ES5abLY,1165
 Dshell/DISCORD_COMMANDS/utils/utils_message.py,sha256=cQvJ15f49ddOjybARwkJKNFe3ITYQciF-pZHERFPkr0,2964
 Dshell/DISCORD_COMMANDS/utils/utils_permissions.py,sha256=Gi6vpCA2yXUZ20OCay5dkX6HeN4LglVROwcvTWVCsKg,3600
-Dshell/DISCORD_COMMANDS/utils/utils_string.py,sha256=WyTJJXjHwxs_76PKclRErjK8b6CFYpZhbZbAlr259HA,4667
+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=jl_gH8MoqerW--I-IHXwUZTo80JOtfr7AOA57xVgeGQ,58
-Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=wX7P7MwJ0O6I5mZ5FJG7qoH8qfObGuxPUVjerhRPYtM,29559
+Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=WrYwJHXv3e7dbWOqsTW3ATjl62Ct2Ly_TKCg1LhJ03s,29613
 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=RLlylX9bvbJEG3BDMGS4mnMxU8ufnZYIF59NVf_pW7A,18883
@@ -25,8 +25,8 @@ Dshell/_DshellTokenizer/__init__.py,sha256=LIQSRhDx2B9pmPx5ADMwwD0Xr9ybneVLhHH8q
 Dshell/_DshellTokenizer/dshell_keywords.py,sha256=TI5O6y6gAXpM_dKxCW9Fk0H8VR-gmyxxKKOURgcHsCg,7219
 Dshell/_DshellTokenizer/dshell_token_type.py,sha256=gYIb2XN2YcgeRgmar_rBDS5CGmwfmxihu8mOW_d6lbE,1533
 Dshell/_DshellTokenizer/dshell_tokenizer.py,sha256=AJnUocD6hbU6wvjRAN5uDha5QQieTwXlHzZVtgRGaZQ,7307
-dshellinterpreter-0.2.18.2.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
-dshellinterpreter-0.2.18.2.dist-info/METADATA,sha256=RreI25MxGVAKwnPuaJvVoVcW4rViZWfjf01XJbkwnbU,1151
-dshellinterpreter-0.2.18.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dshellinterpreter-0.2.18.2.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
-dshellinterpreter-0.2.18.2.dist-info/RECORD,,
+dshellinterpreter-0.2.18.4.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
+dshellinterpreter-0.2.18.4.dist-info/METADATA,sha256=ok2SM1_HGv_uDUkA5MCxs_nb8v_pV6G6G4yUiv6joOA,1151
+dshellinterpreter-0.2.18.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dshellinterpreter-0.2.18.4.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
+dshellinterpreter-0.2.18.4.dist-info/RECORD,,