Add modal submit collector (#1743)

src/client/bridge/gateway/shard_messenger.rs

@@ -3,7 +3,7 @@ use futures::channel::mpsc::{TrySendError, UnboundedSender as Sender};
 
 use super::{ChunkGuildFilter, ShardClientMessage, ShardRunnerMessage};
 #[cfg(all(feature = "unstable_discord_api", feature = "collector"))]
-use crate::collector::ComponentInteractionFilter;
+use crate::collector::{ComponentInteractionFilter, ModalInteractionFilter};
 #[cfg(feature = "collector")]
 use crate::collector::{EventFilter, MessageFilter, ReactionFilter};
 use crate::gateway::InterMessage;
@@ -279,6 +279,13 @@ impl ShardMessenger {
         #[allow(clippy::let_underscore_must_use)]
         let _ = self.send_to_shard(ShardRunnerMessage::SetComponentInteractionFilter(collector));
     }
+
+    /// Sets a new filter for a modal interaction collector.
+    #[cfg(all(feature = "unstable_discord_api", feature = "collector"))]
+    pub fn set_modal_interaction_filter(&self, collector: ModalInteractionFilter) {
+        #[allow(clippy::let_underscore_must_use)]
+        let _ = self.send_to_shard(ShardRunnerMessage::SetModalInteractionFilter(collector));
+    }
 }
 
 impl AsRef<ShardMessenger> for ShardMessenger {

src/client/bridge/gateway/shard_runner.rs

@@ -19,7 +19,7 @@ use crate::client::bridge::voice::VoiceGatewayManager;
 use crate::client::dispatch::{dispatch, DispatchEvent};
 use crate::client::{EventHandler, RawEventHandler};
 #[cfg(all(feature = "unstable_discord_api", feature = "collector"))]
-use crate::collector::ComponentInteractionFilter;
+use crate::collector::{ComponentInteractionFilter, ModalInteractionFilter};
 #[cfg(feature = "collector")]
 use crate::collector::{EventFilter, LazyArc, LazyReactionAction, MessageFilter, ReactionFilter};
 #[cfg(feature = "framework")]
@@ -29,7 +29,7 @@ use crate::internal::prelude::*;
 use crate::internal::ws_impl::{ReceiverExt, SenderExt};
 use crate::model::event::{Event, GatewayEvent};
 #[cfg(all(feature = "unstable_discord_api", feature = "collector"))]
-use crate::model::interactions::{Interaction, InteractionType};
+use crate::model::interactions::Interaction;
 use crate::CacheAndHttp;
 
 /// A runner for managing a [`Shard`] and its respective WebSocket client.
@@ -56,6 +56,8 @@ pub struct ShardRunner {
     reaction_filters: Vec<ReactionFilter>,
     #[cfg(all(feature = "unstable_discord_api", feature = "collector"))]
     component_interaction_filters: Vec<ComponentInteractionFilter>,
+    #[cfg(all(feature = "unstable_discord_api", feature = "collector"))]
+    modal_interaction_filters: Vec<ModalInteractionFilter>,
 }
 
 impl ShardRunner {
@@ -84,6 +86,8 @@ impl ShardRunner {
             reaction_filters: Vec::new(),
             #[cfg(all(feature = "unstable_discord_api", feature = "collector"))]
             component_interaction_filters: vec![],
+            #[cfg(all(feature = "unstable_discord_api", feature = "collector"))]
+            modal_interaction_filters: vec![],
         }
     }
 
@@ -233,15 +237,20 @@ impl ShardRunner {
             },
             #[cfg(all(feature = "unstable_discord_api", feature = "collector"))]
             Event::InteractionCreate(ref interaction_event) => {
-                if interaction_event.interaction.kind() == InteractionType::MessageComponent {
-                    if let Interaction::MessageComponent(ref interaction) =
-                        interaction_event.interaction
-                    {
+                match &interaction_event.interaction {
+                    Interaction::MessageComponent(interaction) => {
                         let mut interaction = LazyArc::new(interaction);
                         retain(&mut self.component_interaction_filters, |f| {
                             f.send_interaction(&mut interaction)
                         });
-                    }
+                    },
+                    Interaction::ModalSubmit(interaction) => {
+                        let mut interaction = LazyArc::new(interaction);
+                        retain(&mut self.modal_interaction_filters, |f| {
+                            f.send_interaction(&mut interaction)
+                        });
+                    },
+                    _ => (),
                 }
             },
             _ => {},
@@ -466,6 +475,14 @@ impl ShardRunner {
                 )) => {
                     self.component_interaction_filters.push(collector);
 
+                    true
+                },
+                #[cfg(all(feature = "unstable_discord_api", feature = "collector"))]
+                ShardClientMessage::Runner(ShardRunnerMessage::SetModalInteractionFilter(
+                    collector,
+                )) => {
+                    self.modal_interaction_filters.push(collector);
+
                     true
                 },
             },

src/client/bridge/gateway/shard_runner_message.rs

@@ -1,7 +1,7 @@
 use async_tungstenite::tungstenite::Message;
 
 #[cfg(all(feature = "unstable_discord_api", feature = "collector"))]
-use crate::collector::ComponentInteractionFilter;
+use crate::collector::{ComponentInteractionFilter, ModalInteractionFilter};
 #[cfg(feature = "collector")]
 use crate::collector::{EventFilter, MessageFilter, ReactionFilter};
 use crate::model::{
@@ -73,4 +73,7 @@ pub enum ShardRunnerMessage {
     /// Sends a new filter for component interactions to the shard.
     #[cfg(all(feature = "unstable_discord_api", feature = "collector"))]
     SetComponentInteractionFilter(ComponentInteractionFilter),
+    /// Sends a new filter for modal interactions to the shard.
+    #[cfg(all(feature = "unstable_discord_api", feature = "collector"))]
+    SetModalInteractionFilter(ModalInteractionFilter),
 }

src/collector/mod.rs

@@ -11,12 +11,16 @@ pub use error::Error as CollectorError;
 pub mod component_interaction_collector;
 pub mod event_collector;
 pub mod message_collector;
+#[cfg(feature = "unstable_discord_api")]
+pub mod modal_interaction_collector;
 pub mod reaction_collector;
 
 #[cfg(feature = "unstable_discord_api")]
 pub use component_interaction_collector::*;
 pub use event_collector::*;
 pub use message_collector::*;
+#[cfg(feature = "unstable_discord_api")]
+pub use modal_interaction_collector::*;
 pub use reaction_collector::*;
 
 /// Wraps a &T and clones the value into an Arc<T> lazily. Used with collectors to allow inspecting