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

fix(core/database): set do not set online status if presence is Invisible

Browse Source 
closes #34
This commit is contained in:
Paul Makles
2024-06-09 13:41:51 +01:00
parent a5d0cdf0dd
commit 506968634e
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -995,6 +995,15 @@ impl crate::User {
vec![] vec![]
}, },
badges: self.badges.unwrap_or_default() as u32, badges: self.badges.unwrap_or_default() as u32,
online: can_see_profile
&& revolt_presence::is_online(&self.id).await
&& !matches!(
self.status,
Some(crate::UserStatus {
presence: Some(crate::Presence::Invisible),
..
})
),
status: if can_see_profile { status: if can_see_profile {
self.status.map(|status| status.into()) self.status.map(|status| status.into())
} else { } else {
@@ -1009,7 +1018,6 @@ impl crate::User {
privileged: self.privileged, privileged: self.privileged,
bot: self.bot.map(|bot| bot.into()), bot: self.bot.map(|bot| bot.into()),
relationship, relationship,
online: can_see_profile && revolt_presence::is_online(&self.id).await,
id: self.id, id: self.id,
} }
} }
@@ -1064,6 +1072,15 @@ impl crate::User {
vec![] vec![]
}, },
badges: self.badges.unwrap_or_default() as u32, badges: self.badges.unwrap_or_default() as u32,
online: can_see_profile
&& is_online
&& !matches!(
self.status,
Some(crate::UserStatus {
presence: Some(crate::Presence::Invisible),
..
})
),
status: if can_see_profile { status: if can_see_profile {
self.status.map(|status| status.into()) self.status.map(|status| status.into())
} else { } else {
@@ -1078,7 +1095,6 @@ impl crate::User {
privileged: self.privileged, privileged: self.privileged,
bot: self.bot.map(|bot| bot.into()), bot: self.bot.map(|bot| bot.into()),
relationship, relationship,
online: can_see_profile && is_online,
id: self.id, id: self.id,
} }
} }
@@ -1099,13 +1115,20 @@ impl crate::User {
}) })
.unwrap_or_default(), .unwrap_or_default(),
badges: self.badges.unwrap_or_default() as u32, badges: self.badges.unwrap_or_default() as u32,
online: revolt_presence::is_online(&self.id).await
&& !matches!(
self.status,
Some(crate::UserStatus {
presence: Some(crate::Presence::Invisible),
..
})
),
status: self.status.map(|status| status.into()), status: self.status.map(|status| status.into()),
profile: self.profile.map(|profile| profile.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()),
relationship: RelationshipStatus::User, relationship: RelationshipStatus::User,
online: revolt_presence::is_online(&self.id).await,
id: self.id, id: self.id,
} }
} }