Merge branch 'master' into 'master'

Added new event 'on_interaction' and some examples

See merge request discord.py-components/discord.py-components!15

Author: kiki7000

discord_components/client.py

@@ -46,9 +46,11 @@ async def on_socket_response(self, res):
         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:

examples/basic.py

@@ -46,4 +46,31 @@ 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,4 +47,33 @@ 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")