From dd85a7de17328e66249be0afb619fb14f577f865 Mon Sep 17 00:00:00 2001 From: bitfl0wer Date: Wed, 24 Jul 2024 15:55:29 +0200 Subject: [PATCH 1/3] Fix/Correct UnavailableGuild object --- src/types/entities/guild.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/types/entities/guild.rs b/src/types/entities/guild.rs index 76256c7..cca9b94 100644 --- a/src/types/entities/guild.rs +++ b/src/types/entities/guild.rs @@ -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, + pub geo_restricted: Option, } -#[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, } From f0fc6eab4df17ccbf2362513537fb8963b0a3ccc Mon Sep 17 00:00:00 2001 From: bitfl0wer Date: Wed, 24 Jul 2024 15:55:49 +0200 Subject: [PATCH 2/3] Fix testcase that relied on false behavior implemented by older spacebar servers --- tests/guilds.rs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tests/guilds.rs b/tests/guilds.rs index e3a73f5..8399567 100644 --- a/tests/guilds.rs +++ b/tests/guilds.rs @@ -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 } From 7bb35e5ed838be34fe825a1ecd09ca92254bda2d Mon Sep 17 00:00:00 2001 From: bitfl0wer Date: Wed, 24 Jul 2024 15:57:12 +0200 Subject: [PATCH 3/3] Increase limit integer size to match spacebars' possibilities --- src/types/config/types/subconfigs/limits/global.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/types/config/types/subconfigs/limits/global.rs b/src/types/config/types/subconfigs/limits/global.rs index 2a23bf4..87e25f6 100644 --- a/src/types/config/types/subconfigs/limits/global.rs +++ b/src/types/config/types/subconfigs/limits/global.rs @@ -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, }