dshellInterpreter 0.2.18.0__py3-none-any.whl → 0.2.18.1__py3-none-any.whl

Dshell/DISCORD_COMMANDS/dshell_message.py

@@ -14,12 +14,12 @@ __all__ = [
     'dshell_delete_message',
     'dshell_purge_message',
     'dshell_edit_message',
-    'dshell_get_hystory_messages',
-    'dshell_research_regex_in_content',
+    'dshell_get_history_messages',
     'dshell_add_reactions',
     'dshell_remove_reactions',
     'dshell_clear_message_reactions',
-    'dshell_clear_one_reactions'
+    'dshell_clear_one_reactions',
+    'dshell_get_content_message'
 ]
 
 
@@ -167,7 +167,7 @@ async def dshell_edit_message(ctx: Message, message, new_content=None, embeds=No
     return edit_message.id
 
 
-async def dshell_get_hystory_messages(ctx: Message, channel=None, limit=None) -> "ListNode":
+async def dshell_get_history_messages(ctx: Message, channel=None, limit=None) -> "ListNode":
     """
     Searches for messages matching a regex in a channel
     """
@@ -184,7 +184,7 @@ async def dshell_get_hystory_messages(ctx: Message, channel=None, limit=None) ->
 
     messages = ListNode([])
     async for message in search_channel.history(limit=limit):
-        messages.add(message)
+        messages.add(message.id)
 
     if not messages:
         raise commands.CommandError(f"No messages in {search_channel.mention}.")
@@ -192,19 +192,6 @@ async def dshell_get_hystory_messages(ctx: Message, channel=None, limit=None) ->
     return messages
 
 
-async def dshell_research_regex_in_content(ctx: Message, regex, content=None):
-    """
-    Searches for a regex in a specific message content
-    """
-
-    if not isinstance(regex, str):
-        raise Exception(f"Regex must be a string, not {type(regex)}!")
-
-    if not search(regex, str(content) if content is not None else ctx.content):
-        return False
-
-    return True
-
 
 async def dshell_add_reactions(ctx: Message, reactions, message=None):
     """
@@ -257,3 +244,14 @@ async def dshell_clear_one_reactions(ctx: Message, message, emoji):
     target_message = ctx if message is None else utils_get_message(ctx, message)
 
     await target_message.clear_reaction(emoji)
+
+async def dshell_get_content_message(ctx: Message, message=None):
+    """
+    Get the content of a message
+    """
+
+    target_message = ctx if message is None else utils_get_message(ctx, message)
+
+    return target_message.content
+
+

Dshell/DISCORD_COMMANDS/utils/utils_string.py

@@ -4,10 +4,14 @@ __all__ = [
     "utils_lower_string",
     "utils_title_string",
     "utils_strip_string",
-    "utils_replace_string"
+    "utils_replace_string",
+    "utils_regex_findall",
+    "utils_regex_sub",
+    "utils_regex_search"
 ]
 
 from discord import Message
+from re import search, findall, sub
 
 async def utils_split_string(ctx: Message, value: str, separator: str = ' ') -> "ListNode":
     """
@@ -93,4 +97,59 @@ async def utils_replace_string(ctx: Message, value: str, old: str, new: str) ->
     if not isinstance(new, str):
         raise TypeError(f"new must be a str in replace command, not {type(new)}")
 
-    return value.replace(old, new)
+    return value.replace(old, new)
+
+async def utils_regex_findall(ctx: Message, regex: str, content: str = None) -> "ListNode":
+    """
+    Find all occurrences of a regex in a string.
+    :param regex:
+    :param content:
+    :return:
+    """
+
+    if not isinstance(regex, str):
+        raise Exception(f"Regex must be a string, not {type(regex)}!")
+
+    if content is not None and not isinstance(content, str):
+        raise Exception(f"Content must be a string, not {type(content)}!")
+
+    from ..._DshellParser.ast_nodes import ListNode
+
+    return ListNode(findall(regex, content if content is not None else ctx.content))
+
+
+async def utils_regex_sub(ctx: Message, regex: str, replace: str, content: str = None) -> str:
+    """
+    Replace all occurrences of a regex in a string with a replacement string.
+    :param regex:
+    :param replace:
+    :param content:
+    :return:
+    """
+
+    if not isinstance(regex, str):
+        raise Exception(f"Regex must be a string, not {type(regex)}!")
+
+    if not isinstance(replace, str):
+        raise Exception(f"Replacement must be a string, not {type(replace)}!")
+
+    if content is not None and not isinstance(content, str):
+        raise Exception(f"Content must be a string, not {type(content)}!")
+
+    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:
+    """
+    Search for a regex in a string.
+    :param regex:
+    :param content:
+    :return:
+    """
+
+    if not isinstance(regex, str):
+        raise Exception(f"Regex must be a string, not {type(regex)}!")
+
+    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))

Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -62,6 +62,7 @@ class DshellInterpreteur:
             '__message_content__': message.content,
             '__message_id__': message.id,
             '__message_url__': message.jump_url if hasattr(message, 'jump_url') else None,
+            '__last_message__': message.channel.last_message_id,
 
             '__channel__': message.channel.id,
             '__channel_name__': message.channel.name,

Dshell/_DshellTokenizer/dshell_keywords.py

@@ -51,6 +51,9 @@ dshell_commands: dict[str, Callable] = {
     'title': utils_title_string,
     'strip': utils_strip_string,
     'replace': utils_replace_string,
+    'regex_findall': utils_regex_findall,
+    'regex_sub': utils_regex_sub,
+    'regex': utils_regex_search,
 
     ## Discord utils
     'name': utils_get_name, # get the name from id (channel, role, member)
@@ -70,6 +73,8 @@ dshell_commands: dict[str, Callable] = {
     "dm": dshell_delete_message,
     "pm": dshell_purge_message,
     "em": dshell_edit_message,  # edit message
+    "mh": dshell_get_history_messages,  # get message history
+    "gcm": dshell_get_content_message,  # get content of a message
 
     "sri": dshell_respond_interaction,  # respond to an interaction
     "sdi": dshell_defer_interaction,  # defer an interaction
@@ -99,9 +104,6 @@ dshell_commands: dict[str, Callable] = {
     "gmr": dshell_give_member_roles, # give roles
     "rmr": dshell_remove_member_roles, # remove roles
 
-    "ghm": dshell_get_hystory_messages,  # research regex in message
-    "src": dshell_research_regex_in_content,  # research regex in content
-
     "ec": dshell_edit_text_channel,  # edit text channel
     "evc": dshell_edit_voice_channel,  # edit voice channel
 

{dshellinterpreter-0.2.18.0.dist-info → dshellinterpreter-0.2.18.1.dist-info}/METADATA

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

@@ -4,7 +4,7 @@ Dshell/DISCORD_COMMANDS/__init__.py,sha256=87-YpGU74m-m7AqUQni7PGbw73JRlioQkywW_
 Dshell/DISCORD_COMMANDS/dshell_channel.py,sha256=PDXpxrRRWPSucdp_3ITJk0Ur3coneRJKWEl2i7GZ2EM,15696
 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=zcWl6Y1W31h9MTHS-j9tLDwcrRiE_wGOu78zu2k0y9I,9101
+Dshell/DISCORD_COMMANDS/dshell_message.py,sha256=Vzk4EsAvXNaPGTtS8t-Zvr_IwUONlafzN2EfMO6FS_0,8954
 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=-amNcYysjgx3YDpDSnbQmJhnm3lbJere9K9aDH-YnJg,115
@@ -13,20 +13,20 @@ 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=wElUdUn3nEeR_ZiJZZDonlCFukBrar8Bxy9-bVlZAvE,2686
+Dshell/DISCORD_COMMANDS/utils/utils_string.py,sha256=WyTJJXjHwxs_76PKclRErjK8b6CFYpZhbZbAlr259HA,4667
 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=PcwfNPz44v6gsl-xNcvNwV5lcLhpJ6yDdjwHHnE6OUE,29493
+Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=wX7P7MwJ0O6I5mZ5FJG7qoH8qfObGuxPUVjerhRPYtM,29559
 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
 Dshell/_DshellParser/dshell_parser.py,sha256=cpukpWFJlioP1pIZZMGg24GrXfnnz1nuPCIKRNsxAcE,18949
 Dshell/_DshellTokenizer/__init__.py,sha256=LIQSRhDx2B9pmPx5ADMwwD0Xr9ybneVLhHH8qrJWw_s,172
-Dshell/_DshellTokenizer/dshell_keywords.py,sha256=hW9ajfKMXN2XNwOnibW5Vn2XhgMfu1hUqUy1WdDQSTs,7123
+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.0.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
-dshellinterpreter-0.2.18.0.dist-info/METADATA,sha256=e4rNTDr91A1ug4oFQk1Shx4Y15MOC9buN5qzbVPL0Bw,1151
-dshellinterpreter-0.2.18.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dshellinterpreter-0.2.18.0.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
-dshellinterpreter-0.2.18.0.dist-info/RECORD,,
+dshellinterpreter-0.2.18.1.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
+dshellinterpreter-0.2.18.1.dist-info/METADATA,sha256=2G017CKReQAhq-2HowFAt1jg9yPxNVWhl5iF-25OCco,1151
+dshellinterpreter-0.2.18.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dshellinterpreter-0.2.18.1.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
+dshellinterpreter-0.2.18.1.dist-info/RECORD,,