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

Dismiss project shared notifications when a project was unshared

Browse source
This commit is contained in:
Antonio Scandurra 2022-10-11 11:44:31 +02:00
parent 1d4bdfc4a1
commit 0a306808da
2 changed files with 43 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

32
crates/call/src/room.rs
View file

@ -18,6 +18,10 @@ pub enum Event {
project_id: u64,
worktree_root_names: Vec<String>,
},
RemoteProjectUnshared {
project_id: u64,
},
Left,
}
pub struct Room {
@ -148,6 +152,7 @@ impl Room {
}
cx.notify();
cx.emit(Event::Left);
self.status = RoomStatus::Offline;
self.remote_participants.clear();
self.pending_participants.clear();
@ -223,15 +228,21 @@ impl Room {
let peer_id = PeerId(participant.peer_id);
this.participant_user_ids.insert(participant.user_id);
let existing_projects = this
let old_projects = this
.remote_participants
.get(&peer_id)
.into_iter()
.flat_map(|existing| &existing.projects)
.map(|project| project.id)
.collect::<HashSet<_>>();
let new_projects = participant
.projects
.iter()
.map(|project| project.id)
.collect::<HashSet<_>>();
for project in &participant.projects {
if !existing_projects.contains(&project.id) {
if !old_projects.contains(&project.id) {
cx.emit(Event::RemoteProjectShared {
owner: user.clone(),
project_id: project.id,
@ -240,6 +251,12 @@ impl Room {
}
}
for unshared_project_id in old_projects.difference(&new_projects) {
cx.emit(Event::RemoteProjectUnshared {
project_id: *unshared_project_id,
});
}
this.remote_participants.insert(
peer_id,
RemoteParticipant {
@ -252,7 +269,16 @@ impl Room {
}
this.remote_participants.retain(|_, participant| {
this.participant_user_ids.contains(&participant.user.id)
if this.participant_user_ids.contains(&participant.user.id) {
true
} else {
for project in &participant.projects {
cx.emit(Event::RemoteProjectUnshared {
project_id: project.id,
});
}
false
}
});
cx.notify();