Merge branch 'dev' into nextest
This commit is contained in:
commit
cc7ed62cf2
|
@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
|
|||
|
||||
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Copy, PartialOrd, Ord, Hash)]
|
||||
pub struct GlobalRateLimit {
|
||||
pub limit: u16,
|
||||
pub limit: u64,
|
||||
pub window: u64,
|
||||
pub enabled: bool,
|
||||
}
|
||||
|
|
|
@ -240,13 +240,18 @@ impl PartialEq for GuildInvite {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq, Hash, Eq, PartialOrd, Ord, Copy)]
|
||||
#[derive(
|
||||
Serialize, Deserialize, Debug, Default, Clone, PartialEq, Hash, Eq, PartialOrd, Ord, Copy,
|
||||
)]
|
||||
pub struct UnavailableGuild {
|
||||
pub id: Snowflake,
|
||||
pub unavailable: bool,
|
||||
pub unavailable: Option<bool>,
|
||||
pub geo_restricted: Option<bool>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Copy)]
|
||||
#[derive(
|
||||
Serialize, Deserialize, Debug, Default, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Copy,
|
||||
)]
|
||||
pub struct GuildCreateResponse {
|
||||
pub id: Snowflake,
|
||||
}
|
||||
|
|
|
@ -70,15 +70,6 @@ async fn guild_create_ban() {
|
|||
)
|
||||
.await
|
||||
.unwrap();
|
||||
assert!(Guild::create_ban(
|
||||
guild.id,
|
||||
other_user_id,
|
||||
None,
|
||||
GuildBanCreateSchema::default(),
|
||||
&mut bundle.user,
|
||||
)
|
||||
.await
|
||||
.is_err());
|
||||
common::teardown(bundle).await
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue