Implement create_invite on ChannelId (#1016)

serenity-rs · Oct 13, 2020 · c0c2137 · c0c2137
1 parent c6150ae
commit c0c2137
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/src/model/channel/channel_id.rs b/src/model/channel/channel_id.rs
@@ -4,6 +4,7 @@ use crate::model::prelude::*;
 use std::fmt::Write as FmtWrite;
 #[cfg(feature = "model")]
 use crate::builder::{
+    CreateInvite,
     CreateMessage,
     EditChannel,
     EditMessage,
@@ -13,7 +14,7 @@ use crate::builder::{
 use crate::cache::Cache;
 #[cfg(feature = "model")]
 use crate::http::AttachmentType;
-#[cfg(feature = "model")]
+#[cfg(all(feature = "model", feature = "utils"))]
 use crate::utils;
 #[cfg(feature = "model")]
 use crate::http::{Http, CacheHttp, Typing};
@@ -60,6 +61,20 @@ impl ChannelId {
         http.as_ref().broadcast_typing(self.0).await
     }
 
+    /// Creates an invite leading to the given channel.
+    #[cfg(feature = "utils")]
+    pub async fn create_invite<F>(&self, http: impl AsRef<Http>, f: F) -> Result<RichInvite>
+    where
+        F: FnOnce(&mut CreateInvite) -> &mut CreateInvite
+    {
+        let mut invite = CreateInvite::default();
+        f(&mut invite);
+
+        let map = utils::hashmap_to_json_map(invite.0);
+
+        http.as_ref().create_invite(self.0, &map).await
+    }
+
     /// Creates a [permission overwrite][`PermissionOverwrite`] for either a
     /// single [`Member`] or [`Role`] within the channel.
     ///
@@ -827,7 +842,7 @@ impl<H: AsRef<Http>> MessagesIter<H> {
     ///
     /// This drops any messages that were currently in the buffer, so it should
     /// only be called when `self.buffer` is empty. Additionally, this updates
-    /// `self.before` so that the next call does not return duplicate items. 
+    /// `self.before` so that the next call does not return duplicate items.
     /// If there are no more messages to be fetched, then this marks
     /// `self.before` as None, indicating that no more calls ought to be made.
     ///

diff --git a/src/model/channel/guild_channel.rs b/src/model/channel/guild_channel.rs
@@ -147,9 +147,12 @@ impl GuildChannel {
     /// ```rust,ignore
     /// let invite = channel.create_invite(&context, |i| i.max_uses(5)).await;
     /// ```
+    #[inline]
     #[cfg(feature = "utils")]
     pub async fn create_invite<F>(&self, cache_http: impl CacheHttp, f: F) -> Result<RichInvite>
-        where F: FnOnce(&mut CreateInvite) -> &mut CreateInvite {
+    where
+        F: FnOnce(&mut CreateInvite) -> &mut CreateInvite
+    {
         #[cfg(feature = "cache")]
         {
             if let Some(cache) = cache_http.cache() {
@@ -161,12 +164,7 @@ impl GuildChannel {
             }
         }
 
-        let mut invite = CreateInvite::default();
-        f(&mut invite);
-
-        let map = serenity_utils::hashmap_to_json_map(invite.0);
-
-        cache_http.http().create_invite(self.id.0, &map).await
+        self.id.create_invite(cache_http.http(), f).await
     }
 
     /// Creates a [permission overwrite][`PermissionOverwrite`] for either a
@@ -952,7 +950,7 @@ impl GuildChannel {
                 "data:image/png;base64,".to_string() + &base64::encode(&picture)
             },
         };
-        
+
         let map = serde_json::json!({
             "name": name,
             "avatar": avatar