From 8d8b7c0b12f43df8fcf19863391694afa530ef72 Mon Sep 17 00:00:00 2001 From: Quaternion Date: Fri, 22 Sep 2023 20:44:25 -0400 Subject: [PATCH 1/3] Update GuildDefaults to use new enums --- src/types/config/types/subconfigs/defaults/guild.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/types/config/types/subconfigs/defaults/guild.rs b/src/types/config/types/subconfigs/defaults/guild.rs index 966c7af..a709f82 100644 --- a/src/types/config/types/subconfigs/defaults/guild.rs +++ b/src/types/config/types/subconfigs/defaults/guild.rs @@ -1,13 +1,15 @@ use serde::{Deserialize, Serialize}; +use crate::types::{ExplicitContentFilterLevel, MessageNotificationLevel}; + #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] pub struct GuildDefaults { pub max_presences: u64, pub max_video_channel_users: u16, pub afk_timeout: u16, - pub default_message_notifications: u8, - pub explicit_content_filter: u8, + pub default_message_notifications: MessageNotificationLevel, + pub explicit_content_filter: ExplicitContentFilterLevel, } impl Default for GuildDefaults { @@ -16,8 +18,8 @@ impl Default for GuildDefaults { max_presences: 250_000, max_video_channel_users: 200, afk_timeout: 300, - default_message_notifications: 1, - explicit_content_filter: 0, + default_message_notifications: MessageNotificationLevel::OnlyMentions, + explicit_content_filter: ExplicitContentFilterLevel::Disabled, } } } From c4928758381f2da21c3ec5874f62dd570b57935c Mon Sep 17 00:00:00 2001 From: Quaternion Date: Fri, 22 Sep 2023 20:44:56 -0400 Subject: [PATCH 2/3] Make new enums derive sqlx::Type --- src/types/entities/guild.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/types/entities/guild.rs b/src/types/entities/guild.rs index bb4db0c..2a63ad0 100644 --- a/src/types/entities/guild.rs +++ b/src/types/entities/guild.rs @@ -343,6 +343,7 @@ pub struct VoiceRegion { } #[derive(Serialize_repr, Deserialize_repr, Debug, Default, Clone, Eq, PartialEq, Hash, Copy)] +#[cfg_attr(feature = "sqlx", derive(sqlx::Type))] #[repr(u8)] #[serde(rename_all = "SCREAMING_SNAKE_CASE")] /// See @@ -353,6 +354,7 @@ pub enum MessageNotificationLevel { } #[derive(Serialize_repr, Deserialize_repr, Debug, Default, Clone, Eq, PartialEq, Hash, Copy)] +#[cfg_attr(feature = "sqlx", derive(sqlx::Type))] #[repr(u8)] #[serde(rename_all = "SCREAMING_SNAKE_CASE")] /// See @@ -364,6 +366,7 @@ pub enum ExplicitContentFilterLevel { } #[derive(Serialize_repr, Deserialize_repr, Debug, Default, Clone, Eq, PartialEq, Hash, Copy)] +#[cfg_attr(feature = "sqlx", derive(sqlx::Type))] #[repr(u8)] #[serde(rename_all = "SCREAMING_SNAKE_CASE")] /// See @@ -377,6 +380,7 @@ pub enum VerificationLevel { } #[derive(Serialize_repr, Deserialize_repr, Debug, Default, Clone, Eq, PartialEq, Hash, Copy)] +#[cfg_attr(feature = "sqlx", derive(sqlx::Type))] #[repr(u8)] #[serde(rename_all = "SCREAMING_SNAKE_CASE")] /// See @@ -387,6 +391,7 @@ pub enum MFALevel { } #[derive(Serialize_repr, Deserialize_repr, Debug, Default, Clone, Eq, PartialEq, Hash, Copy)] +#[cfg_attr(feature = "sqlx", derive(sqlx::Type))] #[repr(u8)] #[serde(rename_all = "SCREAMING_SNAKE_CASE")] /// See @@ -399,6 +404,7 @@ pub enum NSFWLevel { } #[derive(Serialize_repr, Deserialize_repr, Debug, Default, Clone, Eq, PartialEq, Hash, Copy)] +#[cfg_attr(feature = "sqlx", derive(sqlx::Type))] #[repr(u8)] #[serde(rename_all = "SCREAMING_SNAKE_CASE")] /// See From 904d54edbe9967da025b6b8554d959ef1424697b Mon Sep 17 00:00:00 2001 From: Quaternion Date: Fri, 22 Sep 2023 20:45:19 -0400 Subject: [PATCH 3/3] Feature lock UpdateMessage implementations --- src/types/events/guild.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/types/events/guild.rs b/src/types/events/guild.rs index 0c6bb05..89e4a75 100644 --- a/src/types/events/guild.rs +++ b/src/types/events/guild.rs @@ -29,6 +29,7 @@ pub struct GuildCreate { pub json: String, } +#[cfg(feature = "client")] impl UpdateMessage for GuildCreate { fn id(&self) -> Option { match &self.d { @@ -89,6 +90,7 @@ pub struct GuildUpdate { impl WebSocketEvent for GuildUpdate {} +#[cfg(feature = "client")] impl UpdateMessage for GuildUpdate { fn id(&self) -> Option { Some(self.guild.id) @@ -107,6 +109,7 @@ pub struct GuildDelete { pub json: String, } +#[cfg(feature = "client")] impl UpdateMessage for GuildDelete { fn id(&self) -> Option { Some(self.guild.id)