Refactor delete()
This commit is contained in:
parent
b501aca5b2
commit
03e5a83d84
|
@ -85,14 +85,9 @@ impl Guild {
|
||||||
/// None => println!("Guild deleted successfully"),
|
/// None => println!("Guild deleted successfully"),
|
||||||
/// }
|
/// }
|
||||||
/// ```
|
/// ```
|
||||||
pub async fn delete(
|
pub async fn delete(user: &mut UserMeta, guild_id: &str) -> Option<InstanceServerError> {
|
||||||
user: &mut UserMeta,
|
let mut belongs_to = user.belongs_to.borrow_mut();
|
||||||
url_api: &str,
|
let url = format!("{}/guilds/{}/delete/", belongs_to.urls.get_api(), guild_id);
|
||||||
guild_id: &str,
|
|
||||||
) -> Option<InstanceServerError> {
|
|
||||||
let url = format!("{}/guilds/{}/delete/", url_api, guild_id);
|
|
||||||
let limits_user = user.limits.get_as_mut();
|
|
||||||
let limits_instance = &mut user.belongs_to.borrow_mut().limits;
|
|
||||||
let request = reqwest::Client::new()
|
let request = reqwest::Client::new()
|
||||||
.post(url.clone())
|
.post(url.clone())
|
||||||
.bearer_auth(user.token.clone());
|
.bearer_auth(user.token.clone());
|
||||||
|
@ -101,8 +96,8 @@ impl Guild {
|
||||||
.send_request(
|
.send_request(
|
||||||
request,
|
request,
|
||||||
crate::api::limits::LimitType::Guild,
|
crate::api::limits::LimitType::Guild,
|
||||||
limits_instance,
|
&mut belongs_to.limits,
|
||||||
limits_user,
|
&mut user.limits,
|
||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
if result.is_err() {
|
if result.is_err() {
|
||||||
|
|
|
@ -88,11 +88,6 @@ pub async fn setup() -> TestBundle {
|
||||||
|
|
||||||
// Teardown method to clean up after a test.
|
// Teardown method to clean up after a test.
|
||||||
pub async fn teardown(mut bundle: TestBundle) {
|
pub async fn teardown(mut bundle: TestBundle) {
|
||||||
Guild::delete(
|
Guild::delete(&mut bundle.user, &bundle.guild.id.to_string()).await;
|
||||||
&mut bundle.user,
|
|
||||||
bundle.instance.urls.get_api(),
|
|
||||||
&bundle.guild.id.to_string(),
|
|
||||||
)
|
|
||||||
.await;
|
|
||||||
bundle.user.delete().await;
|
bundle.user.delete().await;
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,13 +19,7 @@ async fn guild_creation_deletion() {
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
match Guild::delete(
|
match Guild::delete(&mut bundle.user, &guild.id.to_string()).await {
|
||||||
&mut bundle.user,
|
|
||||||
bundle.urls.get_api(),
|
|
||||||
&guild.id.to_string(),
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
{
|
|
||||||
None => assert!(true),
|
None => assert!(true),
|
||||||
Some(_) => assert!(false),
|
Some(_) => assert!(false),
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue