Fix issues with incoming PRs.
This commit is contained in:
@@ -57,6 +57,6 @@ pub async fn req(user: User, server: Ref, target: Ref, data: Json<Data>) -> Resu
|
||||
with: "server_ban",
|
||||
})?;
|
||||
|
||||
server.remove_member(&target.id, RemoveMember::Ban).await;
|
||||
server.remove_member(&target.id, RemoveMember::Ban).await?;
|
||||
Ok(EmptyResponse {})
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ pub async fn req(user: User, server: Ref, target: String, data: Json<Data>) -> R
|
||||
.map_err(|error| Error::FailedValidation { error })?;
|
||||
|
||||
if data.nickname.is_none() && data.avatar.is_none() && data.roles.is_none() && data.remove.is_none() {
|
||||
return Ok(());
|
||||
return Ok(EmptyResponse {});
|
||||
}
|
||||
|
||||
let server = server.fetch_server().await?;
|
||||
|
||||
@@ -27,7 +27,7 @@ pub async fn req(user: User, target: Ref, member: String) -> Result<EmptyRespons
|
||||
|
||||
target
|
||||
.remove_member(&member.id.user, RemoveMember::Kick)
|
||||
.await;
|
||||
.await?;
|
||||
|
||||
Ok(EmptyResponse {})
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ pub async fn req(user: User, target: Ref, role_id: String, data: Json<Data>) ->
|
||||
|
||||
if data.name.is_none() && data.colour.is_none() && data.hoist.is_none() && data.rank.is_none() && data.remove.is_none()
|
||||
{
|
||||
return Ok(());
|
||||
return Ok(EmptyResponse {});
|
||||
}
|
||||
|
||||
let target = target.fetch_server().await?;
|
||||
|
||||
@@ -18,6 +18,6 @@ pub async fn req(user: User, target: Ref) -> Result<EmptyResponse> {
|
||||
Err(Error::MissingPermission)?
|
||||
}
|
||||
|
||||
target.mark_as_read(&user.id).await;
|
||||
target.mark_as_read(&user.id).await?;
|
||||
Ok(EmptyResponse {})
|
||||
}
|
||||
|
||||
@@ -16,8 +16,10 @@ pub async fn req(user: User, target: Ref) -> Result<EmptyResponse> {
|
||||
}
|
||||
|
||||
if user.id == target.owner {
|
||||
target.delete().await
|
||||
target.delete().await?;
|
||||
} else {
|
||||
target.remove_member(&user.id, RemoveMember::Leave).await
|
||||
target.remove_member(&user.id, RemoveMember::Leave).await?;
|
||||
}
|
||||
|
||||
Ok(EmptyResponse {})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user