dshellInterpreter 0.1.11__tar.gz → 0.1.12__tar.gz

{dshellinterpreter-0.1.11 → dshellinterpreter-0.1.12}/Dshell/DISCORD_COMMANDS/dshell_channel.py

@@ -2,8 +2,7 @@ from asyncio import sleep
 from re import search
 from typing import Union
 
-from discord import MISSING, PermissionOverwrite, Member, Role
-from discord.abc import GuildChannel
+from discord import MISSING, PermissionOverwrite, Member, Role, Message
 
 __all__ = [
     'dshell_create_text_channel',
@@ -13,7 +12,7 @@ __all__ = [
 ]
 
 
-async def dshell_create_text_channel(ctx: GuildChannel,
+async def dshell_create_text_channel(ctx: Message,
                                      name,
                                      category=None,
                                      position=MISSING,
@@ -25,7 +24,7 @@ async def dshell_create_text_channel(ctx: GuildChannel,
     Creates a text channel on the server
     """
 
-    channel_category = ctx.guild.get_channel(category)
+    channel_category = ctx.channel.guild.get_channel(category)
 
     created_channel = await ctx.guild.create_text_channel(name,
                                                           category=channel_category,
@@ -38,7 +37,7 @@ async def dshell_create_text_channel(ctx: GuildChannel,
 
     return created_channel.id
 
-async def dshell_create_voice_channel(ctx: GuildChannel,
+async def dshell_create_voice_channel(ctx: Message,
                                       name,
                                       category=None,
                                       position=MISSING,
@@ -49,7 +48,7 @@ async def dshell_create_voice_channel(ctx: GuildChannel,
     Creates a voice channel on the server
     """
 
-    channel_category = ctx.guild.get_channel(category)
+    channel_category = ctx.channel.guild.get_channel(category)
 
     created_channel = await ctx.guild.create_voice_channel(name,
                                                            category=channel_category,
@@ -61,13 +60,13 @@ async def dshell_create_voice_channel(ctx: GuildChannel,
     return created_channel.id
 
 
-async def dshell_delete_channel(ctx: GuildChannel, channel=None, reason=None, timeout=0):
+async def dshell_delete_channel(ctx: Message, channel=None, reason=None, timeout=0):
     """
     Deletes a channel.
     You can add a waiting time before it is deleted (in seconds)
     """
 
-    channel_to_delete = ctx if channel is None else ctx.guild.get_channel(channel)
+    channel_to_delete = ctx.channel if channel is None else ctx.channel.guild.get_channel(channel)
 
     if channel_to_delete is None:
         raise Exception(f"Le channel {channel} n'existe pas !")
@@ -79,12 +78,12 @@ async def dshell_delete_channel(ctx: GuildChannel, channel=None, reason=None, ti
     return channel_to_delete.id
 
 
-async def dshell_delete_channels(ctx: GuildChannel, name=None, regex=None, reason=None):
+async def dshell_delete_channels(ctx: Message, name=None, regex=None, reason=None):
     """
     Deletes all channels with the same name and/or matching the same regex.
     If neither is set, it will delete all channels with the same name as the one where the command was executed.
     """
-    for channel in ctx.guild.channels:
+    for channel in ctx.channel.guild.channels:
 
         if name is not None and channel.name == str(name):
             await channel.delete(reason=reason)

dshellinterpreter-0.1.12/Dshell/DISCORD_COMMANDS/dshell_member.py

@@ -0,0 +1,67 @@
+from discord import MISSING, Message
+
+
+__all__ = [
+    "dshell_ban_member",
+    "dshell_unban_member",
+    "dshell_kick_member",
+    "dshell_rename_member"
+]
+
+async def dshell_ban_member(ctx: Message, member: int, reason: str = MISSING):
+    """
+    Bans a member from the server.
+    """
+    banned_member = ctx.channel.guild.get_member(member)
+
+    if not banned_member:
+        return 1 # Member not found in the server
+
+    await ctx.channel.guild.ban(banned_member, reason=reason)
+
+    return banned_member.id
+
+async def dshell_unban_member(ctx: Message, user: int, reason: str = MISSING):
+    """
+    Unbans a user from the server.
+    """
+    banned_users = ctx.channel.guild.bans()
+    user_to_unban = None
+
+    async for ban_entry in banned_users:
+        if ban_entry.user.id == user:
+            user_to_unban = ban_entry.user
+            break
+
+    if not user_to_unban:
+        return 1  # User not found in the banned list
+
+    await ctx.channel.guild.unban(user_to_unban, reason=reason)
+
+    return user_to_unban.id
+
+async def dshell_kick_member(ctx: Message, member: int, reason: str = MISSING):
+    """
+    Kicks a member from the server.
+    """
+    kicked_member = ctx.channel.guild.get_member(member)
+
+    if not kicked_member:
+        return 1  # Member not found in the server
+
+    await ctx.channel.guild.kick(kicked_member, reason=reason)
+
+    return kicked_member.id
+
+async def dshell_rename_member(ctx: Message, new_name, member=None):
+    """
+    Renames a member in the server.
+    """
+    renamed_member = ctx.channel.guild.get_member(member)
+
+    if not renamed_member:
+        return 1  # Member not found in the server
+
+    await renamed_member.edit(nick=new_name)
+
+    return renamed_member.id

dshellinterpreter-0.1.12/Dshell/DISCORD_COMMANDS/dshell_message.py

@@ -0,0 +1,113 @@
+from discord import Embed, Message
+from discord.ext import commands
+from .._DshellParser.ast_nodes import ListNode
+from re import search
+
+__all__ = [
+    'dshell_send_message',
+    'dshell_delete_message',
+    'dshell_purge_message',
+    'dshell_edit_message',
+    'dshell_research_regex_message',
+    'dshell_research_regex_in_content'
+]
+
+
+async def dshell_send_message(ctx: Message, message=None, delete=None, channel=None, embeds=None, embed=None):
+    from .._DshellParser.ast_nodes import ListNode
+    """
+    Sends a message on Discord
+    """
+    channel_to_send = ctx.channel if channel is None else ctx.channel.guild.get_channel(channel)
+
+    if channel_to_send is None:
+        raise Exception(f'Channel {channel} not found!')
+
+    if embeds is None:
+        embeds = ListNode([])
+
+    elif isinstance(embeds, Embed):
+        embeds = ListNode([embeds])
+
+    if embed is not None and isinstance(embed, Embed):
+        embeds.add(embed)
+
+    sended_message = await channel_to_send.send(message,
+                                                delete_after=delete,
+                                                embeds=embeds)
+
+    return sended_message.id
+
+
+async def dshell_delete_message(ctx: Message, message, reason=None, delay=0):
+    """
+    Deletes a message
+    """
+
+    delete_message = ctx.channel.get_partial_message(message)  # builds a reference to the message (even if it doesn't exist)
+
+    if delay > 3600:
+        raise Exception(f'The message deletion delay is too long! ({delay} seconds)')
+
+    await delete_message.delete(delay=delay, reason=reason)
+
+
+async def dshell_purge_message(ctx: Message, message_number, channel=None, reason=None):
+    """
+    Purges messages from a channel
+    """
+
+    purge_channel = ctx.channel if channel is None else ctx.channel.guild.get_channel(channel)
+
+    if purge_channel is None:
+        raise Exception(f"Channel {channel} to purge not found!")
+
+    await purge_channel.purge(limit=message_number, reason=reason)
+
+
+async def dshell_edit_message(ctx: Message, message, new_content=None, embeds=None):
+    """
+    Edits a message
+    """
+    edit_message = ctx.channel.get_partial_message(message)  # builds a reference to the message (even if it doesn't exist)
+
+    if embeds is None:
+        embeds = []
+
+    elif isinstance(embeds, Embed):
+        embeds = [embeds]
+
+    await edit_message.edit(content=new_content, embeds=embeds)
+
+    return edit_message.id
+
+async def dshell_research_regex_message(ctx: Message, regex, channel=None):
+    """
+    Searches for messages matching a regex in a channel
+    """
+
+    search_channel = ctx.channel if channel is None else ctx.channel.guild.get_channel(channel)
+
+    if search_channel is None:
+        raise Exception(f"Channel {channel} to search not found!")
+
+    messages = ListNode([])
+    async for message in search_channel.history(limit=100):
+        if search(regex, message.content):
+            messages.add(message)
+
+    if not messages:
+        raise commands.CommandError(f"No messages found matching the regex '{regex}'.")
+
+    return messages
+
+async def dshell_research_regex_in_content(ctx: Message, regex, content):
+    """
+    Searches for a regex in a specific message content
+    """
+
+    if not search(regex, content):
+        return True
+
+    return False
+

{dshellinterpreter-0.1.11 → dshellinterpreter-0.1.12}/Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -3,7 +3,7 @@ from re import findall
 from typing import TypeVar, Union, Any, Optional, Callable
 
 
-from discord import AutoShardedBot, Embed, Colour, PermissionOverwrite, Permissions, Guild, Member, Role
+from discord import AutoShardedBot, Embed, Colour, PermissionOverwrite, Permissions, Guild, Member, Role, Message
 from discord.abc import GuildChannel, PrivateChannel
 
 from .._DshellParser.ast_nodes import *
@@ -15,7 +15,7 @@ from .._DshellTokenizer.dshell_token_type import Token
 from .._DshellTokenizer.dshell_tokenizer import DshellTokenizer
 
 All_nodes = TypeVar('All_nodes', IfNode, LoopNode, ElseNode, ElifNode, ArgsCommandNode, VarNode, IdentOperationNode)
-context = TypeVar('context', AutoShardedBot, GuildChannel, PrivateChannel)
+context = TypeVar('context', AutoShardedBot, Message, PrivateChannel)
 
 
 class DshellInterpreteur:
@@ -299,7 +299,7 @@ def build_permission(body: list[Token], interpreter: DshellInterpreteur) -> dict
 
     for i in args_permissions:
         i.pop('*')
-        permissions.update(DshellPermissions(i).get_permission_overwrite(interpreter.ctx.guild))
+        permissions.update(DshellPermissions(i).get_permission_overwrite(interpreter.ctx.channel.guild))
 
     return permissions
 

{dshellinterpreter-0.1.11 → dshellinterpreter-0.1.12}/Dshell/_DshellTokenizer/dshell_keywords.py

@@ -31,6 +31,9 @@ dshell_commands: dict[str, Callable] = {
     "bm": dshell_ban_member,  # ban member
     "um": dshell_unban_member,  # unban member
     "km": dshell_kick_member,  # kick member
+    "em": dshell_edit_message,  # edit message
+    "srm": dshell_research_regex_message,  # research regex in message
+    "src": dshell_research_regex_in_content,  # research regex in content
 }
 
 dshell_mathematical_operators: dict[str, tuple[Callable, int]] = {

{dshellinterpreter-0.1.11/dshellInterpreter.egg-info → dshellinterpreter-0.1.12}/PKG-INFO

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

{dshellinterpreter-0.1.11 → dshellinterpreter-0.1.12/dshellInterpreter.egg-info}/PKG-INFO

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

{dshellinterpreter-0.1.11 → dshellinterpreter-0.1.12}/setup.py

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

dshellinterpreter-0.1.11/Dshell/DISCORD_COMMANDS/dshell_member.py

@@ -1,54 +0,0 @@
-from discord import Member, User, MISSING
-from discord.abc import GuildChannel
-
-
-__all__ = [
-    "dshell_ban_member",
-    "dshell_unban_member",
-    "dshell_kick_member"
-]
-
-async def dshell_ban_member(ctx: GuildChannel, member: int, reason: str = MISSING):
-    """
-    Bans a member from the server.
-    """
-    banned_member = ctx.guild.get_member(member)
-
-    if not banned_member:
-        return 1 # Member not found in the server
-
-    await ctx.guild.ban(banned_member, reason=reason)
-
-    return banned_member.id
-
-async def dshell_unban_member(ctx: GuildChannel, user: int, reason: str = MISSING):
-    """
-    Unbans a user from the server.
-    """
-    banned_users = ctx.guild.bans()
-    user_to_unban = None
-
-    async for ban_entry in banned_users:
-        if ban_entry.user.id == user:
-            user_to_unban = ban_entry.user
-            break
-
-    if not user_to_unban:
-        return 1  # User not found in the banned list
-
-    await ctx.guild.unban(user_to_unban, reason=reason)
-
-    return user_to_unban.id
-
-async def dshell_kick_member(ctx: GuildChannel, member: int, reason: str = MISSING):
-    """
-    Kicks a member from the server.
-    """
-    kicked_member = ctx.guild.get_member(member)
-
-    if not kicked_member:
-        return 1  # Member not found in the server
-
-    await ctx.guild.kick(kicked_member, reason=reason)
-
-    return kicked_member.id

dshellinterpreter-0.1.11/Dshell/DISCORD_COMMANDS/dshell_message.py

@@ -1,60 +0,0 @@
-from discord import Embed
-from discord.abc import GuildChannel
-
-__all__ = [
-    'dshell_send_message',
-    'dshell_delete_message',
-    'dshell_purge_message'
-]
-
-
-async def dshell_send_message(ctx: GuildChannel, message=None, delete=None, channel=None, embeds=None, embed=None):
-    from .._DshellParser.ast_nodes import ListNode
-    """
-    Sends a message on Discord
-    """
-    channel_to_send = ctx if channel is None else ctx.guild.get_channel(channel)
-
-    if channel_to_send is None:
-        raise Exception(f'Channel {channel} not found!')
-
-    if embeds is None:
-        embeds = ListNode([])
-
-    elif isinstance(embeds, Embed):
-        embeds = ListNode([embeds])
-
-    if embed is not None and isinstance(embed, Embed):
-        embeds.add(embed)
-
-    sended_message = await channel_to_send.send(message,
-                                                delete_after=delete,
-                                                embeds=embeds)
-
-    return sended_message.id
-
-
-async def dshell_delete_message(ctx: GuildChannel, message, reason=None, delay=0):
-    """
-    Deletes a message
-    """
-
-    delete_message = ctx.get_partial_message(message)  # builds a reference to the message (even if it doesn't exist)
-
-    if delay > 3600:
-        raise Exception(f'The message deletion delay is too long! ({delay} seconds)')
-
-    await delete_message.delete(delay=delay, reason=reason)
-
-
-async def dshell_purge_message(ctx: GuildChannel, message_number, channel=None, reason=None):
-    """
-    Purges messages from a channel
-    """
-
-    purge_channel = ctx if channel is None else ctx.guild.get_channel(channel)
-
-    if purge_channel is None:
-        raise Exception(f"Channel {channel} to purge not found!")
-
-    await purge_channel.purge(limit=message_number, reason=reason)