Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix busy status when accepting a contact request

Browse source 
Previously, we would send an contact update when accepting a request
using the same `busy` status for both the requester and the responder.
This was obviously wrong and caused the requester to see their own
busy status as the newly-added responder contact's status.
This commit is contained in:
Antonio Scandurra 2022-12-06 10:19:34 +01:00
parent f1b35981c2
commit fc7b01b74e
2 changed files with 85 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/collab/src/rpc.rs
View file

@ -1616,7 +1616,8 @@ async fn respond_to_contact_request(
db.respond_to_contact_request(responder_id, requester_id, accept)
.await?;
let busy = db.is_user_busy(requester_id).await?;
let requester_busy = db.is_user_busy(requester_id).await?;
let responder_busy = db.is_user_busy(responder_id).await?;
let pool = session.connection_pool().await;
// Update responder with new contact
@ -1624,7 +1625,7 @@ async fn respond_to_contact_request(
if accept {
update
.contacts
.push(contact_for_user(requester_id, false, busy, &pool));
.push(contact_for_user(requester_id, false, requester_busy, &pool));
}
update
.remove_incoming_requests
@ -1638,7 +1639,7 @@ async fn respond_to_contact_request(
if accept {
update
.contacts
.push(contact_for_user(responder_id, true, busy, &pool));
.push(contact_for_user(responder_id, true, responder_busy, &pool));
}
update
.remove_outgoing_requests