dshellInterpreter 0.2.13.14__tar.gz → 0.2.13.15__tar.gz

{dshellinterpreter-0.2.13.14 → dshellinterpreter-0.2.13.15}/Dshell/DISCORD_COMMANDS/dshell_interaction.py

@@ -4,11 +4,22 @@ __all__ = [
 ]
 
 from types import NoneType
-from discord import Interaction, Embed
+from discord import Interaction, Embed, AllowedMentions
 from pycordViews import EasyModifiedViews
 
-
-async def dshell_respond_interaction(ctx: Interaction, content: str = None, delete=None, mentions: bool = None, hide: bool = False, embeds=None, view=None) -> int:
+from .utils.utils_message import utils_autorised_mentions
+
+async def dshell_respond_interaction(ctx: Interaction,
+                                     content: str = None,
+                                     delete=None,
+                                     global_mentions: bool = None,
+                                     everyone_mention: bool = True,
+                                     roles_mentions: bool = True,
+                                     users_mentions: bool = True,
+                                     reply_mention: bool = False,
+                                     hide: bool = False,
+                                     embeds=None,
+                                     view=None) -> int:
     """
     Responds to a message interaction on Discord
     """
@@ -19,13 +30,14 @@ async def dshell_respond_interaction(ctx: Interaction, content: str = None, dele
     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)} !')
 
-    if not isinstance(mentions, (NoneType, bool)):
-        raise Exception(f'Mention parameter must be a boolean or None, not {type(mentions)} !')
-
     if not isinstance(hide, bool):
         raise Exception(f'Hide parameter must be a boolean, not {type(hide)} !')
 
-    allowed_mentions = mentions if mentions is not None else False
+    allowed_mentions = utils_autorised_mentions(global_mentions,
+                                                everyone_mention,
+                                                roles_mentions,
+                                                users_mentions,
+                                                reply_mention)
 
     from .._DshellParser.ast_nodes import ListNode
 

{dshellinterpreter-0.2.13.14 → dshellinterpreter-0.2.13.15}/Dshell/DISCORD_COMMANDS/dshell_message.py

@@ -1,12 +1,11 @@
 from re import search
-from tkinter import Listbox
 
-from discord import Embed, Message, Interaction
+from discord import Embed, Message
 from discord.ext import commands
 
 from pycordViews import EasyModifiedViews
 
-from .utils.utils_message import utils_get_message
+from .utils.utils_message import utils_get_message, utils_autorised_mentions
 from .._utils import NoneType
 
 __all__ = [
@@ -24,7 +23,17 @@ __all__ = [
 ]
 
 
-async def dshell_send_message(ctx: Message, message=None, delete=None, channel=None, embeds=None, view=None) -> int:
+async def dshell_send_message(ctx: Message,
+                              message=None,
+                              delete=None,
+                              channel=None,
+                              global_mentions: bool = None,
+                              everyone_mention: bool = True,
+                              roles_mentions: bool = True,
+                              users_mentions: bool = True,
+                              reply_mention: bool = False,
+                              embeds=None,
+                              view=None) -> int:
     """
     Sends a message on Discord
     """
@@ -33,6 +42,7 @@ async def dshell_send_message(ctx: Message, message=None, delete=None, channel=N
         raise Exception(f'Delete parameter must be a number (seconds) or None, not {type(delete)} !')
 
     channel_to_send = ctx.channel if channel is None else ctx.channel.guild.get_channel(channel)
+    allowed_mentions = utils_autorised_mentions(global_mentions, everyone_mention, roles_mentions, users_mentions, reply_mention)
 
     if channel_to_send is None:
         raise Exception(f'Channel {channel} not found!')
@@ -54,12 +64,22 @@ async def dshell_send_message(ctx: Message, message=None, delete=None, channel=N
     sended_message = await channel_to_send.send(message,
                                                 delete_after=delete,
                                                 embeds=embeds,
+                                                allowed_mentions=allowed_mentions,
                                                 view=view)
 
     return sended_message.id
 
 
-async def dshell_respond_message(ctx: Message, message=None, content: str = None, delete=None, mention: bool = None, embeds=None):
+async def dshell_respond_message(ctx: Message,
+                                 message=None,
+                                 content: str = None,
+                                 global_mentions: bool = None,
+                                 everyone_mention: bool = True,
+                                 roles_mentions: bool = True,
+                                 users_mentions: bool = True,
+                                 reply_mention: bool = False,
+                                 delete=None,
+                                 embeds=None):
     """
     Responds to a message on Discord
     """
@@ -67,7 +87,8 @@ async def dshell_respond_message(ctx: Message, message=None, content: str = None
         raise Exception(f'Delete parameter must be a number (seconds) or None, not {type(delete)} !')
 
     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
+    autorised_mentions = utils_autorised_mentions(global_mentions, everyone_mention, roles_mentions, users_mentions, reply_mention)
+    mention_author = True if reply_mention else False
 
     from .._DshellParser.ast_nodes import ListNode
 
@@ -83,6 +104,7 @@ async def dshell_respond_message(ctx: Message, message=None, content: str = None
     sended_message = await respond_message.reply(
                                      content=str(content),
                                      mention_author=mention_author,
+                                     allowed_mentions=autorised_mentions,
                                      delete_after=delete,
                                      embeds=embeds)
 

dshellinterpreter-0.2.13.15/Dshell/DISCORD_COMMANDS/utils/utils_message.py

@@ -0,0 +1,68 @@
+from discord import Message, PartialMessage, AllowedMentions
+from typing import Union
+from re import search
+
+def utils_get_message(ctx: Message, message: Union[int, str]) -> PartialMessage:
+    """
+    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 ctx.channel.get_partial_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 ctx.guild.get_channel(channel_id).get_partial_message(message_id)
+
+    raise Exception(f"Message must be an integer or a string, not {type(message)} !")
+
+
+def utils_autorised_mentions(global_mentions: bool = None,
+                            everyone_mention: bool = True,
+                            roles_mentions: bool = True,
+                            users_mentions: bool = True,
+                            reply_mention: bool = False) -> Union[bool, 'AllowedMentions']:
+    """
+    Returns the AllowedMentions object based on the provided parameters.
+    If global_mentions is set to True or False, it overrides all other parameters.
+    """
+
+    from discord import AllowedMentions
+
+    if not isinstance(global_mentions, (type(None), bool)):
+        raise Exception(f'Mention parameter must be a boolean or None, not {type(global_mentions)} !')
+
+    if not isinstance(everyone_mention, bool):
+        raise Exception(f'Everyone mention parameter must be a boolean, not {type(everyone_mention)} !')
+
+    if not isinstance(roles_mentions, bool):
+        raise Exception(f'Roles mention parameter must be a boolean, not {type(roles_mentions)} !')
+
+    if not isinstance(users_mentions, bool):
+        raise Exception(f'Users mention parameter must be a boolean, not {type(users_mentions)} !')
+
+    if not isinstance(reply_mention, bool):
+        raise Exception(f'Reply mention parameter must be a boolean, not {type(reply_mention)} !')
+
+    if global_mentions is True:
+        return AllowedMentions.all()
+
+    elif global_mentions is False:
+        return AllowedMentions.none()
+
+    else:
+        return AllowedMentions(everyone=everyone_mention,
+                               roles=roles_mentions,
+                               users=users_mentions,
+                               replied_user=reply_mention)

{dshellinterpreter-0.2.13.14/dshellInterpreter.egg-info → dshellinterpreter-0.2.13.15}/PKG-INFO

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

{dshellinterpreter-0.2.13.14 → dshellinterpreter-0.2.13.15/dshellInterpreter.egg-info}/PKG-INFO

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

{dshellinterpreter-0.2.13.14 → dshellinterpreter-0.2.13.15}/setup.py

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

dshellinterpreter-0.2.13.14/Dshell/DISCORD_COMMANDS/utils/utils_message.py

@@ -1,28 +0,0 @@
-from discord import Message, PartialMessage
-from typing import Union
-from re import search
-
-def utils_get_message(ctx: Message, message: Union[int, str]) -> PartialMessage:
-    """
-    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 ctx.channel.get_partial_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 ctx.guild.get_channel(channel_id).get_partial_message(message_id)
-
-    raise Exception(f"Message must be an integer or a string, not {type(message)} !")