magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reduce number of separate sources of truth for presence disabled-ness

Browse source 
Instead of checking if we should update every time we want to update,
call the updater every time and decide internally.
This commit is contained in:
K900 2024-04-03 16:57:12 +03:00 • committed by June
parent 34fe7b7369
commit 8134dd9151
4 changed files with 29 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/api/client_server/profile.rs
View file

@ -85,12 +85,10 @@ pub async fn set_displayname_route(
.await;
}
if services().globals.allow_local_presence() {
// Presence update
services()
.presence
.ping_presence(sender_user, PresenceState::Online)?;
}
// Presence update
services()
.presence
.ping_presence(sender_user, PresenceState::Online)?;
Ok(set_display_name::v3::Response {})
}
@ -224,12 +222,10 @@ pub async fn set_avatar_url_route(body: Ruma<set_avatar_url::v3::Request>) -> Re
.await;
}
if services().globals.allow_local_presence() {
// Presence update
services()
.presence
.ping_presence(sender_user, PresenceState::Online)?;
}
// Presence update
services()
.presence
.ping_presence(sender_user, PresenceState::Online)?;
Ok(set_avatar_url::v3::Response {})
}

8
src/api/client_server/sync.rs
View file

@ -171,11 +171,9 @@ async fn sync_helper(
// bool = caching allowed
) -> Result<(sync_events::v3::Response, bool), Error> {
// Presence update
if services().globals.allow_local_presence() {
services()
.presence
.ping_presence(&sender_user, body.set_presence)?;
}
services()
.presence
.ping_presence(&sender_user, body.set_presence)?;
// Setup watchers, so if there's no response, we can wait for them
let watcher = services().globals.watch(&sender_user, &sender_device);