dshellInterpreter 0.2.9.1__tar.gz → 0.2.9.3__tar.gz

{dshellinterpreter-0.2.9.1 → dshellinterpreter-0.2.9.3}/Dshell/DISCORD_COMMANDS/__init__.py

@@ -2,4 +2,5 @@ from .dshell_channel import *
 from .dshell_message import *
 from .dshell_member import *
 from .dshell_pastbin import *
-from .dshell_role import *
+from .dshell_role import *
+from .utils import *

{dshellinterpreter-0.2.9.1 → dshellinterpreter-0.2.9.3}/Dshell/DISCORD_COMMANDS/dshell_channel.py

@@ -2,9 +2,11 @@ from asyncio import sleep
 from re import search
 from typing import Union
 
-from discord import MISSING, PermissionOverwrite, Member, Role, Message, Thread
+from discord import MISSING, PermissionOverwrite, Member, Role, Message
 from discord.utils import _MissingSentinel
-from discord import NotFound
+
+from .utils.utils_message import utils_get_message
+from .utils.utils_thread import utils_get_thread
 
 __all__ = [
     'dshell_get_channel',
@@ -22,60 +24,6 @@ __all__ = [
     'dshell_edit_thread'
 ]
 
-async def utils_get_message(ctx: Message, message: Union[int, str]) -> Message:
-    """
-    Returns the message object of the specified message ID or link.
-    Message is only available in the same server as the command and in the same channel.
-    If the message is a link, it must be in the format: https://discord.com/channels/{guild_id}/{channel_id}/{message_id}
-    """
-
-    if isinstance(message, int):
-        return await ctx.channel.fetch_message(message)
-
-    elif isinstance(message, str):
-        match = search(r'https://discord\.com/channels/(\d+)/(\d+)/(\d+)', message)
-        if not match:
-            raise Exception("Invalid message link format. Use a valid Discord message link.")
-        guild_id = int(match.group(1))
-        channel_id = int(match.group(2))
-        message_id = int(match.group(3))
-
-        if guild_id != ctx.guild.id:
-            raise Exception("The message must be from the same server as the command !")
-
-        return await ctx.guild.get_channel(channel_id).fetch_message(message_id)
-
-    raise Exception(f"Message must be an integer or a string, not {type(message)} !")
-
-async def utils_get_thread(ctx: Message, thread: Union[int, str]) -> Thread:
-    """
-    Returns the thread object of the specified thread ID or link.
-    Thread is only available in the same server as the command and in the same channel.
-    If the thread is a link, it must be in the format: https://discord.com/channels/{guild_id}/{channel_id}/{message_id}
-    """
-
-    if isinstance(thread, int):
-        return ctx.channel.get_thread(thread)
-
-    elif isinstance(thread, str):
-        match = search(r'https://discord\.com/channels/(\d+)/(\d+)(/\d+)?', thread)
-        if not match:
-            raise Exception("Invalid thread link format. Use a valid Discord thread link.")
-        guild_id = int(match.group(1))
-        message_id = int(match.group(2))
-        channel_id = ctx.channel.id if len(match.groups()) == 3 else ctx.channel.id
-
-        if guild_id != ctx.guild.id:
-            raise Exception("The thread must be from the same server as the command !")
-
-        try:
-            c = await ctx.guild.get_channel(channel_id).fetch_message(message_id)
-            return c.thread
-        except NotFound:
-            raise Exception(f"Thread with ID {message_id} not found in channel {channel_id} !")
-
-    raise Exception(f"Thread must be an integer or a string, not {type(thread)} !")
-
 
 async def dshell_get_channel(ctx: Message, name):
     """
@@ -338,7 +286,7 @@ async def dshell_create_thread_message(ctx: Message,
     if message is None:
         message = ctx.id
 
-    message = await utils_get_message(ctx, message)
+    message = utils_get_message(ctx, message)
 
 
     if not isinstance(name, str):

{dshellinterpreter-0.2.9.1 → dshellinterpreter-0.2.9.3}/Dshell/DISCORD_COMMANDS/dshell_member.py

@@ -17,7 +17,7 @@ __all__ = [
     "dshell_remove_member_roles"
 ]
 
-async def dshell_send_private_message(ctx: Message, member: int = None, message: str = None, delete: int = None, embeds = None, ):
+async def dshell_send_private_message(ctx: Message, message: str = None, member: int = None, delete: int = None, embeds = None, ):
     """
     Sends a private message to a member.
     If member is None, sends the message to the author of the command.

{dshellinterpreter-0.2.9.1 → dshellinterpreter-0.2.9.3}/Dshell/DISCORD_COMMANDS/dshell_message.py

@@ -3,6 +3,8 @@ from re import search
 from discord import Embed, Message, NotFound
 from discord.ext import commands
 
+from .utils.utils_message import utils_get_message
+
 __all__ = [
     'dshell_send_message',
     'dshell_respond_message',
@@ -48,14 +50,15 @@ async def dshell_send_message(ctx: Message, message=None, delete=None, channel=N
     return sended_message.id
 
 
-async def dshell_respond_message(ctx: Message, message=None, delete=None, embeds=None):
+async def dshell_respond_message(ctx: Message, message=None, content: str = None, delete=None, mention: bool = None, embeds=None):
     """
     Responds to a message on Discord
     """
     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)} !')
 
-    respond_message = ctx if message is None else ctx.channel.get_partial_message(message)  # builds a reference to the message (even if it doesn't exist)
+    respond_message = ctx if message is None else utils_get_message(ctx, message)  # builds a reference to the message (even if it doesn't exist)
+    mention_author = mention if mention is not None else False
 
     from .._DshellParser.ast_nodes import ListNode
 
@@ -68,7 +71,9 @@ async def dshell_respond_message(ctx: Message, message=None, delete=None, embeds
     else:
         raise Exception(f'Embeds must be a list of Embed objects or a single Embed object, not {type(embeds)} !')
 
-    sended_message = await ctx.reply(respond_message,
+    sended_message = await ctx.reply(reference=respond_message,
+                                     content=content,
+                                     mention_author=mention_author,
                                      delete_after=delete,
                                      embeds=embeds)
 
@@ -79,8 +84,7 @@ async def dshell_delete_message(ctx: Message, message=None, reason=None, delay=0
     Deletes a message
     """
 
-    delete_message = ctx if message is None else ctx.channel.get_partial_message(
-        message)  # builds a reference to the message (even if it doesn't exist)
+    delete_message = ctx if message is None else utils_get_message(ctx, message)
 
     if not isinstance(delay, int):
         raise Exception(f'Delete delay must be an integer, not {type(delay)} !')
@@ -91,7 +95,7 @@ async def dshell_delete_message(ctx: Message, message=None, reason=None, delay=0
     await delete_message.delete(delay=delay, reason=reason)
 
 
-async def dshell_purge_message(ctx: Message, message_number, channel=None, reason=None):
+async def dshell_purge_message(ctx: Message, message_number: int, channel=None, reason=None):
     """
     Purges messages from a channel
     """
@@ -111,8 +115,7 @@ async def dshell_edit_message(ctx: Message, message, new_content=None, embeds=No
     """
     Edits a message
     """
-    edit_message = ctx.channel.get_partial_message(
-        message)  # builds a reference to the message (even if it doesn't exist)
+    edit_message = utils_get_message(ctx, message)
 
     if embeds is None:
         embeds = []
@@ -168,8 +171,7 @@ async def dshell_add_reactions(ctx: Message, reactions, message=None):
     """
     Adds reactions to a message
     """
-    message = ctx if message is None else ctx.channel.get_partial_message(
-        message)  # builds a reference to the message (even if it doesn't exist)
+    message = ctx if message is None else utils_get_message(ctx, message)
 
     if isinstance(reactions, str):
         reactions = (reactions,)
@@ -184,8 +186,7 @@ async def dshell_remove_reactions(ctx: Message, reactions, message=None):
     """
     Removes reactions from a message
     """
-    message = ctx if message is None else ctx.channel.get_partial_message(
-        message)  # builds a reference to the message (even if it doesn't exist)
+    message = ctx if message is None else utils_get_message(ctx, message)
 
     if isinstance(reactions, str):
         reactions = [reactions]
@@ -199,29 +200,21 @@ async def dshell_clear_message_reactions(ctx: Message, message):
     """
     Clear all reaction on the target message
     """
-    if not isinstance(message, int):
-        raise Exception(f'Message must be integer, not {type(message)}')
-
-    target_message = await ctx.channel.fetch_message(message)
+    message = ctx if message is None else utils_get_message(ctx, message)
 
-    if target_message is None:
+    if message is None:
         raise Exception(f'Message not found !')
 
-    await target_message.clear_reactions()
+    await message.clear_reactions()
 
 async def dshell_clear_one_reactions(ctx: Message, message, emoji):
     """
     Clear one emoji on the target message
     """
-    if not isinstance(message, int):
-        raise Exception(f'Message must be integer, not {type(message)}')
 
     if not isinstance(emoji, str):
         raise Exception(f'Emoji must be string, not {type(emoji)}')
 
-    try:
-        target_message = await ctx.channel.fetch_message(message)
-    except NotFound:
-        raise Exception(f'Message not found !')
+    target_message = ctx if message is None else utils_get_message(ctx, message)
 
     await target_message.clear_reaction(emoji)

{dshellinterpreter-0.2.9.1 → dshellinterpreter-0.2.9.3}/Dshell/DISCORD_COMMANDS/dshell_role.py

@@ -1,5 +1,6 @@
 from discord import MISSING, Message, PermissionOverwrite
 from discord.utils import _MissingSentinel
+from typing import Union
 from .._utils import NoneType
 
 __all__ = [
@@ -56,7 +57,7 @@ async def dshell_delete_roles(ctx: Message, roles, reason=None):
     Delete the role on the server
     """
     from .._DshellInterpreteur.dshell_interpreter import ListNode
-    roles: int | ListNode
+    roles: Union[int, ListNode]
     if not isinstance(roles, (int, ListNode)):
         raise Exception(f"Role must be a int, role mention or NodeList of both, not {type(roles)} !")
 

{dshellinterpreter-0.2.9.1/dshellInterpreter.egg-info → dshellinterpreter-0.2.9.3}/PKG-INFO

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

{dshellinterpreter-0.2.9.1 → dshellinterpreter-0.2.9.3/dshellInterpreter.egg-info}/PKG-INFO

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

{dshellinterpreter-0.2.9.1 → dshellinterpreter-0.2.9.3}/setup.py

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