Move QuickModal into collector module

examples/e05_sample_bot_structure/src/commands/modal.rs

@@ -1,7 +1,7 @@
 use serenity::builder::*;
+use serenity::collector::{CreateQuickModal, QuickModal};
 use serenity::model::prelude::*;
 use serenity::prelude::*;
-use serenity::utils::CreateQuickModal;
 
 pub async fn run(ctx: &Context, interaction: &CommandInteraction) -> Result<(), serenity::Error> {
     let modal = CreateQuickModal::new("About you")

src/collector.rs → src/collector/mod.rs

@@ -1,7 +1,10 @@
+mod quick_modal;
+
 use std::sync::Arc;
 
 use futures::future::pending;
 use futures::{Stream, StreamExt as _};
+pub use quick_modal::*;
 
 use crate::gateway::{CollectorCallback, ShardMessenger};
 use crate::internal::prelude::*;

src/utils/quick_modal.rs → src/collector/quick_modal.rs

@@ -1,12 +1,12 @@
 use std::borrow::Cow;
+use std::future::Future;
 
 use crate::builder::{CreateActionRow, CreateInputText, CreateInteractionResponse, CreateModal};
 use crate::collector::ModalInteractionCollector;
 use crate::gateway::client::Context;
 use crate::internal::prelude::*;
 use crate::model::prelude::*;
 
-#[cfg(feature = "collector")]
 pub struct QuickModalResponse {
     pub interaction: ModalInteraction,
     pub inputs: FixedArray<FixedString<u16>>,
@@ -15,7 +15,7 @@ pub struct QuickModalResponse {
 /// Convenience builder to create a modal, wait for the user to submit and parse the response.
 ///
 /// ```rust
-/// # use serenity::{builder::*, model::prelude::*, prelude::*, utils::CreateQuickModal, Result};
+/// # use serenity::{builder::*, model::prelude::*, prelude::*, collector::*, Result};
 /// # async fn foo_(ctx: &Context, interaction: &CommandInteraction) -> Result<()> {
 /// let modal = CreateQuickModal::new("About you")
 ///     .timeout(std::time::Duration::from_secs(600))
@@ -28,15 +28,13 @@ pub struct QuickModalResponse {
 /// # Ok(())
 /// # }
 /// ```
-#[cfg(feature = "collector")]
 #[must_use]
 pub struct CreateQuickModal<'a> {
     title: Cow<'a, str>,
     timeout: Option<std::time::Duration>,
     input_texts: Vec<CreateInputText<'a>>,
 }
 
-#[cfg(feature = "collector")]
 impl<'a> CreateQuickModal<'a> {
     pub fn new(title: impl Into<Cow<'a, str>>) -> Self {
         Self {
@@ -143,3 +141,31 @@ impl<'a> CreateQuickModal<'a> {
         }))
     }
 }
+
+pub trait QuickModal {
+    fn quick_modal(
+        &self,
+        ctx: &Context,
+        builder: CreateQuickModal<'_>,
+    ) -> impl Future<Output = Result<Option<QuickModalResponse>>>;
+}
+
+impl QuickModal for CommandInteraction {
+    async fn quick_modal(
+        &self,
+        ctx: &Context,
+        builder: CreateQuickModal<'_>,
+    ) -> Result<Option<QuickModalResponse>> {
+        builder.execute(ctx, self.id, &self.token).await
+    }
+}
+
+impl QuickModal for ComponentInteraction {
+    async fn quick_modal(
+        &self,
+        ctx: &Context,
+        builder: CreateQuickModal<'_>,
+    ) -> Result<Option<QuickModalResponse>> {
+        builder.execute(ctx, self.id, &self.token).await
+    }
+}

src/model/application/command_interaction.rs

@@ -12,14 +12,10 @@ use crate::builder::{
     CreateInteractionResponseMessage,
     EditInteractionResponse,
 };
-#[cfg(feature = "collector")]
-use crate::gateway::client::Context;
 #[cfg(feature = "model")]
 use crate::http::Http;
 use crate::internal::utils::lending_for_each;
 use crate::model::prelude::*;
-#[cfg(all(feature = "collector", feature = "utils"))]
-use crate::utils::{CreateQuickModal, QuickModalResponse};
 
 /// An interaction when a user invokes a slash command.
 ///
@@ -204,20 +200,6 @@ impl CommandInteraction {
         );
         self.create_response(http, builder).await
     }
-
-    /// See [`CreateQuickModal`].
-    ///
-    /// # Errors
-    ///
-    /// See [`CreateQuickModal::execute()`].
-    #[cfg(all(feature = "collector", feature = "utils"))]
-    pub async fn quick_modal(
-        &self,
-        ctx: &Context,
-        builder: CreateQuickModal<'_>,
-    ) -> Result<Option<QuickModalResponse>> {
-        builder.execute(ctx, self.id, &self.token).await
-    }
 }
 
 // Manual impl needed to insert guild_id into resolved Role's

src/model/application/component_interaction.rs

@@ -9,13 +9,9 @@ use crate::builder::{
     CreateInteractionResponseMessage,
     EditInteractionResponse,
 };
-#[cfg(feature = "collector")]
-use crate::gateway::client::Context;
 #[cfg(feature = "model")]
 use crate::http::Http;
 use crate::model::prelude::*;
-#[cfg(all(feature = "collector", feature = "utils"))]
-use crate::utils::{CreateQuickModal, QuickModalResponse};
 
 /// An interaction triggered by a message component.
 ///
@@ -201,20 +197,6 @@ impl ComponentInteraction {
         );
         self.create_response(http, builder).await
     }
-
-    /// See [`CreateQuickModal`].
-    ///
-    /// # Errors
-    ///
-    /// See [`CreateQuickModal::execute()`].
-    #[cfg(all(feature = "collector", feature = "utils"))]
-    pub async fn quick_modal(
-        &self,
-        ctx: &Context,
-        builder: CreateQuickModal<'_>,
-    ) -> Result<Option<QuickModalResponse>> {
-        builder.execute(ctx, self.id, &self.token).await
-    }
 }
 
 // Manual impl needed to insert guild_id into model data

src/utils/mod.rs

@@ -8,8 +8,6 @@ mod content_safe;
 mod custom_message;
 mod formatted_timestamp;
 mod message_builder;
-#[cfg(feature = "collector")]
-mod quick_modal;
 
 use std::num::NonZeroU16;
 
@@ -18,8 +16,6 @@ pub use argument_convert::*;
 #[cfg(feature = "cache")]
 pub use content_safe::*;
 pub use formatted_timestamp::*;
-#[cfg(feature = "collector")]
-pub use quick_modal::*;
 use url::Url;
 
 pub use self::custom_message::CustomMessage;