Add Get Guild Ban/s, add audit_log_reason to create_ban
This commit is contained in:
parent
cd70a5b388
commit
07ebaf6119
|
@ -8,9 +8,9 @@ use crate::errors::ChorusResult;
|
||||||
use crate::instance::ChorusUser;
|
use crate::instance::ChorusUser;
|
||||||
use crate::ratelimiter::ChorusRequest;
|
use crate::ratelimiter::ChorusRequest;
|
||||||
use crate::types::{
|
use crate::types::{
|
||||||
Channel, ChannelCreateSchema, Guild, GuildBanCreateSchema, GuildCreateSchema, GuildMember,
|
Channel, ChannelCreateSchema, Guild, GuildBanCreateSchema, GuildBansQuery, GuildCreateSchema,
|
||||||
GuildMemberSearchSchema, GuildModifySchema, GuildPreview, ModifyGuildMemberProfileSchema,
|
GuildMember, GuildMemberSearchSchema, GuildModifySchema, GuildPreview,
|
||||||
ModifyGuildMemberSchema, UserProfileMetadata,
|
ModifyGuildMemberProfileSchema, ModifyGuildMemberSchema, UserProfileMetadata,
|
||||||
};
|
};
|
||||||
use crate::types::{GuildBan, Snowflake};
|
use crate::types::{GuildBan, Snowflake};
|
||||||
|
|
||||||
|
@ -146,24 +146,26 @@ impl Guild {
|
||||||
pub async fn create_ban(
|
pub async fn create_ban(
|
||||||
guild_id: Snowflake,
|
guild_id: Snowflake,
|
||||||
user_id: Snowflake,
|
user_id: Snowflake,
|
||||||
|
audit_log_reason: Option<String>,
|
||||||
schema: GuildBanCreateSchema,
|
schema: GuildBanCreateSchema,
|
||||||
user: &mut ChorusUser,
|
user: &mut ChorusUser,
|
||||||
) -> ChorusResult<GuildBan> {
|
) -> ChorusResult<GuildBan> {
|
||||||
let chorus_request = ChorusRequest {
|
let request = ChorusRequest::new(
|
||||||
request: Client::new()
|
http::Method::PUT,
|
||||||
.put(format!(
|
format!(
|
||||||
"{}/guilds/{}/bans/{}",
|
"{}/guilds/{}/bans/{}",
|
||||||
user.belongs_to.borrow().urls.api,
|
user.belongs_to.borrow().urls.api,
|
||||||
guild_id,
|
guild_id,
|
||||||
user_id
|
user_id
|
||||||
))
|
)
|
||||||
.header("Authorization", user.token())
|
.as_str(),
|
||||||
.body(to_string(&schema).unwrap()),
|
Some(to_string(&schema).unwrap()),
|
||||||
limit_type: LimitType::Guild(guild_id),
|
audit_log_reason.as_deref(),
|
||||||
};
|
None,
|
||||||
let response = chorus_request
|
Some(user),
|
||||||
.deserialize_response::<GuildBan>(user)
|
LimitType::Guild(guild_id),
|
||||||
.await?;
|
);
|
||||||
|
let response = request.deserialize_response::<GuildBan>(user).await?;
|
||||||
Ok(response)
|
Ok(response)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -381,6 +383,64 @@ impl Guild {
|
||||||
.deserialize_response::<UserProfileMetadata>(user)
|
.deserialize_response::<UserProfileMetadata>(user)
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Returns a list of ban objects for the guild. Requires the `BAN_MEMBERS` permission.
|
||||||
|
///
|
||||||
|
/// # Reference:
|
||||||
|
/// See <https://discord-userdoccers.vercel.app/resources/guild#get-guild-bans>
|
||||||
|
pub async fn get_bans(
|
||||||
|
user: &mut ChorusUser,
|
||||||
|
guild_id: Snowflake,
|
||||||
|
query: Option<GuildBansQuery>,
|
||||||
|
) -> ChorusResult<Vec<GuildBan>> {
|
||||||
|
let url = format!(
|
||||||
|
"{}/guilds/{}/bans",
|
||||||
|
user.belongs_to.borrow_mut().urls.api,
|
||||||
|
guild_id,
|
||||||
|
);
|
||||||
|
|
||||||
|
let mut request = ChorusRequest::new(
|
||||||
|
http::Method::GET,
|
||||||
|
&url,
|
||||||
|
None,
|
||||||
|
None,
|
||||||
|
None,
|
||||||
|
Some(user),
|
||||||
|
LimitType::Guild(guild_id),
|
||||||
|
);
|
||||||
|
if let Some(query) = query {
|
||||||
|
request.request = request.request.query(&to_string(&query).unwrap());
|
||||||
|
}
|
||||||
|
request.deserialize_response::<Vec<GuildBan>>(user).await
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Returns a ban object for the given user. Requires the `BAN_MEMBERS` permission.
|
||||||
|
///
|
||||||
|
/// # Reference:
|
||||||
|
/// See <https://discord-userdoccers.vercel.app/resources/guild#get-guild-ban>
|
||||||
|
pub async fn get_ban(
|
||||||
|
user: &mut ChorusUser,
|
||||||
|
guild_id: Snowflake,
|
||||||
|
user_id: Snowflake,
|
||||||
|
) -> ChorusResult<GuildBan> {
|
||||||
|
let url = format!(
|
||||||
|
"{}/guilds/{}/bans/{}",
|
||||||
|
user.belongs_to.borrow_mut().urls.api,
|
||||||
|
guild_id,
|
||||||
|
user_id
|
||||||
|
);
|
||||||
|
|
||||||
|
let request = ChorusRequest::new(
|
||||||
|
http::Method::GET,
|
||||||
|
&url,
|
||||||
|
None,
|
||||||
|
None,
|
||||||
|
None,
|
||||||
|
Some(user),
|
||||||
|
LimitType::Guild(guild_id),
|
||||||
|
);
|
||||||
|
request.deserialize_response::<GuildBan>(user).await
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Channel {
|
impl Channel {
|
||||||
|
|
|
@ -123,7 +123,7 @@ bitflags::bitflags! {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, PartialOrd, Eq, Ord)]
|
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, PartialOrd)]
|
||||||
pub struct UserProfileMetadata {
|
pub struct UserProfileMetadata {
|
||||||
pub guild_id: Option<Snowflake>,
|
pub guild_id: Option<Snowflake>,
|
||||||
pub pronouns: String,
|
pub pronouns: String,
|
||||||
|
|
|
@ -155,3 +155,11 @@ pub struct ModifyGuildMemberProfileSchema {
|
||||||
pub popout_animation_particle_type: Option<Snowflake>,
|
pub popout_animation_particle_type: Option<Snowflake>,
|
||||||
pub emoji_id: Option<Snowflake>,
|
pub emoji_id: Option<Snowflake>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, PartialOrd, Eq, Ord)]
|
||||||
|
/// The limit argument is a number between 1 and 1000.
|
||||||
|
pub struct GuildBansQuery {
|
||||||
|
pub before: Option<Snowflake>,
|
||||||
|
pub after: Option<Snowflake>,
|
||||||
|
pub limit: Option<u16>,
|
||||||
|
}
|
||||||
|
|
|
@ -53,6 +53,7 @@ async fn guild_create_ban() {
|
||||||
Guild::create_ban(
|
Guild::create_ban(
|
||||||
guild.id,
|
guild.id,
|
||||||
other_user_id,
|
other_user_id,
|
||||||
|
None,
|
||||||
GuildBanCreateSchema::default(),
|
GuildBanCreateSchema::default(),
|
||||||
&mut bundle.user,
|
&mut bundle.user,
|
||||||
)
|
)
|
||||||
|
@ -61,6 +62,7 @@ async fn guild_create_ban() {
|
||||||
assert!(Guild::create_ban(
|
assert!(Guild::create_ban(
|
||||||
guild.id,
|
guild.id,
|
||||||
other_user_id,
|
other_user_id,
|
||||||
|
None,
|
||||||
GuildBanCreateSchema::default(),
|
GuildBanCreateSchema::default(),
|
||||||
&mut bundle.user,
|
&mut bundle.user,
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue