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

Dismiss contact request notification if request is cancelled

Browse source
This commit is contained in:
Nathan Sobo 2022-05-10 18:50:18 -06:00
parent 3bca1c29e2
commit fe89de8b11
5 changed files with 100 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/client/src/user.rs
View file

@ -55,7 +55,8 @@ pub struct UserStore {
}
pub enum Event {
NotifyIncomingRequest(Arc<User>),
ContactRequested(Arc<User>),
ContactRequestCancelled(Arc<User>),
}
impl Entity for UserStore {
@ -225,12 +226,18 @@ impl UserStore {
}
// Remove incoming contact requests
this.incoming_contact_requests
.retain(|user| !removed_incoming_requests.contains(&user.id));
this.incoming_contact_requests.retain(|user| {
if removed_incoming_requests.contains(&user.id) {
cx.emit(Event::ContactRequestCancelled(user.clone()));
false
} else {
true
}
});
// Update existing incoming requests and insert new ones
for (user, should_notify) in incoming_requests {
if should_notify {
cx.emit(Event::NotifyIncomingRequest(user.clone()));
cx.emit(Event::ContactRequested(user.clone()));
}
match this