Merge pull request #3631 from urbit/la/fix-dumb-mistake

chat-hook: fix dumb mistake

pkg/arvo/app/chat-hook.hoon

@@ -24,8 +24,10 @@
       state-7
       state-8
       state-9
+      state-10
   ==
 ::
++$  state-10  [%10 state-base]
 +$  state-9  [%9 state-base]
 +$  state-8  [%8 state-base]
 +$  state-7  [%7 state-base]
@@ -58,7 +60,7 @@
   $%  [%chat-update update:store]
   ==
 --
-=|  state-9
+=|  state-10
 =*  state  -
 ::
 %-  agent:dbug
@@ -87,20 +89,47 @@
     =/  old  !<(versioned-state old-vase)
     =|  cards=(list card)
     |-
-    ?:  ?=(%9 -.old)
+    ?:  ?=(%10 -.old)
       [cards this(state old)]
-    ?:  ?=(%8 -.old)
+    ?:  ?=(%9 -.old)
+      =.  cards
+        %+  weld  cards
+        ^-  (list card)
+        %+  roll  ~(tap in ~(key by wex.bol))
+        |=  [[=wire =ship =term] out=(list card)]
+        ?>  ?=([@ *] wire)
+        ?.  ?&(=(ship our.bol) =(term %chat-hook))
+          out
+        :_  out
+        =-  [%pass / %agent [our.bol %chat-hook] %poke %chat-hook-action !>(-)]
+        [%remove t.wire]
+      =/  chat-keys=(set path)  (scry-for (set path) %chat-store [%keys ~])
+      =.  cards
+        %+  weld  cards
+        ^-  (list card)
+        %+  turn  ~(tap in chat-keys)
+        |=  =app=path
+        ^-  card
+        ?>  ?=([@ @ ~] app-path)
+        =/  =ship  (slav %p i.app-path)
+        ?:  =(ship our.bol)
+          (add-owned app-path %.y)
+        (add-synced ship app-path)
+      ::       
       =/  list-paths=(list path)
         %+  murn  ~(tap in ~(key by synced.old))
         |=  =app=path
         ^-  (unit path)
-        ?~  (groups-of-chat:cc app-path)  ~
-        `app-path
+        ?~  (groups-of-chat:cc app-path)
+          `app-path
+        ~
       |-
       ?~  list-paths
-        ^$(-.old %9)
+        ^$(-.old %10)
       =.  synced.old  (~(del by synced.old) i.list-paths)
       $(list-paths t.list-paths)
+    ?:  ?=(%8 -.old)
+      $(-.old %9)
     ?:  ?=(%7 -.old)
       =/  subscribers=(jug path ship)
         %+  roll  ~(val by sup.bol)
@@ -202,6 +231,17 @@
       ^-  (list (list card))
       (turn ~(tap in keys) generate-cards)
     ==
+    ::
+    ++  scry-for
+      |*  [=mold app=term =path]
+      .^  mold
+        %gx
+        (scot %p our.bol)
+        app
+        (scot %da now.bol)
+        (snoc `^path`path %noun)
+      ==
+    ::
     ++  kick-old-subs
       |=  old-path=path
       ^-  (list card)
@@ -565,6 +605,7 @@
   ::
       %add-synced
     ?>  (team:title our.bol src.bol)
+    ?<  =(ship.act our.bol)
     ?:  (~(has by synced) path.act)  [~ state]
     =.  synced  (~(put by synced) path.act ship.act)
     ?.  ask-history.act
@@ -831,13 +872,7 @@
     ?:  =(i.t.wir '~')
       ?>  ?=(^ chat)
       (migrate-listen t.chat)
-    :_  state
-    %.  ~[(chat-view-poke %delete chat)]
-    %-  slog
-    :*  leaf+"chat-hook failed subscribe on {(spud chat)}"
-        leaf+"stack trace:"
-        u.saw
-    ==
+    [~ state]
   ==
 ::
 ++  chat-poke