From 0779aafe6d03000634f0a9f5ddca54fe2700a107 Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Thu, 22 Sep 2016 14:55:03 -0700
Subject: [PATCH] keep canonical remote presence station names

---
 app/talk.hoon | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/app/talk.hoon b/app/talk.hoon
index 591fbaa36..e432d5291 100644
--- a/app/talk.hoon
+++ b/app/talk.hoon
@@ -1752,30 +1752,11 @@
     ::
     ++  pa-remind                                       ::  remote presence
       |=  {tay/partner loc/atlas rem/(map partner atlas)}
-      =+  ^=  buk
-          =+  mer=(turn (~(tap by rem) ~) |=({* a/atlas} a))
-          |-  ^-  atlas
-          ?~  mer  loc
-          =.  loc  $(mer t.mer)
-          =+  dur=`(list (pair ship status))`(~(tap by i.mer) ~)
-          |-  ^-  atlas
-          ?~  dur  loc
-          =.  loc  $(dur t.dur)
-          =+  fuy=(~(get by loc) p.i.dur)
-          ?~  fuy  (~(put by loc) p.i.dur q.i.dur)
-          ?:  =(`presence`p.q.i.dur `presence`p.u.fuy)
-            loc
-          ?-  p.u.fuy
-            $gone  (~(del by loc) p.i.dur q.i.dur)
-            $talk  loc
-            $hear  (~(put by loc) p.i.dur q.i.dur)
-          ==
-      =+  gub=(~(get by remotes) tay)
-      ::  ~&  [%pa-remind tay gub buk]
-      ?.  |(?=($~ gub) !=(buk u.gub))
-        +>.$
-      =.  remotes  (~(put by remotes) tay buk)
-      (pa-report-group groupers)
+      =.  rem  (~(del by rem) %& our.hid man)  :: superceded by local data
+      =/  buk  (~(uni by remotes) rem)  ::  XX drop?
+      =.  buk  (~(put by buk) tay loc)
+      ?:  =(buk remotes)  +>.$
+      (pa-report-group(remotes buk) groupers)
     ::
     ++  pa-start                                        ::  start stream
       |=  riv/river