diff --git a/src/api/channels/channels.rs b/src/api/channels/channels.rs index bfe9959..21026b6 100644 --- a/src/api/channels/channels.rs +++ b/src/api/channels/channels.rs @@ -4,28 +4,31 @@ use serde_json::{from_str, to_string}; use crate::{ api::limits::Limits, errors::InstanceServerError, + instance::UserMeta, limit::LimitedRequester, types::{Channel, ChannelModifySchema}, }; impl Channel { pub async fn get( - token: &str, - url_api: &str, + user: &mut UserMeta, channel_id: &str, - limits_user: &mut Limits, - limits_instance: &mut Limits, ) -> Result { + let mut belongs_to = user.belongs_to.borrow_mut(); let request = Client::new() - .get(format!("{}/channels/{}/", url_api, channel_id)) - .bearer_auth(token); + .get(format!( + "{}/channels/{}/", + belongs_to.urls.get_api(), + channel_id + )) + .bearer_auth(user.token()); let mut requester = LimitedRequester::new().await; let result = match requester .send_request( request, crate::api::limits::LimitType::Guild, - limits_instance, - limits_user, + &mut belongs_to.limits, + &mut user.limits, ) .await { @@ -36,7 +39,7 @@ impl Channel { match from_str::(&result_text) { Ok(object) => Ok(object), Err(e) => Err(InstanceServerError::RequestErrorError { - url: format!("{}/channels/{}/", url_api, channel_id), + url: format!("{}/channels/{}/", belongs_to.urls.get_api(), channel_id), error: e.to_string(), }), } diff --git a/tests/channel.rs b/tests/channel.rs index 56f1ce5..58776b0 100644 --- a/tests/channel.rs +++ b/tests/channel.rs @@ -5,19 +5,13 @@ use chorus::types::{self, Channel}; async fn get_channel() { let mut bundle = common::setup().await; let bundle_channel = bundle.channel.clone(); - let bundle_user = &mut bundle.user; + let mut bundle_user = &mut bundle.user; assert_eq!( bundle_channel, - Channel::get( - bundle_user.token.as_str(), - bundle.instance.urls.get_api(), - &bundle_channel.id.to_string(), - &mut bundle_user.limits, - &mut bundle.instance.limits - ) - .await - .unwrap() + Channel::get(&mut bundle_user, &bundle_channel.id.to_string(),) + .await + .unwrap() ); common::teardown(bundle).await }