HMC/handmade-revolt-backend
6
0
Fork 0
forked from jmug/stoatchat
Code Pull Requests Actions Packages Releases 2 Activity

refactor: remove profile from v0 user, added unintentionally

Browse Source
This commit is contained in:
Paul Makles
2024-06-15 10:50:43 +01:00
parent b12e728514
commit a31a3e2e65
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/core/database/src/util/bridge/v0.rs
View File

@@ -1009,11 +1009,6 @@ impl crate::User {
} else { } else {
None None
}, },
profile: if can_see_profile {
self.profile.map(|profile| profile.into())
} else {
None
},
flags: self.flags.unwrap_or_default() as u32, flags: self.flags.unwrap_or_default() as u32,
privileged: self.privileged, privileged: self.privileged,
bot: self.bot.map(|bot| bot.into()), bot: self.bot.map(|bot| bot.into()),
@@ -1086,11 +1081,6 @@ impl crate::User {
} else { } else {
None None
}, },
profile: if can_see_profile {
self.profile.map(|profile| profile.into())
} else {
None
},
flags: self.flags.unwrap_or_default() as u32, flags: self.flags.unwrap_or_default() as u32,
privileged: self.privileged, privileged: self.privileged,
bot: self.bot.map(|bot| bot.into()), bot: self.bot.map(|bot| bot.into()),
@@ -1124,7 +1114,6 @@ impl crate::User {
}) })
), ),
status: self.status.map(|status| status.into()), status: self.status.map(|status| status.into()),
profile: self.profile.map(|profile| profile.into()),
flags: self.flags.unwrap_or_default() as u32, flags: self.flags.unwrap_or_default() as u32,
privileged: self.privileged, privileged: self.privileged,
bot: self.bot.map(|bot| bot.into()), bot: self.bot.map(|bot| bot.into()),
@@ -1152,7 +1141,7 @@ impl From<User> for crate::User {
relations: None, relations: None,
badges: Some(value.badges as i32), badges: Some(value.badges as i32),
status: value.status.map(Into::into), status: value.status.map(Into::into),
profile: value.profile.map(Into::into), profile: None,
flags: Some(value.flags as i32), flags: Some(value.flags as i32),
privileged: value.privileged, privileged: value.privileged,
bot: value.bot.map(Into::into), bot: value.bot.map(Into::into),
@@ -1175,7 +1164,6 @@ impl From<crate::PartialUser> for PartialUser {
}), }),
badges: value.badges.map(|badges| badges as u32), badges: value.badges.map(|badges| badges as u32),
status: value.status.map(|status| status.into()), status: value.status.map(|status| status.into()),
profile: value.profile.map(|profile| profile.into()),
flags: value.flags.map(|flags| flags as u32), flags: value.flags.map(|flags| flags as u32),
privileged: value.privileged, privileged: value.privileged,
bot: value.bot.map(|bot| bot.into()), bot: value.bot.map(|bot| bot.into()),

3
crates/core/models/src/v0/users.rs
View File

@@ -50,9 +50,6 @@ auto_derived_partial!(
/// User's current status /// User's current status
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))] #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
pub status: Option<UserStatus>, pub status: Option<UserStatus>,
/// User's profile page
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
pub profile: Option<UserProfile>,
/// Enum of user flags /// Enum of user flags
#[cfg_attr( #[cfg_attr(