Change send_request() calls to pass &mut Instance
This commit is contained in:
parent
2233063d5f
commit
e7eee4808e
|
@ -26,7 +26,7 @@ impl Instance {
|
||||||
let response = LimitedRequester::send_request(
|
let response = LimitedRequester::send_request(
|
||||||
request_builder,
|
request_builder,
|
||||||
LimitType::AuthRegister,
|
LimitType::AuthRegister,
|
||||||
&mut self.limits,
|
self,
|
||||||
&mut cloned_limits,
|
&mut cloned_limits,
|
||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
|
|
|
@ -36,7 +36,7 @@ impl Instance {
|
||||||
let response = LimitedRequester::send_request(
|
let response = LimitedRequester::send_request(
|
||||||
request_builder,
|
request_builder,
|
||||||
LimitType::AuthRegister,
|
LimitType::AuthRegister,
|
||||||
&mut self.limits,
|
self,
|
||||||
&mut cloned_limits,
|
&mut cloned_limits,
|
||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
|
@ -61,7 +61,7 @@ impl Instance {
|
||||||
return Err(ChorusLibError::InvalidFormBodyError { error_type, error });
|
return Err(ChorusLibError::InvalidFormBodyError { error_type, error });
|
||||||
}
|
}
|
||||||
let user_object = self.get_user(token.clone(), None).await.unwrap();
|
let user_object = self.get_user(token.clone(), None).await.unwrap();
|
||||||
let settings = UserMeta::get_settings(&token, &self.urls.api, &mut self.limits)
|
let settings = UserMeta::get_settings(&token, &self.urls.api.clone(), self)
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let user = UserMeta::new(
|
let user = UserMeta::new(
|
||||||
|
|
|
@ -15,7 +15,7 @@ pub async fn handle_request(
|
||||||
LimitedRequester::send_request(
|
LimitedRequester::send_request(
|
||||||
request,
|
request,
|
||||||
limit_type,
|
limit_type,
|
||||||
&mut user.belongs_to.borrow_mut().limits,
|
&mut user.belongs_to.borrow_mut(),
|
||||||
&mut user.limits,
|
&mut user.limits,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
|
|
@ -7,6 +7,7 @@ use crate::api::handle_request;
|
||||||
use crate::api::handle_request_as_result;
|
use crate::api::handle_request_as_result;
|
||||||
use crate::api::limits::Limits;
|
use crate::api::limits::Limits;
|
||||||
use crate::errors::ChorusLibError;
|
use crate::errors::ChorusLibError;
|
||||||
|
use crate::instance::Instance;
|
||||||
use crate::instance::UserMeta;
|
use crate::instance::UserMeta;
|
||||||
use crate::limit::LimitedRequester;
|
use crate::limit::LimitedRequester;
|
||||||
use crate::types::{Channel, ChannelCreateSchema, Guild, GuildCreateSchema};
|
use crate::types::{Channel, ChannelCreateSchema, Guild, GuildCreateSchema};
|
||||||
|
@ -101,7 +102,7 @@ impl Guild {
|
||||||
&self.id.to_string(),
|
&self.id.to_string(),
|
||||||
schema,
|
schema,
|
||||||
&mut user.limits,
|
&mut user.limits,
|
||||||
&mut belongs_to.limits,
|
&mut belongs_to,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
@ -161,7 +162,7 @@ impl Guild {
|
||||||
guild_id,
|
guild_id,
|
||||||
&user.token,
|
&user.token,
|
||||||
&mut user.limits,
|
&mut user.limits,
|
||||||
&mut belongs_to.limits,
|
&mut belongs_to,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
@ -173,7 +174,7 @@ impl Guild {
|
||||||
guild_id: &str,
|
guild_id: &str,
|
||||||
token: &str,
|
token: &str,
|
||||||
limits_user: &mut Limits,
|
limits_user: &mut Limits,
|
||||||
limits_instance: &mut Limits,
|
instance: &mut Instance,
|
||||||
) -> Result<Guild, ChorusLibError> {
|
) -> Result<Guild, ChorusLibError> {
|
||||||
let request = Client::new()
|
let request = Client::new()
|
||||||
.get(format!("{}/guilds/{}/", url_api, guild_id))
|
.get(format!("{}/guilds/{}/", url_api, guild_id))
|
||||||
|
@ -181,7 +182,7 @@ impl Guild {
|
||||||
let response = match LimitedRequester::send_request(
|
let response = match LimitedRequester::send_request(
|
||||||
request,
|
request,
|
||||||
crate::api::limits::LimitType::Guild,
|
crate::api::limits::LimitType::Guild,
|
||||||
limits_instance,
|
instance,
|
||||||
limits_user,
|
limits_user,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
@ -221,7 +222,7 @@ impl Channel {
|
||||||
guild_id,
|
guild_id,
|
||||||
schema,
|
schema,
|
||||||
&mut user.limits,
|
&mut user.limits,
|
||||||
&mut belongs_to.limits,
|
&mut belongs_to,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
@ -232,7 +233,7 @@ impl Channel {
|
||||||
guild_id: &str,
|
guild_id: &str,
|
||||||
schema: ChannelCreateSchema,
|
schema: ChannelCreateSchema,
|
||||||
limits_user: &mut Limits,
|
limits_user: &mut Limits,
|
||||||
limits_instance: &mut Limits,
|
instance: &mut Instance,
|
||||||
) -> Result<Channel, ChorusLibError> {
|
) -> Result<Channel, ChorusLibError> {
|
||||||
let request = Client::new()
|
let request = Client::new()
|
||||||
.post(format!("{}/guilds/{}/channels/", url_api, guild_id))
|
.post(format!("{}/guilds/{}/channels/", url_api, guild_id))
|
||||||
|
@ -241,7 +242,7 @@ impl Channel {
|
||||||
let result = match LimitedRequester::send_request(
|
let result = match LimitedRequester::send_request(
|
||||||
request,
|
request,
|
||||||
crate::api::limits::LimitType::Guild,
|
crate::api::limits::LimitType::Guild,
|
||||||
limits_instance,
|
instance,
|
||||||
limits_user,
|
limits_user,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
|
|
@ -6,11 +6,9 @@ use crate::instance::Instance;
|
||||||
use crate::types::GeneralConfiguration;
|
use crate::types::GeneralConfiguration;
|
||||||
|
|
||||||
impl Instance {
|
impl Instance {
|
||||||
/**
|
/// Gets the instance policies schema.
|
||||||
Gets the instance policies schema.
|
/// # Errors
|
||||||
# Errors
|
/// [`ChorusLibError`] - If the request fails.
|
||||||
[`ChorusLibError`] - If the request fails.
|
|
||||||
*/
|
|
||||||
pub async fn general_configuration_schema(
|
pub async fn general_configuration_schema(
|
||||||
&self,
|
&self,
|
||||||
) -> Result<GeneralConfiguration, ChorusLibError> {
|
) -> Result<GeneralConfiguration, ChorusLibError> {
|
||||||
|
|
|
@ -29,9 +29,9 @@ impl UserMeta {
|
||||||
pub async fn get_settings(
|
pub async fn get_settings(
|
||||||
token: &String,
|
token: &String,
|
||||||
url_api: &String,
|
url_api: &String,
|
||||||
instance_limits: &mut Limits,
|
instance: &mut Instance,
|
||||||
) -> Result<UserSettings, ChorusLibError> {
|
) -> Result<UserSettings, ChorusLibError> {
|
||||||
User::get_settings(token, url_api, instance_limits).await
|
User::get_settings(token, url_api, instance).await
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Modify the current user's `UserObject`.
|
/// Modify the current user's `UserObject`.
|
||||||
|
@ -91,7 +91,7 @@ impl User {
|
||||||
User::_get(
|
User::_get(
|
||||||
&user.token(),
|
&user.token(),
|
||||||
&format!("{}", belongs_to.urls.api),
|
&format!("{}", belongs_to.urls.api),
|
||||||
&mut belongs_to.limits,
|
&mut belongs_to,
|
||||||
id,
|
id,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
@ -100,7 +100,7 @@ impl User {
|
||||||
async fn _get(
|
async fn _get(
|
||||||
token: &str,
|
token: &str,
|
||||||
url_api: &str,
|
url_api: &str,
|
||||||
limits_instance: &mut Limits,
|
instance: &mut Instance,
|
||||||
id: Option<&String>,
|
id: Option<&String>,
|
||||||
) -> Result<User, ChorusLibError> {
|
) -> Result<User, ChorusLibError> {
|
||||||
let url = if id.is_none() {
|
let url = if id.is_none() {
|
||||||
|
@ -109,11 +109,11 @@ impl User {
|
||||||
format!("{}/users/{}", url_api, id.unwrap())
|
format!("{}/users/{}", url_api, id.unwrap())
|
||||||
};
|
};
|
||||||
let request = reqwest::Client::new().get(url).bearer_auth(token);
|
let request = reqwest::Client::new().get(url).bearer_auth(token);
|
||||||
let mut cloned_limits = limits_instance.clone();
|
let mut cloned_limits = instance.limits.clone();
|
||||||
match LimitedRequester::send_request(
|
match LimitedRequester::send_request(
|
||||||
request,
|
request,
|
||||||
crate::api::limits::LimitType::Ip,
|
crate::api::limits::LimitType::Ip,
|
||||||
limits_instance,
|
instance,
|
||||||
&mut cloned_limits,
|
&mut cloned_limits,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
@ -129,16 +129,16 @@ impl User {
|
||||||
pub async fn get_settings(
|
pub async fn get_settings(
|
||||||
token: &String,
|
token: &String,
|
||||||
url_api: &String,
|
url_api: &String,
|
||||||
instance_limits: &mut Limits,
|
instance: &mut Instance,
|
||||||
) -> Result<UserSettings, ChorusLibError> {
|
) -> Result<UserSettings, ChorusLibError> {
|
||||||
let request: reqwest::RequestBuilder = Client::new()
|
let request: reqwest::RequestBuilder = Client::new()
|
||||||
.get(format!("{}/users/@me/settings/", url_api))
|
.get(format!("{}/users/@me/settings/", url_api))
|
||||||
.bearer_auth(token);
|
.bearer_auth(token);
|
||||||
let mut cloned_limits = instance_limits.clone();
|
let mut cloned_limits = instance.limits.clone();
|
||||||
match LimitedRequester::send_request(
|
match LimitedRequester::send_request(
|
||||||
request,
|
request,
|
||||||
crate::api::limits::LimitType::Ip,
|
crate::api::limits::LimitType::Ip,
|
||||||
instance_limits,
|
instance,
|
||||||
&mut cloned_limits,
|
&mut cloned_limits,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
@ -165,6 +165,6 @@ impl Instance {
|
||||||
token: String,
|
token: String,
|
||||||
id: Option<&String>,
|
id: Option<&String>,
|
||||||
) -> Result<User, ChorusLibError> {
|
) -> Result<User, ChorusLibError> {
|
||||||
User::_get(&token, &self.urls.api, &mut self.limits, id).await
|
User::_get(&token, &self.urls.api.clone(), self, id).await
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue