refactor: event dispatching

Author: kiki7000

discord_components/client.py

@@ -43,28 +43,27 @@ async def on_socket_response(self, res):
         ].get("channel_id"):
             res["d"]["message"]["message_reference"] = res["d"]["channel_id"]
 
+        interaction = self._get_interaction(res)
+        self.bot.dispatch(f"raw_interaction", res["d"])
+        self.bot.dispatch("interaction", interaction)
+
+        if self._components_callback.get(interaction.custom_id):
+            callback_info = self._components_callback[interaction.custom_id]
+            if callback_info["uses"] == 0:
+                del self._components_callback[interaction.custom_id]
+                return
+
+            if callback_info["uses"] is not None:
+                self._components_callback[interaction.custom_id]["uses"] -= 1
+            if not callback_info["filter"](interaction):
+                return
+
+            await self._components_callback[interaction.custom_id]["callback"](interaction)
+
         for _type in InteractionEventType:
             if _type.value == res["d"]["data"]["component_type"]:
                 self.bot.dispatch(f"raw_{_type.name}", res["d"])
-                self.bot.dispatch(f"raw_interaction", res["d"])
-
-                interaction = self._get_interaction(res)
                 self.bot.dispatch(_type.name, interaction)
-                self.bot.dispatch("interaction", interaction)
-                if self._components_callback.get(interaction.custom_id):
-                    callback_info = self._components_callback[interaction.custom_id]
-                    if callback_info["uses"] == 0:
-                        del self._components_callback[interaction.custom_id]
-                        return
-
-                    if callback_info["uses"] is not None:
-                        self._components_callback[interaction.custom_id]["uses"] -= 1
-                    if not callback_info["filter"](interaction):
-                        return
-
-                    await self._components_callback[interaction.custom_id]["callback"](
-                        interaction
-                    )
                 break
 
     def _get_interaction(self, json: dict):
@@ -107,9 +106,7 @@ def check(interaction: Interaction):
 
         return await self.bot.wait_for(event, check=check, timeout=timeout)
 
-    def add_callback(
-        self, component: Component, callback, *, uses: int = None, filter=None
-    ):
+    def add_callback(self, component: Component, callback, *, uses: int = None, filter=None):
         self._components_callback[component.custom_id] = {
             "callback": callback,
             "uses": uses,

discord_components/interaction.py

@@ -58,9 +58,7 @@ def __init__(
                 state=state, guild=self.guild, data=raw_data["member"]
             )
         elif raw_data.get("member"):
-            self.user: Union[User, Member] = User(
-                state=state, data=raw_data["member"]["user"]
-            )
+            self.user: Union[User, Member] = User(state=state, data=raw_data["member"]["user"])
         else:
             self.user: Union[User, Member] = User(state=state, data=raw_data["user"])
         self.author: Union[User, Member] = self.user
@@ -113,6 +111,9 @@ async def respond(
         ephemeral: bool = True,
         components: List[Union[ActionRow, Component, List[Component]]] = None,
     ) -> Optional[Union[ComponentMessage, dict]]:
+        if self.responded:
+            return
+
         state = self.state
         data = {"tts": tts}
 
@@ -130,9 +131,7 @@ async def respond(
 
         if embeds is not None:
             if len(embeds) > 10:
-                raise InvalidArgument(
-                    "embeds parameter must be a list of up to 10 elements"
-                )
+                raise InvalidArgument("embeds parameter must be a list of up to 10 elements")
             data["embeds"] = [embed.to_dict() for embed in embeds]
 
         if suppress is not None:
@@ -144,15 +143,11 @@ async def respond(
 
         if allowed_mentions is not None:
             if state.allowed_mentions is not None:
-                data["allowed_mentions"] = state.allowed_mentions.merge(
-                    allowed_mentions
-                ).to_dict()
+                data["allowed_mentions"] = state.allowed_mentions.merge(allowed_mentions).to_dict()
             else:
                 data["allowed_mentions"] = allowed_mentions.to_dict()
         else:
-            data["allowed_mentions"] = (
-                state.allowed_mentions and state.allowed_mentions.to_dict()
-            )
+            data["allowed_mentions"] = state.allowed_mentions and state.allowed_mentions.to_dict()
 
         if components is not None:
             data["components"] = _get_components_json(components)
@@ -164,9 +159,7 @@ async def respond(
             raise InvalidArgument("cannot pass both file and files parameter to send()")
         elif files is not None:
             if len(files) > 10:
-                raise InvalidArgument(
-                    "files parameter must be a list of up to 10 elements"
-                )
+                raise InvalidArgument("files parameter must be a list of up to 10 elements")
         if file is not None:
             files = [file]
 
@@ -188,6 +181,7 @@ async def respond(
             else:
                 self.deferred = True
         except NotFound as e:
+            self.responded = True
             raise NotFound(
                 e.response,
                 "Interaction is unknown (you have already responded to the interaction or responding took too long)",

examples/basic.py

@@ -46,31 +46,4 @@ async def select(ctx):
     await interaction.send(content=f"{interaction.values[0]} selected!")
 
 
-@bot.command()
-async def interaction(ctx):
-    await ctx.send(
-        "Buttons and Selects!",
-        components=[
-            Select(
-                placeholder="Select something!",
-                options=[
-                    SelectOption(label="a", value="a"),
-                    SelectOption(label="b", value="b"),
-                ],
-                custom_id="select1",
-            ),
-            Button(label="Button", custom_id="button1"),
-        ],
-    )
-
-    interaction = await bot.wait_for(
-        "interaction", check=lambda inter: inter.custom_id in ["select1", "button1"]
-    )
-
-    if isinstance(interaction.component, Button):
-        await interaction.respond(content="Button clicked!")
-    else:
-        await interaction.respond(content=f"{interaction.values[0]} selected!")
-
-
 bot.run("your token")

examples/event.py

@@ -47,33 +47,4 @@ async def on_select_option(interaction):
     await interaction.respond(content=f"{interaction.values[0]} selected!")
 
 
-@bot.command()
-async def interaction(ctx):
-    await ctx.send(
-        "Buttons and Selects!",
-        components=[
-            Select(
-                placeholder="Select something!",
-                options=[
-                    SelectOption(label="a", value="a"),
-                    SelectOption(label="b", value="b"),
-                ],
-                custom_id="select1",
-            ),
-            Button(label="Button", custom_id="button1"),
-        ],
-    )
-
-
-@bot.event
-async def on_interaction(interaction):
-    if interaction.custom_id not in ["select1", "button1"]:
-        return
-
-    if isinstance(interaction.component, Button):
-        await interaction.respond(content="Button clicked!")
-    else:
-        await interaction.respond(content=f"{interaction.values[0]} selected!")
-
-
 bot.run("your token")