diff --git a/src/api/channels/reactions.rs b/src/api/channels/reactions.rs index e46adba..dc6070b 100644 --- a/src/api/channels/reactions.rs +++ b/src/api/channels/reactions.rs @@ -1,10 +1,6 @@ use reqwest::Client; -use crate::{ - instance::UserMeta, - limit::LimitedRequester, - types::{self}, -}; +use crate::{api::handle_request, errors::ChorusLibError, instance::UserMeta, types}; /** Useful metadata for working with [`types::Reaction`], bundled together nicely. @@ -23,33 +19,28 @@ impl ReactionMeta { * `user` - A mutable reference to a [`UserMeta`] instance. # Returns - A `Result` containing a [`reqwest::Response`] or a [`crate::errors::ChorusLibError`]. + An `Option` [`crate::errors::ChorusLibError`] if something went wrong. Fires a `Message Reaction Remove All` Gateway event. # Reference See [https://discord.com/developers/docs/resources/channel#delete-all-reactions](https://discord.com/developers/docs/resources/channel#delete-all-reactions) */ - pub async fn delete_all( - &self, - user: &mut UserMeta, - ) -> Result { - let mut belongs_to = user.belongs_to.borrow_mut(); + pub async fn delete_all(&self, user: &mut UserMeta) -> Option { + let belongs_to = user.belongs_to.borrow(); let url = format!( "{}/channels/{}/messages/{}/reactions/", belongs_to.urls.get_api(), self.channel_id, self.message_id ); + drop(belongs_to); let request = Client::new().delete(url).bearer_auth(user.token()); - LimitedRequester::new() - .await - .send_request( - request, - crate::api::limits::LimitType::Channel, - &mut belongs_to.limits, - &mut user.limits, - ) - .await + match handle_request(request, user, crate::api::limits::LimitType::Channel).await { + Ok(_) => None, + Err(e) => Some(ChorusLibError::InvalidResponseError { + error: e.to_string(), + }), + } } /** @@ -62,17 +53,13 @@ impl ReactionMeta { * `user` - A mutable reference to a [`UserMeta`] instance. # Returns - A `Result` containing a [`reqwest::Response`] or a [`crate::errors::ChorusLibError`]. + A [`crate::errors::ChorusLibError`] if something went wrong. # Reference See [https://discord.com/developers/docs/resources/channel#get-reactions](https://discord.com/developers/docs/resources/channel#get-reactions) */ - pub async fn get( - &self, - emoji: &str, - user: &mut UserMeta, - ) -> Result { - let mut belongs_to = user.belongs_to.borrow_mut(); + pub async fn get(&self, emoji: &str, user: &mut UserMeta) -> Option { + let belongs_to = user.belongs_to.borrow(); let url = format!( "{}/channels/{}/messages/{}/reactions/{}/", belongs_to.urls.get_api(), @@ -80,16 +67,14 @@ impl ReactionMeta { self.message_id, emoji ); + drop(belongs_to); let request = Client::new().get(url).bearer_auth(user.token()); - LimitedRequester::new() - .await - .send_request( - request, - crate::api::limits::LimitType::Channel, - &mut belongs_to.limits, - &mut user.limits, - ) - .await + match handle_request(request, user, crate::api::limits::LimitType::Channel).await { + Ok(_) => None, + Err(e) => Some(ChorusLibError::InvalidResponseError { + error: e.to_string(), + }), + } } /** @@ -103,18 +88,14 @@ impl ReactionMeta { * `user` - A mutable reference to a [`UserMeta`] instance. # Returns - A `Result` containing a [`reqwest::Response`] or a [`crate::errors::ChorusLibError`]. + A [`crate::errors::ChorusLibError`] if something went wrong. Fires a `Message Reaction Remove Emoji` Gateway event. # Reference See [https://discord.com/developers/docs/resources/channel#delete-all-reactions-for-emoji](https://discord.com/developers/docs/resources/channel#delete-all-reactions-for-emoji) */ - pub async fn delete_emoji( - &self, - emoji: &str, - user: &mut UserMeta, - ) -> Result { - let mut belongs_to = user.belongs_to.borrow_mut(); + pub async fn delete_emoji(&self, emoji: &str, user: &mut UserMeta) -> Option { + let belongs_to = user.belongs_to.borrow(); let url = format!( "{}/channels/{}/messages/{}/reactions/{}/", belongs_to.urls.get_api(), @@ -122,16 +103,14 @@ impl ReactionMeta { self.message_id, emoji ); + drop(belongs_to); let request = Client::new().delete(url).bearer_auth(user.token()); - LimitedRequester::new() - .await - .send_request( - request, - crate::api::limits::LimitType::Channel, - &mut belongs_to.limits, - &mut user.limits, - ) - .await + match handle_request(request, user, crate::api::limits::LimitType::Channel).await { + Ok(_) => None, + Err(e) => Some(ChorusLibError::InvalidResponseError { + error: e.to_string(), + }), + } } /** @@ -155,12 +134,8 @@ impl ReactionMeta { # Reference See [https://discord.com/developers/docs/resources/channel#create-reaction](https://discord.com/developers/docs/resources/channel#create-reaction) */ - pub async fn create( - &self, - emoji: &str, - user: &mut UserMeta, - ) -> Result { - let mut belongs_to = user.belongs_to.borrow_mut(); + pub async fn create(&self, emoji: &str, user: &mut UserMeta) -> Option { + let belongs_to = user.belongs_to.borrow(); let url = format!( "{}/channels/{}/messages/{}/reactions/{}/@me/", belongs_to.urls.get_api(), @@ -168,16 +143,14 @@ impl ReactionMeta { self.message_id, emoji ); + drop(belongs_to); let request = Client::new().put(url).bearer_auth(user.token()); - LimitedRequester::new() - .await - .send_request( - request, - crate::api::limits::LimitType::Channel, - &mut belongs_to.limits, - &mut user.limits, - ) - .await + match handle_request(request, user, crate::api::limits::LimitType::Channel).await { + Ok(_) => None, + Err(e) => Some(ChorusLibError::InvalidResponseError { + error: e.to_string(), + }), + } } /** @@ -197,12 +170,8 @@ impl ReactionMeta { # Reference See [https://discord.com/developers/docs/resources/channel#delete-own-reaction](https://discord.com/developers/docs/resources/channel#delete-own-reaction) */ - pub async fn remove( - &self, - emoji: &str, - user: &mut UserMeta, - ) -> Result { - let mut belongs_to = user.belongs_to.borrow_mut(); + pub async fn remove(&self, emoji: &str, user: &mut UserMeta) -> Option { + let belongs_to = user.belongs_to.borrow(); let url = format!( "{}/channels/{}/messages/{}/reactions/{}/@me/", belongs_to.urls.get_api(), @@ -210,16 +179,14 @@ impl ReactionMeta { self.message_id, emoji ); + drop(belongs_to); let request = Client::new().delete(url).bearer_auth(user.token()); - LimitedRequester::new() - .await - .send_request( - request, - crate::api::limits::LimitType::Channel, - &mut belongs_to.limits, - &mut user.limits, - ) - .await + match handle_request(request, user, crate::api::limits::LimitType::Channel).await { + Ok(_) => None, + Err(e) => Some(ChorusLibError::InvalidResponseError { + error: e.to_string(), + }), + } } /** @@ -247,8 +214,8 @@ impl ReactionMeta { user_id: &str, emoji: &str, user: &mut UserMeta, - ) -> Result { - let mut belongs_to = user.belongs_to.borrow_mut(); + ) -> Option { + let belongs_to = user.belongs_to.borrow(); let url = format!( "{}/channels/{}/messages/{}/reactions/{}/{}", belongs_to.urls.get_api(), @@ -257,15 +224,13 @@ impl ReactionMeta { emoji, user_id ); + drop(belongs_to); let request = Client::new().delete(url).bearer_auth(user.token()); - LimitedRequester::new() - .await - .send_request( - request, - crate::api::limits::LimitType::Channel, - &mut belongs_to.limits, - &mut user.limits, - ) - .await + match handle_request(request, user, crate::api::limits::LimitType::Channel).await { + Ok(_) => None, + Err(e) => Some(ChorusLibError::InvalidResponseError { + error: e.to_string(), + }), + } } }