From d972395e4307b02a46881f1ca8edbe0a7d04fd71 Mon Sep 17 00:00:00 2001 From: Zomatree Date: Mon, 16 Aug 2021 00:35:53 +0100 Subject: [PATCH] use existing if_false function --- src/database/entities/channel.rs | 4 ++-- src/database/entities/server.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/database/entities/channel.rs b/src/database/entities/channel.rs index d2b4e742..8114f0e3 100644 --- a/src/database/entities/channel.rs +++ b/src/database/entities/channel.rs @@ -103,7 +103,7 @@ pub enum Channel { #[serde(default = "HashMap::new", skip_serializing_if = "HashMap::is_empty")] role_permissions: HashMap, - #[serde(skip_serializing_if = "is_false", default)] + #[serde(skip_serializing_if = "entities::server::if_false", default)] nsfw: bool }, } @@ -406,6 +406,6 @@ impl Channel { } -fn is_false(value: &bool) -> bool { +pub fn is_false(value: &bool) -> bool { !value } \ No newline at end of file diff --git a/src/database/entities/server.rs b/src/database/entities/server.rs index 97abccf6..d75d9b4b 100644 --- a/src/database/entities/server.rs +++ b/src/database/entities/server.rs @@ -37,8 +37,8 @@ pub type PermissionTuple = ( i32 // channel permission ); -fn if_false(t: &bool) -> bool { - *t == false +pub fn if_false(t: &bool) -> bool { + !t } #[derive(Serialize, Deserialize, Debug, Clone)] @@ -108,7 +108,7 @@ pub struct Server { #[serde(skip_serializing_if = "Option::is_none")] pub banner: Option, - #[serde(skip_serializing_if = "is_false", default)] + #[serde(skip_serializing_if = "if_false", default)] pub nsfw: bool }