Matthias/conduit
1
0
Fork 0
Code Issues 179 Pull requests 44 Projects Releases 5 Packages Wiki Activity

fix(sync): correctly update presence properties

Browse source
This commit is contained in:
Jakub Kubík 2023-12-20 13:34:45 +01:00
parent 76a9098109
commit 8690552b64
No known key found for this signature in database
GPG key ID: 5E67F25531ADB523
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -553,17 +553,15 @@ async fn process_room_presence_updates(
// Update existing presence event with more info
curr_content.presence = new_content.presence;
curr_content.status_msg =
curr_content.status_msg.clone().or(new_content.status_msg);
curr_content.status_msg = new_content.status_msg.or(curr_content.status_msg.take());
curr_content.last_active_ago =
curr_content.last_active_ago.or(new_content.last_active_ago);
new_content.last_active_ago.or(curr_content.last_active_ago);
curr_content.displayname =
curr_content.displayname.clone().or(new_content.displayname);
curr_content.avatar_url =
curr_content.avatar_url.clone().or(new_content.avatar_url);
curr_content.currently_active = curr_content
new_content.displayname.or(curr_content.displayname.take());
curr_content.avatar_url = new_content.avatar_url.or(curr_content.avatar_url.take());
curr_content.currently_active = new_content
.currently_active
.or(new_content.currently_active);
.or(curr_content.currently_active);
}
}
}