jmug/stoatchat
1
0
Fork 1
mirror of https://github.com/stoatchat/stoatchat.git synced 2026-07-14 21:47:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: dont leak invisible presence to others

Browse Source
This commit is contained in:
Zomatree
2025-04-22 18:54:26 +01:00
parent a841df3b36
commit 02f18705f4
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1044,7 +1044,7 @@ impl crate::User {
}) })
), ),
status: if can_see_profile { status: if can_see_profile {
self.status.map(|status| status.into()) self.status.and_then(|status| status.into(true))
} else { } else {
None None
}, },
@@ -1106,7 +1106,7 @@ impl crate::User {
}) })
), ),
status: if can_see_profile { status: if can_see_profile {
self.status.map(|status| status.into()) self.status.and_then(|status| status.into(true))
} else { } else {
None None
}, },
@@ -1119,7 +1119,7 @@ impl crate::User {
} }
/// Convert user object into user model without presence information /// Convert user object into user model without presence information
pub fn into_known_static<'a>(self, is_online: bool) -> User { pub fn into_known_static(self, is_online: bool) -> User {
User { User {
username: self.username, username: self.username,
discriminator: self.discriminator, discriminator: self.discriminator,
@@ -1135,7 +1135,7 @@ impl crate::User {
.. ..
}) })
), ),
status: self.status.map(|status| status.into()), status: self.status.and_then(|status| status.into(true)),
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()),
@@ -1168,7 +1168,7 @@ impl crate::User {
.. ..
}) })
), ),
status: self.status.map(|status| status.into()), status: self.status.and_then(|status| status.into(true)),
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()),
@@ -1219,7 +1219,7 @@ impl From<crate::PartialUser> for PartialUser {
.collect() .collect()
}), }),
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.and_then(|status| status.into(false)),
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()),
@@ -1308,11 +1308,23 @@ impl From<Presence> for crate::Presence {
} }
} }
impl From<crate::UserStatus> for UserStatus { impl crate::UserStatus {
fn from(value: crate::UserStatus) -> Self { fn into(self, discard_invisible: bool) -> Option<UserStatus> {
UserStatus { let status = UserStatus {
text: value.text, text: self.text,
presence: value.presence.map(|presence| presence.into()), presence: self.presence.and_then(|presence| {
if discard_invisible && presence == crate::Presence::Invisible {
None
} else {
Some(presence.into())
}
}),
};
if status.text.is_none() && status.presence.is_none() {
None
} else {
Some(status)
} }
} }
} }