fixed #94 + added on_component event

Author: kvsxxx

README.md

@@ -175,14 +175,38 @@ You can find more (and better) examples [here](https://github.com/discord-py-ui/
 
 # Changelog
 
+-   <details>
+    <summary>4.2.7<summary>
+
+    ## **Added**
+    
+    - `on_component`
+    > There is now an event with the name `component` that will be dispatched whenever a component was received
+    > If you use `Message.wait_for`, there is now a new event choice with the name `component` (`message.wait_for("component", client)`)
+
+
+    ## **Fixed**
+    
+    - #94
+    > DM issue with deleting messages
+
+    ## **Changed**
+
+    - `edit`
+    > Edit now takes "content" as not positional (`.edit("the content")` works now)
+    - component lenght
+    > You are now able to set component values with the right max lenght
+
+    </details>
+
 -   <details>
     <summary>4.2.6</summary>
 
     ## **Fixed**
 
     - emebds
     > there was an issue with sending embeds
-    
+
     </details>
 
 -   <details>

discord_ui/__init__.py

@@ -37,11 +37,11 @@
 from .slash.tools import ParseMethod
 from .tools import components_to_dict
 from .slash.tools import create_choice
-from .receive import Interaction, InteractionType, Message, WebhookMessage, PressedButton, SelectedMenu, SlashedCommand, SlashedSubCommand, EphemeralMessage, EphemeralResponseMessage
+from .receive import Interaction, InteractionType, Message, WebhookMessage, PressedButton, SelectedMenu, ComponentContext, SlashedCommand, SlashedSubCommand, EphemeralMessage, EphemeralResponseMessage
 
 from .override import override_dpy, override_dpy2_client
 override_dpy2_client()
 
 
 __title__ = "discord-ui"
-__version__ = "4.2.6"
+__version__ = "4.2.7"

discord_ui/client.py

@@ -1,13 +1,14 @@
+from discord.channel import TextChannel
 from .cogs import BaseCallable, CogCommand, CogMessageCommand, CogSubCommandGroup, ListeningComponent
 from .components import Component, ComponentType
 from .slash.errors import NoAsyncCallback
 from .errors import MissingListenedComponentParameters, WrongType
 from .slash.tools import ParseMethod, cache_data, format_name, handle_options, handle_thing
 from .slash.http import create_global_command, create_guild_command, delete_global_command, delete_guild_command, delete_guild_commands, edit_global_command, edit_guild_command, get_command, get_command_permissions, get_global_commands, get_guild_commands, delete_global_commands, get_id, update_command_permissions
 from .slash.types import AdditionalType, CommandType, ContextCommand, MessageCommand, OptionType, SlashCommand, SlashOption, SlashSubcommand, UserCommand
-from .tools import MISSING, _or, get_index, setup_logger
+from .tools import MISSING, _none, _or, get_index, setup_logger
 from .http import jsonifyMessage, BetterRoute, send_files
-from .receive import Interaction, Message, PressedButton, SelectedMenu, SlashedContext, WebhookMessage, SlashedCommand, SlashedSubCommand, getMessage
+from .receive import ComponentContext, Interaction, Message, PressedButton, SelectedMenu, SlashedContext, WebhookMessage, SlashedCommand, SlashedSubCommand, getMessage
 from .override import override_dpy as override_it
 
 import discord
@@ -172,6 +173,7 @@ async def _on_response(self, msg):
             await interaction.defer(self.auto_defer[1])
         self._discord.dispatch("interaction_received", interaction)
 
+
         #region basic commands
         if data["data"]["type"] == CommandType.SLASH and not (data["data"].get("options") and data["data"]["options"][0]["type"] in [OptionType.SUB_COMMAND, OptionType.SUB_COMMAND_GROUP]):
             x = self.commands.get(data["data"]["name"])
@@ -1190,6 +1192,8 @@ async def _on_response(self, msg):
             await interaction.defer(self.auto_defer[1])
         self._discord.dispatch("interaction_received", interaction)
 
+        self._discord.dispatch("component", ComponentContext(self._discord._connection, data, user, msg))
+
         # Handle auto_defer
         if int(data["data"]["component_type"]) == 2:
             for x in msg.buttons:
@@ -1254,10 +1258,20 @@ async def send(self, channel, content=MISSING, *, tts=False, embed=MISSING, embe
         :type: :class:`~Message`
         """
 
-        if not isinstance(channel, (discord.TextChannel, int, str)):
-            raise WrongType("channel", channel, "discord.TextChannel")
+        if not isinstance(channel, (discord.TextChannel, int, str, discord.User)):
+            raise WrongType("channel", channel, ["discord.TextChannel", "discord.User"])
 
-        channel_id = channel.id if isinstance(channel, discord.TextChannel) else channel
+        channel_id = None
+        if isinstance(channel, discord.User):
+            if channel.dm_channel is None:
+                channel = await channel.create_dm()
+                channel_id = channel.id
+            else:
+                channel_id = channel.dm_channel
+        elif isinstance(channel, discord.TextChannel):
+            channel_id = channel.id
+        else: 
+            channel_id = channel
         payload = jsonifyMessage(content=content, tts=tts, embed=embed, embeds=embeds, nonce=nonce, allowed_mentions=allowed_mentions, reference=reference, mention_author=mention_author, components=components)
 
         route = BetterRoute("POST", f"/channels/{channel_id}/messages")
@@ -1268,9 +1282,9 @@ async def send(self, channel, content=MISSING, *, tts=False, embed=MISSING, embe
         else:
             r = await send_files(route, files=_or(files, [file]), payload=payload, http=self._discord.http)
 
-        msg = Message(state=self._discord._get_state(), channel=channel, data=r)
-            
-        if delete_after is not None:
+        msg = Message(state=self._discord._connection, channel=channel, data=r)
+        
+        if not _none(delete_after):
             await msg.delete(delay=delete_after)
 
         return msg

discord_ui/components.py

@@ -81,6 +81,9 @@ def value(self) -> Any:
     def value(self, value):
         if inspect.isclass(value):
             raise WrongType("value", value, ["int", "str", "bool", "float"])
+        if isinstance(value, str):
+            if len(value) > 100 or len(value) < 1:
+                raise InvalidLength("value", _min=1, _max=100)
         self._json["value"] = value
 
     @property
@@ -95,8 +98,8 @@ def description(self) -> str:
     def description(self, value):
         if value is not MISSING and not isinstance(value, str):
             raise WrongType("description", "str")
-        if value is not MISSING and len(value) > 50:
-            raise InvalidLength("description", 50, 0)
+        if value is not MISSING and len(value) > 100:
+            raise InvalidLength("description", 100, 0)
         self._json["description"] = value
 
     @property
@@ -288,7 +291,7 @@ def options(self) -> List[SelectOption]:
     def options(self, value: List[SelectOption]):
         if isinstance(value, list):
             if len(value) > 25 or len(value) == 0:
-                raise OutOfValidRange("options", 1, 25)
+                raise OutOfValidRange("length of options", 1, 25)
             if all(isinstance(x, SelectOption) for x in value):
                 self._json["options"] = [x.to_dict() for x in value]
             elif all(isinstance(x, dict) for x in value):
@@ -465,8 +468,8 @@ def label(self, val: str):
             val = ""
         elif val is not None and not isinstance(val, str):
             raise WrongType("label", val, "str")
-        elif val is not None and len(val) > 80:
-            raise InvalidLength("label", _max=80)
+        elif val is not None and len(val) > 100:
+            raise InvalidLength("label", _max=100)
         elif val is not None and len(val) < 1:
             raise InvalidLength("label", _min=0)
 

discord_ui/override.py

@@ -41,8 +41,10 @@ def override_dpy():
     async def send(self: discord.TextChannel, content=None, **kwargs) -> Message:
         channel_id = self.id if not isinstance(self, commands.Context) else self.channel.id
 
+        channel = None
         if isinstance(self, (discord.Member, discord.User)) and self.dm_channel is None:
-                channel_id = (await self.create_dm()).id
+                channel = await self.create_dm()
+                channel_id = channel.id
 
         route = BetterRoute("POST", f"/channels/{channel_id}/messages")
 
@@ -58,7 +60,9 @@ async def send(self: discord.TextChannel, content=None, **kwargs) -> Message:
             payload = jsonifyMessage(content=content, **kwargs)
             r = await send_files(route, files=files, payload=payload, http=self._state.http)
 
-        msg = Message(state=self._state, channel=self if not isinstance(self, commands.Context) else self.channel, data=r)
+        if channel is None:
+            channel = self if not isinstance(self, commands.Context) else self.channel
+        msg = Message(state=self._state, channel=channel, data=r)
         if kwargs.get("delete_after") is not None:
             await msg.delete(delay=kwargs.get("delete_after"))
 

discord_ui/receive.py

@@ -3,7 +3,7 @@
 from .slash.types import ContextCommand, SlashCommand, SlashPermission, SlashSubcommand
 from .tools import MISSING, setup_logger, _none
 from .http import BetterRoute, jsonifyMessage, send_files
-from .components import ActionRow, Button, LinkButton, SelectMenu, SelectOption, make_component
+from .components import ActionRow, Button, Component, LinkButton, SelectMenu, SelectOption, make_component
 
 import discord
 from discord.ext.commands import Bot
@@ -167,7 +167,7 @@ async def respond(self, content=MISSING, *, tts=False, embed=MISSING, embeds=MIS
 
 
         r = None
-        if delete_after is not MISSING and hide_message is True:
+        if not _none(delete_after) and hide_message is True:
             raise EphemeralDeletion()
 
         if hide_message:
@@ -199,7 +199,7 @@ async def respond(self, content=MISSING, *, tts=False, embed=MISSING, embeds=MIS
         if not hide_message:
             responseMSG = await self._state.http.request(BetterRoute("GET", f"/webhooks/{self.application_id}/{self.token}/messages/@original"))
             msg = await getMessage(self._state, data=responseMSG, response=False)
-            if delete_after is not MISSING:
+            if not _none(delete_after):
                 await msg.delete(delete_after)
             return msg
 
@@ -263,6 +263,12 @@ def _handle_auto_defer(self, auto_defer):
         self.deferred = auto_defer[0]
         self._deferred_hidden = auto_defer[1]
 
+class ComponentContext(Interaction, Component):
+    """A received component"""
+    def __init__(self, state, data, user, message) -> None:
+        Interaction.__init__(self, state, data, user=user, message=message)
+        Component.__init__(self, data["data"]["component_type"])
+
 class SelectedMenu(Interaction, SelectMenu):
     """A :class:`~SelectMenu` object in which an item was selected"""
     def __init__(self, data, user, s, msg, client) -> None:
@@ -349,7 +355,7 @@ async def getMessage(state: ConnectionState, data, response = True):
     :class:`~Message` | :class:`~EphemeralMessage`
         The sent message
     """
-    channel = state.get_channel(int(data["channel_id"]))
+    channel = state.get_channel(int(data["channel_id"])) or state._get_private_channel_by_user(data["message"]["author"]["id"])
     if response:
         if data.get("message") is not None and data.get("message", data)["flags"] == 64:
             return EphemeralResponseMessage(state=state, channel=channel, data=data.get("message", data))
@@ -423,7 +429,7 @@ def _update(self, data):
         super()._update(data)
         self._update_components(data)
 
-    async def edit(self, *, content=MISSING, embed=MISSING, embeds=MISSING, attachments=MISSING, suppress=MISSING, 
+    async def edit(self, content=MISSING, *, embed=MISSING, embeds=MISSING, attachments=MISSING, suppress=MISSING, 
         delete_after=MISSING, allowed_mentions=MISSING, components=MISSING):
         """Edits the message and updates its properties
 
@@ -454,7 +460,7 @@ async def edit(self, *, content=MISSING, embed=MISSING, embeds=MISSING, attachme
         data = await self._state.http.edit_message(self.channel.id, self.id, **payload)
         self._update(data)
 
-        if delete_after is not MISSING:
+        if not _none(delete_after):
             await self.delete(delay=delete_after)
 
     async def disable_action_row(self, row, disable = True):
@@ -528,17 +534,17 @@ def action_rows(self):
             rows.append(c_row) 
         return rows
 
-    async def wait_for(self, event_name: Literal["select", "button"], client, custom_id=MISSING, by=MISSING, check=lambda component: True, timeout=None) -> Union[PressedButton, SelectedMenu]:
+    async def wait_for(self, event_name: Literal["select", "button", "component"], client, custom_id=MISSING, by=MISSING, check=lambda component: True, timeout=None) -> Union[PressedButton, SelectedMenu]:
         """Waits for a message component to be invoked in this message
 
         Parameters
         -----------
             event_name: :class:`str`
-                The name of the event which will be awaited [``"select"`` | ``"button"``]
+                The name of the event which will be awaited [``"select"`` | ``"button"`` | ``"component"``]
                 
                 .. note::
 
-                    ``event_name`` must be ``select`` for a select menu selection and ``button`` for a button press
+                    ``event_name`` must be ``select`` for a select menu selection, ``button`` for a button press and ``component`` for any component
 
             client: :class:`discord.ext.commands.Bot`
                 The discord client
@@ -577,7 +583,7 @@ async def wait_for(self, event_name: Literal["select", "button"], client, custom
             except asyncio.TimeoutError:
                 # no button press was received in 20 seconds timespan
         """
-        if event_name.lower() in ["button", "select"]:
+        if event_name.lower() in ["button", "select", "component"]:
             def _check(com):
                 if com.message.id == self.id:
                     statements = []
@@ -591,23 +597,15 @@ def _check(com):
                 return False
             if not isinstance(client, Bot):
                 raise WrongType("client", client, "discord.ext.commands.Bot")
-            return (await client.wait_for('button_press' if event_name.lower() == "button" else "menu_select", check=_check, timeout=timeout))
+            return (await client.wait_for('button_press' if event_name.lower() == "button" else ("menu_select" if event_name.lower() == "menu" else "component"), check=_check, timeout=timeout))
 
-        raise InvalidEvent(event_name, ["button", "select"])
-
-class ResponseMessage(Message):
-    r"""A message Object which extends the `Message` Object optimized for an interaction component"""
-    def __init__(self, *, state, channel, data, user, interaction_component = None):
-        Message.__init__(self, state=state, channel=channel, data=data["message"])
-        self.interaction = Interaction(state, data, user, self)
-        self.interaction_component = interaction_component
-
+        raise InvalidEvent(event_name, ["button", "select", "component"])
 
 class WebhookMessage(Message, discord.WebhookMessage):
     def __init__(self, *, state, channel, data):
         Message.__init__(self, state=state, channel=channel, data=data)
         discord.WebhookMessage.__init__(self, state=state, channel=channel, data=data)
-    async def edit(self, **fields):
+    async def edit(self, *args, **fields):
         """Edits the message
 
         content: :class:`str`, Optional
@@ -621,7 +619,7 @@ async def edit(self, **fields):
         allowed_mentions: :class`discord.AllowedMentions`
             Controls the mentions being processed in this message. See `discord.abc.Messageable.send` for more information.
         """
-        return await self._state._webhook._adapter.edit_webhook_message(message_id=self.id, payload=jsonifyMessage(**fields))
+        return await self._state._webhook._adapter.edit_webhook_message(message_id=self.id, payload=jsonifyMessage(*args, **fields))
 
 
 class EphemeralComponent(Interaction):
@@ -651,9 +649,9 @@ def __init__(self, state, channel, data, application_id=MISSING, token=MISSING):
         Message.__init__(self, state=state, channel=channel, data=data)
         self._application_id = application_id
         self._interaction_token = token
-    async def edit(self, **fields):
+    async def edit(self, *args, **fields):
         r = BetterRoute("PATCH", f"/webhooks/{self._application_id}/{self._interaction_token}/messages/{self.id}")
-        self._update(await self._state.http.request(r, json=jsonifyMessage(**fields)))        
+        self._update(await self._state.http.request(r, json=jsonifyMessage(*args, **fields)))        
     async def delete(self):
         """Override for delete function that will throw an exception"""
         raise EphemeralDeletion()
@@ -668,7 +666,7 @@ class EphemeralResponseMessage(Message):
     def __init__(self, *, state, channel, data):
         Message.__init__(self, state=state, channel=channel, data=data)
 
-    async def edit(self, token, **fields):
+    async def edit(self, token, *args, **fields):
         """Edits the message
         
         Parameters
@@ -689,7 +687,7 @@ async def testing(ctx):
         
         """
         route = BetterRoute("PATCH", f"/webhooks/{self.interaction.application_id}/{token}/messages/{self.id}")
-        self._update(await self._state.http.request(route, json=jsonifyMessage(**fields)))
+        self._update(await self._state.http.request(route, json=jsonifyMessage(*args, **fields)))
     async def delete(self):
         """Override for delete function that will throw an exception"""
         raise EphemeralDeletion()