From a31a3e2e65d45d82449139edd9180df01547f7dc Mon Sep 17 00:00:00 2001 From: Paul Makles Date: Sat, 15 Jun 2024 10:50:43 +0100 Subject: [PATCH] refactor: remove profile from v0 user, added unintentionally --- crates/core/database/src/util/bridge/v0.rs | 14 +------------- crates/core/models/src/v0/users.rs | 3 --- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/crates/core/database/src/util/bridge/v0.rs b/crates/core/database/src/util/bridge/v0.rs index 2ac317a6..5c1291f4 100644 --- a/crates/core/database/src/util/bridge/v0.rs +++ b/crates/core/database/src/util/bridge/v0.rs @@ -1009,11 +1009,6 @@ impl crate::User { } else { None }, - profile: if can_see_profile { - self.profile.map(|profile| profile.into()) - } else { - None - }, flags: self.flags.unwrap_or_default() as u32, privileged: self.privileged, bot: self.bot.map(|bot| bot.into()), @@ -1086,11 +1081,6 @@ impl crate::User { } else { None }, - profile: if can_see_profile { - self.profile.map(|profile| profile.into()) - } else { - None - }, flags: self.flags.unwrap_or_default() as u32, privileged: self.privileged, bot: self.bot.map(|bot| bot.into()), @@ -1124,7 +1114,6 @@ impl crate::User { }) ), status: self.status.map(|status| status.into()), - profile: self.profile.map(|profile| profile.into()), flags: self.flags.unwrap_or_default() as u32, privileged: self.privileged, bot: self.bot.map(|bot| bot.into()), @@ -1152,7 +1141,7 @@ impl From for crate::User { relations: None, badges: Some(value.badges as i32), status: value.status.map(Into::into), - profile: value.profile.map(Into::into), + profile: None, flags: Some(value.flags as i32), privileged: value.privileged, bot: value.bot.map(Into::into), @@ -1175,7 +1164,6 @@ impl From for PartialUser { }), badges: value.badges.map(|badges| badges as u32), status: value.status.map(|status| status.into()), - profile: value.profile.map(|profile| profile.into()), flags: value.flags.map(|flags| flags as u32), privileged: value.privileged, bot: value.bot.map(|bot| bot.into()), diff --git a/crates/core/models/src/v0/users.rs b/crates/core/models/src/v0/users.rs index 1966e35c..ac3a8d1d 100644 --- a/crates/core/models/src/v0/users.rs +++ b/crates/core/models/src/v0/users.rs @@ -50,9 +50,6 @@ auto_derived_partial!( /// User's current status #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))] pub status: Option, - /// User's profile page - #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))] - pub profile: Option, /// Enum of user flags #[cfg_attr(