Merge pull request #1007 from zed-industries/dedup-contact-notifications

Max Brunsfeld created 3 years ago

Avoid creating duplicate notifications

Change summary

crates/contacts_panel/src/contacts_panel.rs | 14 ++---
crates/workspace/src/workspace.rs           | 53 ++++++++++++++--------
2 files changed, 39 insertions(+), 28 deletions(-)

Detailed changes

crates/contacts_panel/src/contacts_panel.rs

@@ -132,16 +132,15 @@ impl ContactsPanel {
                             project::Event::ContactRequestedJoin(user) => {
                                 if let Some(workspace) = workspace.upgrade(cx) {
                                     workspace.update(cx, |workspace, cx| {
-                                        workspace.show_notification(
+                                        workspace.show_notification(user.id as usize, cx, |cx| {
                                             cx.add_view(|cx| {
                                                 JoinProjectNotification::new(
                                                     project,
                                                     user.clone(),
                                                     cx,
                                                 )
-                                            }),
-                                            cx,
-                                        )
+                                            })
+                                        })
                                     });
                                 }
                             }
@@ -161,12 +160,11 @@ impl ContactsPanel {
                 {
                     workspace.update(cx, |workspace, cx| match event.kind {
                         ContactEventKind::Requested | ContactEventKind::Accepted => workspace
-                            .show_notification(
+                            .show_notification(event.user.id as usize, cx, |cx| {
                                 cx.add_view(|cx| {
                                     ContactNotification::new(event.clone(), user_store, cx)
-                                }),
-                                cx,
-                            ),
+                                })
+                            }),
                         _ => {}
                     });
                 }

crates/workspace/src/workspace.rs

@@ -716,7 +716,7 @@ pub struct Workspace {
     panes: Vec<ViewHandle<Pane>>,
     active_pane: ViewHandle<Pane>,
     status_bar: ViewHandle<StatusBar>,
-    notifications: Vec<Box<dyn NotificationHandle>>,
+    notifications: Vec<(TypeId, usize, Box<dyn NotificationHandle>)>,
     project: ModelHandle<Project>,
     leader_state: LeaderState,
     follower_states_by_leader: FollowerStatesByLeader,
@@ -1008,28 +1008,41 @@ impl Workspace {
 
     pub fn show_notification<V: Notification>(
         &mut self,
-        notification: ViewHandle<V>,
+        id: usize,
         cx: &mut ViewContext<Self>,
+        build_notification: impl FnOnce(&mut ViewContext<Self>) -> ViewHandle<V>,
     ) {
-        cx.subscribe(&notification, |this, handle, event, cx| {
-            if handle.read(cx).should_dismiss_notification_on_event(event) {
-                this.dismiss_notification(handle.id(), cx);
-            }
-        })
-        .detach();
-        self.notifications.push(Box::new(notification));
-        cx.notify();
+        let type_id = TypeId::of::<V>();
+        if self
+            .notifications
+            .iter()
+            .all(|(existing_type_id, existing_id, _)| {
+                (*existing_type_id, *existing_id) != (type_id, id)
+            })
+        {
+            let notification = build_notification(cx);
+            cx.subscribe(&notification, move |this, handle, event, cx| {
+                if handle.read(cx).should_dismiss_notification_on_event(event) {
+                    this.dismiss_notification(type_id, id, cx);
+                }
+            })
+            .detach();
+            self.notifications
+                .push((type_id, id, Box::new(notification)));
+            cx.notify();
+        }
     }
 
-    fn dismiss_notification(&mut self, id: usize, cx: &mut ViewContext<Self>) {
-        self.notifications.retain(|handle| {
-            if handle.id() == id {
-                cx.notify();
-                false
-            } else {
-                true
-            }
-        });
+    fn dismiss_notification(&mut self, type_id: TypeId, id: usize, cx: &mut ViewContext<Self>) {
+        self.notifications
+            .retain(|(existing_type_id, existing_id, _)| {
+                if (*existing_type_id, *existing_id) == (type_id, id) {
+                    cx.notify();
+                    false
+                } else {
+                    true
+                }
+            });
     }
 
     pub fn items<'a>(
@@ -1724,7 +1737,7 @@ impl Workspace {
         } else {
             Some(
                 Flex::column()
-                    .with_children(self.notifications.iter().map(|notification| {
+                    .with_children(self.notifications.iter().map(|(_, _, notification)| {
                         ChildView::new(notification.as_ref())
                             .contained()
                             .with_style(theme.notification)