From d91de5f2769060e81bd46c696f373064a9bf9033 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Sat, 1 Aug 2020 11:11:13 +1000
Subject: [PATCH 01/89] lib-hooks: document with comments

---
 pkg/arvo/lib/pull-hook.hoon | 38 ++++++++++++++++++++++--
 pkg/arvo/lib/push-hook.hoon | 58 +++++++++++++++++++++++++++++++++++--
 2 files changed, 92 insertions(+), 4 deletions(-)

diff --git a/pkg/arvo/lib/pull-hook.hoon b/pkg/arvo/lib/pull-hook.hoon
index 6fdbf1007c..19f861f809 100644
--- a/pkg/arvo/lib/pull-hook.hoon
+++ b/pkg/arvo/lib/pull-hook.hoon
@@ -1,3 +1,24 @@
+::  lib/pull-hook/hoon: helper for creating a push hook
+::  
+::   lib/pull-hook is a helper for automatically pulling data from a
+::   corresponding push-hook to a store. 
+::   
+::   ## Interfacing notes:
+::
+::   lib/push-hook provides the inner door with its own separate state.
+::   The inner door may interact with the library by producing cards or
+::   scrying. Do not pass any cards on a wire beginning with /helper as
+::   these wires are reserved by this library. Any watches/pokes/peeks
+::   not listed below will be routed to the inner door.
+::
+::   ##  Subscription paths
+::
+::   /tracking: The set of resources we are pulling
+::
+::   ##  Pokes
+::
+::   %pull-hook-action: Add/remove a resource from pulling.
+::
 /-  *pull-hook
 /+  default-agent, resource
 ::
@@ -5,13 +26,24 @@
 |%
 +$  card   card:agent:gall
 ::
+::  $config: configuration for the pull hook
+::
+::    .store-name: name of the store to proxy subscriptions to.
+::    .update-mark: mark that updates will be tagged with
+::    .push-hook-name: name of the corresponding push-hook
+
 +$  config
   $:  store-name=term
       update=mold
       update-mark=term
       push-hook-name=term
   ==
+::  
+::  $state-0: state for the pull hook
 ::
+::    .tracking: a map of resources we are pulling, and the ships that
+::    we are pulling them from.
+::    .inner-state: state given to internal door
 +$  state-0
   $:  %0
     tracking=(map resource ship)
@@ -37,7 +69,7 @@
   |*  config
   $_  ^|
   |_  bowl:gall
-  ::
+  ::  from agent:gall
   ++  on-init
     *[(list card) _^|(..on-init)]
   ::
@@ -77,7 +109,9 @@
     *[(list card) _^|(..on-init)]
   ::  +on-pull-nack: handle failed pull subscription
   ::
-  ::    This arm is called when a pull subscription fails.
+  ::    This arm is called when a pull subscription fails. lib/pull-hook
+  ::    will automatically delete the resource from .tracking by the
+  ::    time this arm is called.
   ::
   ++  on-pull-nack
     |~  [resource tang]
diff --git a/pkg/arvo/lib/push-hook.hoon b/pkg/arvo/lib/push-hook.hoon
index 776aa0f597..e922283534 100644
--- a/pkg/arvo/lib/push-hook.hoon
+++ b/pkg/arvo/lib/push-hook.hoon
@@ -1,8 +1,42 @@
+::  lib/push-hook/hoon: helper for creating a push hook
+::  
+::   lib/push-hook is a helper for automatically pushing data from a
+::   local store to the corresponding pull-hook on remote ships. It also
+::   proxies remote pokes to the store.
+::
+::   ## Interfacing notes:
+::
+::   lib/push-hook provides the inner door with its own separate state.
+::   The inner door may interact with the library by producing cards or
+::   scrying. Do not pass any cards on a wire beginning with /helper as
+::   these wires are reserved by this library. Any watches/pokes/peeks
+::   not listed below will be routed to the inner door.
+::
+::   ##  Subscription paths
+::
+::   /resource/[resource]: Receive initial state and updates to
+::   .resource. .resource should be encoded with de-path:resource from
+::   /lib/resource. Facts on this path will be of mark
+::   update-mark.config
+::
+::   ##  Pokes
+::
+::   %push-hook-action: Add/remove a resource from pushing.
+::   [update-mark.config]: A poke to proxy to the local store
+::
 /-  *push-hook
 /+  default-agent, resource
 |%
 +$  card  card:agent:gall
 ::
+::  $config: configuration for the push hook
+::  
+::    .store-name: name of the store to proxy pokes and
+::    subscriptions to
+::    .store-path: subscription path to receive updates on
+::    .update-mark: mark that updates will be tagged with
+::    .pull-hook-name: name of the corresponding pull-hook
+::
 +$  config
   $:  store-name=term
       store-path=path
@@ -10,6 +44,12 @@
       update-mark=term
       pull-hook-name=term
   ==
+::
+::  $state-0: state for the push hook
+::
+::    .sharing: resources that the push hook is proxying
+::    .inner-state: state given to internal door
+::
 +$  state-0
   $:  %0
     sharing=(set resource)
@@ -20,6 +60,7 @@
   |*  =config
   $_  ^|
   |_  bowl:gall
+  ::  from agent:gall
   ::
   ++  on-init
     *[(list card) _^|(..on-init)]
@@ -58,14 +99,21 @@
   ++  on-fail
     |~  [term tang]
     *[(list card) _^|(..on-init)]
+  ::
   ::  +resource-for-update: get affected resource from an update
+  ::  
+  ::    Given a vase of the update, the mark of which is
+  ::    update-mark.config, produce the affected resource, if any.
+  ::
   ++  resource-for-update
     |~  vase
     *(unit resource)
   ::
   ::  +on-update: handle update from store
   ::
-  ::    Do extra stuff on store update
+  ::    Given an update from the store, do other things after proxying
+  ::    the update
+  ::
   ++  take-update
     |~  vase
     *[(list card) _^|(..on-init)]
@@ -81,7 +129,13 @@
   ::  +initial-watch: produce initial state for a subscription
   ::
   ::    .resource is the resource being subscribed to.
-  ::    .path is any additional information in the subscription wire
+  ::    .path is any additional information in the subscription wire.
+  ::    This would typically be used to encode state that the subscriber
+  ::    already has. For example, a chat client might encode
+  ::    the number of messages that it already has, or the date it last
+  ::    received an update.
+  ::
+  ::    If +initial-watch crashes, the subscription fails.
   ::
   ++  initial-watch
     |~  [path resource]

From 531d53ddfc2b52512544f5206af47f8d28441a91 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Wed, 5 Aug 2020 13:55:12 +1000
Subject: [PATCH 02/89] lib-hooks: address mark review

---
 pkg/arvo/lib/pull-hook.hoon | 57 ++++++++++++------------
 pkg/arvo/lib/push-hook.hoon | 88 ++++++++++++++++++-------------------
 2 files changed, 73 insertions(+), 72 deletions(-)

diff --git a/pkg/arvo/lib/pull-hook.hoon b/pkg/arvo/lib/pull-hook.hoon
index 19f861f809..5afd0275d7 100644
--- a/pkg/arvo/lib/pull-hook.hoon
+++ b/pkg/arvo/lib/pull-hook.hoon
@@ -1,11 +1,10 @@
-::  lib/pull-hook/hoon: helper for creating a push hook
+::  lib/pull-hook: helper for creating a push hook
 ::  
 ::   lib/pull-hook is a helper for automatically pulling data from a
 ::   corresponding push-hook to a store. 
 ::   
 ::   ## Interfacing notes:
 ::
-::   lib/push-hook provides the inner door with its own separate state.
 ::   The inner door may interact with the library by producing cards or
 ::   scrying. Do not pass any cards on a wire beginning with /helper as
 ::   these wires are reserved by this library. Any watches/pokes/peeks
@@ -28,10 +27,10 @@
 ::
 ::  $config: configuration for the pull hook
 ::
-::    .store-name: name of the store to proxy subscriptions to.
+::    .store-name: name of the store to send subscription updates to.
 ::    .update-mark: mark that updates will be tagged with
 ::    .push-hook-name: name of the corresponding push-hook
-
+::
 +$  config
   $:  store-name=term
       update=mold
@@ -44,6 +43,7 @@
 ::    .tracking: a map of resources we are pulling, and the ships that
 ::    we are pulling them from.
 ::    .inner-state: state given to internal door
+::
 +$  state-0
   $:  %0
     tracking=(map resource ship)
@@ -69,6 +69,28 @@
   |*  config
   $_  ^|
   |_  bowl:gall
+  ::  +on-pull-nack: handle failed pull subscription
+  ::
+  ::    This arm is called when a pull subscription fails. lib/pull-hook
+  ::    will automatically delete the resource from .tracking by the
+  ::    time this arm is called.
+  ::
+  ++  on-pull-nack
+    |~  [resource tang]
+    *[(list card) _^|(..on-init)]
+  ::  +on-pull-kick: produce any additional resubscribe path
+  ::
+  ::    If non-null, the produced path is appended to the original
+  ::    subscription path. This should be used to encode extra
+  ::    information onto the path in order to reduce the payload of a
+  ::    kick and resubscribe.
+  ::
+  ::    If null, a resubscribe is not attempted
+  ::
+  ++  on-pull-kick
+    |~  resource
+    *(unit path)
+  ::
   ::  from agent:gall
   ++  on-init
     *[(list card) _^|(..on-init)]
@@ -107,28 +129,6 @@
   ++  on-fail
     |~  [term tang]
     *[(list card) _^|(..on-init)]
-  ::  +on-pull-nack: handle failed pull subscription
-  ::
-  ::    This arm is called when a pull subscription fails. lib/pull-hook
-  ::    will automatically delete the resource from .tracking by the
-  ::    time this arm is called.
-  ::
-  ++  on-pull-nack
-    |~  [resource tang]
-    *[(list card) _^|(..on-init)]
-  ::  +on-pull-kick: produce any additional resubscribe path
-  ::
-  ::    If non-null, the produced path is appended to the original
-  ::    subscription path. This should be used to encode extra
-  ::    information onto the path in order to reduce the payload of a
-  ::    kick and resubscribe.
-  ::
-  ::    If null, a resubscribe is not attempted
-  ::
-  ++  on-pull-kick
-    |~  resource
-    *(unit path)
-  ::  ::
   --
 ++  agent
   |*  =config
@@ -243,7 +243,10 @@
         =^  cards  pull-hook
           (on-fail:og term tang)
         [cards this]
-      ++  on-peek   on-peek:def
+      ++  on-peek   
+        |=  =path
+        ^-  (unit (unit cage))
+        (on-peek:og path)
     --
   |_  =bowl:gall
   +*  og   ~(. pull-hook bowl)
diff --git a/pkg/arvo/lib/push-hook.hoon b/pkg/arvo/lib/push-hook.hoon
index e922283534..1ddc07a76a 100644
--- a/pkg/arvo/lib/push-hook.hoon
+++ b/pkg/arvo/lib/push-hook.hoon
@@ -1,4 +1,4 @@
-::  lib/push-hook/hoon: helper for creating a push hook
+::  lib/push-hook: helper for creating a push hook
 ::  
 ::   lib/push-hook is a helper for automatically pushing data from a
 ::   local store to the corresponding pull-hook on remote ships. It also
@@ -6,7 +6,6 @@
 ::
 ::   ## Interfacing notes:
 ::
-::   lib/push-hook provides the inner door with its own separate state.
 ::   The inner door may interact with the library by producing cards or
 ::   scrying. Do not pass any cards on a wire beginning with /helper as
 ::   these wires are reserved by this library. Any watches/pokes/peeks
@@ -15,7 +14,7 @@
 ::   ##  Subscription paths
 ::
 ::   /resource/[resource]: Receive initial state and updates to
-::   .resource. .resource should be encoded with de-path:resource from
+::   .resource. .resource should be encoded with en-path:resource from
 ::   /lib/resource. Facts on this path will be of mark
 ::   update-mark.config
 ::
@@ -60,6 +59,47 @@
   |*  =config
   $_  ^|
   |_  bowl:gall
+  ::
+  ::  +resource-for-update: get affected resource from an update
+  ::  
+  ::    Given a vase of the update, the mark of which is
+  ::    update-mark.config, produce the affected resource, if any.
+  ::
+  ++  resource-for-update
+    |~  vase
+    *(unit resource)
+  ::
+  ::  +take-update: handle update from store
+  ::
+  ::    Given an update from the store, do other things after proxying
+  ::    the update
+  ::
+  ++  take-update
+    |~  vase
+    *[(list card) _^|(..on-init)]
+  ::  +should-proxy-update: should forward update to store
+  ::
+  ::    If %.y is produced, then the update is forwarded to the local
+  ::    store. If %.n is produced then the update is not forwarded and
+  ::    the poke fails.
+  ::
+  ++  should-proxy-update
+    |~  vase
+    *?
+  ::  +initial-watch: produce initial state for a subscription
+  ::
+  ::    .resource is the resource being subscribed to.
+  ::    .path is any additional information in the subscription wire.
+  ::    This would typically be used to encode state that the subscriber
+  ::    already has. For example, a chat client might encode
+  ::    the number of messages that it already has, or the date it last
+  ::    received an update.
+  ::
+  ::    If +initial-watch crashes, the subscription fails.
+  ::
+  ++  initial-watch
+    |~  [path resource]
+    *vase
   ::  from agent:gall
   ::
   ++  on-init
@@ -99,48 +139,6 @@
   ++  on-fail
     |~  [term tang]
     *[(list card) _^|(..on-init)]
-  ::
-  ::  +resource-for-update: get affected resource from an update
-  ::  
-  ::    Given a vase of the update, the mark of which is
-  ::    update-mark.config, produce the affected resource, if any.
-  ::
-  ++  resource-for-update
-    |~  vase
-    *(unit resource)
-  ::
-  ::  +on-update: handle update from store
-  ::
-  ::    Given an update from the store, do other things after proxying
-  ::    the update
-  ::
-  ++  take-update
-    |~  vase
-    *[(list card) _^|(..on-init)]
-  ::  +should-proxy-update: should forward update to store
-  ::
-  ::    If %.y is produced, then the update is forwarded to the local
-  ::    store. If %.n is produced then the update is not forwarded and
-  ::    the poke fails.
-  ::
-  ++  should-proxy-update
-    |~  vase
-    *?
-  ::  +initial-watch: produce initial state for a subscription
-  ::
-  ::    .resource is the resource being subscribed to.
-  ::    .path is any additional information in the subscription wire.
-  ::    This would typically be used to encode state that the subscriber
-  ::    already has. For example, a chat client might encode
-  ::    the number of messages that it already has, or the date it last
-  ::    received an update.
-  ::
-  ::    If +initial-watch crashes, the subscription fails.
-  ::
-  ++  initial-watch
-    |~  [path resource]
-    *vase
-  ::
   --
 ++  agent
   |*  =config

From 96d2906edce45efa65106aad1cb11537adf5afcd Mon Sep 17 00:00:00 2001
From: Ted Blackman <ted@tlon.io>
Date: Tue, 18 Aug 2020 13:32:04 -0400
Subject: [PATCH 03/89] link: graph validator compiles and runs

---
 pkg/arvo/mar/graph/validator/link.hoon | 27 ++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 pkg/arvo/mar/graph/validator/link.hoon

diff --git a/pkg/arvo/mar/graph/validator/link.hoon b/pkg/arvo/mar/graph/validator/link.hoon
new file mode 100644
index 0000000000..006feda37e
--- /dev/null
+++ b/pkg/arvo/mar/graph/validator/link.hoon
@@ -0,0 +1,27 @@
+/-  *post
+|_  i=indexed-post
+++  grow
+  |%
+  ++  noun  i
+  --
+++  grab
+  |%
+  ++  noun
+    |=  p=*
+    =/  ip  ;;(indexed-post p)
+    ?+    index.p.ip  ~|(index+index.p.ip !!)
+        ::  top-level link post
+        ::
+        [@ ~]
+      ?>  ?=([[%text @] [%url @] [%text @] ~] contents.p.ip)
+      ip
+    ::
+        ::  comment on link post
+        ::
+        [@ @ ~]
+      ?>  ?=([[%text @] ~] contents.p.ip)
+      ip
+    ==
+  --
+++  grad  %noun
+--

From dd2bae9320530ae564982d690ab268fc93f65db6 Mon Sep 17 00:00:00 2001
From: Ted Blackman <ted@tlon.io>
Date: Tue, 18 Aug 2020 15:41:24 -0400
Subject: [PATCH 04/89] links: data migration compiles; untested and still
 needs subscription migration

---
 pkg/arvo/app/link-store.hoon           | 481 +++++--------------------
 pkg/arvo/mar/graph/validator/link.hoon |   6 +-
 2 files changed, 85 insertions(+), 402 deletions(-)

diff --git a/pkg/arvo/app/link-store.hoon b/pkg/arvo/app/link-store.hoon
index fed3d1206a..0253b413fe 100644
--- a/pkg/arvo/app/link-store.hoon
+++ b/pkg/arvo/app/link-store.hoon
@@ -50,10 +50,12 @@
 ::      ?
 ::    /seen/wood-url/some-path              have we seen this here
 ::
-/-  *link
-/+  store=link-store, default-agent, verb, dbug
+/-  *link, gra=graph-store, *resource
+/+  store=link-store, graph-store, default-agent, verb, dbug
 ::
 |%
++$  state-any  $%(state-1 state-0)
++$  state-1  [%1 ~]
 +$  state-0
   $:  %0
       by-group=(map path links)
@@ -76,414 +78,95 @@
 +$  card  card:agent:gall
 --
 ::
-=|  state-0
+=|  state-1
 =*  state  -
 ::
 %-  agent:dbug
 %+  verb  |
 ^-  agent:gall
-=<
-  |_  =bowl:gall
-  +*  this  .
-      do    ~(. +> bowl)
-      def   ~(. (default-agent this %|) bowl)
-  ::
-  ++  on-init  on-init:def
-  ++  on-save  !>(state)
-  ++  on-load
-    |=  old=vase
-    ^-  (quip card _this)
-    [~ this(state !<(state-0 old))]
-  ::
-  ++  on-poke
-    |=  [=mark =vase]
-    ^-  (quip card _this)
-    ?>  (team:title [our src]:bowl)  ::TODO  /lib/store
-    =^  cards  state
-      ?+  mark  (on-poke:def mark vase)
-        ::TODO  move json conversion into mark once mark performance improves
-        %json         (do-action:do (action:dejs:store !<(json vase)))
-        %link-action  (do-action:do !<(action:store vase))
-      ==
-    [cards this]
-  ::
-  ++  on-peek
-    |=  =path
-    ^-  (unit (unit cage))
-    ?+  path  (on-peek:def path)
-        [%y ?(%local-pages %submissions) ~]
-      ``noun+!>(~(key by by-group))
-    ::
-        [%x %local-pages *]
-      ``noun+!>((get-local-pages:do t.t.path))
-    ::
-        [%x %submissions *]
-      ``noun+!>((get-submissions:do t.t.path))
-    ::
-        [%y ?(%annotations %discussions) *]
-      =/  [spath=^path surl=url]
-        (break-discussion-path:store t.t.path)
-      =-  ``noun+!>(-)
-      ::
-      ?:  =(~ surl)
-        ::  no url, provide urls that have comments
-        ::
-        ^-  (set url)
-        ?~  spath
-          ::  no path, find urls accross all paths
-          ::
-          %-  ~(rep by discussions)
-          |=  [[* discussions=(map url discussion)] urls=(set url)]
-          %-  ~(uni in urls)
-          ~(key by discussions)
-        ::  specified path, find urls for that specific path
-        ::
-        %~  key  by
-        (~(gut by discussions) spath *(map url *))
-      ::  specified url and path, nothing to list here
-      ::
-      ?^  spath  !!
-      ::  no path, find paths with comments for this url
-      ::
-      ^-  (set ^path)
-      %-  ~(rep by discussions)
-      |=  [[=^path urls=(map url discussion)] paths=(set ^path)]
-      ?.  (~(has by urls) surl)  paths
-      (~(put in paths) path)
-    ::
-        [%x %annotations *]
-      ``noun+!>((get-annotations:do t.t.path))
-    ::
-        [%x %discussions *]
-      ``noun+!>((get-discussions:do t.t.path))
-    ::
-        [%x %seen @ ^]
-      ``noun+!>((is-seen:do t.t.path))
-    ::
-        [%x %unseen ~]
-      ``noun+!>(get-all-unseen:do)
-    ::
-        [%x %unseen ^]
-      ``noun+!>((get-unseen:do t.t.path))
-    ==
-  ::
-  ++  on-watch
-    |=  =path
-    ^-  (quip card _this)
-    ?>  (team:title [our src]:bowl)  ::TODO  /lib/store
-    :_  this
-    |^  ?+  path  (on-watch:def path)
-            [%local-pages *]
-          %+  give  %link-initial
-          ^-  initial:store
-          [%local-pages (get-local-pages:do t.path)]
-        ::
-            [%submissions *]
-          %+  give  %link-initial
-          ^-  initial:store
-          [%submissions (get-submissions:do t.path)]
-        ::
-            [%annotations *]
-          %+  give  %link-initial
-          ^-  initial:store
-          [%annotations (get-annotations:do t.path)]
-        ::
-            [%discussions *]
-          %+  give  %link-initial
-          ^-  initial:store
-          [%discussions (get-discussions:do t.path)]
-        ::
-            [%seen ~]
-          ~
-        ==
-    ::
-    ++  give
-      |*  [=mark =noun]
-      ^-  (list card)
-      [%give %fact ~ mark !>(noun)]~
-    ::
-    ++  give-single
-      |*  [=mark =noun]
-      ^-  card
-      [%give %fact ~ mark !>(noun)]
-    --
-  ::
-  ++  on-leave  on-leave:def
-  ++  on-agent  on-agent:def
-  ++  on-arvo   on-arvo:def
-  ++  on-fail   on-fail:def
-  --
-::
 |_  =bowl:gall
++*  this  .
+    do    ~(. +> bowl)
+    def   ~(. (default-agent this %|) bowl)
 ::
-::  writing
-::
-++  do-action
-  |=  =action:store
-  ^-  (quip card _state)
-  ?-  -.action
-    %save  (save-page +.action)
-    %note  (note-note +.action)
-    %seen  (seen-submission +.action)
+++  on-init  on-init:def
+++  on-save  !>(state)
+++  on-load
+  |=  old=vase
+  ^-  (quip card _this)
+  =/  s  !<(state-any old)
+  ?:  ?=(%1 -.s)
+    [~ this(state s)]
   ::
-    %hear  (hear-submission +.action)
-    %read  (read-comment +.action)
+  :_  this(state *state-1)
+  =/  orm  orm:graph-store
+  |^  ^-  (list card)
+  %+  murn  ~(tap by by-group.s)
+  |=  [=path =links]
+  ^-  (unit card)
+  ?.  ?=([@ @ *] path)
+    (on-bad-path path links)
+  :-  ~
+  %+  add-graph  `resource`[(slav %p i.path) i.t.path]
+  ^-  graph:gra
+  %+  gas:orm  ~
+  =/  comments  (~(gut by discussions.s) path *(map url discussion))
+  %+  turn  submissions.links
+  |=  sub=submission
+  ^-  [atom node:gra]
+  :-  time.sub
+  =/  contents  ~[text+title.sub url+url.sub]
+  =/  parent-hash  `@ux`(sham ~ ship.sub time.sub contents)
+  :-  ^-  post:gra
+      :*  author=ship.sub
+          index=~[time.sub]
+          time-sent=time.sub
+          contents
+          hash=`parent-hash
+          signatures=~
+      ==
+  ^-  internal-graph:gra
+  =/  dis  (~(get by comments) url.sub)
+  ?~  dis
+    [%empty ~]
+  :-  %graph
+  ^-  graph:gra
+  %+  gas:orm  ~
+  %+  turn  comments.u.dis
+  |=  [=ship =time udon=@t]
+  ^-  [atom node:gra]
+  :-  time
+  :_  `internal-graph:gra`[%empty ~]
+  =/  contents  ~[text+udon]
+  :*  author=ship
+      index=~[time.sub time]
+      time-sent=time
+      contents
+      hash=``@ux`(sham `parent-hash ship time contents)
+      signatures=~
   ==
-::  +save-page: save a page ourselves
-::
-++  save-page
-  |=  [=path title=@t =url]
-  ^-  (quip card _state)
-  ?<  |(=(~ path) =(~ title) =(~ url))
-  ::  add page to group ours
   ::
-  =/  =links  (~(gut by by-group) path *links)
-  =/  =page  [title url now.bowl]
-  =.  ours.links  [page ours.links]
-  =.  by-group  (~(put by by-group) path links)
-  ::  do generic submission logic
+  ++  on-bad-path
+    |=  [=path =links]
+    ^-  (unit card)
+    ~|  discarding-malformed-links+[path links]
+    ~
   ::
-  =^  submission-cards  state
-    (hear-submission path [our.bowl page])
-  ::  mark page as seen (because we submitted it ourselves)
-  ::
-  =^  seen-cards  state
-    (seen-submission path `url)
-  ::  send updates to subscribers
-  ::
-  :_  state
-  :_  (weld submission-cards seen-cards)
-  :+  %give  %fact
-  :+  :~  /local-pages
-          [%local-pages path]
-      ==
-    %link-update
-  !>([%local-pages path [page]~])
-::  +note-note: save a note for a url
-::
-++  note-note
-  |=  [=path =url udon=@t]
-  ^-  (quip card _state)
-  ?<  |(=(~ path) =(~ url) =(~ udon))
-  ::  add note to discussion ours
-  ::
-  =/  urls  (~(gut by discussions) path *(map ^url discussion))
-  =/  =discussion  (~(gut by urls) url *discussion)
-  =/  =note  [now.bowl udon]
-  =.  ours.discussion  [note ours.discussion]
-  =.  urls  (~(put by urls) url discussion)
-  =.  discussions  (~(put by discussions) path urls)
-  ::  do generic comment logic
-  ::
-  =^  cards  state
-    (read-comment path url [our.bowl note])
-  ::  send updates to subscribers
-  ::
-  :_  state
-  ^-  (list card)
-  :_  cards
-  :+  %give  %fact
-  :+  :~  /annotations
-          [%annotations %$ path]
-          [%annotations (build-discussion-path:store url)]
-          [%annotations (build-discussion-path:store path url)]
-      ==
-    %link-update
-  !>([%annotations path url [note]~])
-::  +seen-submission: mark url as seen/read
-::
-::    if no url specified, all under path are marked as read
-::
-++  seen-submission
-  |=  [=path murl=(unit url)]
-  ^-  (quip card _state)
-  =/  =links  (~(gut by by-group) path *links)
-  ::  new: urls we want to, but haven't yet, marked as seen
-  ::
-  =/  new=(set url)
-    %.  seen.links
-    %~  dif  in
-    ^-  (set url)
-    ?^  murl  (sy ~[u.murl])
-    %-  ~(gas in *(set url))
-    %+  turn  submissions.links
-    |=(submission url)
-  ?:  =(~ new)  [~ state]
-  =.  seen.links  (~(uni in seen.links) new)
-  :_  state(by-group (~(put by by-group) path links))
-  [%give %fact ~[/seen] %link-update !>([%observation path new])]~
-::  +hear-submission: record page someone else saved
-::
-++  hear-submission
-  |=  [=path =submission]
-  ^-  (quip card _state)
-  ?<  =(~ path)
-  ::  add link to group submissions
-  ::
-  =/  =links  (~(gut by by-group) path *links)
-  =^  added  submissions.links
-    ?:  ?=(^ (find ~[submission] submissions.links))
-      [| submissions.links]
-    :-  &
-    (submissions:merge:store submissions.links ~[submission])
-  =.  by-group  (~(put by by-group) path links)
-  ::  add submission to global sites
-  ::
-  =/  =site  (site-from-url:store url.submission)
-  =.  by-site  (~(add ja by-site) site [path submission])
-  ::  send updates to subscribers
-  ::
-  :_  state
-  ?.  added  ~
-  :_  ~
-  :+  %give  %fact
-  :+  :~  /submissions
-          [%submissions path]
-      ==
-    %link-update
-  !>([%submissions path [submission]~])
-::  +read-comment: record a comment someone else made
-::
-++  read-comment
-  |=  [=path =url =comment]
-  ^-  (quip card _state)
-  ::  add comment to url's discussion
-  ::
-  =/  urls  (~(gut by discussions) path *(map ^url discussion))
-  =/  =discussion  (~(gut by urls) url *discussion)
-  =^  added  comments.discussion
-    ?:  ?=(^ (find ~[comment] comments.discussion))
-      [| comments.discussion]
-    :-  &
-    (comments:merge:store comments.discussion ~[comment])
-  =.  urls  (~(put by urls) url discussion)
-  =.  discussions  (~(put by discussions) path urls)
-  ::  send updates to subscribers
-  ::
-  :_  state
-  ?.  added  ~
-  :_  ~
-  :+  %give  %fact
-  :+  :~  /discussions
-          [%discussions '' path]
-          [%discussions (build-discussion-path:store url)]
-          [%discussions (build-discussion-path:store path url)]
-      ==
-    %link-update
-  !>([%discussions path url [comment]~])
-::
-::  reading
-::
-++  get-local-pages
-  |=  =path
-  ^-  (map ^path pages)
-  ?~  path
-    ::  all paths
-    ::
-    %-  ~(run by by-group)
-    |=(links ours)
-  ::  specific path
-  ::
-  %+  ~(put by *(map ^path pages))  path
-  ours:(~(gut by by-group) path *links)
-::
-++  get-submissions
-  |=  =path
-  ^-  (map ^path submissions)
-  ?~  path
-    ::  all paths
-    ::
-    %-  ~(run by by-group)
-    |=(links submissions)
-  ::  specific path
-  ::
-  %+  ~(put by *(map ^path submissions))  path
-  submissions:(~(gut by by-group) path *links)
-::
-++  get-all-unseen
-  ^-  (jug path url)
-  %-  ~(rut by by-group)
-  |=  [=path *]
-  (get-unseen path)
-::
-++  get-unseen
-  |=  =path
-  ^-  (set url)
-  =/  =links
-    (~(gut by by-group) path *links)
-  %-  ~(gas in *(set url))
-  %+  murn  submissions.links
-  |=  submission
-  ?:  (~(has in seen.links) url)  ~
-  (some url)
-::
-++  is-seen
-  |=  =path
-  ^-  ?
-  =/  [=^path =url]
-    (break-discussion-path:store path)
-  %.  url
-  %~  has  in
-  seen:(~(gut by by-group) path *links)
-::
-::
-++  get-annotations
-  |=  =path
-  ^-  (per-path-url notes)
-  =/  args=[=^path =url]
-    (break-discussion-path:store path)
-  |^  ?~  path
-        ::  all paths
-        ::
-        (~(run by discussions) get-ours)
-      ::  specific path
-      ::
-      %+  ~(put by *(per-path-url notes))  path.args
-      %-  get-ours
-      %+  ~(gut by discussions)  path.args
-      *(map url discussion)
-  ::
-  ++  get-ours
-    |=  m=(map url discussion)
-    ^-  (map url notes)
-    ?:  =(~ url.args)
-      ::  all urls
-      ::
-      %-  ~(run by m)
-      |=(discussion ours)
-    ::  specific url
-    ::
-    %+  ~(put by *(map url notes))  url.args
-    ours:(~(gut by m) url.args *discussion)
+  ++  add-graph
+    |=  [=resource =graph:gra]
+    ^-  card
+    =-  [%pass /migrate-link %agent [our.bowl %graph-store] -]
+    ^-  task:agent:gall
+    :+  %poke  %graph-update
+    !>  ^-  update:gra
+    [%0 now.bowl %add-graph resource graph `%graph-validator-link]
   --
 ::
-++  get-discussions
-  |=  =path
-  ^-  (per-path-url comments)
-  =/  args=[=^path =url]
-    (break-discussion-path:store path)
-  |^  ?~  path
-        ::  all paths
-        ::
-        (~(run by discussions) get-comments)
-      ::  specific path
-      ::
-      %+  ~(put by *(per-path-url comments))  path.args
-      %-  get-comments
-      %+  ~(gut by discussions)  path.args
-      *(map url discussion)
-  ::
-  ++  get-comments
-    |=  m=(map url discussion)
-    ^-  (map url comments)
-    ?:  =(~ url.args)
-      ::  all urls
-      ::
-      %-  ~(run by m)
-      |=(discussion comments)
-    ::  specific url
-    ::
-    %+  ~(put by *(map url comments))  url.args
-    comments:(~(gut by m) url.args *discussion)
-  --
+++  on-poke   on-poke:def
+++  on-peek   on-peek:def
+++  on-watch  on-watch:def
+++  on-leave  on-leave:def
+++  on-agent  on-agent:def
+++  on-arvo   on-arvo:def
+++  on-fail   on-fail:def
 --
diff --git a/pkg/arvo/mar/graph/validator/link.hoon b/pkg/arvo/mar/graph/validator/link.hoon
index 006feda37e..a9c1cbb309 100644
--- a/pkg/arvo/mar/graph/validator/link.hoon
+++ b/pkg/arvo/mar/graph/validator/link.hoon
@@ -10,13 +10,13 @@
     |=  p=*
     =/  ip  ;;(indexed-post p)
     ?+    index.p.ip  ~|(index+index.p.ip !!)
-        ::  top-level link post
+        ::  top-level link post; title and url
         ::
         [@ ~]
-      ?>  ?=([[%text @] [%url @] [%text @] ~] contents.p.ip)
+      ?>  ?=([[%text @] [%url @] ~] contents.p.ip)
       ip
     ::
-        ::  comment on link post
+        ::  comment on link post; comment text
         ::
         [@ @ ~]
       ?>  ?=([[%text @] ~] contents.p.ip)

From 65b38121915ac7eeb0e014f714309b2dcb6c77da Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde@tlon.io>
Date: Tue, 18 Aug 2020 18:39:43 -0400
Subject: [PATCH 05/89] chat: restore 'copied' notice on copy

Fixes #3326.
---
 .../src/views/apps/chat/components/lib/message.js    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkg/interface/src/views/apps/chat/components/lib/message.js b/pkg/interface/src/views/apps/chat/components/lib/message.js
index 461423db79..c47d3f2abe 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/message.js
+++ b/pkg/interface/src/views/apps/chat/components/lib/message.js
@@ -60,6 +60,15 @@ const renderWithSigil = (props, timestamp) => {
       name = cite(props.msg.author);
     }
 
+    let nameSpan = null;
+
+    const copyNotice = (saveName) => {
+      nameSpan.innerText = 'Copied';
+      setTimeout(() => {
+        nameSpan.innerText = saveName;
+      }, 800);
+    };
+
     return (
       <div className="flex w-100">
         <OverlaySigil
@@ -80,8 +89,11 @@ const renderWithSigil = (props, timestamp) => {
                   'mw5 db truncate pointer ' +
                   (contact.nickname ? '' : 'mono')
                 }
+                ref={(e) => nameSpan = e}
                 onClick={() => {
+                  const saveName = name;
                   writeText(props.msg.author);
+                  copyNotice(saveName);
                 }}
                 title={`~${props.msg.author}`}
               >

From 928e5f7362d2879efaa429382192ac3982f70e6c Mon Sep 17 00:00:00 2001
From: Logan Allen <loganallc@gmail.com>
Date: Wed, 19 Aug 2020 12:22:20 -0700
Subject: [PATCH 06/89] graph-hooks: initial sketch

---
 pkg/arvo/app/graph-pull-hook.hoon |  48 +++++++++++++
 pkg/arvo/app/graph-push-hook.hoon | 116 ++++++++++++++++++++++++++++++
 pkg/arvo/app/graph-store.hoon     |   9 +++
 pkg/arvo/lib/graph.hoon           |   8 ++-
 4 files changed, 180 insertions(+), 1 deletion(-)
 create mode 100644 pkg/arvo/app/graph-pull-hook.hoon
 create mode 100644 pkg/arvo/app/graph-push-hook.hoon

diff --git a/pkg/arvo/app/graph-pull-hook.hoon b/pkg/arvo/app/graph-pull-hook.hoon
new file mode 100644
index 0000000000..bb36868737
--- /dev/null
+++ b/pkg/arvo/app/graph-pull-hook.hoon
@@ -0,0 +1,48 @@
+/-  *resource
+/+  store=graph-store, graph, default-agent, verb, dbug, pull-hook
+~%  %graph-pull-hook-top  ..is  ~
+|%
++$  card  card:agent:gall
+++  config
+  ^-  config:pull-hook
+  :*  %graph-store
+      update:store
+      %graph-update
+      %graph-push-hook
+  ==
+--
+::
+%-  agent:dbug
+^-  agent:gall
+%-  (agent:pull-hook config)
+^-  (pull-hook:pull-hook config)
+|_  =bowl:gall
++*  this  .
+    def   ~(. (default-agent this %|) bowl)
+    dep   ~(. (default:pull-hook this config) bowl)
+::
+++  on-init       on-init:def
+++  on-save       !>(~)
+++  on-load       on-load:def
+++  on-poke       on-poke:def
+++  on-peek       on-peek:def
+++  on-arvo       on-arvo:def
+++  on-fail       on-fail:def
+++  on-agent      on-agent:def
+++  on-watch      on-watch:def
+++  on-leave      on-leave:def
+++  on-pull-nack
+  |=  [=resource =tang]
+  ^-  (quip card _this)
+  :_  this
+  =-  [%pass /pull-nack %agent [our.bowl %graph-store] %poke %graph-update -]~
+  ^-  update:store
+  !>([%0 now.bowl [%archive-graph resource])
+::
+++  on-pull-kick
+  |=  =resource
+  ^-  (unit path)
+  =/  maybe-time  (peek-log:graph resource)
+  ?~  maybe-time  `/
+  `/(scot %da u.maybe-time)
+--
diff --git a/pkg/arvo/app/graph-push-hook.hoon b/pkg/arvo/app/graph-push-hook.hoon
new file mode 100644
index 0000000000..f93fefed7b
--- /dev/null
+++ b/pkg/arvo/app/graph-push-hook.hoon
@@ -0,0 +1,116 @@
+/+  store=graph-store
+/+  res=resource
+/+  graph
+/+  group
+/+  default-agent
+/+  dbug
+/+  push-hook
+~%  %graph-push-hook-top  ..is  ~
+|%
++$  card  card:agent:gall
+++  config
+  ^-  config:push-hook
+  :*  %graph-store
+      /updates
+      update:store
+      %graph-update
+      %graph-pull-hook
+  ==
+::
++$  agent  (push-hook:push-hook config)
+--
+::
+%-  agent:dbug
+^-  agent:gall
+%-  (agent:push-hook config)
+^-  agent
+|_  =bowl:gall
++*  this  .
+    def   ~(. (default-agent this %|) bowl)
+    grp   ~(. group bowl)
+    gra   ~(. graph bowl)
+::
+++  on-init   on-init:def
+++  on-save   !>(~)
+++  on-load   on-load:def
+++  on-poke   on-poke:def
+++  on-agent  on-agent:def
+++  on-watch  on-watch:def
+++  on-leave  on-leave:def
+++  on-peek   on-peek:def
+++  on-arvo   on-arvo:def
+++  on-fail   on-fail:def
+::
+++  should-proxy-update
+  |=  =vase
+  ^-  ?
+  =/  =update:store  !<(update:store vase)
+  ?-  -.q.update
+      %add-graph          %.y
+      %remove-graph       %.y
+      %add-nodes          %.y
+      %remove-nodes       %.y
+      %add-signatures     %.y
+      %remove-signatures  %.y
+      %archive-graph      %.y
+      %unarchive-graph    %.n
+      %add-tag            %.n
+      %remove-tag         %.n
+      %keys               %.n
+      %tags               %.n
+      %tag-queries        %.n
+      %run-updates        %.y
+  ==
+::
+++  resource-for-update
+  |=  =vase
+  ^-  (unit resource:res)
+  =/  =update:store  !<(update:store vase)
+  ?-  -.q.update
+      %add-graph          `resource.q.update
+      %remove-graph       `resource.q.update
+      %add-nodes          `resource.q.update
+      %remove-nodes       `resource.q.update
+      %add-signatures     `resource.uid.q.update
+      %remove-signatures  `resource.uid.q.update
+      %archive-graph      `resource.q.update
+      %unarchive-graph    ~
+      %add-tag            ~
+      %remove-tag         ~
+      %keys               ~
+      %tags               ~
+      %tag-queries        ~
+      %run-updates        `resource.q.update
+  ==
+::
+++  initial-watch
+  |=  [=path =resource:res]
+  ^-  vase
+  ?>  (can-join:grp resource src.bowl)
+  !>  ^-  update:store
+  ?~  path
+    ::  new subscribe
+    ::
+    =/  [=graph:store mark=(unit mark:store)]
+      (get-graph:gra resource)
+    [%0 now.bowl [%add-graph resource graph mark]]
+  ::  resubscribe
+  ::
+  =/  =time  (slav %da i.path)
+  =/  =update-log:store  (get-update-log-subset:gra resource time)
+  [%0 now.bowl [%run-updates resource update-log]]
+::
+++  take-update
+  |=  =vase
+  ^-  [(list card) agent]
+  =/  =update:store  !<(update:store vase)
+  ?+  -.q.update       [~ this]
+      %remove-graph
+    :_  this
+    [%give %kick ~[resource+(en-path:res resource.q.update)] ~]~
+  ::
+      %archive-graph
+    :_  this
+    [%give %kick ~[resource+(en-path:res resource.q.update)] ~]~
+  ==
+--
diff --git a/pkg/arvo/app/graph-store.hoon b/pkg/arvo/app/graph-store.hoon
index ab9a6b9710..3724b52d9d 100644
--- a/pkg/arvo/app/graph-store.hoon
+++ b/pkg/arvo/app/graph-store.hoon
@@ -511,6 +511,15 @@
         %empty  [~ ~]
         %graph  ``noun+!>(`graph:store`(subset:orm p.children.u.node start end))
     ==
+  ::
+      [%x %update-log-subset @ @ @ @ ~]
+    =/  =ship   (slav %p i.t.t.path)
+    =/  =term   i.t.t.t.path
+    =/  start=(unit time)  (slaw %da i.t.t.t.t.path)
+    =/  end=(unit time)    (slaw %da i.t.t.t.t.t.path)
+    =/  update-log=(unit update-log:store)  (~(get by update-logs) [ship term])
+    ?~  update-log  [~ ~]
+    ``noun+!>((subset:orm-log u.update-log start end))
   ::
       [%x %update-log @ @ ~]
     =/  =ship   (slav %p i.t.t.path)
diff --git a/pkg/arvo/lib/graph.hoon b/pkg/arvo/lib/graph.hoon
index 395c0554fa..6ea0ceba92 100644
--- a/pkg/arvo/lib/graph.hoon
+++ b/pkg/arvo/lib/graph.hoon
@@ -17,8 +17,14 @@
   %+  scry-for  marked-graph:store
   /graph/(scot %p entity.res)/[name.res]
 ::
-++  peek-log
+++  peek-update-log
   |=  res=resource
   ^-  (unit time)
   (scry-for (unit time) /peek-update-log/(scot %p entity.res)/[name.res])
+::
+++  get-update-log-subset
+  |=  [res=resource start=@da]
+  ^-  update-log:store
+  %+  scry-for  update-log:store
+  /update-log-subset/(scot %p entity.res)/[name.res]/(scot %da start)/'~'
 --

From b70cae9d7765a42a70c5a7f018b0e310d07a5a43 Mon Sep 17 00:00:00 2001
From: Logan Allen <loganallc@gmail.com>
Date: Wed, 19 Aug 2020 12:26:58 -0700
Subject: [PATCH 07/89] graph-hook: both hooks compile

---
 pkg/arvo/app/graph-pull-hook.hoon | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/arvo/app/graph-pull-hook.hoon b/pkg/arvo/app/graph-pull-hook.hoon
index bb36868737..5971ef9482 100644
--- a/pkg/arvo/app/graph-pull-hook.hoon
+++ b/pkg/arvo/app/graph-pull-hook.hoon
@@ -36,13 +36,13 @@
   ^-  (quip card _this)
   :_  this
   =-  [%pass /pull-nack %agent [our.bowl %graph-store] %poke %graph-update -]~
-  ^-  update:store
-  !>([%0 now.bowl [%archive-graph resource])
+  !>  ^-  update:store
+  [%0 now.bowl [%archive-graph resource]]
 ::
 ++  on-pull-kick
   |=  =resource
   ^-  (unit path)
-  =/  maybe-time  (peek-log:graph resource)
+  =/  maybe-time  (peek-update-log:graph resource)
   ?~  maybe-time  `/
   `/(scot %da u.maybe-time)
 --

From a4e21da3f0d3020c1e1e04b2d2434b471e692067 Mon Sep 17 00:00:00 2001
From: Logan Allen <loganallc@gmail.com>
Date: Wed, 19 Aug 2020 12:31:47 -0700
Subject: [PATCH 08/89] hood: starts %graph-pull-hook and %graph-push-hook

---
 pkg/arvo/app/hood.hoon      | 3 ++-
 pkg/arvo/lib/hood/drum.hoon | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkg/arvo/app/hood.hoon b/pkg/arvo/app/hood.hoon
index 1bc70ed80d..a816843c0e 100644
--- a/pkg/arvo/app/hood.hoon
+++ b/pkg/arvo/app/hood.hoon
@@ -2,7 +2,7 @@
 /+  drum=hood-drum, helm=hood-helm, kiln=hood-kiln
 |%
 +$  state
-  $:  %9
+  $:  %10
       drum=state:drum
       helm=state:helm
       kiln=state:kiln
@@ -12,6 +12,7 @@
       [ver=?(%1 %2 %3 %4 %5 %6) lac=(map @tas fin-any-state)]
       [%7 drum=state:drum helm=state:helm kiln=state:kiln]
       [%8 drum=state:drum helm=state:helm kiln=state:kiln]
+      [%9 drum=state:drum helm=state:helm kiln=state:kiln]
   ==
 +$  any-state-tuple
   $:  drum=any-state:drum
diff --git a/pkg/arvo/lib/hood/drum.hoon b/pkg/arvo/lib/hood/drum.hoon
index e7b91cfbe2..a41c917a7c 100644
--- a/pkg/arvo/lib/hood/drum.hoon
+++ b/pkg/arvo/lib/hood/drum.hoon
@@ -105,6 +105,8 @@
       %file-server
       %glob
       %graph-store
+      %graph-pull-hook
+      %graph-push-hook
   ==
 ::
 ++  deft-fish                                           ::  default connects
@@ -207,7 +209,7 @@
   ==
 ::
 ++  on-load
-  |=  [hood-version=?(%1 %2 %3 %4 %5 %6 %7 %8 %9) old=any-state]
+  |=  [hood-version=?(%1 %2 %3 %4 %5 %6 %7 %8 %9 %10) old=any-state]
   =<  se-abet  =<  se-view
   =.  sat  old
   =.  dev  (~(gut by bin) ost *source)
@@ -236,6 +238,9 @@
     (se-born | %home %group-pull-hook)
   =?  ..on-load  (lte hood-version %9)
    (se-born | %home %graph-store)
+  =?  ..on-load  (lte hood-version %10)
+    =>  (se-born | %home %graph-push-hook)
+    (se-born | %home %graph-pull-hook)
   ..on-load
 ::
 ++  reap-phat                                         ::  ack connect

From 291ec5526bf2d62510816f4453e75810cb4c83cf Mon Sep 17 00:00:00 2001
From: Logan Allen <loganallc@gmail.com>
Date: Wed, 19 Aug 2020 16:21:42 -0700
Subject: [PATCH 09/89] link-hooks: deactivated and deleted state

---
 pkg/arvo/app/link-listen-hook.hoon | 650 ++---------------------------
 pkg/arvo/app/link-proxy-hook.hoon  | 342 +--------------
 2 files changed, 47 insertions(+), 945 deletions(-)

diff --git a/pkg/arvo/app/link-listen-hook.hoon b/pkg/arvo/app/link-listen-hook.hoon
index 9fae8d98b7..feb5ffb1e3 100644
--- a/pkg/arvo/app/link-listen-hook.hoon
+++ b/pkg/arvo/app/link-listen-hook.hoon
@@ -1,644 +1,42 @@
-::  link-listen-hook: get your friends' bookmarks
+::  link-listen-hook: no longer in use
 ::
-::    keeps track of a listening=(set app-path). users can manually add to and
-::    remove from this set.
-::
-::    for all ships in groups associated with those resources, we subscribe to
-::    their link's local-pages and annotations at the resource path (through
-::    link-proxy-hook), and forward all entries into our link-store as
-::    submissions and comments.
-::
-::    if a subscription to a target fails, we assume it's because their
-::    metadata+groups definition hasn't been updated to include us yet.
-::    we retry with exponential backoff, maxing out at one hour timeouts.
-::    to expede this process, we prod other potential listeners when we add
-::    them to our metadata+groups definition.
-::
-::
-/-  listen-hook=link-listen-hook, *metadata-store, *group, *link
-/+  mdl=metadata, default-agent, verb, dbug, group-store, grpl=group, resource, store=link-store
+/+  default-agent, verb, dbug
 ::
 ~%  %link-listen-hook-top  ..is  ~
 |%
 +$  versioned-state
-  $%  [%0 state-0]
-      [%1 state-1]
-      [%2 state-2]
-      [%3 state-3]
+  $%  [%0 *]
+      [%1 *]
+      [%2 *]
+      [%3 *]
+      [%4 ~]
   ==
-+$  state-3  state-1
-+$  state-2  state-1
-+$  state-1
-  $:  listening=(set app-path)
-      state-0
-  ==
-+$  state-0
-  $:  retry-timers=(map target @dr)
-      ::  reasoning: the resources we're subscribed to,
-      ::             and the groups that cause that.
-      ::
-      ::    we don't strictly need to track this in state, but doing so heavily
-      ::    simplifies logic and reduces the amount of big scries we do.
-      ::    this also gives us the option to check & restore subscriptions,
-      ::    should we ever need that.
-      ::
-      reasoning=(jug [ship app-path] group-path)
-  ==
-::
-+$  what-target  ?(%local-pages %annotations)
-+$  target
-  $:  what=what-target
-      who=ship
-      where=path
-  ==
-++  wire-to-target
-  |=  =wire
-  ^-  target
-  ?>  ?=([what-target @ ^] wire)
-  [i.wire (slav %p i.t.wire) t.t.wire]
-++  target-to-wire
-  |=  target
-  ^-  wire
-  [what (scot %p who) where]
-::
 +$  card  card:agent:gall
 --
 ::
-=|  [%3 state-3]
+=|  [%4 ~]
 =*  state  -
 ::
 %-  agent:dbug
 %+  verb  |
 ^-  agent:gall
-=<
-  |_  =bowl:gall
-  +*  this  .
-      do    ~(. +> bowl)
-      def   ~(. (default-agent this %|) bowl)
-  ::
-  ++  on-init
-    ^-  (quip card _this)
-    :_  this
-    ~[watch-metadata:do watch-groups:do]
-  ::
-  ++  on-save  !>(state)
-  ++  on-load
-    |=  =vase
-    ^-  (quip card _this)
-    =/  old=versioned-state
-      !<(versioned-state vase)
-    =|  cards=(list card)
-    |-
-    =*  upgrade-loop  $
-    ?-  -.old
-      %3  [cards this(state old)]
-    ::
-        %2
-        :_  this(state [%3 +.old])
-        %+  welp  cards
-        :~  [%pass /groups %agent [our.bowl %group-store] %leave ~]
-             watch-groups:do
-        ==
-    ::
-        %1
-      ::  the upgrade from 0 left out local-only collections.
-      ::  here, we pull those back in.
-      ::
-      =.  listening.old
-        (~(run in ~(key by reasoning.old)) tail)
-      =/  resources=(list [=group-path =app-path])
-        %~  tap  in
-        %.  %link
-        %~  get  ju
-        .^  (jug app-name [group-path app-path])
-          %gy
-          (scot %p our.bowl)
-          %metadata-store
-          (scot %da now.bowl)
-          /app-indices
-        ==
-      |-
-      ?~  resources  
-        upgrade-loop(old [%2 +.old])
-      =,  i.resources
-      =/  members=(set ship)
-        (members-from-path:grp:do group-path)
-      ::  if we're the only group member, this got incorrectly ignored
-      ::  during 0's upgrade logic. watch it now.
-      ::
-      ?.  &(=(1 ~(wyt in members)) (~(has in members) our.bowl))
-        $(resources t.resources)
-      =^  more-cards  state
-        (handle-listen-action:do %watch app-path)
-      $(resources t.resources, cards (weld more-cards cards))
-    ::
-        %0
-      =/  listening=(set app-path)
-        (~(run in ~(key by reasoning.old)) tail)
-      $(old [%1 listening +.old])
-    ==
-  ::
-  ++  on-agent
-    |=  [=wire =sign:agent:gall]
-    ^-  (quip card _this)
-    =^  cards  state
-      ?+  wire  ~|([dap.bowl %weird-agent-wire wire] !!)
-          [%metadata ~]
-        (take-metadata-sign:do sign)
-      ::
-          [%groups ~]
-        (take-groups-sign:do sign)
-      ::
-          [%links ?(%local-pages %annotations) @ ^]
-        (take-link-sign:do (wire-to-target t.wire) sign)
-      ::
-          [%forward ^]
-        (take-forward-sign:do t.wire sign)
-      ::
-          [%prod *]
-        ?>  ?=(%poke-ack -.sign)
-        ?~  p.sign  [~ state]
-        %-  (slog leaf+"prod failed" u.p.sign)
-        [~ state]
-      ==
-    [cards this]
-  ::
-  ++  on-poke
-    |=  [=mark =vase]
-    ?+  mark  (on-poke:def mark vase)
-        %link-listen-poke
-      =/  =path  !<(path vase)
-      :_  this
-      %+  weld
-        (take-retry:do %local-pages src.bowl path)
-      (take-retry:do %annotations src.bowl path)
-    ::
-        %link-listen-action
-      ?>  (team:title [our src]:bowl)
-      =^  cards  state
-        ~|  p.vase
-        (handle-listen-action:do !<(action:listen-hook vase))
-      [cards this]
-    ==
-  ::
-  ++  on-arvo
-    |=  [=wire =sign-arvo]
-    ^-  (quip card _this)
-    ?+  sign-arvo  (on-arvo:def wire sign-arvo)
-        [%g %done *]
-      ?~  error.sign-arvo  [~ this]
-      =/  =tank  leaf+"{(trip dap.bowl)}'s message went wrong!"
-      %-  (slog tank tang.u.error.sign-arvo)
-      [~ this]
-    ::
-        [%b %wake *]
-      ?>  ?=([%retry @ @ ^] wire)
-      ?^  error.sign-arvo
-        =/  =tank  leaf+"wake on {(spud wire)} went wrong!"
-        %-  (slog tank u.error.sign-arvo)
-        [~ this]
-      :_  this
-      (take-retry:do (wire-to-target t.wire))
-    ==
-  ::
-  ++  on-peek
-    |=  =path
-    ^-  (unit (unit cage))
-    ?+  path  ~
-      [%x %listening ~]  ``noun+!>(listening)
-      [%x %listening ^]  ``noun+!>((~(has in listening) t.t.path))
-    ==
-  ::
-  ++  on-watch
-    |=  =path
-    ^-  (quip card _this)
-    ?.  ?=([%listening ~] path)  (on-watch:def path)
-    ?>  (team:title [our src]:bowl)
-    :_  this
-    [%give %fact ~ %link-listen-update !>([%listening listening])]~
-  ::
-  ++  on-leave  on-leave:def
-  ++  on-fail   on-fail:def
-  --
-::
-::
 |_  =bowl:gall
-+*  md  ~(. mdl bowl)
-++  grp   ~(. grpl bowl)
++*  this  .
+    def   ~(. (default-agent this %|) bowl)
 ::
-::  user actions & updates
+++  on-init  [~ this]
+++  on-save  !>(state)
+++  on-load
+  |=  =vase
+  ^-  (quip card _this)
+  :_  this
+  [%pass /groups %agent [our.bowl %group-store] %leave ~]~
 ::
-++  handle-listen-action
-  |=  =action:listen-hook
-  ^-  (quip card _state)
-  ::NOTE  no-opping where appropriate happens further down the call stack.
-  ::      we *could* no-op here, as %watch when we're already listening should
-  ::      result in no-ops all the way down, but walking through everything
-  ::      makes this a nice "resurrect if broken unexpectedly" option.
-  ::
-  =*  app-path  path.action
-  =^  cards  listening
-    ^-  (quip card _listening)
-    =/  had=?  (~(has in listening) app-path)
-    ?-  -.action
-        %watch
-      :_  (~(put in listening) app-path)
-      ?:(had ~ [(send-update action)]~)
-    ::
-        %leave
-      :_  (~(del in listening) app-path)
-      ?.(had ~ [(send-update action)]~)
-    ==
-  =/  groups=(list group-path)
-    (groups-from-resource:md %link app-path)
-  |-
-  ?~  groups  [cards state]
-  =^  more-cards  state
-    ?-  -.action
-      %watch  (listen-to-group app-path i.groups)
-      %leave  (leave-from-group app-path i.groups)
-    ==
-  $(cards (weld cards more-cards), groups t.groups)
-::
-++  send-update
-  |=  =update:listen-hook
-  ^-  card
-  [%give %fact ~[/listening] %link-listen-update !>(update)]
-::
-::  metadata subscription
-::
-++  watch-metadata
-  ^-  card
-  [%pass /metadata %agent [our.bowl %metadata-store] %watch /app-name/link]
-::
-++  take-metadata-sign
-  |=  =sign:agent:gall
-  ^-  (quip card _state)
-  ?-  -.sign
-    %poke-ack     ~|([dap.bowl %unexpected-poke-ack /metadata] !!)
-    %kick         [[watch-metadata]~ state]
-  ::
-      %watch-ack
-    ?~  p.sign  [~ state]
-    =/  =tank
-      :-  %leaf
-      "{(trip dap.bowl)} failed subscribe to metadata store. very wrong!"
-    %-  (slog tank u.p.sign)
-    [~ state]
-  ::
-      %fact
-    =*  mark  p.cage.sign
-    =*  vase  q.cage.sign
-    ?.  ?=(%metadata-update mark)
-      ~|  [dap.bowl %unexpected-mark mark]
-      !!
-    %-  handle-metadata-update
-    !<(metadata-update vase)
-  ==
-::
-++  handle-metadata-update
-  |=  upd=metadata-update
-  ^-  (quip card _state)
-  ?+  -.upd  [~ state]
-      %add
-    ?>  =(%link app-name.resource.upd)
-    ::  auto-listen to collections in unmanaged groups only
-    ::
-    =/  rid=resource
-      (de-path:resource group-path.upd)
-    =/  =group
-      (need (scry-group:grp rid))
-    ?.  hidden.group
-      [~ state]
-    =,  resource.upd
-    =^  update  listening
-      ^-  (quip card _listening)
-      ?:  (~(has in listening) app-path)
-        [~ listening]
-      :-  [(send-update %watch app-path)]~
-      (~(put in listening) app-path)
-    =^  cards  state
-      (listen-to-group app-path group-path.upd)
-    [(weld update cards) state]
-  ::
-      %remove
-    ?>  =(%link app-name.resource.upd)
-    =?  listening
-        ?=(~ (groups-from-resource:md %link app-path.resource.upd))
-      (~(del in listening) app-path.resource.upd)
-    (leave-from-group app-path.resource.upd group-path.upd)
-  ==
-::
-::  groups subscriptions
-::
-++  watch-groups
-  ^-  card
-  [%pass /groups %agent [our.bowl %group-store] %watch /groups]
-::
-++  take-groups-sign
-  |=  =sign:agent:gall
-  ^-  (quip card _state)
-  ?-  -.sign
-    %poke-ack   ~|([dap.bowl %unexpected-poke-ack /groups] !!)
-    %kick       [[watch-groups]~ state]
-  ::
-      %watch-ack
-    ?~  p.sign  [~ state]
-    =/  =tank
-      :-  %leaf
-      "{(trip dap.bowl)} failed subscribe to groups. very wrong!"
-    %-  (slog tank u.p.sign)
-    [~ state]
-  ::
-      %fact
-    =*  mark  p.cage.sign
-    =*  vase  q.cage.sign
-    ?+  mark  ~|([dap.bowl %unexpected-mark mark] !!)
-      %group-initial  [~ state]  ::NOTE  initial handled using metadata
-      %group-update   (handle-group-update !<(update:group-store vase))
-    ==
-  ==
-::
-++  handle-group-update
-  |=  upd=update:group-store
-  ^-  (quip card _state)
-  ?.  ?=(?(%add-members %initial-group %remove-members) -.upd)
-    [~ state]
-  =/  =path
-    (en-path:resource resource.upd)
-  =/  socs=(list app-path)
-    (app-paths-from-group:md %link path)
-  =/  whos=(list ship)
-    ?-  -.upd
-      %add-members     ~(tap in ships.upd)
-      %remove-members  ~(tap in ships.upd)
-      %initial-group   ~(tap in members.group.upd)
-    ==
-  =|  cards=(list card)
-  |-
-  =*  loop-socs  $
-  ?~  socs  [cards state]
-  ?.  (~(has in listening) i.socs)
-    loop-socs(socs t.socs)
-  |-
-  =*  loop-whos  $
-  ?~  whos  loop-socs(socs t.socs)
-  =^  caz  state
-    ?.  ?=(%remove-members -.upd)
-      (listen-to-peer i.socs path i.whos)
-    ?:  =(our.bowl i.whos)
-      (handle-listen-action %leave i.socs)
-    (leave-from-peer i.socs path i.whos)
-  loop-whos(whos t.whos, cards (weld cards caz))
-::
-::  link subscriptions
-::
-++  listen-to-group
-  |=  [=app-path =group-path]
-  ^-  (quip card _state)
-  =/  peers=(list ship)
-    ~|  group-path
-    %~  tap  in
-    (members-from-path:grp group-path)
-  =|  cards=(list card)
-  |-
-  ?~  peers  [cards state]
-  =^  caz  state
-    (listen-to-peer app-path group-path i.peers)
-  $(peers t.peers, cards (weld cards caz))
-::
-++  leave-from-group
-  |=  [=app-path =group-path]
-  ^-  (quip card _state)
-  =/  peers=(list ship)
-    %~  tap  in
-    (members-from-path:grp group-path)
-  =|  cards=(list card)
-  |-
-  ?~  peers  [cards state]
-  =^  caz  state
-    (leave-from-peer app-path group-path i.peers)
-  $(peers t.peers, cards (weld cards caz))
-::
-++  listen-to-peer
-  |=  [=app-path =group-path who=ship]
-  ^-  (quip card _state)
-  ?:  =(our.bowl who)
-    [~ state]
-  :_  =-  state(reasoning -)
-      (~(put ju reasoning) [who app-path] group-path)
-  :-  (prod-other-listener who app-path)
-  ?^  (~(get ju reasoning) [who app-path])
-    ~
-  (start-link-subscriptions who app-path)
-::
-++  leave-from-peer
-  |=  [=app-path =group-path who=ship]
-  ^-  (quip card _state)
-  ?:  =(our.bowl who)
-    [~ state]
-  =.  reasoning  (~(del ju reasoning) [who app-path] group-path)
-  ::NOTE  leaving is always safe, so we just do it unconditionally
-  (end-link-subscriptions who app-path)
-::
-++  start-link-subscriptions
-  |=  [=ship =app-path]
-  ^-  (list card)
-  :~  (start-link-subscription %local-pages ship app-path)
-      (start-link-subscription %annotations ship app-path)
-  ==
-::
-++  start-link-subscription
-  |=  =target
-  ^-  card
-  :*  %pass
-      [%links (target-to-wire target)]
-      %agent
-      [who.target %link-proxy-hook]
-      %watch
-      ?-  what.target
-        %local-pages  [what where]:target
-        %annotations  [what %$ where]:target
-      ==
-  ==
-::
-++  end-link-subscriptions
-  |=  [who=ship where=path]
-  ^-  (quip card _state)
-  =.  retry-timers  (~(del by retry-timers) [%local-pages who where])
-  =.  retry-timers  (~(del by retry-timers) [%annotations who where])
-  :_  state
-  |^  ~[(end %local-pages) (end %annotations)]
-  ::
-  ++  end
-    |=  what=what-target
-    :*  %pass
-        [%links (target-to-wire what who where)]
-        %agent
-        [who %link-proxy-hook]
-        %leave
-        ~
-    ==
-  --
-::
-++  prod-other-listener
-  |=  [who=ship where=path]
-  ^-  card
-  :*  %pass
-      [%prod (scot %p who) where]
-      %agent
-      [who %link-listen-hook]
-      %poke
-      %link-listen-poke
-      !>(where)
-  ==
-::
-++  take-link-sign
-  |=  [=target =sign:agent:gall]
-  ^-  (quip card _state)
-  ?-  -.sign
-    %poke-ack   ~|([dap.bowl %unexpected-poke-ack /links target] !!)
-    %kick       [[(start-link-subscription target)]~ state]
-  ::
-      %watch-ack
-    ?~  p.sign
-      =.  retry-timers  (~(del by retry-timers) target)
-      [~ state]
-    ::  our subscription request got rejected,
-    ::  most likely because our group definition is out of sync with theirs.
-    ::  set timer for retry.
-    ::
-    (start-retry target)
-  ::
-      %fact
-    =*  mark  p.cage.sign
-    =*  vase  q.cage.sign
-    ?+  mark  ~|([dap.bowl %unexpected-mark mark] !!)
-        %link-initial
-      %-  handle-link-initial
-      [who.target where.target !<(initial:store vase)]
-    ::
-        %link-update
-      %-  handle-link-update
-      [who.target where.target !<(update:store vase)]
-    ==
-  ==
-::
-++  start-retry
-  |=  =target
-  ^-  (quip card _state)
-  =/  timer=@dr
-    %+  min  ~h1
-    %+  mul  2
-    (~(gut by retry-timers) target ~s15)
-  =.  retry-timers
-    (~(put by retry-timers) target timer)
-  :_  state
-  :_  ~
-  :*  %pass
-      [%retry (target-to-wire target)]
-      [%arvo %b %wait (add now.bowl timer)]
-  ==
-::
-++  take-retry
-  |=  =target
-  ^-  (list card)
-  ::  relevant: whether :who is still associated with resource :where
-  ::
-  =;  relevant=?
-    ?.  relevant  ~
-    [(start-link-subscription target)]~
-  ?.  (~(has in listening) where.target)
-    |
-  ?:  %-  ~(has by wex.bowl)
-      [[%links (target-to-wire target)] who.target %link-proxy-hook]
-    |
-  %+  lien  (groups-from-resource:md %link where.target)
-  |=  =group-path
-  ^-  ?
-  %.  who.target
-  ~(has in (members-from-path:grp group-path))
-
-::
-++  do-link-action
-  |=  [=wire =action:store]
-  ^-  card
-  :*  %pass
-      wire
-      %agent
-      [our.bowl %link-store]
-      %poke
-      %link-action
-      !>(action)
-  ==
-::
-++  handle-link-initial
-  |=  [who=ship where=path =initial:store]
-  ^-  (quip card _state)
-  ?>  =(src.bowl who)
-  ?+  -.initial  ~|([dap.bowl %unexpected-initial -.initial] !!)
-      %local-pages
-    =/  =pages  (~(got by pages.initial) where)
-    (handle-link-update who where [%local-pages where pages])
-  ::
-      %annotations
-    =/  urls=(list [=url =notes])
-      ~(tap by (~(got by notes.initial) where))
-    =|  cards=(list card)
-    |-  ^-  (quip card _state)
-    ?~  urls  [cards state]
-    =^  caz  state
-      ^-  (quip card _state)
-      =,  i.urls
-      (handle-link-update who where [%annotations where url notes])
-    $(urls t.urls, cards (weld cards caz))
-  ==
-::
-++  handle-link-update
-  |=  [who=ship where=path =update:store]
-  ^-  (quip card _state)
-  ?>  =(src.bowl who)
-  :_  state
-  ?+  -.update  ~|([dap.bowl %unexpected-update -.update] !!)
-      %local-pages
-    %+  turn  pages.update
-    |=  =page
-    %+  do-link-action
-      [%forward %local-page (scot %p who) where]
-    [%hear where who page]
-  ::
-      %annotations
-    %+  turn  notes.update
-    |=  =note
-    ^-  card
-    %+  do-link-action
-      `wire`[%forward %annotation (scot %p who) where]
-    `action:store`[%read where url.update `comment`[who note]]
-  ==
-::
-++  take-forward-sign
-  |=  [=wire =sign:agent:gall]
-  ^-  (quip card _state)
-  ~|  [%unexpected-sign on=[%forward wire] -.sign]
-  ?>  ?=(%poke-ack -.sign)
-  ?~  p.sign  [~ state]
-  =/  =tank
-    :-  %leaf
-    ;:  weld
-      (trip dap.bowl)
-      " failed to save submission from "
-      (spud wire)
-    ==
-  %-  (slog tank u.p.sign)
-  [~ state]
-::
-++  scry-for
-  |*  [=mold =app-name =path]
-  .^  mold
-    %gx
-    (scot %p our.bowl)
-    app-name
-    (scot %da now.bowl)
-    (snoc `^path`path %noun)
-  ==
+++  on-agent  on-agent:def
+++  on-poke   on-poke:def
+++  on-arvo   on-arvo:def
+++  on-peek   on-peek:def
+++  on-watch  on-watch:def
+++  on-leave  on-leave:def
+++  on-fail   on-fail:def
 --
diff --git a/pkg/arvo/app/link-proxy-hook.hoon b/pkg/arvo/app/link-proxy-hook.hoon
index 98f61f6f8c..ffa822ee65 100644
--- a/pkg/arvo/app/link-proxy-hook.hoon
+++ b/pkg/arvo/app/link-proxy-hook.hoon
@@ -1,337 +1,41 @@
-::  link-proxy-hook: make local pages available to foreign ships
+::  link-proxy-hook: no longer in use
 ::
-::    this is a "proxy" style hook, relaying foreign subscriptions into local
-::    stores if permission conditions are met.
-::    the patterns herein should one day be generalized into a proxy-hook lib.
-::
-::    this uses metadata-store to discover resources and their associated
-::    groups. it sets the permission condition to be that a ship must be in a
-::    group associated with the resource it's subscribing to.
-::    we check this on-watch, but also subscribe to metadata & groups so that
-::    we can kick subscriptions if needed (eg ship removed from group).
-::
-::    we deduplicate incoming subscriptions on the same path, ensuring we have
-::    exactly one local subscription per unique incoming subscription path.
-::    this comes at the cost of assuming that the store's initial response is
-::    whatever's returned by the scry at that path, but perhaps that should
-::    become part of the stores standard anyway.
-::
-::    when adding support for new paths, the only things you'll likely want
-::    to touch are +permitted, +initial-response, & +kick-proxies.
-::
-/-  *link, *metadata-store, *group
-/+  metadata, default-agent, verb, dbug, group-store, grpl=group,
-    resource, store=link-store
+/+  default-agent, verb, dbug
 ~%  %link-proxy-hook-top  ..is  ~
 |%
-+$  state-0
-  $:  %0
-      ::TODO  we use this to detect "first sub started" and "last sub left",
-      ::      but can't we use [wex sup]:bowl for that?
-      active=(map path (set ship))
-  ==
-+$  state-1
-  $:  %1
-      active=(map path (set ship))
-  ==
-::
 +$  versioned-state
-  $%  state-0
-      state-1
+  $%  [%0 *]
+      [%1 *]
+      [%2 ~]
   ==
 ::
 +$  card  card:agent:gall
 --
 ::
-=|  state-1
+=|  [%2 ~]
 =*  state  -
 ::
 %-  agent:dbug
 %+  verb  |
 ^-  agent:gall
-=<
-  |_  =bowl:gall
-  +*  this  .
-      do    ~(. +> bowl)
-      def   ~(. (default-agent this %&) bowl)
-  ::
-  ++  on-init
-    ^-  (quip card _this)
-    :_  this
-    ~[watch-groups:do watch-metadata:do]
-  ::
-  ++  on-save  !>(state)
-  ++  on-load
-    |=  old-vase=vase
-    ^-  (quip card _this)
-    =/  old
-      !<(versioned-state old-vase)
-    ?-  -.old
-      %1  [~ this(state old)]
-    ::
-        %0
-      :_  this(state [%1 +.old])
-      :~  [%pass /groups %agent [our.bowl %group-store] %leave ~]
-          watch-groups:do
-      ==
-    ==
-
-  ::
-  ++  on-watch
-    |=  =path
-    ^-  (quip card _this)
-    ::  the local ship should just use link-store directly
-    ::TODO  do we want to allow this anyway, to avoid client-side target checks?
-    ::
-    ?<  (team:title [our src]:bowl)
-    ?>  (permitted:do src.bowl path)
-    =^  cards  state
-      (start-proxy:do src.bowl path)
-    [cards this]
-  ::
-  ++  on-leave
-    |=  =path
-    ^-  (quip card _this)
-    =^  cards  state
-      (stop-proxy:do src.bowl path)
-    [cards this]
-  ::
-  ++  on-agent
-    |=  [=wire =sign:agent:gall]
-    ^-  (quip card _this)
-    ?:  ?=([%groups ~] wire)
-      =^  cards  state
-        (take-groups-sign:do sign)
-      [cards this]
-    ?:  ?=([%proxy ^] wire)
-      =^  cards  state
-        (handle-proxy-sign t.wire sign)
-      [cards this]
-    ~|  [dap.bowl %weird-wire wire]
-    !!
-  ::
-  ++  on-poke  on-poke:def
-  ++  on-peek  on-peek:def
-  ++  on-arvo  on-arvo:def
-  ++  on-fail  on-fail:def
-  --
-::
 |_  =bowl:gall
-+*  md  ~(. metadata bowl)
-   grp   ~(. grpl bowl)
++*  this  .
+    def   ~(. (default-agent this %&) bowl)
 ::
-::  permissions
+++  on-init  on-init:def
+++  on-save  !>(state)
+++  on-load
+  |=  old-vase=vase
+  ^-  (quip card _this)
+  :_  this
+  [%pass /groups %agent [our.bowl %group-store] %leave ~]~
 ::
-++  permitted
-  |=  [who=ship =path]
-  ^-  ?
-  ::  we only expose /local-pages and /annotations,
-  ::  to ships in the groups associated with the resource.
-  ::  (no url-specific annotations subscriptions, either.)
-  ::
-  =/  target=(unit ^path)
-    ?:  ?=([%local-pages ^] path)
-      `t.path
-    ?:  ?=([%annotations ~ ^] path)
-      `t.t.path
-    ~
-  ?~  target  |
-  %+  lien  (groups-from-resource:md %link u.target)
-  |=  =group-path
-  ^-  ?
-  (~(has in (members-from-path:grp group-path)) who)
-::
-++  kick-revoked-permissions
-  |=  [=path who=(list ship)]
-  ^-  (list card)
-  %+  murn  who
-  |=  =ship
-  ^-  (unit card)
-  ::  no need to remove to ourselves
-  ::
-  ?:  =(our.bowl ship)  ~
-  ?:  (permitted ship path)  ~
-  `(kick-proxies ship path)
-::
-::  metadata subscription
-::
-++  watch-metadata
-  ^-  card
-  [%pass /metadata %agent [our.bowl %metadata-store] %watch /app-name/link]
-::
-++  take-metadata-sign
-  |=  =sign:agent:gall
-  ^-  (quip card _state)
-  ?-  -.sign
-    %poke-ack     ~|([dap.bowl %unexpected-poke-ack /metadata] !!)
-    %kick         [[watch-metadata]~ state]
-  ::
-      %watch-ack
-    ?~  p.sign  [~ state]
-    =/  =tank
-      :-  %leaf
-      "{(trip dap.bowl)} failed subscribe to metadata store. very wrong!"
-    %-  (slog tank u.p.sign)
-    [~ state]
-  ::
-      %fact
-    =*  mark  p.cage.sign
-    =*  vase  q.cage.sign
-    ?.  ?=(%metadata-update mark)
-      ~|  [dap.bowl %unexpected-mark mark]
-      !!
-    %-  handle-metadata-update
-    !<(metadata-update vase)
-  ==
-::
-++  handle-metadata-update
-  |=  upd=metadata-update
-  ^-  (quip card _state)
-  :_  state
-  ?.  ?=(%remove -.upd)  ~
-  ?>  =(%link app-name.resource.upd)
-  ::  if a group is no longer associated with a resource,
-  ::  we need to re-check permissions for everyone in that group.
-  ::
-  %+  kick-revoked-permissions
-    app-path.resource.upd
-  %~  tap  in
-  (members-from-path:grp group-path.upd)
-::
-::  groups subscription
-::TODO  largely copied from link-listen-hook. maybe make a store-listener lib?
-::
-++  watch-groups
-  ^-  card
-  [%pass /groups %agent [our.bowl %group-store] %watch /groups]
-::
-++  take-groups-sign
-  |=  =sign:agent:gall
-  ^-  (quip card _state)
-  ?-  -.sign
-    %poke-ack   ~|([dap.bowl %unexpected-poke-ack /groups] !!)
-    %kick       [[watch-groups]~ state]
-  ::
-      %watch-ack
-    ?~  p.sign  [~ state]
-    =/  =tank
-      :-  %leaf
-      "{(trip dap.bowl)} failed subscribe to group store. very wrong!"
-    %-  (slog tank u.p.sign)
-    [~ state]
-  ::
-      %fact
-    =*  mark  p.cage.sign
-    =*  vase  q.cage.sign
-    ?+  mark  ~|([dap.bowl %unexpected-mark mark] !!)
-      %group-initial  [~ state]
-      %group-update   (handle-group-update !<(update:group-store vase))
-    ==
-  ==
-::
-++  handle-group-update
-  |=  upd=update:group-store
-  ^-  (quip card _state)
-  :_  state
-  ?.  ?=(%remove-members -.upd)  ~
-  ::  if someone was removed from a group, find all link resources associated
-  ::  with that group, then kick their subscriptions if they're no longer
-  ::
-  %-  zing
-  %+  turn  (app-paths-from-group:md %link (en-path:resource resource.upd))
-  |=  =app-path
-  ^-  (list card)
-  %+  kick-revoked-permissions
-    app-path
-  ~(tap in ships.upd)
-::
-::  proxy subscriptions
-::
-++  kick-proxies
-  |=  [who=ship =path]
-  ^-  card
-  =-  [%give %kick - `who]
-  :~  [%local-pages path]
-      [%annotations %$ path]
-  ==
-::
-++  handle-proxy-sign
-  |=  [=wire =sign:agent:gall]
-  ^-  (quip card _state)
-  ?-  -.sign
-    %poke-ack     ~|([dap.bowl %unexpected-poke-ack wire] !!)
-    %fact         [[%give %fact ~[wire] cage.sign]~ state]
-    %kick         [[(proxy-pass-link-store wire %watch wire)]~ state]
-  ::
-      %watch-ack
-    ?~  p.sign  [~ state]
-    =/  =tank
-      :-  %leaf
-      "{(trip dap.bowl)} failed subscribe to link-store. very wrong!"
-    %-  (slog tank u.p.sign)
-    [~ state]
-  ==
-::
-++  proxy-pass-link-store
-  |=  [=path =task:agent:gall]
-  ^-  card
-  :*  %pass
-      [%proxy path]
-      %agent
-      [our.bowl %link-store]
-      task
-  ==
-::
-++  initial-response
-  |=  =path
-  ^-  card
-  =;  =initial:store
-    [%give %fact ~ %link-initial !>(initial)]
-  ?+  path  !!
-      [%local-pages ^]
-    [%local-pages (scry-for (map ^path pages) %link-store path)]
-  ::
-      [%annotations %$ ^]
-    [%annotations (scry-for (per-path-url notes) %link-store path)]
-  ==
-::
-++  start-proxy
-  |=  [who=ship =path]
-  ^-  (quip card _state)
-  :_  state(active (~(put ju active) path who))
-  :_  ~
-  ::  if we already have a local subscription open,
-  ::
-  ?.  =(~ (~(get ju active) path))
-    ::  gather the initial response ourselves, and send that.
-    ::
-    (initial-response path)
-  ::  else, open a local subscription,
-  ::  sending outward its initial response when we hear it.
-  ::
-  (proxy-pass-link-store path %watch path)
-::
-++  stop-proxy
-  |=  [who=ship =path]
-  ^-  (quip card _state)
-  =.  active  (~(del ju active) path who)
-  :_  state
-  ::  if there are still subscriptions remaining, do nothing.
-  ::
-  ?.  =(~ (~(get ju active) path))  ~
-  ::  else, close the local subscription.
-  ::
-  [(proxy-pass-link-store path %leave ~)]~
-::
-::  helpers
-::
-++  scry-for
-  |*  [=mold =app-name =path]
-  .^  mold
-    %gx
-    (scot %p our.bowl)
-    app-name
-    (scot %da now.bowl)
-    (snoc `^path`path %noun)
-  ==
+++  on-watch  on-watch:def
+++  on-leave  on-leave:def
+++  on-agent  on-agent:def
+++  on-poke  on-poke:def
+++  on-peek  on-peek:def
+++  on-arvo  on-arvo:def
+++  on-fail  on-fail:def
 --
+

From 5838b017f8f5cd2f72b7367c3d3c990a640c0265 Mon Sep 17 00:00:00 2001
From: Logan Allen <loganallc@gmail.com>
Date: Wed, 19 Aug 2020 16:26:21 -0700
Subject: [PATCH 10/89] link: deactivated view

---
 pkg/arvo/app/link-view.hoon | 632 ++----------------------------------
 1 file changed, 23 insertions(+), 609 deletions(-)

diff --git a/pkg/arvo/app/link-view.hoon b/pkg/arvo/app/link-view.hoon
index 4e5fe6de7c..9ddb2b8811 100644
--- a/pkg/arvo/app/link-view.hoon
+++ b/pkg/arvo/app/link-view.hoon
@@ -1,626 +1,40 @@
-::  link-view: frontend endpoints
-::
-::  endpoints, mapping onto link-store's paths. p is for page as in pagination.
-::  only the /0/submissions endpoint provides updates.
-::  as with link-store, urls are expected to use +wood encoding.
-::
-::    /json/0/submissions                             initial + updates for all
-::    /json/[p]/submissions/[collection]              page for one collection
-::    /json/[p]/discussions/[wood-url]/[collection]   page for url in collection
-::    /json/[n]/submission/[wood-url]/[collection]    nth matching submission
-::    /json/seen                                      mark-as-read updates
-::
-/-  *link, view=link-view
-/-  *invite-store, group-store
-/-  listen-hook=link-listen-hook
-/-  group-hook, permission-hook, permission-group-hook
-/-  metadata-hook, contact-view
-/-  pull-hook, *group
-/+  store=link-store, metadata, *server, default-agent, verb, dbug, grpl=group
-/+  group-store, resource
+::  link-view: no longer in use
+/+  default-agent, verb, dbug
 ~%  %link-view-top  ..is  ~
-::
-::
 |%
 +$  versioned-state
-  $%  state-0
-      state-1
-  ==
-+$  state-0
-  $:  %0
-      ~
-  ==
-::
-+$  state-1
-  $:  %1
-      ~
+  $%  [%0 ~]
+      [%1 ~]
+      [%2 ~]
   ==
 ::
 +$  card  card:agent:gall
 --
 ::
-=|  state-1
+=|  [%2 ~]
 =*  state  -
 ::
 %+  verb  |
 %-  agent:dbug
 ^-  agent:gall
-=<
-  |_  =bowl:gall
-  +*  this  .
-      do    ~(. +> bowl)
-      def   ~(. (default-agent this %|) bowl)
-  ::
-  ++  on-init
-    ^-  (quip card _this)
-    :_  this
-    :~  [%pass /submissions %agent [our.bowl %link-store] %watch /submissions]
-        [%pass /discussions %agent [our.bowl %link-store] %watch /discussions]
-        [%pass /seen %agent [our.bowl %link-store] %watch /seen]
-      ::
-        =+  [%invite-action !>([%create /link])]
-        [%pass /invitatory/create %agent [our.bowl %invite-store] %poke -]
-      ::
-        =+  /invitatory/link
-        [%pass - %agent [our.bowl %invite-store] %watch -]
-        :*  %pass  /srv  %agent  [our.bowl %file-server]
-            %poke  %file-server-action
-            !>([%serve-dir /'~link' /app/landscape %.n])
-        ==
-    ==
-  ::
-  ++  on-save  !>(state)
-  ++  on-load
-    |=  old-vase=vase
-    ^-  (quip card _this)
-    =/  old  !<(versioned-state old-vase)
-    ?-  -.old
-        %1  [~ this]
-        %0
-      :_  this(state [%1 ~])
-      :-  [%pass /connect %arvo %e %disconnect [~ /'~link']]
-      :~  :*  %pass  /srv  %agent  [our.bowl %file-server]
-          %poke  %file-server-action
-          !>([%serve-dir /'~link' /app/landscape %.n])
-      ==  ==
-    ==
-  ::
-  ++  on-poke
-    |=  [=mark =vase]
-    ^-  (quip card _this)
-    ?>  (team:title our.bowl src.bowl)
-    :_  this
-    ?+  mark  (on-poke:def mark vase)
-        %link-action
-      [(handle-action:do !<(action:store vase)) ~]
-    ::
-        %link-view-action
-      (handle-view-action:do !<(action:view vase))
-    ==
-  ::
-  ++  on-watch
-    |=  =path
-    ^-  (quip card _this)
-    ?:  ?=([%json %seen ~] path)
-      [~ this]
-    ?:  ?=([%tile ~] path)
-      :_  this
-      ~[give-tile-data:do]
-    ?.  ?=([%json @ @ *] path)
-      (on-watch:def path)
-    =/  p=@ud  (slav %ud i.t.path)
-    ?+  t.t.path  (on-watch:def path)
-        [%submissions ~]
-      :_  this
-      (give-initial-submissions:do p ~)
-    ::
-        [%submissions ^]
-      :_  this
-      (give-initial-submissions:do p t.t.t.path)
-    ::
-        [%submission @ ^]
-      :_  this
-      (give-specific-submission:do p (break-discussion-path:store t.t.t.path))
-    ::
-        [%discussions @ ^]
-      :_  this
-      (give-initial-discussions:do p (break-discussion-path:store t.t.t.path))
-    ==
-  ::
-  ++  on-agent
-    |=  [=wire =sign:agent:gall]
-    ^-  (quip card _this)
-    ?+  -.sign  (on-agent:def wire sign)
-        %poke-ack
-      ?.  ?=([%join-group @ @ @ @ ~] wire)
-        (on-agent:def wire sign)
-      ?^  p.sign
-        (on-agent:def wire sign)
-      =/  rid=resource
-        (de-path:resource t.t.wire)
-      =/  host=ship
-        (slav %p i.t.wire)
-      :_  this
-      (joined-group:do host rid)
-    ::
-        %kick
-      :_  this
-      =/  app=term
-        ?:  ?=([%invites *] wire)
-          %invite-store
-        %link-store
-      [%pass wire %agent [our.bowl app] %watch wire]~
-    ::
-        %fact
-      =*  mark  p.cage.sign
-      =*  vase  q.cage.sign
-      ?+  mark  (on-agent:def wire sign)
-        %invite-update  [(handle-invite-update:do !<(invite-update vase)) this]
-        %link-initial   [~ this]
-      ::
-          %link-update
-        :_  this
-        :-  (send-update:do !<(update:store vase))
-        ?:  =(/discussions wire)  ~
-        ~[give-tile-data:do]
-      ==
-    ==
-  ::
-  ++  on-arvo
-    |=  [=wire =sign-arvo]
-    ^-  (quip card _this)
-    ?.  ?=([%e %bound *] sign-arvo)
-      (on-arvo:def wire sign-arvo)
-    ~?  !accepted.sign-arvo
-      [dap.bowl "bind rejected!" binding.sign-arvo]
-    [~ this]
-  ::
-  ++  on-peek   on-peek:def
-  ++  on-leave  on-leave:def
-  ++  on-fail   on-fail:def
-  --
-::
-~%  %link-view-logic  ..card  ~
 |_  =bowl:gall
-+*  md  ~(. metadata bowl)
-    grp  ~(. grpl bowl)
++*  this  .
+    def   ~(. (default-agent this %|) bowl)
 ::
-++  page-size  25
-++  get-paginated
-  |*  [page=(unit @ud) list=(list)]
-  ^-  [total=@ud pages=@ud page=_list]
-  =/  l=@ud  (lent list)
-  :+  l
-    %+  add  (div l page-size)
-    (min 1 (mod l page-size))
-  ?~  page  list
-  %+  swag
-    [(mul u.page page-size) page-size]
-  list
+++  on-init  [~ this]
+++  on-save  !>(state)
+++  on-load
+  |=  old-vase=vase
+  ^-  (quip card _this)
+  :_  this(state [%2 ~])
+  ::  TODO: leave all subscriptions
+  [%pass /connect %arvo %e %disconnect [~ /'~link']]~
 ::
-++  page-to-json
-  =,  enjs:format
-  |*  $:  page-number=@ud
-          [total-items=@ud total-pages=@ud page=(list)]
-          item-to-json=$-(* json)
-      ==
-  ^-  json
-  %-  pairs
-  :~  'totalItems'^(numb total-items)
-      'totalPages'^(numb total-pages)
-      'pageNumber'^(numb page-number)
-      'page'^a+(turn page item-to-json)
-  ==
-++  do-poke
-  |=  [app=term =mark =vase]
-  ^-  card
-  [%pass /create/[app]/[mark] %agent [our.bowl app] %poke mark vase]
-::
-++  joined-group
-  |=  [host=ship rid=resource]
-  ^-  (list card)
-  =/  =path
-    (en-path:resource rid)
-  :~
-    ::  sync the group
-    ::
-    %^  do-poke  %group-pull-hook
-      %pull-hook-action
-    !>  ^-  action:pull-hook
-    [%add host rid]
-    ::
-    ::  sync the metadata
-    ::
-    %^  do-poke  %metadata-hook
-      %metadata-hook-action
-    !>  ^-  metadata-hook-action:metadata-hook
-    [%add-synced host path]
-    ::
-    ::  sync the collection
-    ::
-    %^  do-poke  %link-listen-hook
-      %link-listen-action
-    !>  ^-  action:listen-hook
-    [%watch ~[name.rid]]
-  ==
-::
-++  handle-invite-update
-  |=  upd=invite-update
-  ^-  (list card)
-  ?.  ?=(%accepted -.upd)  ~
-  ?.  =(/link path.upd)    ~
-  =/  rid=resource
-    (de-path:resource path.invite.upd)
-  :~   ::  add self
-      :*  %pass
-          [%join-group (scot %p ship.invite.upd) path.invite.upd]
-          %agent  [entity.rid %group-push-hook]
-          %poke  %group-update
-          !>  ^-  action:group-store
-          [%add-members rid (sy our.bowl ~)]
-  ==  ==
-::
-++  handle-action
-  |=  =action:store
-  ^-  card
-  [%pass /action %agent [our.bowl %link-store] %poke %link-action !>(action)]
-::
-++  handle-view-action
-  |=  act=action:view
-  ^-  (list card)
-  ?-  -.act
-    %create  (handle-create +.act)
-    %delete  (handle-delete +.act)
-    %invite  (handle-invite +.act)
-  ==
-::
-++  handle-create
-  |=  [=path title=@t description=@t members=create-members:view real-group=?]
-  ^-  (list card)
-  =/  group-path=^path
-    ?-  -.members
-      %group  path.members
-    ::
-        %ships
-      [%ship (scot %p our.bowl) path]
-    ==
-  =;  group-setup=(list card)
-    %+  weld  group-setup
-    :~  ::  add collection to metadata-store
-        ::
-        %^  do-poke  %metadata-hook
-          %metadata-action
-        !>  ^-  metadata-action:md
-        :^  %add  group-path
-          [%link path]
-        %*  .  *metadata:md
-          title         title
-          description   description
-          date-created  now.bowl
-          creator       our.bowl
-        ==
-      ::
-        ::  expose the metadata
-        ::
-        %^  do-poke  %metadata-hook
-          %metadata-hook-action
-        !>  ^-  metadata-hook-action:metadata-hook
-        [%add-owned group-path]
-      ::
-        ::  watch the collection ourselves
-        ::
-        %^  do-poke  %link-listen-hook
-          %link-listen-action
-        !>  ^-  action:listen-hook
-        [%watch path]
-    ==
-  ?:  ?=(%group -.members)  ~
-  ::  if the group is "real", make contact-view do the heavy lifting
-  =/  rid=resource
-    (de-path:resource group-path)
-  ?:  real-group
-    :-  %^  do-poke  %contact-view
-          %contact-view-action
-        !>  ^-  contact-view-action:contact-view
-        [%groupify rid title description]
-    %+  turn  ~(tap in ships.members)
-    |=  =ship
-    ^-  card
-    %^  do-poke  %invite-hook
-      %invite-action
-    !>  ^-  invite-action
-    :^  %invite  /link
-      (sham group-path eny.bowl)
-    :*  our.bowl
-        %group-hook
-        group-path
-        ship
-        title
-    ==
-  ::  for "unmanaged" groups, do it ourselves
-  ::
-  =/  =policy
-    [%invite ships.members]
-  :*  ::  create the new group
-      ::
-      %^  do-poke  %group-store
-        %group-action
-      !>  ^-  action:group-store
-      [%add-group rid policy %.y]
-      ::
-      ::  send invites
-      ::
-      %+  turn  ~(tap in ships.members)
-      |=  =ship
-      ^-  card
-      %^  do-poke  %invite-hook
-        %invite-action
-      !>  ^-  invite-action
-      :^  %invite  /link
-        (sham group-path eny.bowl)
-      :*  our.bowl
-          %group-hook
-          group-path
-          ship
-          title
-      ==
-  ==
-::
-++  handle-delete
-  |=  =path
-  ^-  (list card)
-  =/  groups=(list ^path)
-    (groups-from-resource:md [%link path])
-  %-  zing
-  %+  turn  groups
-  |=  =group=^path
-  =/  rid=resource
-    (de-path:resource group-path)
-  %+  snoc
-    ^-  (list card)
-    ::  if it's a real group, we can't/shouldn't unsync it. this leaves us with
-    ::  no way to stop propagation of collection deletion.
-    ::
-    ?.  ?=([%'~' ^] group-path)  ~
-    ::  if it's an unmanaged group, we just stop syncing the group & metadata,
-    ::  and clean up the group (after un-hooking it, to not push deletion).
-    ::
-    :~  %^  do-poke  %group-hook
-          %group-hook-action
-        !>  ^-  action:group-hook
-        [%remove rid]
-      ::
-        %^  do-poke  %metadata-hook
-          %metadata-hook-action
-        !>  ^-  metadata-hook-action:metadata-hook
-        [%remove group-path]
-      ::
-        %^  do-poke  %group-store
-          %group-action
-        !>  ^-  action:group-store
-        [%remove-group rid ~]
-    ==
-  ::  remove collection from metadata-store
-  ::
-  %^  do-poke  %metadata-store
-    %metadata-action
-  !>  ^-  metadata-action:md
-  [%remove group-path [%link path]]
-::
-++  handle-invite
-  |=  [=path ships=(set ship)]
-  ^-  (list card)
-  %-  zing
-  %+  turn  (groups-from-resource:md %link path)
-  |=  =group=^path
-  ^-  (list card)
-  =/  rid=resource
-    (de-path:resource group-path)
-  =/  =group
-    (need (scry-group:grp rid))
-  %-  zing
-  :~
-    ?.  ?=(%invite -.policy.group)
-        ~
-    :~  %^  do-poke  %group-store
-            %group-action
-            !>  ^-  action:group-store
-            [%change-policy rid %invite %add-invites ships]
-    ==
-  ::
-    %+  turn  ~(tap in ships)
-    |=  =ship
-    ^-  card
-    %^  do-poke  %invite-hook
-      %invite-action
-    !>  ^-  invite-action
-    :^  %invite  /link
-      (sham group-path eny.bowl)
-    :*  our.bowl
-        %group-pull-hook
-        group-path
-        ship
-        (rsh 3 1 (spat path))
-    ==
-  ==
-::  +give-tile-data: total unread count as json object
-::
-::NOTE  the full recalc of totals here probably isn't the end of the world.
-::      but in case it is, well, here it is.
-::
-++  give-tile-data
-  ^-  card
-  =;  =json
-    [%give %fact ~[/tile] %json !>(json)]
-  %+  frond:enjs:format  'unseen'
-  %-  numb:enjs:format
-  %-  %~  rep  in
-      (scry-for (jug path url) /unseen)
-  |=  [[=path unseen=(set url)] total=@ud]
-  %+  add  total
-  ~(wyt in unseen)
-::
-::  +give-initial-submissions: page of submissions on path
-::
-::    for the / path, give page for every path
-::
-::    result is in the shape of: {
-::      "/some/path": {
-::        totalItems: 1,
-::        totalPages: 1,
-::        pageNumber: 0,
-::        page: [
-::          { commentCount: 1, ...restOfTheSubmission }
-::        ]
-::      },
-::      "/maybe/more": { etc }
-::    }
-::
-++  give-initial-submissions
-  ~/  %link-view-initial-submissions
-  |=  [p=@ud =requested=path]
-  ^-  (list card)
-  :_  ::  only keep the base case alive (for updates), kick all others
-      ::
-      ?:  &(=(0 p) ?=(~ requested-path))  ~
-      [%give %kick ~ ~]~
-  =;  =json
-    [%give %fact ~ %json !>(json)]
-  %+  frond:enjs:format  'link-update'
-  %+  frond:enjs:format  'initial-submissions'
-  %-  pairs:enjs:format
-  %+  turn
-    %~  tap  by
-    %+  scry-for  (map path submissions)
-    [%submissions requested-path]
-  |=  [=path =submissions]
-  ^-  [@t json]
-  :-  (spat path)
-  =;  =json
-    ::  add unseen count
-    ::
-    ?>  ?=(%o -.json)
-    :-  %o
-    %+  ~(put by p.json)  'unseenCount'
-    %-  numb:enjs:format
-    %~  wyt  in
-    %+  scry-for  (set url)
-    [%unseen path]
-  ?:  &(=(0 p) ?=(~ requested-path))
-    ::  for a broad-scope initial result, only give total counts
-    ::
-    =,  enjs:format
-    %-  pairs
-    =+  l=(lent submissions)
-    :~  'totalItems'^(numb l)
-        'totalPages'^(numb (div l page-size))
-    ==
-  %^  page-to-json  p
-    %+  get-paginated  `p
-    submissions
-  |=  =submission
-  ^-  json
-  =/  =json  (submission:enjs:store submission)
-  ?>  ?=([%o *] json)
-  ::  add in seen status
-  ::
-  =.  p.json
-    %+  ~(put by p.json)  'seen'
-    :-  %b
-    %+  scry-for  ?
-    [%seen (build-discussion-path:store path url.submission)]
-  ::  add in comment count
-  ::
-  =;  comment-count=@ud
-    :-  %o
-    %+  ~(put by p.json)  'commentCount'
-    (numb:enjs:format comment-count)
-  %-  lent
-  ~|  [path url.submission]
-  ^-  comments
-  =-  (~(got by (~(got by -) path)) url.submission)
-  %+  scry-for  (per-path-url comments)
-  :-  %discussions
-  (build-discussion-path:store path url.submission)
-::
-++  give-specific-submission
-  |=  [n=@ud =path =url]
-  :_  [%give %kick ~ ~]~
-  =;  =json
-    [%give %fact ~ %json !>(json)]
-  %+  frond:enjs:format  'link-update'
-  %+  frond:enjs:format  'submission'
-  ^-  json
-  =;  sub=(unit submission)
-    ?~  sub  ~
-    (submission:enjs:store u.sub)
-  =/  =submissions
-    =-  (~(got by -) path)
-    %+  scry-for  (map ^path submissions)
-    [%submissions path]
-  |-
-  ?~  submissions  ~
-  =*  sub  i.submissions
-  ?.  =(url.sub url)
-    $(submissions t.submissions)
-  ?:  =(0 n)  `sub
-  $(n (dec n), submissions t.submissions)
-::
-++  give-initial-discussions
-  |=  [p=@ud =path =url]
-  ^-  (list card)
-  :_  ?:  =(0 p)  ~
-      [%give %kick ~ ~]~
-  =;  =json
-    [%give %fact ~ %json !>(json)]
-  %+  frond:enjs:format  'link-update'
-  %+  frond:enjs:format  'initial-discussions'
-  %^  page-to-json  p
-    %+  get-paginated  `p
-    =-  (~(got by (~(got by -) path)) url)
-    %+  scry-for  (per-path-url comments)
-    [%discussions (build-discussion-path:store path url)]
-  comment:enjs:store
-::
-++  send-update
-  |=  =update:store
-  ^-  card
-  ?+  -.update  ~|([dap.bowl %unexpected-update -.update] !!)
-      %submissions
-    %+  give-json
-      %+  frond:enjs:format  'link-update'
-      (update:enjs:store update)
-    :~  /json/0/submissions
-        (weld /json/0/submissions path.update)
-    ==
-  ::
-      %discussions
-    %+  give-json
-      %+  frond:enjs:format  'link-update'
-      (update:enjs:store update)
-    :_  ~
-    %+  weld  /json/0/discussions
-    (build-discussion-path:store [path url]:update)
-  ::
-      %observation
-    %+  give-json
-      %+  frond:enjs:format  'link-update'
-      (update:enjs:store update)
-    ~[/json/seen]
-  ==
-::
-++  give-json
-  |=  [=json paths=(list path)]
-  ^-  card
-  [%give %fact paths %json !>(json)]
-::
-++  scry-for
-  |*  [=mold =path]
-  .^  mold
-    %gx
-    (scot %p our.bowl)
-    %link-store
-    (scot %da now.bowl)
-    (snoc `^path`path %noun)
-  ==
+++  on-poke   on-poke:def
+++  on-watch  on-watch:def
+++  on-agent  on-agent:def
+++  on-arvo   on-arvo:def
+++  on-peek   on-peek:def
+++  on-leave  on-leave:def
+++  on-fail   on-fail:def
 --

From 1a419895a32d596313b79ed8efcf46ede077ab0b Mon Sep 17 00:00:00 2001
From: Logan Allen <loganallc@gmail.com>
Date: Wed, 19 Aug 2020 16:27:08 -0700
Subject: [PATCH 11/89] link-hooks: left TODO comments

---
 pkg/arvo/app/link-listen-hook.hoon | 1 +
 pkg/arvo/app/link-proxy-hook.hoon  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkg/arvo/app/link-listen-hook.hoon b/pkg/arvo/app/link-listen-hook.hoon
index feb5ffb1e3..5c1fade7cf 100644
--- a/pkg/arvo/app/link-listen-hook.hoon
+++ b/pkg/arvo/app/link-listen-hook.hoon
@@ -29,6 +29,7 @@
 ++  on-load
   |=  =vase
   ^-  (quip card _this)
+  ::  TODO: get rid of all subscriptions in bowl
   :_  this
   [%pass /groups %agent [our.bowl %group-store] %leave ~]~
 ::
diff --git a/pkg/arvo/app/link-proxy-hook.hoon b/pkg/arvo/app/link-proxy-hook.hoon
index ffa822ee65..0eab5a3923 100644
--- a/pkg/arvo/app/link-proxy-hook.hoon
+++ b/pkg/arvo/app/link-proxy-hook.hoon
@@ -27,6 +27,7 @@
 ++  on-load
   |=  old-vase=vase
   ^-  (quip card _this)
+  ::  TODO: get rid of all subscriptions in bowl
   :_  this
   [%pass /groups %agent [our.bowl %group-store] %leave ~]~
 ::

From c383d31c24f75a00fd0acb50fb8d4dfde37a1450 Mon Sep 17 00:00:00 2001
From: Tyler Brown Cifu Shuster <tyler@fivepaths.com>
Date: Fri, 21 Aug 2020 16:14:10 -0700
Subject: [PATCH 12/89] chat: updated Leave Group copy

---
 .../apps/chat/components/lib/delete-button.js | 97 ++++++++++---------
 .../views/apps/chat/components/settings.js    |  2 +
 2 files changed, 52 insertions(+), 47 deletions(-)

diff --git a/pkg/interface/src/views/apps/chat/components/lib/delete-button.js b/pkg/interface/src/views/apps/chat/components/lib/delete-button.js
index cb7b75ae75..1abb19f7e9 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/delete-button.js
+++ b/pkg/interface/src/views/apps/chat/components/lib/delete-button.js
@@ -1,51 +1,54 @@
-import React, { Component } from 'react';
+import React, { memo } from 'react';
 
+export const DeleteButton = memo(({ isOwner, station, changeLoading, association, contacts, api }) => {
+  const leaveButtonClasses = (!isOwner) ? 'pointer' : 'c-default';
+  const deleteButtonClasses = (isOwner) ? 
+    'b--red2 red2 pointer bg-gray0-d' :
+    'b--gray3 gray3 bg-gray0-d c-default';
 
-export const DeleteButton = (props) => {
-    const { isOwner, station, changeLoading, api } = props;
-    const leaveButtonClasses = (!isOwner) ? 'pointer' : 'c-default';
-    const deleteButtonClasses = (isOwner) ? 
-      'b--red2 red2 pointer bg-gray0-d' :
-      'b--gray3 gray3 bg-gray0-d c-default';
-
-    const deleteChat = () => {
-      changeLoading(
-        true,
-        true,
-        isOwner ? 'Deleting chat...' : 'Leaving chat...',
-        () => {
-          api.chat.delete(station);
-        }
-      );
-    };
-
-    return (
-      <div className="w-100 cf">
-        <div className={'w-100 fl mt3 ' + ((isOwner) ? 'o-30' : '')}>
-          <p className="f8 mt3 lh-copy db">Leave Chat</p>
-          <p className="f9 gray2 db mb4">
-            Remove this chat from your chat list.{' '}
-            You will need to request for access again.
-          </p>
-          <a onClick={(!isOwner) ? deleteChat : null}
-             className={
-               'dib f9 black gray4-d bg-gray0-d ba pa2 b--black b--gray1-d ' +
-               leaveButtonClasses
-             }>
-            Leave this chat
-          </a>
-        </div>
-        <div className={'w-100 fl mt3 ' + ((!isOwner) ? 'o-30' : '')}>
-          <p className="f8 mt3 lh-copy db">Delete Chat</p>
-            <p className="f9 gray2 db mb4">
-              Permanently delete this chat.{' '}
-              All current members will no longer see this chat.
-            </p>
-            <a onClick={(isOwner) ? deleteChat : null}
-             className={'dib f9 ba pa2 ' + deleteButtonClasses}
-            >Delete this chat</a>
-        </div>
-      </div>
+  const deleteChat = () => {
+    changeLoading(
+      true,
+      true,
+      isOwner ? 'Deleting chat...' : 'Leaving chat...',
+      () => {
+        api.chat.delete(station);
+      }
     );
-};
+  };
 
+  const groupPath = association['group-path'];
+  const unmanagedVillage = !contacts[groupPath];
+
+  return (
+    <div className="w-100 cf">
+      <div className={'w-100 fl mt3 ' + ((isOwner) ? 'o-30' : '')}>
+        <p className="f8 mt3 lh-copy db">Leave Chat</p>
+        <p className="f9 gray2 db mb4">
+          Remove this chat from your chat list.{' '}
+          {unmanagedVillage 
+            ? 'You will need to request for access again'
+            : 'You will need to join again from the group page.'
+          }
+        </p>
+        <a onClick={(!isOwner) ? deleteChat : null}
+           className={
+             'dib f9 black gray4-d bg-gray0-d ba pa2 b--black b--gray1-d ' +
+             leaveButtonClasses
+           }>
+          Leave this chat
+        </a>
+      </div>
+      <div className={'w-100 fl mt3 ' + ((!isOwner) ? 'o-30' : '')}>
+        <p className="f8 mt3 lh-copy db">Delete Chat</p>
+          <p className="f9 gray2 db mb4">
+            Permanently delete this chat.{' '}
+            All current members will no longer see this chat.
+          </p>
+          <a onClick={(isOwner) ? deleteChat : null}
+           className={'dib f9 ba pa2 ' + deleteButtonClasses}
+          >Delete this chat</a>
+      </div>
+    </div>
+  );
+})
\ No newline at end of file
diff --git a/pkg/interface/src/views/apps/chat/components/settings.js b/pkg/interface/src/views/apps/chat/components/settings.js
index 9b1b339367..6250ef7861 100644
--- a/pkg/interface/src/views/apps/chat/components/settings.js
+++ b/pkg/interface/src/views/apps/chat/components/settings.js
@@ -89,6 +89,8 @@ export class SettingsScreen extends Component {
           isOwner={isOwner}
           changeLoading={this.changeLoading}
           station={station}
+          association={association}
+          contacts={contacts}
           api={api} />
         <MetadataSettings
           isOwner={isOwner}

From e8b51df6dd1544a9e63e1caab24dee769dad4e58 Mon Sep 17 00:00:00 2001
From: matildepark <matilde@tlon.io>
Date: Wed, 26 Aug 2020 18:29:19 -0400
Subject: [PATCH 13/89] arvo/README: update maintainers

---
 pkg/arvo/README.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkg/arvo/README.md b/pkg/arvo/README.md
index 8f1d068700..4331571774 100644
--- a/pkg/arvo/README.md
+++ b/pkg/arvo/README.md
@@ -41,20 +41,20 @@ Most parts of Arvo have dedicated maintainers.
 
 * `/sys/hoon`: @pilfer-pandex (~pilfer-pandex)
 * `/sys/zuse`: @pilfer-pandex (~pilfer-pandex)
-* `/sys/arvo`: @jtobin (~nidsut-tomdun)
-* `/sys/vane/ames`: @belisarius222 (~rovnys-ricfer) & @joemfb (~master-morzod)
+* `/sys/arvo`: @joemfb (~master-morzod)
+* `/sys/vane/ames`: @belisarius222 (~rovnys-ricfer) & @philipcmonk (~wicdev-wisryt)
 * `/sys/vane/behn`: @belisarius222 (~rovnys-ricfer)
-* `/sys/vane/clay`: @philipcmonk (~wicdev-wisryt)
-* `/sys/vane/dill`: @bernardodelaplaz (~rigdyn-sondur)
+* `/sys/vane/clay`: @philipcmonk (~wicdev-wisryt) & @belisarius222 (~rovnys-ricfer)
+* `/sys/vane/dill`: @joemfb (~master-morzod)
 * `/sys/vane/eyre`: @eglaysher (~littel-ponnys)
-* `/sys/vane/ford`: @belisarius222 (~rovnys-ricfer) & @eglaysher (~littel-ponnys)
-* `/sys/vane/gall`: @jtobin (~nidsut-tomdun)
-* `/sys/vane/jael`: @fang- (~palfun-foslup) & @joemfb (~master-morzod)
+* `/sys/vane/gall`: @philipcmonk (~wicdev-wisryt)
+* `/sys/vane/jael`: @fang- (~palfun-foslup) & @philipcmonk (~wicdev-wisryt)
 * `/app/acme`: @joemfb (~master-morzod)
 * `/app/dns`: @joemfb (~master-morzod)
-* `/app/hall`: @fang- (~palfun-foslup)
-* `/app/talk`: @fang- (~palfun-foslup)
 * `/app/aqua`: @philipcmonk (~wicdev-wisryt)
+* `/app/hood`: @belisarius222 (~rovnys-ricfer)
+* `/lib/hood/drum`: @philipcmonk (~wicdev-wisryt)
+* `/lib/hood/kiln`: @philipcmonk (~wicdev-wisryt)
 * `/lib/test`: @eglaysher (~littel-ponnys)
 
 ## Contributing

From bafe213d458566b0910bdb0e993fab6e73591df4 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Tue, 1 Sep 2020 01:13:33 +1000
Subject: [PATCH 14/89] publish: check roles correctly for tags

---
 .../publish/components/lib/Subscribers.tsx    | 25 +++++++++++--------
 pkg/interface/src/views/components/Group.tsx  |  4 +--
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkg/interface/src/views/apps/publish/components/lib/Subscribers.tsx b/pkg/interface/src/views/apps/publish/components/lib/Subscribers.tsx
index 4ff86c82bf..069e851f33 100644
--- a/pkg/interface/src/views/apps/publish/components/lib/Subscribers.tsx
+++ b/pkg/interface/src/views/apps/publish/components/lib/Subscribers.tsx
@@ -1,11 +1,12 @@
 import React, { Component } from 'react';
 import { GroupView } from '~/views/components/Group';
-import { resourceFromPath } from '~/logic/lib/group';
+import { resourceFromPath, roleForShip } from '~/logic/lib/group';
 import {Notebook} from '~/types/publish-update';
 import GlobalApi from '~/logic/api/global';
 import {Groups} from '~/types/group-update';
 import {Associations} from '~/types/metadata-update';
 import {Rolodex} from '~/types/contact-update';
+import {Box, Button} from '@tlon/indigo-react';
 
 interface SubscribersProps {
   notebook: Notebook;
@@ -71,16 +72,20 @@ export class Subscribers extends Component<SubscribersProps> {
         addDesc: 'Allow user to write to this notebook'
       },
     ];
-    
+
+    if(!group) {
+      return null;
+    }
+
+    const role = roleForShip(group, window.ship)
 
     return (
-      <div>
-        <button
-           onClick={this.addAll}
-           className={'dib f9 black gray4-d bg-gray0-d ba pa2 mb4 b--black b--gray1-d pointer'}
-        >
-          Add all members as writers
-        </button>
+      <Box>
+        { role === 'admin' && (
+          <Button mb={3} border onClick={this.addAll}>
+            Add all members as writers
+          </Button>
+        )}
         <GroupView
           permissions
           resourcePath={path}
@@ -92,7 +97,7 @@ export class Subscribers extends Component<SubscribersProps> {
           associations={this.props.associations}
           api={this.props.api}
         />
-      </div>
+      </Box>
     );
   }
 }
diff --git a/pkg/interface/src/views/components/Group.tsx b/pkg/interface/src/views/components/Group.tsx
index e364c0aeb4..0b8dc9bf31 100644
--- a/pkg/interface/src/views/components/Group.tsx
+++ b/pkg/interface/src/views/components/Group.tsx
@@ -143,10 +143,8 @@ export class GroupView extends Component<
   }
 
   isAdmin(): boolean {
-    const us = `~${window.ship}`;
     const role = roleForShip(this.props.group, window.ship);
-    const resource = resourceFromPath(this.props.resourcePath);
-    return resource.ship == us || role === 'admin';
+    return role === 'admin';
   }
 
   optionsForShip(ship: Patp, missing: GroupViewAppTag[]) {

From 149ffd32e64569cfa63a13fb15b96bbe03ff29a2 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Tue, 1 Sep 2020 01:25:51 +1000
Subject: [PATCH 15/89] publish: make input form expand to screen

---
 .../src/views/apps/publish/components/lib/MarkdownField.tsx    | 2 +-
 .../src/views/apps/publish/components/lib/NoteForm.tsx         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/interface/src/views/apps/publish/components/lib/MarkdownField.tsx b/pkg/interface/src/views/apps/publish/components/lib/MarkdownField.tsx
index efd4f0e475..b60af6a5cf 100644
--- a/pkg/interface/src/views/apps/publish/components/lib/MarkdownField.tsx
+++ b/pkg/interface/src/views/apps/publish/components/lib/MarkdownField.tsx
@@ -12,7 +12,7 @@ export const MarkdownField = ({ id, ...rest }: { id: string; } & Parameters<type
   const [{ value }, { error, touched }, { setValue, setTouched }] = useField(id);
 
   return (
-    <Box width="100%" display="flex" flexDirection="column" {...rest}>
+    <Box height="100%" width="100%" display="flex" flexDirection="column" {...rest}>
       <MarkdownEditor
         onFocus={() => setTouched(true)}
         onBlur={() => setTouched(false)}
diff --git a/pkg/interface/src/views/apps/publish/components/lib/NoteForm.tsx b/pkg/interface/src/views/apps/publish/components/lib/NoteForm.tsx
index cc83d248d9..e4cc1f8ae6 100644
--- a/pkg/interface/src/views/apps/publish/components/lib/NoteForm.tsx
+++ b/pkg/interface/src/views/apps/publish/components/lib/NoteForm.tsx
@@ -31,10 +31,11 @@ export function PostForm(props: PostFormProps) {
   return (
     <Box
       width="100%"
+      height="100%"
       p={[2, 4]}
       display="grid"
       justifyItems="start"
-      gridAutoRows="min-content"
+      gridTemplateRows={["64px 64px 1fr", "64px 1fr"]}
       gridTemplateColumns={["100%", "1fr 1fr"]}
       gridColumnGap={2}
       gridRowGap={2}

From 9daab55c3aa9276ae69087ebc8eb80a7dda5d0d0 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde@tlon.io>
Date: Mon, 31 Aug 2020 21:34:15 -0400
Subject: [PATCH 16/89] meta: add issue links to landscape, urbit-dev

---
 .github/ISSUE_TEMPLATE/config.yml        | 8 ++++++++
 .github/ISSUE_TEMPLATE/os1-bug-report.md | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..63b3ea5fe0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Landscape feature request
+    url: https://github.com/urbit/landscape/issues/new?assignees=&labels=feature+request&template=feature_request.md&title=
+    about: Landscape is comprised of Tlon's user applications and client for Urbit. Submit Landscape feature requests here.
+  - name: urbit-dev mailing list
+    url: https://groups.google.com/a/urbit.org/g/dev
+    about: Developer questions and discussions also take place on the urbit-dev mailing list.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/os1-bug-report.md b/.github/ISSUE_TEMPLATE/os1-bug-report.md
index 974acf0453..b6800a7a7f 100644
--- a/.github/ISSUE_TEMPLATE/os1-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/os1-bug-report.md
@@ -1,6 +1,6 @@
 ---
-name: OS1 Bug report
-about: 'Use this template to file a bug for any OS1 app: Chat, Publish, Links, Groups,
+name: Landscape bug report
+about: 'Use this template to file a bug for any Landscape app: Chat, Publish, Links, Groups,
   Weather or Clock'
 title: ''
 labels: landscape

From 748a03bbae4b04fc4fae404538205573f10bc9ad Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde@tlon.io>
Date: Mon, 31 Aug 2020 21:35:04 -0400
Subject: [PATCH 17/89] README: general legibility changes

Describes what's literally in this repository.
---
 README.md | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index c5018a871e..914815947c 100644
--- a/README.md
+++ b/README.md
@@ -1,27 +1,38 @@
 # Urbit
 
-A personal server operating function.
+[Urbit](https://urbit.org) is a personal server stack built from scratch. It
+has an identity layer (Azimuth), virtual machine (Vere), and operating system
+(Arvo).
 
-> The Urbit address space, Azimuth, is now live on the Ethereum blockchain. You
-> can find it at [`0x223c067f8cf28ae173ee5cafea60ca44c335fecb`][azim] or
-> [`azimuth.eth`][aens]. Owners of Azimuth points (galaxies, stars, or planets)
-> can view or manage them using [Bridge][brid], and can also use them to boot
-> [Arvo][arvo], the Urbit OS.
+A running Urbit "ship" is designed to operate with other ships peer-to-peer.
+Urbit is a general-purpose, peer-to-peer computer and network.
+
+This repository contains:
+
+- The [Arvo OS][arvo]
+- [herb][herb], a tool for Unix control of an Urbit ship
+- Source code for [Landscape's web interface][land]
+- Source code for the [vere][vere] virtual machine.
+
+For more on the identity layer, see [Azimuth][azim]. To manage your Urbit
+identity, use [Bridge][brid].
 
-[azim]: https://etherscan.io/address/0x223c067f8cf28ae173ee5cafea60ca44c335fecb
-[aens]: https://etherscan.io/address/azimuth.eth
-[brid]: https://github.com/urbit/bridge
 [arvo]: https://github.com/urbit/urbit/tree/master/pkg/arvo
+[azim]: https://github.com/urbit/azimuth
+[brid]: https://github.com/urbit/bridge
+[herb]: https://github.com/urbit/urbit/tree/master/pkg/herb
+[land]: https://github.com/urbit/urbit/tree/master/pkg/interface
+[vere]: https://github.com/urbit/urbit/tree/master/pkg/urbit
 
 ## Install
 
 To install and run Urbit, please follow the instructions at
-[urbit.org/docs/getting-started/][start].  You'll be on the live network in a
+[urbit.org/using/install][start].  You'll be on the live network in a
 few minutes.
 
 If you're interested in Urbit development, keep reading.
 
-[start]: https://urbit.org/docs/getting-started/
+[start]: https://urbit.org/using/install/
 
 ## Development
 
@@ -38,7 +49,7 @@ The Makefile in the project's root directory contains useful phony targets for
 building, installing, testing, and so on.  You can use it to avoid dealing with
 Nix explicitly.
 
-To build Urbit, for example, use:
+To build the Urbit virtual machine binary, for example, use:
 
 ```
 make build
@@ -68,12 +79,10 @@ Contributions of any form are more than welcome!  Please take a look at our
 [contributing guidelines][cont] for details on our git practices, coding
 styles, how we manage issues, and so on.
 
-You might also be interested in:
+For instructions on contributing to Landscape, see [its][lcont] guidelines.
 
-- joining the [urbit-dev][list] mailing list.
-- [applying to Hoon School][mail], a course we run to teach the Hoon
-  programming language and Urbit application development.
+You might also be interested in joining the [urbit-dev][list] mailing list.
 
 [list]: https://groups.google.com/a/urbit.org/forum/#!forum/dev
-[mail]: mailto:support@urbit.org
 [cont]: https://github.com/urbit/urbit/blob/master/CONTRIBUTING.md
+[lcont]: https://github.com/urbit/urbit/blob/master/pkg/interface/CONTRIBUTING.md
\ No newline at end of file

From 9b2f0b0e122ebf13957b69e7fd34ba6a9cec571d Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde@tlon.io>
Date: Mon, 31 Aug 2020 21:35:52 -0400
Subject: [PATCH 18/89] CONTRIBUTING: add link to maintainers in pkg/arvo

Also removes a blurb about accepting emailed patches; this
has never happened in practice, and we don't supply
maintainers' emails. Sticking to what we know we support
is best.
---
 CONTRIBUTING.md | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1a1b08a2d7..b64ef9c03f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,12 +2,14 @@
 
 Thank you for your interest in contributing to Urbit.
 
-See [urbit.org/docs/getting-started][start] for basic orientation and usage
+See [urbit.org/using/install][start] for basic orientation and usage
 instructions.  You may also want to subscribe to [urbit-dev][list], the Urbit
 development mailing list. For specific information on contributing to the Urbit
 interface, see its [contribution guidelines][interface].
 
-[start]: https://urbit.org/docs/getting-started/#arvo
+For information on Arvo's maintainers, see [pkg/arvo][main].
+
+[start]: https://urbit.org/using/install
 [interface]: /pkg/interface/CONTRIBUTING.md
 
 ## Fake ships
@@ -45,11 +47,10 @@ The canonical source tree is the `master` branch of
 `master` when commencing new work; similarly, when we pull in your
 contribution, we'll do so by merging it to `master`.
 
-Since we use GitHub, it's helpful (though not required) to contribute via a
-GitHub pull request.  You can also post patches to the [mailing list][list],
-email them to maintainers, or request a maintainer pull from your tree directly
--- but note that some maintainers will be more receptive to these methods than
-others.
+Since we use GitHub, we request you contribute via a GitHub pull request. Tag
+the [maintainer][main] for the component. If you have a question for the
+maintainer, you can direct message them from your Urbit ship using that
+information.
 
 When contributing changes, via whatever means, make sure you describe them
 appropriately.  You should attach a reasonably high-level summary of what the
@@ -58,8 +59,8 @@ exist, e.g. a GitHub issue, a mailing list discussion, a UP, etc.  [Here][jbpr]
 is a good example of a pull request with a useful, concise description.
 
 If your changes replace significant extant functionality, be sure to compare
-them with the thing you're replacing.  You may also want to cc maintainers,
-reviewers, or other parties who might have a particular interest in what you're
+them with the thing you're replacing.  You may also want to cc reviewers,
+or other parties who might have a particular interest in what you're
 contributing.
 
 [jbpr]: https://github.com/urbit/urbit/pull/1782
@@ -283,3 +284,4 @@ Questions or other communications about contributing to Urbit can go to
 [reba]: https://git-rebase.io/
 [issu]: https://github.com/urbit/urbit/issues
 [hoon]: https://urbit.org/docs/learn/hoon/style/
+[main]: https://github.com/urbit/urbit/tree/master/pkg/arvo#maintainers
\ No newline at end of file

From a8cc26892b06814e5e638240ae8f8ef8a2e4fdf8 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde@tlon.io>
Date: Mon, 31 Aug 2020 21:41:12 -0400
Subject: [PATCH 19/89] interface/README: add README

---
 pkg/interface/README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 pkg/interface/README.md

diff --git a/pkg/interface/README.md b/pkg/interface/README.md
new file mode 100644
index 0000000000..1af93b2b4f
--- /dev/null
+++ b/pkg/interface/README.md
@@ -0,0 +1,17 @@
+## interface
+
+Landscape is Tlon's suite of userspace applications (and web interface),
+currently bundled as part of Arvo.
+
+This directory comprises the source code for the web interface. For code related
+to the Gall agents that make up the Landscape suite in Arvo, see
+[pkg/arvo][arvo].
+
+### Contributions and feature requests
+
+For information on how to contribute, see [CONTRIBUTING][cont]. To submit
+a feature request, submit to the product board at [urbit/landscape][land].
+
+[arvo]: https://github.com/urbit/urbit/tree/master/pkg/arvo
+[cont]: https://github.com/urbit/urbit/blob/master/pkg/interface/CONTRIBUTING.md
+[land]: https://github.com/urbit/landscape/issues/new?assignees=&labels=feature+request&template=feature_request.md&title=
\ No newline at end of file

From ef3b9282c2db0e25c72ad93ea4c42e2e8917e777 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde@tlon.io>
Date: Mon, 31 Aug 2020 21:54:39 -0400
Subject: [PATCH 20/89] various: add [landscape] marker to apps in arvo

---
 pkg/arvo/app/chat-hook.hoon             |  4 ++--
 pkg/arvo/app/chat-store.hoon            |  4 +++-
 pkg/arvo/app/chat-view.hoon             | 10 ++++++----
 pkg/arvo/app/clock.hoon                 |  4 +++-
 pkg/arvo/app/contact-hook.hoon          | 15 ++++++++-------
 pkg/arvo/app/contact-store.hoon         |  6 ++++--
 pkg/arvo/app/contact-view.hoon          |  4 +++-
 pkg/arvo/app/file-server.hoon           |  8 ++++++--
 pkg/arvo/app/glob.hoon                  |  4 ++++
 pkg/arvo/app/graph-store.hoon           |  9 ++++++---
 pkg/arvo/app/group-hook.hoon            |  6 ++++--
 pkg/arvo/app/group-pull-hook.hoon       |  3 ++-
 pkg/arvo/app/group-push-hook.hoon       |  3 ++-
 pkg/arvo/app/group-store.hoon           | 14 ++++++++------
 pkg/arvo/app/invite-hook.hoon           |  4 +++-
 pkg/arvo/app/invite-store.hoon          |  1 +
 pkg/arvo/app/invite-view.hoon           |  4 ++++
 pkg/arvo/app/launch.hoon                |  4 ++++
 pkg/arvo/app/link-listen-hook.hoon      |  6 ++++--
 pkg/arvo/app/link-proxy-hook.hoon       |  4 +++-
 pkg/arvo/app/link-store.hoon            |  4 +++-
 pkg/arvo/app/link-view.hoon             |  4 +++-
 pkg/arvo/app/metadata-hook.hoon         |  6 ++++--
 pkg/arvo/app/metadata-store.hoon        |  4 +++-
 pkg/arvo/app/permission-group-hook.hoon |  4 +++-
 pkg/arvo/app/permission-hook.hoon       |  4 +++-
 pkg/arvo/app/permission-store.hoon      |  4 +++-
 pkg/arvo/app/pool-group-hook.hoon       |  4 +++-
 pkg/arvo/app/publish.hoon               |  4 ++++
 pkg/arvo/app/s3-store.hoon              |  4 ++++
 pkg/arvo/app/soto.hoon                  |  3 ++-
 pkg/arvo/app/weather.hoon               |  4 ++++
 32 files changed, 119 insertions(+), 47 deletions(-)

diff --git a/pkg/arvo/app/chat-hook.hoon b/pkg/arvo/app/chat-hook.hoon
index fc8d546ec8..e6aa7e2e5e 100644
--- a/pkg/arvo/app/chat-hook.hoon
+++ b/pkg/arvo/app/chat-hook.hoon
@@ -1,4 +1,4 @@
-::  chat-hook:
+::  chat-hook [landscape]:
 ::  mirror chat data from foreign to local based on read permissions
 ::  allow sending chat messages to foreign paths based on write perms
 ::
@@ -114,7 +114,7 @@
           i.syncs
         ?>  ?=(^ pax)
         ?.  =('~' i.pax)
-          $(syncs t.syncs) 
+          $(syncs t.syncs)
         =/  new-path=path
           t.pax
         =.  synced.old
diff --git a/pkg/arvo/app/chat-store.hoon b/pkg/arvo/app/chat-store.hoon
index 3004a1c5ff..5118babbcc 100644
--- a/pkg/arvo/app/chat-store.hoon
+++ b/pkg/arvo/app/chat-store.hoon
@@ -1,4 +1,6 @@
-:: chat-store: data store that holds linear sequences of chat messages
+:: chat-store [landscape]:
+::
+:: data store that holds linear sequences of chat messages
 ::
 /+  store=chat-store, default-agent, verb, dbug, group-store
 ~%  %chat-store-top  ..is  ~
diff --git a/pkg/arvo/app/chat-view.hoon b/pkg/arvo/app/chat-view.hoon
index 15b7bdf403..054c702403 100644
--- a/pkg/arvo/app/chat-view.hoon
+++ b/pkg/arvo/app/chat-view.hoon
@@ -1,4 +1,6 @@
-::  chat-view: sets up chat JS client, paginates data, and combines commands
+::  chat-view [landscape]:
+::
+::  sets up chat JS client, paginates data, and combines commands
 ::  into semantic actions for the UI
 ::
 /-  *permission-store,
@@ -157,7 +159,7 @@
     (on-arvo:def wire sign-arvo)
   ::
   ++  on-save  !>(state)
-  ++  on-load  
+  ++  on-load
     |=  old-vase=vase
     ^-  (quip card _this)
     =/  old  ((soft state-0) q.old-vase)
@@ -212,8 +214,8 @@
   ?-  -.act
       %create
     ?>  ?=(^ app-path.act)
-    ?>  ?|  =(+:group-path.act app-path.act) 
-            =(~(tap in members.act) ~) 
+    ?>  ?|  =(+:group-path.act app-path.act)
+            =(~(tap in members.act) ~)
         ==
     ?^  (chat-scry app-path.act)
       ~&  %chat-already-exists
diff --git a/pkg/arvo/app/clock.hoon b/pkg/arvo/app/clock.hoon
index 74af060986..c4db5f62de 100644
--- a/pkg/arvo/app/clock.hoon
+++ b/pkg/arvo/app/clock.hoon
@@ -1,4 +1,6 @@
-::  clock: deprecated, should be removed
+::  clock [landscape]:
+::
+::  deprecated, should be removed
 ::
 /+  *server, default-agent, verb, dbug
 =,  format
diff --git a/pkg/arvo/app/contact-hook.hoon b/pkg/arvo/app/contact-hook.hoon
index acb3b95724..4bc66de485 100644
--- a/pkg/arvo/app/contact-hook.hoon
+++ b/pkg/arvo/app/contact-hook.hoon
@@ -1,4 +1,5 @@
-::  contact-hook:
+::  contact-hook [landscape]
+::
 ::
 /-  group-hook,
     *contact-hook,
@@ -54,7 +55,7 @@
     =/  old  !<(versioned-state old-vase)
     =|  cards=(list card)
     |^
-    |-  ^-  (quip card _this) 
+    |-  ^-  (quip card _this)
     ?:  ?=(%3 -.old)
       [cards this(state old)]
     ?:  ?=(%2 -.old)
@@ -80,7 +81,7 @@
       %_    $
         -.old  %2
         ::
-          synced.old  
+          synced.old
         %-  malt
         %+  turn
           ~(tap by synced.old)
@@ -126,7 +127,7 @@
           %json
         (poke-json:cc !<(json vase))
       ::
-          %contact-action  
+          %contact-action
         (poke-contact-action:cc !<(contact-action vase))
       ::
           %contact-hook-action
@@ -149,7 +150,7 @@
         %kick       [(kick:cc wire) this]
         %watch-ack
       =^  cards  state
-        (watch-ack:cc wire p.sign) 
+        (watch-ack:cc wire p.sign)
       [cards this]
     ::
         %fact
@@ -301,8 +302,8 @@
     [%pass /group %agent [our.bol %group-store] %watch /groups]~
   ::
       [%contacts @ *]
-    =/  wir  
-      ?:  =(%ship i.t.wir) 
+    =/  wir
+      ?:  =(%ship i.t.wir)
         wir
       (migrate wir)
     ?>  ?=([%contacts @ @ *] wir)
diff --git a/pkg/arvo/app/contact-store.hoon b/pkg/arvo/app/contact-store.hoon
index 50b6f9cfb7..6089cae80c 100644
--- a/pkg/arvo/app/contact-store.hoon
+++ b/pkg/arvo/app/contact-store.hoon
@@ -1,4 +1,6 @@
-:: contact-store: data store that holds group-based contact data
+:: contact-store [landscape]:
+::
+:: data store that holds group-based contact data
 ::
 /+  *contact-json, default-agent, dbug
 |%
@@ -253,7 +255,7 @@
 ++  send-diff
   |=  [pax=path upd=contact-update]
   ^-  (list card)
-  :~  :*  
+  :~  :*
     %give  %fact
     ~[/all /updates [%contacts pax]]
     %contact-update  !>(upd)
diff --git a/pkg/arvo/app/contact-view.hoon b/pkg/arvo/app/contact-view.hoon
index 417b754524..9fab4648c8 100644
--- a/pkg/arvo/app/contact-view.hoon
+++ b/pkg/arvo/app/contact-view.hoon
@@ -1,4 +1,6 @@
-::  contact-view: sets up contact JS client and combines commands
+::  contact-view [landscape]:
+::
+::  sets up contact JS client and combines commands
 ::  into semantic actions for the UI
 ::
 /-
diff --git a/pkg/arvo/app/file-server.hoon b/pkg/arvo/app/file-server.hoon
index 7969a37296..ddeb7b3d90 100644
--- a/pkg/arvo/app/file-server.hoon
+++ b/pkg/arvo/app/file-server.hoon
@@ -1,3 +1,7 @@
+::  file-server [landscape]:
+::
+::  mounts HTTP endpoints for Landscape (and third-party) user applications
+::
 /-  srv=file-server, glob
 /+  *server, default-agent, verb, dbug
 |%
@@ -218,8 +222,8 @@
           ::
               [~ %html]
             %.  file
-            %*    .   html-response:gen 
-                cache  
+            %*    .   html-response:gen
+                cache
               !=(/app/landscape/index/html (slag 3 scry-path))
             ==
         ==
diff --git a/pkg/arvo/app/glob.hoon b/pkg/arvo/app/glob.hoon
index cdaff45f24..dc1ae6e083 100644
--- a/pkg/arvo/app/glob.hoon
+++ b/pkg/arvo/app/glob.hoon
@@ -1,3 +1,7 @@
+::  glob [landscape]:
+::
+::  prompts content delivery and Gall state storage for Landscape JS blob
+::
 /-  glob
 /+  default-agent, verb, dbug
 |%
diff --git a/pkg/arvo/app/graph-store.hoon b/pkg/arvo/app/graph-store.hoon
index ab9a6b9710..8197f439ab 100644
--- a/pkg/arvo/app/graph-store.hoon
+++ b/pkg/arvo/app/graph-store.hoon
@@ -1,3 +1,6 @@
+::  graph-store [landscape]
+::
+::
 /+  store=graph-store, sigs=signatures, res=resource, default-agent, dbug
 ~%  %graph-store-top  ..is  ~
 |%
@@ -282,7 +285,7 @@
         ?~  index  graph
         =*  atom   i.index
         =/  =node:store
-          ~|  "node does not exist to add signatures to!" 
+          ~|  "node does not exist to add signatures to!"
           (need (get:orm graph atom))
         ::  last index in list
         ::
@@ -327,7 +330,7 @@
         ?~  index  graph
         =*  atom   i.index
         =/  =node:store
-          ~|  "node does not exist to add signatures to!" 
+          ~|  "node does not exist to add signatures to!"
           (need (get:orm graph atom))
         ::  last index in list
         ::
@@ -525,7 +528,7 @@
     =/  update-log=(unit update-log:store)  (~(get by update-logs) [ship term])
     ?~  update-log  [~ ~]
     =/  result=(unit [time update:store])
-      (peek:orm-log:store u.update-log) 
+      (peek:orm-log:store u.update-log)
     ?~  result  [~ ~]
     ``noun+!>([~ -.u.result])
   ==
diff --git a/pkg/arvo/app/group-hook.hoon b/pkg/arvo/app/group-hook.hoon
index 4b2d7a2204..5a29752e35 100644
--- a/pkg/arvo/app/group-hook.hoon
+++ b/pkg/arvo/app/group-hook.hoon
@@ -1,4 +1,6 @@
-::  group-hook: allow syncing group data from foreign paths to local paths
+::  group-hook [landscape]:
+::
+::  allow syncing group data from foreign paths to local paths
 ::
 /-  *group, hook=group-hook, *invite-store
 /+  default-agent, verb, dbug, store=group-store, grpl=group, pull-hook, push-hook, resource
@@ -58,7 +60,7 @@
     :: ignore duplicate publish groups
     ?:  =(4 (lent path))
       ~&  "ignoring: {<path>}"
-      ~ 
+      ~
     =/  pax=^path
       ?:  =('~' i.path)
         t.path
diff --git a/pkg/arvo/app/group-pull-hook.hoon b/pkg/arvo/app/group-pull-hook.hoon
index 5a8c639c13..4d6da63891 100644
--- a/pkg/arvo/app/group-pull-hook.hoon
+++ b/pkg/arvo/app/group-pull-hook.hoon
@@ -1,5 +1,6 @@
-::  group-hook: allow syncing group data from foreign paths to local paths
+::  group-hook [landscape]:
 ::
+::  allow syncing group data from foreign paths to local paths
 ::
 /-  *group, hook=group-hook, *invite-store, *resource
 /+  default-agent, verb, dbug, store=group-store, grpl=group, pull-hook
diff --git a/pkg/arvo/app/group-push-hook.hoon b/pkg/arvo/app/group-push-hook.hoon
index 443889e883..7e5215fa02 100644
--- a/pkg/arvo/app/group-push-hook.hoon
+++ b/pkg/arvo/app/group-push-hook.hoon
@@ -1,5 +1,6 @@
-::  group-hook: allow syncing group data from foreign paths to local paths
+::  group-hook [landscape]:
 ::
+::  allow syncing group data from foreign paths to local paths
 ::
 /-  *group, hook=group-hook, *invite-store
 /+  default-agent, verb, dbug, store=group-store, grpl=group, push-hook,
diff --git a/pkg/arvo/app/group-store.hoon b/pkg/arvo/app/group-store.hoon
index bec2254017..57552866af 100644
--- a/pkg/arvo/app/group-store.hoon
+++ b/pkg/arvo/app/group-store.hoon
@@ -1,4 +1,6 @@
-::  group-store: Store groups of ships
+::  group-store [landscape]:
+::
+::  Store groups of ships
 ::
 ::    group-store stores groups of ships, so that resources in other apps can be
 ::    associated with a group. The current model of group-store rolls
@@ -128,7 +130,7 @@
       ^-  [resource group]
       =/  members=(set ship)
         (~(got by groups.old) pax)
-      =|  =invite:policy 
+      =|  =invite:policy
       ?>  ?=(^ pax)
       =/  rid=resource
         (resource-from-old-path t.pax)
@@ -149,7 +151,7 @@
       |=  pax=path
       =/  members
         (~(got by groups.old) pax)
-      =|  =invite:policy  
+      =|  =invite:policy
       =/  rid=resource
         (resource-from-old-path pax)
       =/  =tags
@@ -239,7 +241,7 @@
         (~(has in members.group) ship)
     ==
       %open
-    ?!  ?|  
+    ?!  ?|
       (~(has in banned.policy) ship)
       (~(has in ban-ranks.policy) (clan:title ship))
     ==
@@ -285,7 +287,7 @@
     ^-  resource
     ?>  ?=([@ @ *] path)
     :-  (slav %p i.path)
-    i.t.path 
+    i.t.path
   ::
   ++  add-new
     |=  =permission:permission-store
@@ -293,7 +295,7 @@
     ?:  ?=(%black kind.permission)
       [~ ~ [%open ~ who.permission] %.y]
     [who.permission ~ [%invite ~] %.y]
-  ::   
+  ::
   ++  update-existing
     |=  =permission:permission-store
     |=  =group
diff --git a/pkg/arvo/app/invite-hook.hoon b/pkg/arvo/app/invite-hook.hoon
index 2e4cef97b9..0e7b93d97a 100644
--- a/pkg/arvo/app/invite-hook.hoon
+++ b/pkg/arvo/app/invite-hook.hoon
@@ -1,4 +1,6 @@
-::  invite-hook: receive invites from any source
+::  invite-hook [landscape]:
+::
+::  receive invites from any source
 ::
 ::    only handles %invite actions. accepts json, but only from the host team.
 ::    can be poked by the host team to send an invite out to someone.
diff --git a/pkg/arvo/app/invite-store.hoon b/pkg/arvo/app/invite-store.hoon
index f08bb6cbf4..c09bd4cbae 100644
--- a/pkg/arvo/app/invite-store.hoon
+++ b/pkg/arvo/app/invite-store.hoon
@@ -1,3 +1,4 @@
+::  invite-store [landscape]
 /+  *invite-json, default-agent, dbug
 |%
 +$  card  card:agent:gall
diff --git a/pkg/arvo/app/invite-view.hoon b/pkg/arvo/app/invite-view.hoon
index 666ed54730..72f3a0cc5a 100644
--- a/pkg/arvo/app/invite-view.hoon
+++ b/pkg/arvo/app/invite-view.hoon
@@ -1,3 +1,7 @@
+:: invite-view [landscape]:
+::
+::  deprecated
+::
 /+  default-agent
 ^-  agent:gall
 |_  =bowl:gall
diff --git a/pkg/arvo/app/launch.hoon b/pkg/arvo/app/launch.hoon
index 2eb3b3e675..ee0b23964b 100644
--- a/pkg/arvo/app/launch.hoon
+++ b/pkg/arvo/app/launch.hoon
@@ -1,3 +1,7 @@
+::  launch [landscape]:
+::
+::  registers Landscape (and third party) applications, tiles
+::
 /+  store=launch-store, default-agent, dbug
 |%
 +$  card  card:agent:gall
diff --git a/pkg/arvo/app/link-listen-hook.hoon b/pkg/arvo/app/link-listen-hook.hoon
index 9fae8d98b7..8fe602d2d8 100644
--- a/pkg/arvo/app/link-listen-hook.hoon
+++ b/pkg/arvo/app/link-listen-hook.hoon
@@ -1,4 +1,6 @@
-::  link-listen-hook: get your friends' bookmarks
+::  link-listen-hook [landscape]:
+::
+::  get your friends' bookmarks
 ::
 ::    keeps track of a listening=(set app-path). users can manually add to and
 ::    remove from this set.
@@ -118,7 +120,7 @@
           /app-indices
         ==
       |-
-      ?~  resources  
+      ?~  resources
         upgrade-loop(old [%2 +.old])
       =,  i.resources
       =/  members=(set ship)
diff --git a/pkg/arvo/app/link-proxy-hook.hoon b/pkg/arvo/app/link-proxy-hook.hoon
index 98f61f6f8c..4d325e11fc 100644
--- a/pkg/arvo/app/link-proxy-hook.hoon
+++ b/pkg/arvo/app/link-proxy-hook.hoon
@@ -1,4 +1,6 @@
-::  link-proxy-hook: make local pages available to foreign ships
+::  link-proxy-hook [landscape]:
+::
+::  make local pages available to foreign ships
 ::
 ::    this is a "proxy" style hook, relaying foreign subscriptions into local
 ::    stores if permission conditions are met.
diff --git a/pkg/arvo/app/link-store.hoon b/pkg/arvo/app/link-store.hoon
index fed3d1206a..8fe1c54a25 100644
--- a/pkg/arvo/app/link-store.hoon
+++ b/pkg/arvo/app/link-store.hoon
@@ -1,4 +1,6 @@
-::  link: social bookmarking
+::  link [landscape]:
+::
+::  social bookmarking
 ::
 ::    the paths under which links are submitted are generally expected to
 ::    correspond to existing group paths. for strictly-local collections of
diff --git a/pkg/arvo/app/link-view.hoon b/pkg/arvo/app/link-view.hoon
index eaeefae07c..3487e4e92d 100644
--- a/pkg/arvo/app/link-view.hoon
+++ b/pkg/arvo/app/link-view.hoon
@@ -1,4 +1,6 @@
-::  link-view: frontend endpoints
+::  link-view [landscape]:
+::
+::frontend endpoints
 ::
 ::  endpoints, mapping onto link-store's paths. p is for page as in pagination.
 ::  only the /0/submissions endpoint provides updates.
diff --git a/pkg/arvo/app/metadata-hook.hoon b/pkg/arvo/app/metadata-hook.hoon
index e3acbd0129..5cad893191 100644
--- a/pkg/arvo/app/metadata-hook.hoon
+++ b/pkg/arvo/app/metadata-hook.hoon
@@ -1,4 +1,6 @@
-::  metadata-hook: allow syncing foreign metadata
+::  metadata-hook [landscape]:
+::
+::  allow syncing foreign metadata
 ::
 ::  watch paths:
 ::  /group/%group-path                      all updates related to this group
@@ -37,7 +39,7 @@
     [[%pass /updates %agent [our.bowl %metadata-store] %watch /updates]~ this]
   ::
   ++  on-save   !>(state)
-  ++  on-load   
+  ++  on-load
     |=  =vase
     =/  old
       !<(versioned-state vase)
diff --git a/pkg/arvo/app/metadata-store.hoon b/pkg/arvo/app/metadata-store.hoon
index a0e88e2e6d..0a6c52db6e 100644
--- a/pkg/arvo/app/metadata-store.hoon
+++ b/pkg/arvo/app/metadata-store.hoon
@@ -1,4 +1,6 @@
-::  metadata-store: data store for application metadata and mappings
+::  metadata-store [landscape]:
+::
+::  data store for application metadata and mappings
 ::  between groups and resources within applications
 ::
 ::  group-paths are expected to be an existing group path
diff --git a/pkg/arvo/app/permission-group-hook.hoon b/pkg/arvo/app/permission-group-hook.hoon
index 266666a8c0..535b54caf7 100644
--- a/pkg/arvo/app/permission-group-hook.hoon
+++ b/pkg/arvo/app/permission-group-hook.hoon
@@ -1,4 +1,6 @@
-::  permission-group-hook: groups into permissions
+::  permission-group-hook [landscape]:
+::
+::  groups into permissions
 ::
 ::    mirror the ships in specified groups to specified permission paths
 ::
diff --git a/pkg/arvo/app/permission-hook.hoon b/pkg/arvo/app/permission-hook.hoon
index 7c55bdc682..ba715b64c5 100644
--- a/pkg/arvo/app/permission-hook.hoon
+++ b/pkg/arvo/app/permission-hook.hoon
@@ -1,4 +1,6 @@
-::  permission-hook: mirror remote permissions
+::  permission-hook [landscape]:
+::
+::  mirror remote permissions
 ::
 ::    allows mirroring permissions between local and foreign ships.
 ::    local permission path are exposed according to the permssion paths
diff --git a/pkg/arvo/app/permission-store.hoon b/pkg/arvo/app/permission-store.hoon
index be9b2923e6..0d051aac75 100644
--- a/pkg/arvo/app/permission-store.hoon
+++ b/pkg/arvo/app/permission-store.hoon
@@ -1,4 +1,6 @@
-::  permission-store: track black- and whitelists of ships
+::  permission-store [landscape]:
+::
+::  track black- and whitelists of ships
 ::
 /-  *permission-store
 /+  default-agent, verb, dbug
diff --git a/pkg/arvo/app/pool-group-hook.hoon b/pkg/arvo/app/pool-group-hook.hoon
index 74e9385d32..e858112c55 100644
--- a/pkg/arvo/app/pool-group-hook.hoon
+++ b/pkg/arvo/app/pool-group-hook.hoon
@@ -1,4 +1,6 @@
-::  pool-group-hook: maintain groups based on invite pool
+::  pool-group-hook [landscape]:
+::
+::  maintain groups based on invite pool
 ::
 ::    looks at our invite tree, adds our siblings to group at +group-path
 ::
diff --git a/pkg/arvo/app/publish.hoon b/pkg/arvo/app/publish.hoon
index 00b5075bfb..2ec74fb1ca 100644
--- a/pkg/arvo/app/publish.hoon
+++ b/pkg/arvo/app/publish.hoon
@@ -1,3 +1,7 @@
+::  publish [landscape]
+::
+::  stores notebooks in clay, subscribes and allow subscriptions to notebooks
+::
 /-  *publish
 /-  *group
 /-  group-hook
diff --git a/pkg/arvo/app/s3-store.hoon b/pkg/arvo/app/s3-store.hoon
index 390ae8e7ff..5b0bf0c70c 100644
--- a/pkg/arvo/app/s3-store.hoon
+++ b/pkg/arvo/app/s3-store.hoon
@@ -1,3 +1,7 @@
+::  s3-store [landscape]:
+::
+::  stores s3 keys for uploading and sharing images and objects
+::
 /-  *s3
 /+  s3-json, default-agent, verb, dbug
 ~%  %s3-top  ..is  ~
diff --git a/pkg/arvo/app/soto.hoon b/pkg/arvo/app/soto.hoon
index 98645dafde..2ca0c26202 100644
--- a/pkg/arvo/app/soto.hoon
+++ b/pkg/arvo/app/soto.hoon
@@ -1,5 +1,6 @@
 ::
-::  Soto: A Dojo relay for Urbit's Landscape interface
+::  soto [landscape]: A Dojo relay for Urbit's Landscape interface
+::
 ::  Relays sole-effects to subscribers and forwards sole-action pokes
 ::
 /-  sole
diff --git a/pkg/arvo/app/weather.hoon b/pkg/arvo/app/weather.hoon
index 9c07b0faec..684956b151 100644
--- a/pkg/arvo/app/weather.hoon
+++ b/pkg/arvo/app/weather.hoon
@@ -1,3 +1,7 @@
+::  weather [landscape]:
+::
+::  holds latlong, gets weather data from API, passes it on to subscribers
+::
 /+  *server, default-agent, verb, dbug
 =,  format
 ::

From 4b26b2dd7115f933698cbd74c436099e873e4e55 Mon Sep 17 00:00:00 2001
From: Ted Blackman <ted@tlon.io>
Date: Tue, 1 Sep 2020 13:57:19 -0400
Subject: [PATCH 21/89] link: archive graph on migration

---
 pkg/arvo/app/link-store.hoon | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/pkg/arvo/app/link-store.hoon b/pkg/arvo/app/link-store.hoon
index 0253b413fe..485be958d1 100644
--- a/pkg/arvo/app/link-store.hoon
+++ b/pkg/arvo/app/link-store.hoon
@@ -101,13 +101,15 @@
   :_  this(state *state-1)
   =/  orm  orm:graph-store
   |^  ^-  (list card)
-  %+  murn  ~(tap by by-group.s)
+  %-  zing
+  %+  turn  ~(tap by by-group.s)
   |=  [=path =links]
-  ^-  (unit card)
+  ^-  (list card)
   ?.  ?=([@ @ *] path)
     (on-bad-path path links)
-  :-  ~
-  %+  add-graph  `resource`[(slav %p i.path) i.t.path]
+  =/  =resource  [(slav %p i.path) i.t.path]
+  :_  [(archive-graph resource)]~
+  %+  add-graph  resource
   ^-  graph:gra
   %+  gas:orm  ~
   =/  comments  (~(gut by discussions.s) path *(map url discussion))
@@ -155,11 +157,21 @@
   ++  add-graph
     |=  [=resource =graph:gra]
     ^-  card
-    =-  [%pass /migrate-link %agent [our.bowl %graph-store] -]
-    ^-  task:agent:gall
-    :+  %poke  %graph-update
-    !>  ^-  update:gra
+    %-  poke-graph-store
     [%0 now.bowl %add-graph resource graph `%graph-validator-link]
+  ::
+  ++  archive-graph
+    |=  =resource
+    ^-  card
+    %-  poke-graph-store
+    [%0 now.bowl %archive-graph resource]
+  ::
+  ++  poke-graph-store
+    |=  =update:gra
+    ^-  card
+    :*  %pass  /migrate-link  %agent  [our.bowl %graph-store]
+        %poke  %graph-update  !>(update)
+    ==
   --
 ::
 ++  on-poke   on-poke:def

From 97e84f96f24c52793c2502d8b2d9c43d91c5e4ec Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde@tlon.io>
Date: Tue, 1 Sep 2020 14:43:05 -0400
Subject: [PATCH 22/89] leap: move leap to its own subfolder

---
 pkg/interface/src/views/App.js                        | 11 +++++------
 .../src/views/components/{ => leap}/Omnibox.js        |  0
 .../src/views/components/{ => leap}/OmniboxInput.js   |  0
 .../src/views/components/{ => leap}/OmniboxResult.js  |  0
 4 files changed, 5 insertions(+), 6 deletions(-)
 rename pkg/interface/src/views/components/{ => leap}/Omnibox.js (100%)
 rename pkg/interface/src/views/components/{ => leap}/OmniboxInput.js (100%)
 rename pkg/interface/src/views/components/{ => leap}/OmniboxResult.js (100%)

diff --git a/pkg/interface/src/views/App.js b/pkg/interface/src/views/App.js
index 497c5677b9..e72d0b1d16 100644
--- a/pkg/interface/src/views/App.js
+++ b/pkg/interface/src/views/App.js
@@ -1,7 +1,7 @@
 import { hot } from 'react-hot-loader/root';
 import 'react-hot-loader';
 import * as React from 'react';
-import { BrowserRouter as Router, Route, withRouter, Switch } from 'react-router-dom';
+import { BrowserRouter as Router, withRouter } from 'react-router-dom';
 import styled, { ThemeProvider, createGlobalStyle } from 'styled-components';
 import { sigil as sigiljs, stringRenderer } from 'urbit-sigil-js';
 import Helmet from 'react-helmet';
@@ -16,8 +16,7 @@ import dark from './themes/old-dark';
 
 import { Content } from './components/Content';
 import StatusBar from './components/StatusBar';
-import Omnibox from './components/Omnibox';
-import ErrorComponent from './components/Error';
+import Omnibox from './components/leap/Omnibox';
 
 import GlobalStore from '~/logic/store/store';
 import GlobalSubscription from '~/logic/subscription/global';
@@ -36,7 +35,7 @@ const Root = styled.div`
     background-size: cover;
     ` : p.background?.type === 'color' ? `
     background-color: ${p.background.color};
-    ` : ``
+    ` : ''
   }
   display: flex;
   flex-flow: column nowrap;
@@ -135,7 +134,8 @@ class App extends React.Component {
             ship={this.ship}
             api={this.api}
             subscription={this.subscription}
-            {...state} />
+            {...state}
+          />
           </Router>
         </Root>
       </ThemeProvider>
@@ -143,6 +143,5 @@ class App extends React.Component {
   }
 }
 
-
 export default process.env.NODE_ENV === 'production' ? App : hot(App);
 
diff --git a/pkg/interface/src/views/components/Omnibox.js b/pkg/interface/src/views/components/leap/Omnibox.js
similarity index 100%
rename from pkg/interface/src/views/components/Omnibox.js
rename to pkg/interface/src/views/components/leap/Omnibox.js
diff --git a/pkg/interface/src/views/components/OmniboxInput.js b/pkg/interface/src/views/components/leap/OmniboxInput.js
similarity index 100%
rename from pkg/interface/src/views/components/OmniboxInput.js
rename to pkg/interface/src/views/components/leap/OmniboxInput.js
diff --git a/pkg/interface/src/views/components/OmniboxResult.js b/pkg/interface/src/views/components/leap/OmniboxResult.js
similarity index 100%
rename from pkg/interface/src/views/components/OmniboxResult.js
rename to pkg/interface/src/views/components/leap/OmniboxResult.js

From 37786327f473ff9e9240ed5c74d30cc1088c8363 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde@tlon.io>
Date: Tue, 1 Sep 2020 16:01:29 -0400
Subject: [PATCH 23/89] leap: add "other" actions, prepopulate results

---
 pkg/interface/src/logic/lib/omnibox.js        | 17 ++++-
 .../src/views/components/leap/Omnibox.js      | 32 +++++++--
 .../views/components/leap/OmniboxResult.js    | 70 +++++++++++++------
 3 files changed, 86 insertions(+), 33 deletions(-)

diff --git a/pkg/interface/src/logic/lib/omnibox.js b/pkg/interface/src/logic/lib/omnibox.js
index 60dc95c01f..49bf777261 100644
--- a/pkg/interface/src/logic/lib/omnibox.js
+++ b/pkg/interface/src/logic/lib/omnibox.js
@@ -4,7 +4,8 @@ import defaultApps from './default-apps';
     ['commands', []],
     ['subscriptions', []],
     ['groups', []],
-    ['apps', []]
+    ['apps', []],
+    ['other', []]
   ]);
 
 // result schematic
@@ -41,8 +42,6 @@ const commandIndex = function () {
       }
     });
 
-  commands.push(result('Profile', '/~profile', 'profile', null));
-
   return commands;
 };
 
@@ -54,6 +53,9 @@ const appIndex = function (apps) {
     .filter((e) => {
       return apps[e]?.type?.basic;
     })
+    .sort((a,b) => {
+      return a.localeCompare(b);
+    })
     .map((e) => {
       const obj = result(
         apps[e].type.basic.title,
@@ -70,6 +72,14 @@ const appIndex = function (apps) {
   return applications;
 };
 
+const otherIndex = function() {
+  const other = [];
+  other.push(result('Profile and Settings', '/~profile/identity', 'profile', null));
+  other.push(result('Log Out', '/~/logout', 'logout', null));
+
+  return other;
+};
+
 export default function index(associations, apps) {
   // all metadata from all apps is indexed
   // into subscriptions and groups
@@ -118,6 +128,7 @@ export default function index(associations, apps) {
   indexes.set('subscriptions', subscriptions);
   indexes.set('groups', groups);
   indexes.set('apps', appIndex(apps));
+  indexes.set('other', otherIndex());
 
   return indexes;
 };
diff --git a/pkg/interface/src/views/components/leap/Omnibox.js b/pkg/interface/src/views/components/leap/Omnibox.js
index 624229d20a..190220f961 100644
--- a/pkg/interface/src/views/components/leap/Omnibox.js
+++ b/pkg/interface/src/views/components/leap/Omnibox.js
@@ -26,11 +26,15 @@ export class Omnibox extends Component {
     this.renderResults = this.renderResults.bind(this);
   }
 
-  componentDidUpdate(prevProps) {
+  componentDidUpdate(prevProps, prevState) {
     if (prevProps !== this.props) {
       this.setState({ index: index(this.props.associations, this.props.apps.tiles) });
     }
 
+    if (prevProps && (prevProps.apps !== this.props.apps) && (this.state.query === '')) {
+      this.setState({ results: this.initialResults() });
+    }
+
     if (prevProps && this.props.show && prevProps.show !== this.props.show) {
       Mousetrap.bind('escape', () => this.props.api.local.setOmnibox());
       document.addEventListener('mousedown', this.handleClickOutside);
@@ -48,7 +52,7 @@ export class Omnibox extends Component {
   }
 
   getSearchedCategories() {
-    return ['apps', 'commands', 'groups', 'subscriptions'];
+    return ['apps', 'commands', 'groups', 'subscriptions', 'other'];
   }
 
   control(evt) {
@@ -91,7 +95,18 @@ export class Omnibox extends Component {
   }
 
   initialResults() {
-    return new Map(this.getSearchedCategories().map(category => [category, []]));
+    return new Map(this.getSearchedCategories().map((category) => {
+      if (!this.state) {
+        return [category, []];
+      }
+      if (category === 'apps') {
+        return ['apps', this.state.index.get('apps')];
+      }
+      if (category === 'other') {
+        return ['other', this.state.index.get('other')];
+      }
+      return [category, []];
+    }));
   }
 
   navigate(link) {
@@ -202,10 +217,12 @@ export class Omnibox extends Component {
       {this.getSearchedCategories()
         .map(category => Object({ category, categoryResults: state.results.get(category) }))
         .filter(category => category.categoryResults.length > 0)
-        .map(({ category, categoryResults }, i) => (
-          <Box key={i} width='max(50vw, 300px)' maxWidth='600px'>
+        .map(({ category, categoryResults }, i) => {
+          const categoryTitle = (category === 'other')
+            ? null : <Text gray ml={2}>{category.charAt(0).toUpperCase() + category.slice(1)}</Text>;
+          return (<Box key={i} width='max(50vw, 300px)' maxWidth='600px'>
             <Rule borderTopWidth="0.5px" color="washedGray" />
-            <Text gray ml={2}>{category.charAt(0).toUpperCase() + category.slice(1)}</Text>
+            {categoryTitle}
             {categoryResults.map((result, i2) => (
               <OmniboxResult
                 key={i2}
@@ -218,7 +235,8 @@ export class Omnibox extends Component {
                 dark={props.dark} />
             ))}
           </Box>
-        ))
+        );
+      })
       }
     </Box>;
   }
diff --git a/pkg/interface/src/views/components/leap/OmniboxResult.js b/pkg/interface/src/views/components/leap/OmniboxResult.js
index 589ab12b75..c8ccda3ed3 100644
--- a/pkg/interface/src/views/components/leap/OmniboxResult.js
+++ b/pkg/interface/src/views/components/leap/OmniboxResult.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import { Row, Icon, Text } from '@tlon/indigo-react';
 import defaultApps from '~/logic/lib/default-apps';
+import Sigil from '~/logic/lib/sigil';
 
 export class OmniboxResult extends Component {
   constructor(props) {
@@ -24,35 +25,58 @@ export class OmniboxResult extends Component {
       }
   }
 
-  setHover(boolean) {
-    this.setState({ hovered: boolean });
-  }
-  render() {
-    const { icon, text, subtext, link, navigate, selected, dark } = this.props;
-
-    let invertGraphic = {};
+  getIcon(icon, dark, selected, link) {
+    // graphicStyle is only necessary for pngs
+    //
+    //TODO can be removed after indigo-react 1.2
+    //which includes icons for apps
+    let graphicStyle = {};
 
     if (icon.toLowerCase() !== 'dojo') {
-      invertGraphic = (!dark && this.state.hovered) ||
-      selected === link ||
-      (dark && !(this.state.hovered || selected === link))
-        ? { filter: 'invert(1)', paddingTop: 2 }
-        : { filter: 'invert(0)', paddingTop: 2 };
-    } else {
-      invertGraphic =
-        (!dark && this.state.hovered) ||
+      graphicStyle = (!dark && this.state.hovered) ||
         selected === link ||
         (dark && !(this.state.hovered || selected === link))
-          ? { filter: 'invert(0)', paddingTop: 2 }
-          : { filter: 'invert(1)', paddingTop: 2 };
+        ? { filter: 'invert(1)' }
+        : { filter: 'invert(0)' };
+    } else {
+      graphicStyle =
+        (!dark && this.state.hovered) ||
+          selected === link ||
+          (dark && !(this.state.hovered || selected === link))
+          ? { filter: 'invert(0)' }
+          : { filter: 'invert(1)' };
     }
 
+    const iconFill = this.state.hovered || selected === link ? 'white' : 'black';
+    const sigilFill = this.state.hovered || selected === link ? '#3a8ff7' : '#ffffff';
+
     let graphic = <div />;
     if (defaultApps.includes(icon.toLowerCase()) || icon.toLowerCase() === 'links') {
-      graphic = <img className="mr2 v-mid" height="12" width="12" src={`/~landscape/img/${icon.toLowerCase()}.png`} style={invertGraphic} />;
+      graphic =
+        <img className="mr2 v-mid dib" height="16"
+          width="16" src={`/~landscape/img/${icon.toLowerCase()}.png`}
+          style={graphicStyle}
+        />;
+    } else if (icon === 'logout') {
+      graphic = <Icon display="inline-block" verticalAlign="middle" icon='ArrowWest' mr='2' size='16px' fill={iconFill} />;
+    } else if (icon === 'profile') {
+      graphic = <Sigil color={sigilFill} classes='dib v-mid mr2' ship={window.ship} size={16} />;
     } else {
-      graphic = <Icon verticalAlign="middle" mr={2} size="12px" />;
+      graphic = <Icon verticalAlign="middle" mr='2' size="16px" fill={iconFill} />;
     }
+
+    return graphic;
+  }
+
+  setHover(boolean) {
+    this.setState({ hovered: boolean });
+  }
+
+  render() {
+    const { icon, text, subtext, link, navigate, selected, dark } = this.props;
+
+    const graphic = this.getIcon(icon, dark, selected, link);
+
     return (
         <Row
           py='2'
@@ -72,18 +96,18 @@ export class OmniboxResult extends Component {
           {this.state.hovered || selected === link ? (
             <>
             {graphic}
-              <Text color='white' mr='1' style={{ 'flex-shrink': 0 }}>
+              <Text display="inline-block" verticalAlign="middle" color='white' mr='1' style={{ 'flex-shrink': 0 }}>
                 {text}
               </Text>
-              <Text pr='2' color='white' width='100%' textAlign='right'>
+            <Text pr='2' display="inline-block" verticalAlign="middle" color='white' width='100%' textAlign='right'>
                 {subtext}
               </Text>
             </>
           ) : (
             <>
             {graphic}
-              <Text mr='1' style={{ 'flex-shrink': 0 }}>{text}</Text>
-              <Text pr='2' gray width='100%' textAlign='right'>
+              <Text mr='1' display="inline-block" verticalAlign="middle" style={{ 'flex-shrink': 0 }}>{text}</Text>
+              <Text pr='2' display="inline-block" verticalAlign="middle" gray width='100%' textAlign='right'>
                 {subtext}
               </Text>
             </>

From e2df23eca65731982e59d26ca045ff77b1615a51 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde@tlon.io>
Date: Tue, 1 Sep 2020 16:08:50 -0400
Subject: [PATCH 24/89] leap: show group's name, not the host ship

---
 pkg/interface/src/logic/lib/omnibox.js             | 5 +++--
 pkg/interface/src/views/components/leap/Omnibox.js | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkg/interface/src/logic/lib/omnibox.js b/pkg/interface/src/logic/lib/omnibox.js
index 49bf777261..ee616ddc93 100644
--- a/pkg/interface/src/logic/lib/omnibox.js
+++ b/pkg/interface/src/logic/lib/omnibox.js
@@ -1,4 +1,5 @@
 import defaultApps from './default-apps';
+import { cite } from '~/logic/lib/util';
 
   const indexes = new Map([
     ['commands', []],
@@ -109,7 +110,7 @@ export default function index(associations, apps) {
             title,
             `/~${app}${each['app-path']}`,
             app.charAt(0).toUpperCase() + app.slice(1),
-            shipStart.slice(0, shipStart.indexOf('/'))
+            cite(shipStart.slice(0, shipStart.indexOf('/')))
           );
           groups.push(obj);
         } else {
@@ -117,7 +118,7 @@ export default function index(associations, apps) {
             title,
             `/~${each['app-name']}/join${each['app-path']}`,
             app.charAt(0).toUpperCase() + app.slice(1),
-            shipStart.slice(0, shipStart.indexOf('/'))
+            (associations?.contacts?.[each['group-path']]?.metadata?.title || null)
           );
           subscriptions.push(obj);
         }
diff --git a/pkg/interface/src/views/components/leap/Omnibox.js b/pkg/interface/src/views/components/leap/Omnibox.js
index 190220f961..4a4b484ace 100644
--- a/pkg/interface/src/views/components/leap/Omnibox.js
+++ b/pkg/interface/src/views/components/leap/Omnibox.js
@@ -6,8 +6,6 @@ import Mousetrap from 'mousetrap';
 import OmniboxInput from './OmniboxInput';
 import OmniboxResult from './OmniboxResult';
 
-import { cite } from '~/logic/lib/util';
-
 export class Omnibox extends Component {
   constructor(props) {
     super(props);
@@ -228,7 +226,7 @@ export class Omnibox extends Component {
                 key={i2}
                 icon={result.app}
                 text={result.title}
-                subtext={cite(result.host)}
+                subtext={result.host}
                 link={result.link}
                 navigate={() => this.navigate(result.link)}
                 selected={this.state.selected}

From 24753dd0c89c083820ba437da6d7f0f8dc986437 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde@tlon.io>
Date: Tue, 1 Sep 2020 16:23:42 -0400
Subject: [PATCH 25/89] leap: better compensate for long titles

---
 .../views/components/leap/OmniboxResult.js    | 35 ++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/pkg/interface/src/views/components/leap/OmniboxResult.js b/pkg/interface/src/views/components/leap/OmniboxResult.js
index c8ccda3ed3..89dde65f1f 100644
--- a/pkg/interface/src/views/components/leap/OmniboxResult.js
+++ b/pkg/interface/src/views/components/leap/OmniboxResult.js
@@ -96,18 +96,45 @@ export class OmniboxResult extends Component {
           {this.state.hovered || selected === link ? (
             <>
             {graphic}
-              <Text display="inline-block" verticalAlign="middle" color='white' mr='1' style={{ 'flex-shrink': 0 }}>
+              <Text
+                display="inline-block"
+                verticalAlign="middle"
+                color='white'
+                maxWidth="60%"
+                style={{ 'flex-shrink': 0 }}
+                mr='1'>
                 {text}
               </Text>
-            <Text pr='2' display="inline-block" verticalAlign="middle" color='white' width='100%' textAlign='right'>
+            <Text pr='2'
+            display="inline-block"
+            verticalAlign="middle"
+            color='white'
+            width='100%'
+            textAlign='right'
+            >
                 {subtext}
               </Text>
             </>
           ) : (
             <>
             {graphic}
-              <Text mr='1' display="inline-block" verticalAlign="middle" style={{ 'flex-shrink': 0 }}>{text}</Text>
-              <Text pr='2' display="inline-block" verticalAlign="middle" gray width='100%' textAlign='right'>
+              <Text
+                mr='1'
+                display="inline-block"
+                verticalAlign="middle"
+                maxWidth="60%"
+                style={{ 'flex-shrink': 0 }}
+              >
+              {text}
+            </Text>
+              <Text
+                pr='2'
+                display="inline-block"
+                verticalAlign="middle"
+                gray
+                width='100%'
+                textAlign='right'
+              >
                 {subtext}
               </Text>
             </>

From baf2226e3dc5e81bff991e02c509307883ae32e8 Mon Sep 17 00:00:00 2001
From: Tyler Brown Cifu Shuster <tyler@fivepaths.com>
Date: Tue, 1 Sep 2020 17:17:28 -0700
Subject: [PATCH 26/89] chat: break up inline code while maintaining multiline
 codeblocks

---
 pkg/interface/src/views/apps/chat/css/custom.css | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkg/interface/src/views/apps/chat/css/custom.css b/pkg/interface/src/views/apps/chat/css/custom.css
index 052fb06282..6294427bd0 100644
--- a/pkg/interface/src/views/apps/chat/css/custom.css
+++ b/pkg/interface/src/views/apps/chat/css/custom.css
@@ -252,12 +252,13 @@ blockquote {
     font-family: 'Inter';
 }
 
-code {
-  white-space: normal;
+pre, code {
+  background-color: var(--light-gray);
 }
 
-code, pre.code {
-  background-color: var(--light-gray);
+pre code {
+  background-color: transparent;
+  white-space: pre-wrap;
 }
 
 code, .code, .chat.code .react-codemirror2 .CodeMirror * {

From 4389c635d1174ea94163743f4f1594c40538d9af Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Wed, 2 Sep 2020 11:20:00 +1000
Subject: [PATCH 27/89] chat: ensure joined chats are loaded before joining

---
 pkg/interface/src/views/apps/chat/app.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkg/interface/src/views/apps/chat/app.tsx b/pkg/interface/src/views/apps/chat/app.tsx
index 2a3a761757..032211ba5f 100644
--- a/pkg/interface/src/views/apps/chat/app.tsx
+++ b/pkg/interface/src/views/apps/chat/app.tsx
@@ -194,6 +194,11 @@ export default class ChatApp extends React.Component<ChatAppProps, {}> {
             render={(props) => {
               let station = `/${props.match.params.ship}/${props.match.params.station}`;
 
+              // ensure we know joined chats
+              if(!chatInitialized) {
+                return null;
+              }
+
             return (
               <Skeleton
                 associations={associations}

From b81153db03432bd545bb03744b509a5d5c7e25b6 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Wed, 2 Sep 2020 11:21:14 +1000
Subject: [PATCH 28/89] pull-hook: prevent from subscribing to ourselves

---
 pkg/arvo/lib/pull-hook.hoon | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/arvo/lib/pull-hook.hoon b/pkg/arvo/lib/pull-hook.hoon
index 23903fda6e..e5d2fabac0 100644
--- a/pkg/arvo/lib/pull-hook.hoon
+++ b/pkg/arvo/lib/pull-hook.hoon
@@ -225,6 +225,7 @@
     ++  add
       |=  [=ship =resource]
       ~|  resource
+      ?<  |(=(our.bowl ship) =(our.bowl entity.resource))
       ?:  (~(has by tracking) resource)
         [~ state]
       =.  tracking

From b006e7f4ad9456829f6e33bd65ed0503ebdb7b36 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Wed, 2 Sep 2020 11:21:44 +1000
Subject: [PATCH 29/89] chat-view: crash on joining own chat

---
 pkg/arvo/app/chat-view.hoon | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/arvo/app/chat-view.hoon b/pkg/arvo/app/chat-view.hoon
index 054c702403..609c29a773 100644
--- a/pkg/arvo/app/chat-view.hoon
+++ b/pkg/arvo/app/chat-view.hoon
@@ -298,6 +298,7 @@
       ~[(chat-hook-poke %add-synced ship.act app-path.act ask-history.act)]
     =/  rid=resource
       (de-path:resource ship+app-path.act)
+    ?<  =(our.bol entity.rid)
     =/  =cage
       :-  %group-update
       !>  ^-  action:group-store

From e96671b930a4260e4a930103c75681e2b124406c Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Wed, 2 Sep 2020 11:44:10 +1000
Subject: [PATCH 30/89] chat-view: no-op instead of crash on self-join

---
 pkg/arvo/app/chat-view.hoon | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/arvo/app/chat-view.hoon b/pkg/arvo/app/chat-view.hoon
index 609c29a773..115b07648a 100644
--- a/pkg/arvo/app/chat-view.hoon
+++ b/pkg/arvo/app/chat-view.hoon
@@ -298,7 +298,7 @@
       ~[(chat-hook-poke %add-synced ship.act app-path.act ask-history.act)]
     =/  rid=resource
       (de-path:resource ship+app-path.act)
-    ?<  =(our.bol entity.rid)
+    ?:  =(our.bol entity.rid)  ~
     =/  =cage
       :-  %group-update
       !>  ^-  action:group-store

From 3cce0f38300d2e9cae0b47ad1b6901050ba18152 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Wed, 2 Sep 2020 12:22:31 +1000
Subject: [PATCH 31/89] glob: update to 0v5.g2nge.n1pgc.v5326.ivfqv.7ici2

---
 bin/solid.pill                    | 4 ++--
 pkg/arvo/app/glob.hoon            | 2 +-
 pkg/arvo/app/landscape/index.html | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/solid.pill b/bin/solid.pill
index 26952f2819..b17328bd83 100644
--- a/bin/solid.pill
+++ b/bin/solid.pill
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cfb556a9e6b473f6cf6c75b30a3b12cb986e57df1600dad4383b9d3380cffdb6
-size 6263010
+oid sha256:1c22402da73118aad41deafbefce58afcb642feee21fcf0619927a3ddc0fc3cc
+size 6264167
diff --git a/pkg/arvo/app/glob.hoon b/pkg/arvo/app/glob.hoon
index dc1ae6e083..e55e0407ff 100644
--- a/pkg/arvo/app/glob.hoon
+++ b/pkg/arvo/app/glob.hoon
@@ -5,7 +5,7 @@
 /-  glob
 /+  default-agent, verb, dbug
 |%
-++  hash  0v6.8fpt6.7mcjg.nb019.df3fo.haav6
+++  hash  0v5.g2nge.n1pgc.v5326.ivfqv.7ici2
 +$  state-0  [%0 hash=@uv glob=(unit (each glob:glob tid=@ta))]
 +$  all-states
   $%  state-0
diff --git a/pkg/arvo/app/landscape/index.html b/pkg/arvo/app/landscape/index.html
index 8ba549f11b..855f1d87f5 100644
--- a/pkg/arvo/app/landscape/index.html
+++ b/pkg/arvo/app/landscape/index.html
@@ -23,7 +23,7 @@
     <div id="root"></div>
     <script src="/~landscape/js/channel.js"></script>
     <script src="/~landscape/js/session.js"></script>
-    <script src="/~landscape/js/bundle/index.5c70804296e13e8973c3.js"></script>
+    <script src="/~landscape/js/bundle/index.58a0b8803ec6f99b878c.js"></script>
     <script src="https://sdk.amazonaws.com/js/aws-sdk-2.1.12.min.js"></script>
   </body>
 </html>

From 630b79ad372fe0dcd183a00550265eca11bcca71 Mon Sep 17 00:00:00 2001
From: Tyler Brown Cifu Shuster <tyler@fivepaths.com>
Date: Sun, 23 Aug 2020 21:40:31 -0700
Subject: [PATCH 32/89] links: added s3 integration

---
 pkg/interface/src/logic/store/links.js        |   4 +
 .../apps/chat/components/lib/chat-input.js    |  52 +++++----
 .../apps/chat/components/lib/s3-upload.js     | 105 ------------------
 .../groups/components/lib/contact-card.js     |  12 +-
 pkg/interface/src/views/apps/links/app.js     |   3 +-
 .../apps/links/components/lib/link-submit.js  | 103 ++++++++++-------
 .../views/apps/links/components/links-list.js |   2 +-
 .../src/views/apps/links/components/new.js    |   5 +-
 pkg/interface/src/views/components/Spinner.js |   2 +-
 .../lib => components}/s3-upload.js           |  72 +++++++-----
 10 files changed, 159 insertions(+), 201 deletions(-)
 delete mode 100644 pkg/interface/src/views/apps/chat/components/lib/s3-upload.js
 rename pkg/interface/src/views/{apps/groups/components/lib => components}/s3-upload.js (54%)

diff --git a/pkg/interface/src/logic/store/links.js b/pkg/interface/src/logic/store/links.js
index d8d7fd7dd4..eb395603fa 100644
--- a/pkg/interface/src/logic/store/links.js
+++ b/pkg/interface/src/logic/store/links.js
@@ -6,6 +6,7 @@ import InviteReducer from '../reducers/invite-update';
 import LinkReducer from '../reducers/link-update';
 import ListenReducer from '../reducers/listen-update';
 import LocalReducer from '../reducers/local';
+import S3Reducer from '../reducers/s3-update';
 
 import BaseStore from './base';
 
@@ -21,6 +22,7 @@ export default class LinksStore extends BaseStore {
     this.localReducer = new LocalReducer();
     this.linkReducer = new LinkReducer();
     this.listenReducer = new ListenReducer();
+    this.s3Reducer = new S3Reducer();
   }
 
   initialState() {
@@ -37,6 +39,7 @@ export default class LinksStore extends BaseStore {
       comments: {},
       seen: {},
       permissions: {},
+      s3: {},
       sidebarShown: true
     };
   }
@@ -50,6 +53,7 @@ export default class LinksStore extends BaseStore {
     this.localReducer.reduce(data, this.state);
     this.linkReducer.reduce(data, this.state);
     this.listenReducer.reduce(data, this.state);
+    this.s3Reducer.reduce(data, this.state);
   }
 }
 
diff --git a/pkg/interface/src/views/apps/chat/components/lib/chat-input.js b/pkg/interface/src/views/apps/chat/components/lib/chat-input.js
index c4919cefce..1cc8990422 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/chat-input.js
+++ b/pkg/interface/src/views/apps/chat/components/lib/chat-input.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import ChatEditor from './chat-editor';
-import { S3Upload } from './s3-upload'
+import { S3Upload } from '~/views/components/s3-upload'
 ;
 import { uxToHex } from '~/logic/lib/util';
 import { Sigil } from '~/logic/lib/sigil';
@@ -221,10 +221,10 @@ export class ChatInput extends Component {
            style={{ flexGrow: 1 }}>
         <div className="fl"
              style={{
-               marginTop: 6,
-               flexBasis: 24,
-               height: 24
-             }}>
+                marginTop: 6,
+                flexBasis: 24,
+                height: 24
+              }}>
           {avatar}
         </div>
         <ChatEditor
@@ -235,32 +235,40 @@ export class ChatInput extends Component {
           placeholder='Message...' />
         <div className="ml2 mr2"
              style={{
-               height: '16px',
-               width: '16px',
-               flexBasis: 16,
-               marginTop: 10
-             }}>
+                height: '16px',
+                width: '16px',
+                flexBasis: 16,
+                marginTop: 10
+              }}>
           <S3Upload
             configuration={props.s3.configuration}
             credentials={props.s3.credentials}
             uploadSuccess={this.uploadSuccess.bind(this)}
             uploadError={this.uploadError.bind(this)}
-          />
+            accept="image/*"
+          >
+            <img
+              className="invert-d"
+              src="/~chat/img/ImageUpload.png"
+              width="16"
+              height="16"
+            />
+          </S3Upload>
         </div>
         <div style={{
-               height: '16px',
-               width: '16px',
-               flexBasis: 16,
-               marginTop: 10
+            height: '16px',
+            width: '16px',
+            flexBasis: 16,
+            marginTop: 10
           }}>
           <img style={{
-                 filter: state.inCodeMode && 'invert(100%)',
-                 height: '14px',
-                 width: '14px',
-               }}
-               onClick={this.toggleCode}
-               src="/~chat/img/CodeEval.png"
-               className="contrast-10-d bg-white bg-none-d ba b--gray1-d br1" />
+              filter: state.inCodeMode && 'invert(100%)',
+              height: '14px',
+              width: '14px',
+            }}
+            onClick={this.toggleCode}
+            src="/~chat/img/CodeEval.png"
+            className="contrast-10-d bg-white bg-none-d ba b--gray1-d br1" />
         </div>
       </div>
     );
diff --git a/pkg/interface/src/views/apps/chat/components/lib/s3-upload.js b/pkg/interface/src/views/apps/chat/components/lib/s3-upload.js
deleted file mode 100644
index b497413cfd..0000000000
--- a/pkg/interface/src/views/apps/chat/components/lib/s3-upload.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import React, { Component } from 'react';
-import S3Client from '~/logic/lib/s3';
-
-export class S3Upload extends Component {
-  constructor(props) {
-    super(props);
-    this.s3 = new S3Client();
-    this.setCredentials(props.credentials, props.configuration);
-    this.inputRef = React.createRef();
-  }
-
-  isReady(creds, config) {
-    return (
-      Boolean(creds) &&
-      'endpoint' in creds &&
-      'accessKeyId' in creds &&
-      'secretAccessKey' in creds &&
-      creds.endpoint !== '' &&
-      creds.accessKeyId !== '' &&
-      creds.secretAccessKey !== '' &&
-      Boolean(config) &&
-      'currentBucket' in config &&
-      config.currentBucket !== ''
-    );
-  }
-
-  componentDidUpdate(prevProps) {
-    const { props } = this;
-    this.setCredentials(props.credentials, props.configuration);
-  }
-
-  setCredentials(credentials, configuration) {
-    if (!this.isReady(credentials, configuration)) {
- return;
-}
-    this.s3.setCredentials(
-      credentials.endpoint,
-      credentials.accessKeyId,
-      credentials.secretAccessKey
-    );
-  }
-
-  getFileUrl(endpoint, filename) {
-    return endpoint + '/' + filename;
-  }
-
-  onChange() {
-    const { props } = this;
-    if (!this.inputRef.current) {
- return;
-}
-    const files = this.inputRef.current.files;
-    if (files.length <= 0) {
- return;
-}
-
-    const file = files.item(0);
-    const bucket = props.configuration.currentBucket;
-
-    this.s3.upload(bucket, file.name, file).then((data) => {
-      if (!data || !('Location' in data)) {
-        return;
-      }
-      this.props.uploadSuccess(data.Location);
-    }).catch((err) => {
-      console.error(err);
-      this.props.uploadError(err);
-    });
-  }
-
-  onClick() {
-    if (!this.inputRef.current) {
-      return;
-    }
-    this.inputRef.current.click();
-  }
-
-  render() {
-    const { props } = this;
-    if (!this.isReady(props.credentials, props.configuration)) {
-      return <div></div>;
-    } else {
-      const classes = props.className ?
-        'pointer ' + props.className : 'pointer';
-      return (
-        <div className={classes}>
-          <input className="dn"
-                 type="file"
-                 id="fileElement"
-                 ref={this.inputRef}
-                 accept="image/*"
-                 onChange={this.onChange.bind(this)}
-          />
-          <img className="invert-d"
-               src="/~chat/img/ImageUpload.png"
-               width="16"
-               height="16"
-               onClick={this.onClick.bind(this)}
-          />
-        </div>
-      );
-    }
-  }
-}
-
diff --git a/pkg/interface/src/views/apps/groups/components/lib/contact-card.js b/pkg/interface/src/views/apps/groups/components/lib/contact-card.js
index 572f2f2f06..40d44ae690 100644
--- a/pkg/interface/src/views/apps/groups/components/lib/contact-card.js
+++ b/pkg/interface/src/views/apps/groups/components/lib/contact-card.js
@@ -5,7 +5,7 @@ import { Link } from 'react-router-dom';
 import { EditElement } from './edit-element';
 import { Spinner } from '~/views/components/Spinner';
 import { uxToHex } from '~/logic/lib/util';
-import { S3Upload } from './s3-upload';
+import { S3Upload } from '~/views/components/s3-upload';
 
 export class ContactCard extends Component {
   constructor(props) {
@@ -492,7 +492,15 @@ export class ContactCard extends Component {
               credentials={props.s3.credentials}
               uploadSuccess={this.uploadSuccess.bind(this)}
               uploadError={this.uploadError.bind(this)}
-            />
+              accept="image/*"
+            >
+              <img
+                className="invert-d"
+                src="/~chat/img/ImageUpload.png"
+                width="32"
+                height="32"
+              />
+            </S3Upload>
           </span>
           <EditElement
             className="fr w-80"
diff --git a/pkg/interface/src/views/apps/links/app.js b/pkg/interface/src/views/apps/links/app.js
index 73b134a9e3..718a09363a 100644
--- a/pkg/interface/src/views/apps/links/app.js
+++ b/pkg/interface/src/views/apps/links/app.js
@@ -59,7 +59,7 @@ export class LinksApp extends Component {
       props.invites : {};
 
     const listening = props.linkListening;
-    const { api, sidebarShown, hideAvatars, hideNicknames } = this.props;
+    const { api, sidebarShown, hideAvatars, hideNicknames, s3 } = this.props;
 
     return (
       <>
@@ -256,6 +256,7 @@ export class LinksApp extends Component {
                     api={api}
                     hideNicknames={hideNicknames}
                     hideAvatars={hideAvatars}
+                    s3={s3}
                   />
                   </Skeleton>
                 );
diff --git a/pkg/interface/src/views/apps/links/components/lib/link-submit.js b/pkg/interface/src/views/apps/links/components/lib/link-submit.js
index 780df3d88e..042ce804e5 100644
--- a/pkg/interface/src/views/apps/links/components/lib/link-submit.js
+++ b/pkg/interface/src/views/apps/links/components/lib/link-submit.js
@@ -1,5 +1,8 @@
 import React, { Component } from 'react';
+
+import { S3Upload } from '~/views/components/s3-upload';
 import { Spinner } from '~/views/components/Spinner';
+import { Icon } from "@tlon/indigo-react";
 
 export class LinkSubmit extends Component {
   constructor() {
@@ -60,23 +63,29 @@ export class LinkSubmit extends Component {
     this.setState({ linkTitle: event.target.value });
   }
 
+  uploadSuccess(url) {
+    this.setState({ linkValue: url });
+    this.setLinkValid(url);
+  }
+
+  uploadError(error) {
+    //  no-op for now
+  }
+
   render() {
+    console.log('s3', this.props.s3);
     const activeClasses = (this.state.linkValid && !this.state.disabled)
       ? 'green2 pointer' : 'gray2';
 
     const focus = (this.state.submitFocus)
       ? 'b--black b--white-d'
       : 'b--gray4 b--gray2-d';
-
+    
     return (
       <div className={'relative ba br1 w-100 mb6 ' + focus}>
-        <textarea
-          className="pl2 bg-gray0-d white-d w-100 f8"
-          style={{
-            resize: 'none',
-            height: 40,
-            paddingTop: 10
-          }}
+        <input
+          type="url"
+          className="pl2 bg-gray0-d white-d w-100 f8 pt2"
           placeholder="Paste link here"
           onChange={this.setLinkValue}
           onBlur={() => this.setState({ submitFocus: false })}
@@ -91,41 +100,51 @@ export class LinkSubmit extends Component {
           }}
           value={this.state.linkValue}
         />
-        <textarea
-          className="pl2 bg-gray0-d white-d w-100 f8"
-          style={{
-            resize: 'none',
-            height: 40,
-            paddingTop: 16
-          }}
-          placeholder="Enter title"
-          onChange={this.setLinkTitle}
-          onBlur={() => this.setState({ submitFocus: false })}
-          onFocus={() => this.setState({ submitFocus: true })}
-          spellCheck="false"
-          rows={1}
-          onKeyPress={(e) => {
-            if (e.key === 'Enter') {
-              e.preventDefault();
-              this.onClickPost();
+        <div className="flex flex-auto mt2 pt2">
+          <input
+            type="text"
+            className="pl2 bg-gray0-d white-d w-100 f8"
+            style={{
+              resize: 'none',
+              height: 40
+            }}
+            placeholder="Enter title"
+            onChange={this.setLinkTitle}
+            onBlur={() => this.setState({ submitFocus: false })}
+            onFocus={() => this.setState({ submitFocus: true })}
+            spellCheck="false"
+            rows={1}
+            onKeyPress={(e) => {
+              if (e.key === 'Enter') {
+                e.preventDefault();
+                this.onClickPost();
+              }
+            }}
+            value={this.state.linkTitle}
+          />
+          {!this.state.disabled ? <S3Upload
+            configuration={this.props.s3.configuration}
+            credentials={this.props.s3.credentials}
+            uploadSuccess={this.uploadSuccess.bind(this)}
+            uploadError={this.uploadError.bind(this)}
+            className="nowrap flex items-center pr2 h-100"
+          ><span className="green2 f8">Upload File</span></S3Upload> : null}
+          {!this.state.disabled ? <button
+            className={
+              'bg-gray0-d f8 flex-shrink-0 pr2 ' + activeClasses
             }
-          }}
-          value={this.state.linkTitle}
-        />
-        <button
-          className={
-            'absolute bg-gray0-d f8 ml2 flex-shrink-0 ' + activeClasses
-          }
-          disabled={!this.state.linkValid || this.state.disabled}
-          onClick={this.onClickPost.bind(this)}
-          style={{
-            bottom: 12,
-            right: 8
-          }}
-        >
-          Post
-        </button>
-        <Spinner awaiting={this.state.disabled} classes="mt3 absolute right-0" text="Posting to collection..." />
+            disabled={!this.state.linkValid || this.state.disabled}
+            onClick={this.onClickPost.bind(this)}
+            style={{
+              bottom: 12,
+              right: 8
+            }}
+          >
+            Post
+          </button> : null}
+          <Spinner awaiting={this.state.disabled} classes="nowrap flex items-center pr2" style={{flex: '1 1 14rem'}} text="Posting to collection..." />
+        </div>
+        
       </div>
     ) ;
   }
diff --git a/pkg/interface/src/views/apps/links/components/links-list.js b/pkg/interface/src/views/apps/links/components/links-list.js
index ca2d6c8459..70912f7574 100644
--- a/pkg/interface/src/views/apps/links/components/links-list.js
+++ b/pkg/interface/src/views/apps/links/components/links-list.js
@@ -139,7 +139,7 @@ export class Links extends Component {
         <div className="w-100 mt6 flex justify-center overflow-y-scroll ph4 pb4">
           <div className="w-100 mw7">
             <div className="flex">
-              <LinkSubmit resourcePath={props.resourcePath} api={this.props.api} />
+              <LinkSubmit resourcePath={props.resourcePath} api={this.props.api} s3={props.s3} />
             </div>
             <div className="pb4">
             {LinkList}
diff --git a/pkg/interface/src/views/apps/links/components/new.js b/pkg/interface/src/views/apps/links/components/new.js
index 3d32dff262..c99d6140a7 100644
--- a/pkg/interface/src/views/apps/links/components/new.js
+++ b/pkg/interface/src/views/apps/links/components/new.js
@@ -1,9 +1,10 @@
 import React, { Component } from 'react';
+import urbitOb from 'urbit-ob';
+import { Link } from 'react-router-dom';
+
 import { InviteSearch } from '~/views/components/InviteSearch';
 import { Spinner } from '~/views/components/Spinner';
-import { Link } from 'react-router-dom';
 import { makeRoutePath, deSig } from '~/logic/lib/util';
-import urbitOb from 'urbit-ob';
 
 export class NewScreen extends Component {
   constructor(props) {
diff --git a/pkg/interface/src/views/components/Spinner.js b/pkg/interface/src/views/components/Spinner.js
index d818fb03f3..7ee4a67ce7 100644
--- a/pkg/interface/src/views/components/Spinner.js
+++ b/pkg/interface/src/views/components/Spinner.js
@@ -8,7 +8,7 @@ export class Spinner extends Component {
 
     if (awaiting) {
       return (
-        <div className={classes + ' z-2 bg-white bg-gray0-d white-d'}>
+        <div className={classes + ' z-2 bg-white bg-gray0-d white-d flex'}>
           <img className="invert-d spin-active v-mid"
             src="/~landscape/img/Spinner.png"
             width={16}
diff --git a/pkg/interface/src/views/apps/groups/components/lib/s3-upload.js b/pkg/interface/src/views/components/s3-upload.js
similarity index 54%
rename from pkg/interface/src/views/apps/groups/components/lib/s3-upload.js
rename to pkg/interface/src/views/components/s3-upload.js
index b94b14728a..4cb37bd6d0 100644
--- a/pkg/interface/src/views/apps/groups/components/lib/s3-upload.js
+++ b/pkg/interface/src/views/components/s3-upload.js
@@ -1,10 +1,16 @@
 import React, { Component } from 'react'
+import { Icon } from "@tlon/indigo-react";
+
 import S3Client from '~/logic/lib/s3';
+import { Spinner } from './Spinner';
 
 export class S3Upload extends Component {
 
   constructor(props) {
     super(props);
+    this.state = {
+      isUploading: false
+    };
     this.s3 = new S3Client();
     this.setCredentials(props.credentials, props.configuration);
     this.inputRef = React.createRef();
@@ -52,15 +58,22 @@ export class S3Upload extends Component {
     let file = files.item(0);
     let bucket = props.configuration.currentBucket;
 
-    this.s3.upload(bucket, file.name, file).then((data) => {
-      if (!data || !('Location' in data)) {
-        return;
-      }
-      this.props.uploadSuccess(data.Location);
-    }).catch((err) => {
-      console.error(err);
-      this.props.uploadError(err);
-    });
+    this.setState({ isUploading: true });
+
+    this.s3.upload(bucket, file.name, file)
+      .then((data) => {
+        if (!data || !('Location' in data)) {
+          return;
+        }
+        this.props.uploadSuccess(data.Location);
+      })
+      .catch((err) => {
+        console.error(err);
+        this.props.uploadError(err);
+      })
+      .finally(() => {
+        this.setState({ isUploading: false });
+      });
   }
 
   onClick() {
@@ -69,25 +82,34 @@ export class S3Upload extends Component {
   }
 
   render() {
-    const { props } = this;
-    if (!this.isReady(props.credentials, props.configuration)) {
+    const {
+      credentials,
+      configuration,
+      className,
+      accept = '*',
+      children = false
+    } = this.props;
+    if (!this.isReady(credentials, configuration)) {
       return <div></div>;
     } else {
-      let classes = !!props.className ?
-        "pointer " + props.className : "pointer";
+      let classes = !!className
+        ? "pointer " + className
+        : "pointer";
+      const display = children || <Icon icon='ArrowNorth' />;
       return (
-        <div className={classes}>
-          <input className="dn"
-                 type="file"
-                 id="fileElement"
-                 ref={this.inputRef}
-                 accept="image/*"
-                 onChange={this.onChange.bind(this)} />
-          <img className="invert-d"
-               src="/~landscape/img/ImageUpload.png"
-               width="32"
-               height="32"
-               onClick={this.onClick.bind(this)} />
+        <div>
+          <input
+            className="dn"
+            type="file"
+            id="fileElement"
+            ref={this.inputRef}
+            accept={accept}
+            onChange={this.onChange.bind(this)} />
+          {this.state.isUploading
+            ? <Spinner awaiting={true} classes={className} />
+            : <span className={`pointer ${className}`} onClick={this.onClick.bind(this)}>{display}</span>
+          }
+          
         </div>
       );
     }

From 882c9179e376ddba5d494d738ca4a17b15342f78 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@sunshinegardens.org>
Date: Wed, 2 Sep 2020 18:05:36 -0400
Subject: [PATCH 33/89] chat: address #3347 review feedback

---
 .../views/apps/chat/components/lib/message.js  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkg/interface/src/views/apps/chat/components/lib/message.js b/pkg/interface/src/views/apps/chat/components/lib/message.js
index c47d3f2abe..0574783f59 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/message.js
+++ b/pkg/interface/src/views/apps/chat/components/lib/message.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React from 'react';
 import { OverlaySigil } from './overlay-sigil';
 import MessageContent from './message-content';
 import { uxToHex, cite, writeText } from '~/logic/lib/util';
@@ -9,7 +9,7 @@ export const Message = (props) => {
   const pending = props.msg.pending ? ' o-40' : '';
   const containerClass =
     props.renderSigil ?
-      `w-100 f7 pl3 pt4 pr3 cf flex lh-copy ` + pending :
+      'w-100 f7 pl3 pt4 pr3 cf flex lh-copy ' + pending :
       'w-100 pr3 cf hide-child flex' + pending;
 
   const timestamp =
@@ -63,10 +63,12 @@ const renderWithSigil = (props, timestamp) => {
     let nameSpan = null;
 
     const copyNotice = (saveName) => {
-      nameSpan.innerText = 'Copied';
-      setTimeout(() => {
-        nameSpan.innerText = saveName;
-      }, 800);
+      if (nameSpan !== null) {
+        nameSpan.innerText = 'Copied';
+        setTimeout(() => {
+          nameSpan.innerText = saveName;
+        }, 800);
+      }
     };
 
     return (
@@ -92,7 +94,7 @@ const renderWithSigil = (props, timestamp) => {
                 ref={(e) => nameSpan = e}
                 onClick={() => {
                   const saveName = name;
-                  writeText(props.msg.author);
+                  writeText(`~${props.msg.author}`);
                   copyNotice(saveName);
                 }}
                 title={`~${props.msg.author}`}
@@ -109,5 +111,5 @@ const renderWithSigil = (props, timestamp) => {
         </div>
       </div>
     );
-  }
+  };
 

From 3b27b1e5ee759cc0e948da1920c4599f59115e15 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@sunshinegardens.org>
Date: Wed, 2 Sep 2020 18:24:44 -0400
Subject: [PATCH 34/89] chat: slightly simplify #3347 implementation

---
 pkg/interface/src/views/apps/chat/components/lib/message.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg/interface/src/views/apps/chat/components/lib/message.js b/pkg/interface/src/views/apps/chat/components/lib/message.js
index 0574783f59..4e311df9fe 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/message.js
+++ b/pkg/interface/src/views/apps/chat/components/lib/message.js
@@ -93,9 +93,8 @@ const renderWithSigil = (props, timestamp) => {
                 }
                 ref={(e) => nameSpan = e}
                 onClick={() => {
-                  const saveName = name;
                   writeText(`~${props.msg.author}`);
-                  copyNotice(saveName);
+                  copyNotice(name);
                 }}
                 title={`~${props.msg.author}`}
               >

From 003537e80e33cc3d3edffc69418e70efae4374da Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Thu, 3 Sep 2020 10:13:29 +1000
Subject: [PATCH 35/89] lib/hooks: remove reference to scrying

---
 pkg/arvo/lib/pull-hook.hoon | 8 ++++----
 pkg/arvo/lib/push-hook.hoon | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg/arvo/lib/pull-hook.hoon b/pkg/arvo/lib/pull-hook.hoon
index 5afd0275d7..5302ad1d5e 100644
--- a/pkg/arvo/lib/pull-hook.hoon
+++ b/pkg/arvo/lib/pull-hook.hoon
@@ -5,10 +5,10 @@
 ::   
 ::   ## Interfacing notes:
 ::
-::   The inner door may interact with the library by producing cards or
-::   scrying. Do not pass any cards on a wire beginning with /helper as
-::   these wires are reserved by this library. Any watches/pokes/peeks
-::   not listed below will be routed to the inner door.
+::   The inner door may interact with the library by producing cards.
+::   Do not pass any cards on a wire beginning with /helper as these
+::   wires are reserved by this library. Any watches/pokes/peeks not
+::   listed below will be routed to the inner door.
 ::
 ::   ##  Subscription paths
 ::
diff --git a/pkg/arvo/lib/push-hook.hoon b/pkg/arvo/lib/push-hook.hoon
index 1ddc07a76a..bbe6f73c66 100644
--- a/pkg/arvo/lib/push-hook.hoon
+++ b/pkg/arvo/lib/push-hook.hoon
@@ -6,10 +6,10 @@
 ::
 ::   ## Interfacing notes:
 ::
-::   The inner door may interact with the library by producing cards or
-::   scrying. Do not pass any cards on a wire beginning with /helper as
-::   these wires are reserved by this library. Any watches/pokes/peeks
-::   not listed below will be routed to the inner door.
+::   The inner door may interact with the library by producing cards. 
+::   Do not pass any cards on a wire beginning with /helper as these
+::   wires are reserved by this library. Any watches/pokes/peeks not
+::   listed below will be routed to the inner door.
 ::
 ::   ##  Subscription paths
 ::

From 8729020fd3e88c25dacbab166b1d41a484be2389 Mon Sep 17 00:00:00 2001
From: Tyler Brown Cifu Shuster <tyler@fivepaths.com>
Date: Thu, 27 Aug 2020 20:15:47 -0700
Subject: [PATCH 36/89] interface: added oembed parser

---
 pkg/interface/package-lock.json               |  21 +++
 pkg/interface/package.json                    |   2 +
 pkg/interface/src/logic/api/local.ts          |  12 +-
 pkg/interface/src/logic/reducers/local.ts     |  11 +-
 pkg/interface/src/logic/store/store.ts        |   6 +
 pkg/interface/src/logic/store/type.ts         |   3 +-
 pkg/interface/src/types/local-update.ts       |  34 ++--
 pkg/interface/src/views/apps/chat/app.tsx     |   4 +-
 .../src/views/apps/chat/components/chat.tsx   |   3 +
 .../apps/chat/components/lib/chat-message.tsx |   4 +-
 .../apps/chat/components/lib/chat-window.tsx  |   1 +
 .../apps/chat/components/lib/content/url.js   | 106 -------------
 .../chat/components/lib/message-content.js    |  15 +-
 .../views/apps/chat/components/lib/message.js |   4 +-
 .../src/views/apps/chat/css/custom.css        |  25 +--
 pkg/interface/src/views/apps/links/app.js     |   3 +-
 .../components/lib/link-detail-preview.js     |  72 ++-------
 .../src/views/apps/links/components/link.js   |   1 +
 .../profile/components/lib/RemoteContent.tsx  |  94 +++++++++++
 .../apps/profile/components/settings.tsx      |   3 +
 .../src/views/components/RemoteContent.tsx    | 148 ++++++++++++++++++
 21 files changed, 361 insertions(+), 211 deletions(-)
 delete mode 100644 pkg/interface/src/views/apps/chat/components/lib/content/url.js
 create mode 100644 pkg/interface/src/views/apps/profile/components/lib/RemoteContent.tsx
 create mode 100644 pkg/interface/src/views/components/RemoteContent.tsx

diff --git a/pkg/interface/package-lock.json b/pkg/interface/package-lock.json
index 921fcbadf0..b3516b8918 100644
--- a/pkg/interface/package-lock.json
+++ b/pkg/interface/package-lock.json
@@ -6807,6 +6807,11 @@
         "tslib": "^1.10.0"
       }
     },
+    "node-fetch": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
+      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+    },
     "node-forge": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
@@ -7058,6 +7063,14 @@
       "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
       "dev": true
     },
+    "oembed-parser": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/oembed-parser/-/oembed-parser-1.4.1.tgz",
+      "integrity": "sha512-1KqnfrXF3TiAQhJ9+vv3dEtMhPSVSOT9D9XPqLjEtaQg5liPc3LQ65YjgKHo7Z/YY/kmZ1PDb5gMcOxxCPPdBA==",
+      "requires": {
+        "node-fetch": "^2.6.0"
+      }
+    },
     "omit-deep": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/omit-deep/-/omit-deep-0.3.0.tgz",
@@ -7937,6 +7950,14 @@
         "xtend": "^4.0.1"
       }
     },
+    "react-oembed-container": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/react-oembed-container/-/react-oembed-container-1.0.0.tgz",
+      "integrity": "sha512-YppvCDgxZkn6qgwAIpxRtmMtxaMpau8yQhm8nzmH7yHpDapmHxzakXvQke5qPfmdYyYW4CsKDfVfGoX14NvQkw==",
+      "requires": {
+        "prop-types": "^15.6.0"
+      }
+    },
     "react-router": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.1.2.tgz",
diff --git a/pkg/interface/package.json b/pkg/interface/package.json
index 65a6a0181c..94a4caff76 100644
--- a/pkg/interface/package.json
+++ b/pkg/interface/package.json
@@ -20,6 +20,7 @@
     "moment": "^2.20.1",
     "mousetrap": "^1.6.5",
     "mousetrap-global-bind": "^1.1.0",
+    "oembed-parser": "^1.4.1",
     "prop-types": "^15.7.2",
     "react": "^16.5.2",
     "react-codemirror2": "^6.0.1",
@@ -29,6 +30,7 @@
     "react-dom": "^16.8.6",
     "react-helmet": "^6.1.0",
     "react-markdown": "^4.3.1",
+    "react-oembed-container": "^1.0.0",
     "react-router-dom": "^5.0.0",
     "react-window": "^1.8.5",
     "remark-disable-tokenizers": "^1.0.24",
diff --git a/pkg/interface/src/logic/api/local.ts b/pkg/interface/src/logic/api/local.ts
index 976f337c5a..3b874e060d 100644
--- a/pkg/interface/src/logic/api/local.ts
+++ b/pkg/interface/src/logic/api/local.ts
@@ -1,6 +1,6 @@
 import BaseApi from "./base";
 import { StoreState } from "../store/type";
-import { BackgroundConfig } from "../types/local-update";
+import { BackgroundConfig, LocalUpdateRemoteContentPolicy } from "../types/local-update";
 
 export default class LocalApi extends BaseApi<StoreState> {
   getBaseHash() {
@@ -69,6 +69,16 @@ export default class LocalApi extends BaseApi<StoreState> {
     });
   }
 
+  setRemoteContentPolicy(policy: LocalUpdateRemoteContentPolicy) {
+    this.store.handleEvent({
+      data: {
+        local: {
+          remoteContentPolicy: policy
+        }
+      }
+    });
+  }
+
   dehydrate() {
     this.store.dehydrate();
   }
diff --git a/pkg/interface/src/logic/reducers/local.ts b/pkg/interface/src/logic/reducers/local.ts
index 805e57e273..89a3fa8227 100644
--- a/pkg/interface/src/logic/reducers/local.ts
+++ b/pkg/interface/src/logic/reducers/local.ts
@@ -3,7 +3,7 @@ import { StoreState } from '~/store/type';
 import { Cage } from '~/types/cage';
 import { LocalUpdate, BackgroundConfig } from '~/types/local-update';
 
-type LocalState = Pick<StoreState, 'sidebarShown' | 'omniboxShown' | 'baseHash' | 'hideAvatars' | 'hideNicknames' | 'background' | 'dark' | 'suspendedFocus'>;
+type LocalState = Pick<StoreState, 'sidebarShown' | 'omniboxShown' | 'baseHash' | 'hideAvatars' | 'hideNicknames' | 'background' | 'dark' | 'suspendedFocus' | 'remoteContentPolicy'>;
 
 export default class LocalReducer<S extends LocalState> {
     rehydrate(state: S) {
@@ -18,7 +18,7 @@ export default class LocalReducer<S extends LocalState> {
     }
 
     dehydrate(state: S) {
-      const json = _.pick(state, ['hideNicknames' , 'hideAvatars' , 'background']);
+      const json = _.pick(state, ['hideNicknames' , 'hideAvatars' , 'background', 'remoteContentPolicy']);
       localStorage.setItem('localReducer', JSON.stringify(json));
     }
     reduce(json: Cage, state: S) {
@@ -31,6 +31,7 @@ export default class LocalReducer<S extends LocalState> {
             this.hideAvatars(data, state)
             this.hideNicknames(data, state)
             this.omniboxShown(data, state);
+            this.remoteContentPolicy(data, state);
         }
     }
     baseHash(obj: LocalUpdate, state: S) {
@@ -70,6 +71,12 @@ export default class LocalReducer<S extends LocalState> {
       }
     }
 
+    remoteContentPolicy(obj: LocalUpdate, state: S) {
+      if('remoteContentPolicy' in obj) {
+        state.remoteContentPolicy = obj.remoteContentPolicy;
+      }
+    }
+
     hideAvatars(obj: LocalUpdate, state: S) {
       if('hideAvatars' in obj) {
         state.hideAvatars = obj.hideAvatars;
diff --git a/pkg/interface/src/logic/store/store.ts b/pkg/interface/src/logic/store/store.ts
index 8926231cc7..63d3bb0167 100644
--- a/pkg/interface/src/logic/store/store.ts
+++ b/pkg/interface/src/logic/store/store.ts
@@ -54,6 +54,12 @@ export default class GlobalStore extends BaseStore<StoreState> {
       suspendedFocus: null,
       baseHash: null,
       background: undefined,
+      remoteContentPolicy: {
+        imageShown: true,
+        audioShown: true,
+        videoShown: true,
+        oembedShown: false,
+      },
       hideAvatars: false,
       hideNicknames: false,
       invites: {},
diff --git a/pkg/interface/src/logic/store/type.ts b/pkg/interface/src/logic/store/type.ts
index 525ec23a23..ffb989fa50 100644
--- a/pkg/interface/src/logic/store/type.ts
+++ b/pkg/interface/src/logic/store/type.ts
@@ -11,7 +11,7 @@ import { Permissions } from '~/types/permission-update';
 import { LaunchState, WeatherState } from '~/types/launch-update';
 import { LinkComments, LinkCollections, LinkSeen } from '~/types/link-update';
 import { ConnectionStatus } from '~/types/connection';
-import { BackgroundConfig } from '~/types/local-update';
+import { BackgroundConfig, LocalUpdateRemoteContentPolicy } from '~/types/local-update';
 
 export interface StoreState {
   // local state
@@ -22,6 +22,7 @@ export interface StoreState {
   connection: ConnectionStatus;
   baseHash: string | null;
   background: BackgroundConfig;
+  remoteContentPolicy: LocalUpdateRemoteContentPolicy;
   hideAvatars: boolean;
   hideNicknames: boolean;
   // invite state
diff --git a/pkg/interface/src/types/local-update.ts b/pkg/interface/src/types/local-update.ts
index 25d679d467..a5739fd218 100644
--- a/pkg/interface/src/types/local-update.ts
+++ b/pkg/interface/src/types/local-update.ts
@@ -1,12 +1,3 @@
-export type LocalUpdate =
-  LocalUpdateSidebarToggle
-| LocalUpdateSetDark
-| LocalUpdateBaseHash
-| LocalUpdateBackgroundConfig
-| LocalUpdateHideAvatars
-| LocalUpdateHideNicknames
-| LocalUpdateSetOmniboxShown;
-
 interface LocalUpdateSidebarToggle {
   sidebarToggle: boolean;
 }
@@ -31,7 +22,16 @@ interface LocalUpdateHideNicknames {
   hideNicknames: boolean;
 }
 
-export type BackgroundConfig = BackgroundConfigUrl | BackgroundConfigColor | undefined;
+interface LocalUpdateSetOmniboxShown {
+  omniboxShown: boolean;
+}
+
+export interface LocalUpdateRemoteContentPolicy {
+  imageShown: boolean;
+  audioShown: boolean;
+  videoShown: boolean;
+  oembedShown: boolean;
+}
 
 interface BackgroundConfigUrl {
   type: 'url';
@@ -43,6 +43,14 @@ interface BackgroundConfigColor {
   color: string;
 }
 
-interface LocalUpdateSetOmniboxShown {
-  omniboxShown: boolean;
-}
+export type BackgroundConfig = BackgroundConfigUrl | BackgroundConfigColor | undefined;
+
+export type LocalUpdate =
+  LocalUpdateSidebarToggle
+| LocalUpdateSetDark
+| LocalUpdateBaseHash
+| LocalUpdateBackgroundConfig
+| LocalUpdateHideAvatars
+| LocalUpdateHideNicknames
+| LocalUpdateSetOmniboxShown
+| LocalUpdateRemoteContentPolicy;
\ No newline at end of file
diff --git a/pkg/interface/src/views/apps/chat/app.tsx b/pkg/interface/src/views/apps/chat/app.tsx
index cadf3e265e..9ce2a580c7 100644
--- a/pkg/interface/src/views/apps/chat/app.tsx
+++ b/pkg/interface/src/views/apps/chat/app.tsx
@@ -89,7 +89,8 @@ export default class ChatApp extends React.Component<ChatAppProps, {}> {
       pendingMessages,
       groups,
       hideAvatars,
-      hideNicknames
+      hideNicknames,
+      remoteContentPolicy
     } = props;
 
     const renderChannelSidebar = (props, station?) => (
@@ -271,6 +272,7 @@ export default class ChatApp extends React.Component<ChatAppProps, {}> {
                     chatInitialized={chatInitialized}
                     hideAvatars={hideAvatars}
                     hideNicknames={hideNicknames}
+                    remoteContentPolicy={remoteContentPolicy}
                     {...props}
                   />
                 </Skeleton>
diff --git a/pkg/interface/src/views/apps/chat/components/chat.tsx b/pkg/interface/src/views/apps/chat/components/chat.tsx
index 2901e7167d..03b7579879 100644
--- a/pkg/interface/src/views/apps/chat/components/chat.tsx
+++ b/pkg/interface/src/views/apps/chat/components/chat.tsx
@@ -15,6 +15,7 @@ import { Path, Patp } from "~/types/noun";
 import GlobalApi from "~/logic/api/global";
 import { Association } from "~/types/metadata-update";
 import {Group} from "~/types/group-update";
+import { LocalUpdateRemoteContentPolicy } from "~/types";
 
 
 type ChatScreenProps = RouteComponentProps<{
@@ -38,6 +39,7 @@ type ChatScreenProps = RouteComponentProps<{
   envelopes: Envelope[];
   hideAvatars: boolean;
   hideNicknames: boolean;
+  remoteContentPolicy: LocalUpdateRemoteContentPolicy;
 };
 
 interface ChatScreenState {
@@ -131,6 +133,7 @@ export class ChatScreen extends Component<ChatScreenProps, ChatScreenState> {
           api={props.api}
           hideNicknames={props.hideNicknames}
           hideAvatars={props.hideAvatars}
+          remoteContentPolicy={props.remoteContentPolicy}
         />
         <ChatInput
           api={props.api}
diff --git a/pkg/interface/src/views/apps/chat/components/lib/chat-message.tsx b/pkg/interface/src/views/apps/chat/components/lib/chat-message.tsx
index 3d8573927b..3def367c6a 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/chat-message.tsx
+++ b/pkg/interface/src/views/apps/chat/components/lib/chat-message.tsx
@@ -17,7 +17,8 @@ export const ChatMessage = (props) => {
     contacts,
     unreadRef,
     hideAvatars,
-    hideNicknames
+    hideNicknames,
+    remoteContentPolicy
   } = props;
 
   // Render sigil if previous message is not by the same sender
@@ -46,6 +47,7 @@ export const ChatMessage = (props) => {
       association={association}
       hideNicknames={hideNicknames}
       hideAvatars={hideAvatars}
+      remoteContentPolicy={remoteContentPolicy}
     />
   );
 
diff --git a/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx b/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx
index 725abaf0fe..ebb9952837 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx
+++ b/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx
@@ -187,6 +187,7 @@ export class ChatWindow extends Component {
                 contacts={props.contacts} 
                 hideAvatars={props.hideAvatars}
                 hideNicknames={props.hideNicknames}
+                remoteContentPolicy={props.remoteContentPolicy}
               />
             ))
           }
diff --git a/pkg/interface/src/views/apps/chat/components/lib/content/url.js b/pkg/interface/src/views/apps/chat/components/lib/content/url.js
deleted file mode 100644
index a6f1f989a5..0000000000
--- a/pkg/interface/src/views/apps/chat/components/lib/content/url.js
+++ /dev/null
@@ -1,106 +0,0 @@
-import React, { Component } from 'react';
-import { Button } from '@tlon/indigo-react';
-
-const IMAGE_REGEX = new RegExp(/(jpg|img|png|gif|tiff|jpeg|webp|webm|svg)$/i);
-
-const YOUTUBE_REGEX =
-  new RegExp(
-    String(/(?:https?:\/\/(?:[a-z]+.)?)/.source) // protocol
-    + /(?:youtu\.?be(?:\.com)?\/)(?:embed\/)?/.source // short and long-links
-    + /(?:(?:(?:(?:watch\?)?(?:time_continue=(?:[0-9]+))?.+v=)?([a-zA-Z0-9_-]+))(?:\?t\=(?:[0-9a-zA-Z]+))?)/.source // id
-  );
-
-export default class UrlContent extends Component {
-  constructor() {
-    super();
-    this.state = {
-      unfold: false,
-      copied: false
-    };
-    this.unfoldEmbed = this.unfoldEmbed.bind(this);
-  }
-
-  unfoldEmbed(id) {
-    let unfoldState = this.state.unfold;
-    unfoldState = !unfoldState;
-    this.setState({ unfold: unfoldState });
-    this.iframe.setAttribute('src', this.iframe.dataset.src);
-  }
-
-  render() {
-    const { props } = this;
-    const content = props.content;
-    const imgMatch = IMAGE_REGEX.exec(props.content.url);
-    const ytMatch = YOUTUBE_REGEX.exec(props.content.url);
-
-    let contents = content.url;
-    if (imgMatch) {
-      contents = (
-        <img
-          className="o-80-d"
-          src={content.url}
-          style={{
-            maxWidth: '18rem'
-          }}
-        ></img>
-      );
-      return (
-        <a className='f7 lh-copy v-top word-break-all'
-          href={content.url}
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          {contents}
-        </a>
-      );
-    } else if (ytMatch) {
-      contents = (
-        <div className={'embed-container mb2 w-100 w-75-l w-50-xl ' +
-        ((this.state.unfold === true)
-          ? 'db' : 'dn')}
-        >
-        <iframe
-          ref={(el) => {
-            this.iframe = el;
-          }}
-          width="560"
-          height="315"
-          data-src={`https://www.youtube.com/embed/${ytMatch[1]}`}
-          frameBorder="0" allow="picture-in-picture, fullscreen"
-        >
-        </iframe>
-        </div>
-      );
-      return (
-        <div>
-          <a href={content.url}
-            className='f7 lh-copy v-top bb b--white-d word-break-all'
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            {content.url}
-          </a>
-          <Button
-            border={1}
-            style={{ display: 'inline-flex', height: '1.66em' }} // Height is hacked to line-height until Button supports proper size
-            ml={1}
-            onClick={e => this.unfoldEmbed()}
-          >
-            {this.state.unfold ? 'collapse' : 'embed'}
-          </Button>
-          {contents}
-        </div>
-      );
-    } else {
-      return (
-        <a className='f7 lh-copy v-top bb b--white-d b--black word-break-all'
-          href={content.url}
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          {contents}
-        </a>
-      );
-    }
-  }
-}
diff --git a/pkg/interface/src/views/apps/chat/components/lib/message-content.js b/pkg/interface/src/views/apps/chat/components/lib/message-content.js
index 865ab3af20..41321470a8 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/message-content.js
+++ b/pkg/interface/src/views/apps/chat/components/lib/message-content.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 
 import TextContent from './content/text';
 import CodeContent from './content/code';
-import UrlContent from './content/url';
+import RemoteContent from '~/views/components/RemoteContent';
 
 
 export default class MessageContent extends Component {
@@ -15,7 +15,18 @@ export default class MessageContent extends Component {
     if ('code' in content) {
       return <CodeContent content={content} />;
     } else if ('url' in content) {
-      return <UrlContent content={content} />;
+      return (
+        <RemoteContent
+          url={content.url}
+          remoteContentPolicy={props.remoteContentPolicy}
+          imageProps={{style: {
+              maxWidth: '18rem'
+          }}}
+          videoProps={{style: {
+            maxWidth: '18rem'
+          }}}
+        />
+      );
     } else if ('me' in content) {
       return (
         <p className='f7 i lh-copy v-top'>
diff --git a/pkg/interface/src/views/apps/chat/components/lib/message.js b/pkg/interface/src/views/apps/chat/components/lib/message.js
index 2220658d66..f4753bdb57 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/message.js
+++ b/pkg/interface/src/views/apps/chat/components/lib/message.js
@@ -31,7 +31,7 @@ export const Message = (props) => {
             <p className="child pt2 pl2 pr1 mono f9 gray2 dib">{timestamp}</p>
             <div className="fr f7 clamp-message white-d pr3 lh-copy"
                  style={{ flexGrow: 1 }}>
-              <MessageContent letter={props.msg.letter} />
+              <MessageContent letter={props.msg.letter} remoteContentPolicy={props.remoteContentPolicy}/>
             </div>
           </div>
         )
@@ -98,7 +98,7 @@ const renderWithSigil = (props, timestamp) => {
               {datestamp}
             </p>
           </div>
-          <MessageContent letter={props.msg.letter} />
+          <MessageContent letter={props.msg.letter} remoteContentPolicy={props.remoteContentPolicy} />
         </div>
       </div>
     );
diff --git a/pkg/interface/src/views/apps/chat/css/custom.css b/pkg/interface/src/views/apps/chat/css/custom.css
index 6294427bd0..71d507ef96 100644
--- a/pkg/interface/src/views/apps/chat/css/custom.css
+++ b/pkg/interface/src/views/apps/chat/css/custom.css
@@ -116,20 +116,8 @@ h2 {
   100% {transform: rotate(360deg);}
 }
 
-/* embeds */
-.embed-container {
-  position: relative;
-  height: 0;
-  overflow: hidden;
-  padding-bottom: 28.125%;
-}
-
-.embed-container iframe, .embed-container object, .embed-container embed {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
+.embed-container iframe {
+  max-width: 100%;
 }
 
 .mh-16 {
@@ -188,9 +176,6 @@ h2 {
   .h-100-minus-96-s {
     height: calc(100% - 96px);
   }
-  .embed-container {
-    padding-bottom: 56.25%;
-  }
   .unread-notice {
     top: 96px;
   }
@@ -200,18 +185,12 @@ h2 {
   .flex-basis-250-m {
     flex-basis: 250px;
   }
-  .embed-container {
-    padding-bottom: 56.25%;
-  }
 }
 
 @media all and (min-width: 46.875em) and (max-width: 60em) {
   .flex-basis-250-l {
     flex-basis: 250px;
   }
-  .embed-container {
-    padding-bottom: 37.5%;
-  }
 }
 
 @media all and (min-width: 60em) {
diff --git a/pkg/interface/src/views/apps/links/app.js b/pkg/interface/src/views/apps/links/app.js
index 718a09363a..080aefae7d 100644
--- a/pkg/interface/src/views/apps/links/app.js
+++ b/pkg/interface/src/views/apps/links/app.js
@@ -59,7 +59,7 @@ export class LinksApp extends Component {
       props.invites : {};
 
     const listening = props.linkListening;
-    const { api, sidebarShown, hideAvatars, hideNicknames, s3 } = this.props;
+    const { api, sidebarShown, hideAvatars, hideNicknames, s3, remoteContentPolicy } = this.props;
 
     return (
       <>
@@ -319,6 +319,7 @@ export class LinksApp extends Component {
                     api={api}
                     hideAvatars={hideAvatars}
                     hideNicknames={hideNicknames}
+                    remoteContentPolicy={remoteContentPolicy}
                     />
                   </Skeleton>
                 );
diff --git a/pkg/interface/src/views/apps/links/components/lib/link-detail-preview.js b/pkg/interface/src/views/apps/links/components/lib/link-detail-preview.js
index 0dd5ecadc9..bc7d286d73 100644
--- a/pkg/interface/src/views/apps/links/components/lib/link-detail-preview.js
+++ b/pkg/interface/src/views/apps/links/components/lib/link-detail-preview.js
@@ -2,6 +2,8 @@ import React, { Component } from 'react';
 import { cite } from '~/logic/lib/util';
 import moment from 'moment';
 
+import RemoteContent from "~/views/components/RemoteContent";
+
 export class LinkPreview extends Component {
   constructor(props) {
     super(props);
@@ -27,26 +29,6 @@ export class LinkPreview extends Component {
         timeSinceLinkPost: this.getTimeSinceLinkPost()
       });
     }, 60000);
-
-    // check for soundcloud for fetching embed
-    const soundcloudRegex = new RegExp(String(/(https?:\/\/(?:www.)?soundcloud.com\/[\w-]+\/?(?:sets\/)?[\w-]+)/.source)
-    );
-
-    const isSoundcloud = soundcloudRegex.exec(this.props.url);
-
-    if (isSoundcloud && this.state.embed === '') {
-      fetch(
-        'https://soundcloud.com/oembed?format=json&url=' +
-        encodeURIComponent(this.props.url))
-        .then((response) => {
-          return response.json();
-        })
-        .then((json) => {
-          this.setState({ embed: json.html });
-        });
-    } else if (!isSoundcloud) {
-      this.setState({ embed: '' });
-    }
   }
 
   componentWillUnmount() {
@@ -66,6 +48,16 @@ export class LinkPreview extends Component {
   render() {
     const { props } = this;
 
+    const embed = (
+      <RemoteContent
+        unfold={true}
+        renderUrl={false}
+        url={props.url}
+        remoteContentPolicy={props.remoteContentPolicy}
+        className="mw-100"
+      />
+    );
+
     const URLparser = new RegExp(
       /((?:([\w\d\.-]+)\:\/\/?){1}(?:(www)\.?){0,1}(((?:[\w\d-]+\.)*)([\w\d-]+\.[\w\d]+))){1}(?:\:(\d+)){0,1}((\/(?:(?:[^\/\s\?]+\/)*))(?:([^\?\/\s#]+?(?:.[^\?\s]+){0,1}){0,1}(?:\?([^\s#]+)){0,1})){0,1}(?:#([^#\s]+)){0,1}/
     );
@@ -76,42 +68,6 @@ export class LinkPreview extends Component {
       hostname = hostname[4];
     }
 
-    const imgMatch = /(jpg|img|png|gif|tiff|jpeg|JPG|IMG|PNG|TIFF|GIF|webp|WEBP|webm|WEBM)$/.exec(
-      props.url
-    );
-
-    const youTubeRegex = new RegExp(
-      String(/(?:https?:\/\/(?:[a-z]+.)?)/.source) + // protocol
-      /(?:youtu\.?be(?:\.com)?\/)(?:embed\/)?/.source + // short and long-links
-        /(?:(?:(?:(?:watch\?)?(?:time_continue=(?:[0-9]+))?.+v=)?([a-zA-Z0-9_-]+))(?:\?t\=(?:[0-9a-zA-Z]+))?)/.source // id
-    );
-
-    const ytMatch = youTubeRegex.exec(props.url);
-
-    let embed = '';
-
-    if (imgMatch) {
-      embed = <a href={props.url}
-                target="_blank"
-                style={{ width: 'max-content' }}
-              >
-        <img src={props.url} style={{ maxHeight: '500px', maxWidth: '100%' }} />
-      </a>;
-    }
-
-    if (ytMatch) {
-      embed = (
-        <iframe
-          ref="iframe"
-          width="560"
-          height="315"
-          src={`https://www.youtube.com/embed/${ytMatch[1]}`}
-          frameBorder="0"
-          allow="picture-in-picture, fullscreen"
-        ></iframe>
-      );
-    }
-
     const showNickname = props.nickname && !props.hideNicknames;
 
     const nameClass = showNickname ? 'inter' : 'mono';
@@ -119,9 +75,9 @@ export class LinkPreview extends Component {
     return (
       <div className="pb6 w-100">
         <div
-          className={'w-100 tc ' + (ytMatch ? 'links embed-container' : '')}
+          className={'w-100 tc'}
         >
-          {embed || <div dangerouslySetInnerHTML={{ __html: this.state.embed }} />}
+          {embed}
         </div>
         <div className="flex flex-column ml2 pt6 flex-auto">
           <a href={props.url} className="w-100 flex" target="_blank" rel="noopener noreferrer">
diff --git a/pkg/interface/src/views/apps/links/components/link.js b/pkg/interface/src/views/apps/links/components/link.js
index 289848c0fd..4bbbdf1255 100644
--- a/pkg/interface/src/views/apps/links/components/link.js
+++ b/pkg/interface/src/views/apps/links/components/link.js
@@ -167,6 +167,7 @@ export class LinkDetail extends Component {
               linkIndex={props.linkIndex}
               time={this.state.data.time}
               hideNicknames={props.hideNicknames}
+              remoteContentPolicy={props.remoteContentPolicy}
             />
             <div className="relative">
               <div className={'relative ba br1 mt6 mb6 ' + focus}>
diff --git a/pkg/interface/src/views/apps/profile/components/lib/RemoteContent.tsx b/pkg/interface/src/views/apps/profile/components/lib/RemoteContent.tsx
new file mode 100644
index 0000000000..557a2132d6
--- /dev/null
+++ b/pkg/interface/src/views/apps/profile/components/lib/RemoteContent.tsx
@@ -0,0 +1,94 @@
+import React from "react";
+import { Box, Button, Checkbox } from '@tlon/indigo-react';
+import { Formik, Form } from "formik";
+import * as Yup from "yup";
+
+import GlobalApi from "~/logic/api/global";
+import { LocalUpdateRemoteContentPolicy } from "~/types/local-update";
+
+const formSchema = Yup.object().shape({
+  imageShown: Yup.boolean(),
+  audioShown: Yup.boolean(),
+  videoShown: Yup.boolean(),
+  oembedShown: Yup.boolean()
+});
+
+interface FormSchema {
+  imageShown: boolean;
+  audioShown: boolean;
+  videoShown: boolean;
+  oembedShown: boolean;
+}
+
+interface RemoteContentFormProps {
+  api: GlobalApi;
+  remoteContentPolicy: LocalUpdateRemoteContentPolicy;
+}
+
+export default function RemoteContentForm(props: RemoteContentFormProps) {
+  const { api, remoteContentPolicy } = props;
+  const imageShown = remoteContentPolicy.imageShown;
+  const audioShown = remoteContentPolicy.audioShown;
+  const videoShown = remoteContentPolicy.videoShown;
+  const oembedShown = remoteContentPolicy.oembedShown;
+  return (
+    <Formik
+      validationSchema={formSchema}
+      initialValues={
+        {
+          imageShown,
+          audioShown,
+          videoShown,
+          oembedShown
+        } as FormSchema
+      }
+      onSubmit={(values, actions) => {
+        api.local.setRemoteContentPolicy({
+          imageShown: values.imageShown,
+          audioShown: values.audioShown,
+          videoShown: values.videoShown,
+          oembedShown: values.oembedShown
+        });
+        api.local.dehydrate();
+        actions.setSubmitting(false);
+      }}
+    >
+      {(props) => (
+        <Form>
+          <Box
+            display="grid"
+            gridTemplateColumns="1fr"
+            gridTemplateRows="audio"
+            gridRowGap={3}
+          >
+            <Box color="black" fontSize={1} mb={3} fontWeight={900}>
+              Remote Content
+            </Box>
+            <Box>
+              <Checkbox
+                label="Load images"
+                id="imageShown"
+              />
+              <Checkbox
+                label="Load audio files"
+                id="audioShown"
+              />
+              <Checkbox
+                label="Load video files"
+                id="videoShown"
+              />
+              <Checkbox
+                label="Load embedded content"
+                id="oembedShown"
+                caption="Embedded content may contain scripts"
+              />
+            </Box>
+          </Box>
+          <Button border={1} borderColor="washedGray" type="submit">
+            Save
+          </Button>
+        </Form>
+      )}
+    </Formik>
+  );
+}
\ No newline at end of file
diff --git a/pkg/interface/src/views/apps/profile/components/settings.tsx b/pkg/interface/src/views/apps/profile/components/settings.tsx
index d59f04f36c..72c6794cdf 100644
--- a/pkg/interface/src/views/apps/profile/components/settings.tsx
+++ b/pkg/interface/src/views/apps/profile/components/settings.tsx
@@ -19,6 +19,7 @@ import { StoreState } from "../../../store/type";
 import DisplayForm from "./lib/DisplayForm";
 import S3Form from "./lib/S3Form";
 import SecuritySettings from "./lib/Security";
+import RemoteContentForm from "./lib/RemoteContent";
 
 type ProfileProps = StoreState & { api: GlobalApi; ship: string };
 
@@ -30,6 +31,7 @@ export default function Settings({
   hideAvatars,
   hideNicknames,
   background,
+  remoteContentPolicy
 }: ProfileProps) {
   return (
     <Box
@@ -51,6 +53,7 @@ export default function Settings({
         background={background}
         s3={s3}
       />
+      <RemoteContentForm {...{api, remoteContentPolicy}} />
       <S3Form api={api} s3={s3} />
       <SecuritySettings api={api} />
     </Box>
diff --git a/pkg/interface/src/views/components/RemoteContent.tsx b/pkg/interface/src/views/components/RemoteContent.tsx
new file mode 100644
index 0000000000..351abdce5e
--- /dev/null
+++ b/pkg/interface/src/views/components/RemoteContent.tsx
@@ -0,0 +1,148 @@
+import React, { Component, Fragment } from 'react';
+import { LocalUpdateRemoteContentPolicy } from "~/types/local-update";
+import { Button } from '@tlon/indigo-react';
+import { hasProvider } from 'oembed-parser';
+import EmbedContainer from 'react-oembed-container';
+
+interface RemoteContentProps {
+  url: string;
+  remoteContentPolicy: LocalUpdateRemoteContentPolicy;
+  unfold: boolean;
+  renderUrl: boolean;
+  imageProps: any;
+  audioProps: any;
+  videoProps: any;
+  oembedProps: any;
+}
+
+interface RemoteContentState {
+  unfold: boolean;
+  embed: any | undefined;
+}
+
+const IMAGE_REGEX = new RegExp(/(jpg|img|png|gif|tiff|jpeg|webp|webm|svg)$/i);
+const AUDIO_REGEX = new RegExp(/(mp3|wav|ogg)$/i);
+const VIDEO_REGEX = new RegExp(/(mov|mp4|ogv)$/i);
+
+export default class RemoteContent extends Component<RemoteContentProps, RemoteContentState> {
+  constructor(props) {
+    super(props);
+    this.state = {
+      unfold: props.unfold || false,
+      embed: undefined
+    };
+    this.unfoldEmbed = this.unfoldEmbed.bind(this);
+    this.loadOembed = this.loadOembed.bind(this);
+    this.wrapInLink = this.wrapInLink.bind(this);
+  }
+
+  unfoldEmbed() {
+    let unfoldState = this.state.unfold;
+    unfoldState = !unfoldState;
+    this.setState({ unfold: unfoldState });
+  }
+
+  loadOembed() {
+    fetch(`https://noembed.com/embed?url=${this.props.url}`)
+    .then(response => response.json())
+    .then((result) => {
+      this.setState({ embed: result });
+    }).catch((error) => {
+      this.setState({ embed: 'error' });
+      console.log('error fetching oembed', error);
+    });
+  }
+
+  wrapInLink(contents) {
+    return (<a
+      href={this.props.url}
+      className={`f7 lh-copy v-top word-break-all ${(typeof contents === 'string') ? 'bb b--white-d b--black' : ''}`}
+      target="_blank"
+      rel="noopener noreferrer"
+    >
+      {contents}
+    </a>);
+  }
+
+  render() {
+    const {
+      remoteContentPolicy,
+      url,
+      unfold = false,
+      renderUrl = true,
+      imageProps = {},
+      audioProps = {},
+      videoProps = {},
+      oembedProps = {},
+      ...props
+    } = this.props;
+    const isImage = IMAGE_REGEX.test(url);
+    const isAudio = AUDIO_REGEX.test(url);
+    const isVideo = VIDEO_REGEX.test(url);
+    const isOembed = hasProvider(url);
+
+    if (isImage && remoteContentPolicy.imageShown) {
+      return this.wrapInLink(
+        <img
+          src={url}
+          {...imageProps}
+          {...props}
+        />
+      );
+    } else if (isAudio && remoteContentPolicy.audioShown) {
+      return (
+        <>
+          {renderUrl ? this.wrapInLink(url) : null}
+          <audio
+            controls
+            className="db"
+            src={url}
+            {...audioProps}
+            {...props}
+          />
+        </>
+      );
+    } else if (isVideo && remoteContentPolicy.videoShown) {
+      return (
+        <>
+          {renderUrl ? this.wrapInLink(url) : null}
+          <video
+            controls
+            className="db"
+            src={url}
+            {...videoProps}
+            {...props}
+          />
+        </>
+      );
+    } else if (isOembed && remoteContentPolicy.oembedShown) {
+      this.loadOembed();
+      return (
+        <Fragment>
+          {renderUrl ? this.wrapInLink(this.state.embed && this.state.embed.title ? this.state.embed.title : url) : null}
+          {this.state.embed !== 'error' && !unfold ? <Button
+            border={1}
+            style={{ display: 'inline-flex', height: '1.66em' }} // Height is hacked to line-height until Button supports proper size
+            ml={1}
+            onClick={this.unfoldEmbed}
+          >
+            {this.state.unfold ? 'collapse' : 'expand'}
+          </Button> : null}
+          <div
+            className={'embed-container mb2 w-100 w-75-l w-50-xl ' + (this.state.unfold ? 'db' : 'dn')}
+            {...oembedProps}
+            {...props}
+          >
+            {this.state.embed && this.state.embed.html && this.state.unfold
+            ? <EmbedContainer markup={this.state.embed.html}>
+              <div dangerouslySetInnerHTML={{__html: this.state.embed.html}}></div>
+            </EmbedContainer>
+            : null}
+          </div>
+        </Fragment>
+      );
+    } else {
+      return renderUrl ? this.wrapInLink(url) : null;
+    }
+  }
+}
\ No newline at end of file

From a9ed4c905577515bffbd7070da060cb627b70b93 Mon Sep 17 00:00:00 2001
From: Tyler Brown Cifu Shuster <tyler@fivepaths.com>
Date: Fri, 4 Sep 2020 20:12:27 -0700
Subject: [PATCH 37/89] links, publish: display rich text comments

---
 .../src/logic/lib/tokenizeMessage.js          | 67 +++++++++++++++
 .../apps/chat/components/lib/chat-input.js    | 85 ++-----------------
 .../apps/links/components/lib/comment-item.js |  3 +-
 .../apps/links/components/lib/comments.js     |  3 +-
 .../src/views/apps/links/components/link.js   |  1 +
 pkg/interface/src/views/apps/publish/app.tsx  |  2 +
 .../publish/components/lib/CommentItem.tsx    | 24 ++----
 .../apps/publish/components/lib/Comments.tsx  |  4 +
 .../apps/publish/components/lib/Note.tsx      |  3 +
 .../publish/components/lib/NotebookRoutes.tsx |  3 +
 .../src/views/components/RemoteContent.tsx    |  2 +-
 .../src/views/components/RichText.js          | 40 +++++++++
 12 files changed, 138 insertions(+), 99 deletions(-)
 create mode 100644 pkg/interface/src/logic/lib/tokenizeMessage.js
 create mode 100644 pkg/interface/src/views/components/RichText.js

diff --git a/pkg/interface/src/logic/lib/tokenizeMessage.js b/pkg/interface/src/logic/lib/tokenizeMessage.js
new file mode 100644
index 0000000000..6f43c421c8
--- /dev/null
+++ b/pkg/interface/src/logic/lib/tokenizeMessage.js
@@ -0,0 +1,67 @@
+const URL_REGEX = new RegExp(String(/^((\w+:\/\/)[-a-zA-Z0-9:@;?&=\/%\+\.\*!'\(\),\$_\{\}\^~\[\]`#|]+)/.source));
+
+const isUrl = (string) => {
+  try {
+    return URL_REGEX.test(string);
+  } catch (e) {
+    return false;
+  }
+}
+
+const tokenizeMessage = (text) => {
+  let messages = [];
+  let message = [];
+  let isInCodeBlock = false;
+  let endOfCodeBlock = false;
+  text.split(/\r?\n/).forEach((line, index) => {
+    if (index !== 0) {
+      message.push('\n');
+    }
+    // A line of backticks enters and exits a codeblock
+    if (line.startsWith('```')) {
+      // But we need to check if we've ended a codeblock
+      endOfCodeBlock = isInCodeBlock;
+      isInCodeBlock = (!isInCodeBlock);
+    } else {
+      endOfCodeBlock = false;
+    }
+
+    if (isInCodeBlock || endOfCodeBlock) {
+      message.push(line);
+    } else {
+      line.split(/\s/).forEach((str) => {
+        if (
+          (str.startsWith('`') && str !== '`')
+          || (str === '`' && !isInCodeBlock)
+        ) {
+          isInCodeBlock = true;
+        } else if (
+          (str.endsWith('`') && str !== '`')
+          || (str === '`' && isInCodeBlock)
+        ) {
+          isInCodeBlock = false;
+        }
+
+        if (isUrl(str) && !isInCodeBlock) {
+          if (message.length > 0) {
+            // If we're in the middle of a message, add it to the stack and reset
+            messages.push(message);
+            message = [];
+          }
+          messages.push([str]);
+          message = [];
+        } else {
+          message.push(str);
+        }
+      });
+    }
+  });
+
+  if (message.length) {
+    // Add any remaining message
+    messages.push(message);
+  }
+  return messages;
+};
+
+export { tokenizeMessage as default, isUrl, URL_REGEX };
\ No newline at end of file
diff --git a/pkg/interface/src/views/apps/chat/components/lib/chat-input.js b/pkg/interface/src/views/apps/chat/components/lib/chat-input.js
index 1cc8990422..9b69a7ac44 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/chat-input.js
+++ b/pkg/interface/src/views/apps/chat/components/lib/chat-input.js
@@ -4,9 +4,10 @@ import { S3Upload } from '~/views/components/s3-upload'
 ;
 import { uxToHex } from '~/logic/lib/util';
 import { Sigil } from '~/logic/lib/sigil';
+import tokenizeMessage, { isUrl } from '~/logic/lib/tokenizeMessage';
+
 
 
-const URL_REGEX = new RegExp(String(/^((\w+:\/\/)[-a-zA-Z0-9:@;?&=\/%\+\.\*!'\(\),\$_\{\}\^~\[\]`#|]+)/.source));
 
 export class ChatInput extends Component {
   constructor(props) {
@@ -52,7 +53,7 @@ export class ChatInput extends Component {
       return {
         me: letter
       };
-    } else if (this.isUrl(letter)) {
+    } else if (isUrl(letter)) {
       return {
         url: letter
       };
@@ -63,13 +64,7 @@ export class ChatInput extends Component {
     }
   }
 
-  isUrl(string) {
-    try {
-      return URL_REGEX.test(string);
-    } catch (e) {
-      return false;
-    }
-  }
+  
 
   submit(text) {
     const { props, state } = this;
@@ -91,58 +86,7 @@ export class ChatInput extends Component {
       return;
     }
 
-    let messages = [];
-    let message = [];
-    let isInCodeBlock = false;
-    let endOfCodeBlock = false;
-    text.split(/\r?\n/).forEach((line, index) => {
-      if (index !== 0) {
-        message.push('\n');
-      }
-      // A line of backticks enters and exits a codeblock
-      if (line.startsWith('```')) {
-        // But we need to check if we've ended a codeblock
-        endOfCodeBlock = isInCodeBlock;
-        isInCodeBlock = (!isInCodeBlock);
-      } else {
-        endOfCodeBlock = false;
-      }
-
-      if (isInCodeBlock || endOfCodeBlock) {
-        message.push(line);
-      } else {
-        line.split(/\s/).forEach((str) => {
-          if (
-            (str.startsWith('`') && str !== '`')
-            || (str === '`' && !isInCodeBlock)
-          ) {
-            isInCodeBlock = true;
-          } else if (
-            (str.endsWith('`') && str !== '`')
-            || (str === '`' && isInCodeBlock)
-          ) {
-            isInCodeBlock = false;
-          }
-
-          if (this.isUrl(str) && !isInCodeBlock) {
-            if (message.length > 0) {
-              // If we're in the middle of a message, add it to the stack and reset
-              messages.push(message);
-              message = [];
-            }
-            messages.push([str]);
-            message = [];
-          } else {
-            message.push(str);
-          }
-        });
-      }
-    });
-
-    if (message.length) {
-      // Add any remaining message
-      messages.push(message);
-    }
+    const messages = tokenizeMessage(text);
 
     props.deleteMessage();
 
@@ -157,25 +101,6 @@ export class ChatInput extends Component {
         );
       }
     });
-
-    // perf testing:
-    /*let closure = () => {
-      let x = 0;
-      for (var i = 0; i < 30; i++) {
-        x++;
-        props.api.chat.message(
-          props.station,
-          `~${window.ship}`,
-          Date.now(),
-          {
-            text: `${x}`
-          }
-        );
-      }
-      setTimeout(closure, 1000);
-    };
-    this.closure = closure.bind(this);
-    setTimeout(this.closure, 2000);*/
   }
 
   uploadSuccess(url) {
diff --git a/pkg/interface/src/views/apps/links/components/lib/comment-item.js b/pkg/interface/src/views/apps/links/components/lib/comment-item.js
index 227169c994..dfe9b34032 100644
--- a/pkg/interface/src/views/apps/links/components/lib/comment-item.js
+++ b/pkg/interface/src/views/apps/links/components/lib/comment-item.js
@@ -3,6 +3,7 @@ import { Sigil } from '~/logic/lib/sigil';
 import { cite } from '~/logic/lib/util';
 import moment from 'moment';
 import { Box, Text, Row } from '@tlon/indigo-react';
+import RichText from '~/views/components/RichText';
 
 export class CommentItem extends Component {
   constructor(props) {
@@ -60,7 +61,7 @@ export class CommentItem extends Component {
             </Text>
           </Row>
         </Row>
-        <Text display="block" py={3} fontSize={1}>{props.content}</Text>
+        <Text display="block" py={3} fontSize={1}><RichText remoteContentPolicy={props.remoteContentPolicy}>{props.content}</RichText></Text>
       </Box>
     );
   }
diff --git a/pkg/interface/src/views/apps/links/components/lib/comments.js b/pkg/interface/src/views/apps/links/components/lib/comments.js
index e8806f14ac..8982867fd3 100644
--- a/pkg/interface/src/views/apps/links/components/lib/comments.js
+++ b/pkg/interface/src/views/apps/links/components/lib/comments.js
@@ -40,7 +40,7 @@ export class Comments extends Component {
     ? props.comments.totalPages
     : 1;
 
-    const { hideNicknames, hideAvatars } = props;
+    const { hideNicknames, hideAvatars, remoteContentPolicy } = props;
 
     const commentsList = Object.keys(commentsPage)
     .map((entry) => {
@@ -68,6 +68,7 @@ export class Comments extends Component {
           member={member}
           hideNicknames={hideNicknames}
           hideAvatars={hideAvatars}
+          remoteContentPolicy={remoteContentPolicy}
         />
       );
     });
diff --git a/pkg/interface/src/views/apps/links/components/link.js b/pkg/interface/src/views/apps/links/components/link.js
index 4bbbdf1255..646891578b 100644
--- a/pkg/interface/src/views/apps/links/components/link.js
+++ b/pkg/interface/src/views/apps/links/components/link.js
@@ -221,6 +221,7 @@ export class LinkDetail extends Component {
               api={props.api}
               hideAvatars={props.hideAvatars}
               hideNicknames={props.hideNicknames}
+              remoteContentPolicy={props.remoteContentPolicy}
             />
           </div>
         </div>
diff --git a/pkg/interface/src/views/apps/publish/app.tsx b/pkg/interface/src/views/apps/publish/app.tsx
index 59aafff85e..3bcedd386c 100644
--- a/pkg/interface/src/views/apps/publish/app.tsx
+++ b/pkg/interface/src/views/apps/publish/app.tsx
@@ -63,6 +63,7 @@ export default function PublishApp(props: PublishAppProps) {
     associations,
     hideNicknames,
     hideAvatars,
+    remoteContentPolicy
   } = props;
 
   const active = location.pathname.endsWith("/~publish")
@@ -161,6 +162,7 @@ export default function PublishApp(props: PublishAppProps) {
                     api={api}
                     hideNicknames={hideNicknames}
                     hideAvatars={hideAvatars}
+                    remoteContentPolicy={remoteContentPolicy}
                     {...props}
                   />
                 );
diff --git a/pkg/interface/src/views/apps/publish/components/lib/CommentItem.tsx b/pkg/interface/src/views/apps/publish/components/lib/CommentItem.tsx
index a8e9f68083..ea0e4cf53f 100644
--- a/pkg/interface/src/views/apps/publish/components/lib/CommentItem.tsx
+++ b/pkg/interface/src/views/apps/publish/components/lib/CommentItem.tsx
@@ -1,14 +1,13 @@
 import React, { useState } from "react";
-import moment from "moment";
-import { Sigil } from "~/logic/lib/sigil";
 import CommentInput from "./CommentInput";
-import { uxToHex, cite } from "~/logic/lib/util";
 import { Comment, NoteId } from "~/types/publish-update";
 import { Contacts } from "~/types/contact-update";
 import GlobalApi from "~/logic/api/global";
-import { Button, Box, Row, Text } from "@tlon/indigo-react";
+import { Box, Row } from "@tlon/indigo-react";
 import styled from "styled-components";
 import { Author } from "./Author";
+import tokenizeMessage from '~/logic/lib/tokenizeMessage';
+import RichText from '~/views/components/RichText';
 
 const ClickBox = styled(Box)`
   cursor: pointer;
@@ -28,17 +27,11 @@ interface CommentItemProps {
 }
 
 export function CommentItem(props: CommentItemProps) {
-  const { ship, contacts, book, note, api } = props;
+  const { ship, contacts, book, note, api, remoteContentPolicy } = props;
   const [editing, setEditing] = useState<boolean>(false);
   const commentPath = Object.keys(props.comment)[0];
   const commentData = props.comment[commentPath];
-  const content = commentData.content.split("\n").map((line, i) => {
-    return (
-      <Text className="mb2" key={i}>
-        {line}
-      </Text>
-    );
-  });
+  const content = tokenizeMessage(commentData.content).flat().join(' ');
 
   const disabled = props.pending || window.ship !== commentData.author.slice(1);
 
@@ -86,14 +79,13 @@ export function CommentItem(props: CommentItemProps) {
         </Author>
       </Row>
       <Box mb={2}>
-        {!editing && content}
-        {editing && (
-          <CommentInput
+        {editing
+          ? <CommentInput
             onSubmit={onUpdate}
             initial={commentData.content}
             label="Update"
           />
-        )}
+        : <RichText className="f9 white-d" remoteContentPolicy={remoteContentPolicy}>{content}</RichText>}
       </Box>
     </Box>
   );
diff --git a/pkg/interface/src/views/apps/publish/components/lib/Comments.tsx b/pkg/interface/src/views/apps/publish/components/lib/Comments.tsx
index e3f17749a9..19bcfaa679 100644
--- a/pkg/interface/src/views/apps/publish/components/lib/Comments.tsx
+++ b/pkg/interface/src/views/apps/publish/components/lib/Comments.tsx
@@ -8,6 +8,7 @@ import { Contacts } from "~/types/contact-update";
 import _ from "lodash";
 import GlobalApi from "~/logic/api/global";
 import { FormikHelpers } from "formik";
+import { LocalUpdateRemoteContentPolicy } from "~/types";
 
 interface CommentsProps {
   comments: Comment[];
@@ -21,6 +22,7 @@ interface CommentsProps {
   enabled: boolean;
   hideAvatars: boolean;
   hideNicknames: boolean;
+  remoteContentPolicy: LocalUpdateRemoteContentPolicy;
 }
 
 export function Comments(props: CommentsProps) {
@@ -78,6 +80,7 @@ export function Comments(props: CommentsProps) {
             pending={true}
             hideNicknames={props.hideNicknames}
             hideAvatars={props.hideAvatars}
+            remoteContentPolicy={props.remoteContentPolicy}
           />
         );
       })}
@@ -92,6 +95,7 @@ export function Comments(props: CommentsProps) {
           note={note["note-id"]}
           hideNicknames={props.hideNicknames}
           hideAvatars={props.hideAvatars}
+          remoteContentPolicy={props.remoteContentPolicy}
         />
       ))}
     </Col>
diff --git a/pkg/interface/src/views/apps/publish/components/lib/Note.tsx b/pkg/interface/src/views/apps/publish/components/lib/Note.tsx
index d3cf8d9285..d460a08111 100644
--- a/pkg/interface/src/views/apps/publish/components/lib/Note.tsx
+++ b/pkg/interface/src/views/apps/publish/components/lib/Note.tsx
@@ -13,6 +13,7 @@ import {
 import { Contacts } from "~/types/contact-update";
 import GlobalApi from "~/logic/api/global";
 import { Author } from "./Author";
+import { LocalUpdateRemoteContentPolicy } from "~/types";
 
 interface NoteProps {
   ship: string;
@@ -24,6 +25,7 @@ interface NoteProps {
   api: GlobalApi;
   hideAvatars: boolean;
   hideNicknames: boolean;
+  remoteContentPolicy: LocalUpdateRemoteContentPolicy;
 }
 
 export function Note(props: NoteProps & RouteComponentProps) {
@@ -115,6 +117,7 @@ export function Note(props: NoteProps & RouteComponentProps) {
           api={props.api}
           hideNicknames={props.hideNicknames}
           hideAvatars={props.hideAvatars}
+          remoteContentPolicy={props.remoteContentPolicy}
         />
       )}
       <Spinner
diff --git a/pkg/interface/src/views/apps/publish/components/lib/NotebookRoutes.tsx b/pkg/interface/src/views/apps/publish/components/lib/NotebookRoutes.tsx
index ff0dc905b7..385c316375 100644
--- a/pkg/interface/src/views/apps/publish/components/lib/NotebookRoutes.tsx
+++ b/pkg/interface/src/views/apps/publish/components/lib/NotebookRoutes.tsx
@@ -9,6 +9,7 @@ import { Contacts, Rolodex } from "../../../../types/contact-update";
 import Notebook from "./Notebook";
 import NewPost from "./new-post";
 import { NoteRoutes } from './NoteRoutes';
+import { LocalUpdateRemoteContentPolicy } from "~/types";
 
 interface NotebookRoutesProps {
   api: GlobalApi;
@@ -21,6 +22,7 @@ interface NotebookRoutesProps {
   groups: Groups;
   hideAvatars: boolean;
   hideNicknames: boolean;
+  remoteContentPolicy: LocalUpdateRemoteContentPolicy;
 }
 
 export function NotebookRoutes(
@@ -74,6 +76,7 @@ export function NotebookRoutes(
               contacts={notebookContacts}
               hideAvatars={props.hideAvatars}
               hideNicknames={props.hideNicknames}
+              remoteContentPolicy={props.remoteContentPolicy}
               {...routeProps}
             />
           );
diff --git a/pkg/interface/src/views/components/RemoteContent.tsx b/pkg/interface/src/views/components/RemoteContent.tsx
index 351abdce5e..d57b20b616 100644
--- a/pkg/interface/src/views/components/RemoteContent.tsx
+++ b/pkg/interface/src/views/components/RemoteContent.tsx
@@ -56,7 +56,7 @@ export default class RemoteContent extends Component<RemoteContentProps, RemoteC
   wrapInLink(contents) {
     return (<a
       href={this.props.url}
-      className={`f7 lh-copy v-top word-break-all ${(typeof contents === 'string') ? 'bb b--white-d b--black' : ''}`}
+      className={`word-break-all ${(typeof contents === 'string') ? 'bb b--white-d b--black' : ''}`}
       target="_blank"
       rel="noopener noreferrer"
     >
diff --git a/pkg/interface/src/views/components/RichText.js b/pkg/interface/src/views/components/RichText.js
new file mode 100644
index 0000000000..4de80adecb
--- /dev/null
+++ b/pkg/interface/src/views/components/RichText.js
@@ -0,0 +1,40 @@
+import React from "react";
+import RemoteContent from "~/views/components/RemoteContent";
+import { hasProvider } from 'oembed-parser';
+import ReactMarkdown from 'react-markdown';
+import RemarkDisableTokenizers from 'remark-disable-tokenizers';
+
+const DISABLED_BLOCK_TOKENS = [
+  'indentedCode',
+  'atxHeading',
+  'thematicBreak',
+  'list',
+  'setextHeading',
+  'html',
+  'definition',
+  'table'
+];
+
+const DISABLED_INLINE_TOKENS = [];
+
+const RichText = React.memo(({remoteContentPolicy, ...props}) => (
+  <ReactMarkdown
+    {...props}
+    renderers={{
+      link: (props) => {
+        if (hasProvider(props.href)) {
+          return <RemoteContent className="mw-100" url={props.href} remoteContentPolicy={remoteContentPolicy}/>;
+        }
+        return <a {...props} className="bb b--white-d b--black">{props.children}</a>
+      },
+      paragraph: (props) => {
+        return <p {...props} className="mb2 lh-copy">{props.children}</p>
+      }
+    }}
+    plugins={[[
+      RemarkDisableTokenizers,
+      { block: DISABLED_BLOCK_TOKENS, inline: DISABLED_INLINE_TOKENS }
+    ]]} />
+));
+
+export default RichText;
\ No newline at end of file

From 4b130868ed1762d9dfc667f8c9cc46f406f89069 Mon Sep 17 00:00:00 2001
From: Tyler Brown Cifu Shuster <tyler@fivepaths.com>
Date: Mon, 7 Sep 2020 15:09:39 -0700
Subject: [PATCH 38/89] groups: add group deletion confirmation

---
 .../views/apps/groups/components/lib/group-detail.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkg/interface/src/views/apps/groups/components/lib/group-detail.js b/pkg/interface/src/views/apps/groups/components/lib/group-detail.js
index 3dbe30dac0..4d7b6ff942 100644
--- a/pkg/interface/src/views/apps/groups/components/lib/group-detail.js
+++ b/pkg/interface/src/views/apps/groups/components/lib/group-detail.js
@@ -324,11 +324,13 @@ export class GroupDetail extends Component {
           <a className={'dib f9 ba pa2 ' + deleteButtonClasses}
           onClick={() => {
             if (groupOwner) {
-              this.setState({ awaiting: true, type: 'Deleting' }, (() => {
-                props.api.contacts.delete(props.path).then(() => {
-                  props.history.push('/~groups');
-                });
-              }));
+              if (prompt(`To confirm deleting this group, type ${props.path.substr(6)}`) === props.path.substr(6)) {
+                this.setState({ awaiting: true, type: 'Deleting' }, (() => {
+                  props.api.contacts.delete(props.path).then(() => {
+                    props.history.push('/~groups');
+                  });
+                }));
+              }
             }
           }}
           >Delete this group</a>

From 0f355e58d9b926251c79d19403101c22f3e214b6 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Tue, 8 Sep 2020 11:10:55 +1000
Subject: [PATCH 39/89] interface: allow useWaitForProps to not timeout

---
 pkg/interface/src/logic/lib/useWaitForProps.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkg/interface/src/logic/lib/useWaitForProps.ts b/pkg/interface/src/logic/lib/useWaitForProps.ts
index 5a2d752e6a..80e92e92a8 100644
--- a/pkg/interface/src/logic/lib/useWaitForProps.ts
+++ b/pkg/interface/src/logic/lib/useWaitForProps.ts
@@ -1,7 +1,7 @@
 import { useState, useEffect, useCallback } from 'react';
 
 
-export function useWaitForProps<P>(props: P, timeout: number) {
+export function useWaitForProps<P>(props: P, timeout: number = 0) {
   const [resolve, setResolve] = useState<() => void>(() => () => {});
   const [ready, setReady] = useState<(p: P) => boolean | undefined>();
 
@@ -24,9 +24,11 @@ export function useWaitForProps<P>(props: P, timeout: number) {
       setReady(() => r);
       return new Promise<void>((resolve, reject) => {
         setResolve(() => resolve);
-        setTimeout(() => {
-          reject(new Error("Timed out"));
-        }, timeout);
+        if(timeout > 0) {
+          setTimeout(() => {
+            reject(new Error("Timed out"));
+          }, timeout);
+        }
       });
     },
     [setResolve, setReady, timeout]

From 07c0cb1006e8ab0f882b8b4ed624a235ca8563b8 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Tue, 8 Sep 2020 11:11:57 +1000
Subject: [PATCH 40/89] publish: do not timeout join flow

---
 pkg/interface/src/views/apps/publish/components/lib/Join.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/interface/src/views/apps/publish/components/lib/Join.tsx b/pkg/interface/src/views/apps/publish/components/lib/Join.tsx
index 3c57d3f08a..ff7a91c14b 100644
--- a/pkg/interface/src/views/apps/publish/components/lib/Join.tsx
+++ b/pkg/interface/src/views/apps/publish/components/lib/Join.tsx
@@ -17,7 +17,7 @@ export function JoinScreen(props: JoinScreenProps & RouteComponentProps) {
   const [error, setError] = useState(false);
   const joining = useRef(false);
 
-  const waiter = useWaitForProps(props, 10000);
+  const waiter = useWaitForProps(props);
 
   const onJoin = useCallback(async () => {
     joining.current = true;

From 168478eb745dbfbd7cb27c772b6fe94cb0fd2be3 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Tue, 8 Sep 2020 12:11:45 +1000
Subject: [PATCH 41/89] publish: support groupify poke

---
 pkg/interface/src/logic/api/publish.ts           | 11 +++++++++++
 pkg/interface/src/logic/reducers/group-update.ts | 10 ++++++++++
 2 files changed, 21 insertions(+)

diff --git a/pkg/interface/src/logic/api/publish.ts b/pkg/interface/src/logic/api/publish.ts
index 02648f651b..ad99dc077e 100644
--- a/pkg/interface/src/logic/api/publish.ts
+++ b/pkg/interface/src/logic/api/publish.ts
@@ -82,6 +82,17 @@ export default class PublishApi extends BaseApi {
     return this.action('publish', 'publish-action', act);
   }
 
+  groupify(bookId: string) {
+    return this.publishAction({
+      groupify: {
+        book: bookId,
+        target: null,
+        inclusive: false
+      }
+    });
+  }
+
+
   newBook(bookId: string, title: string, description: string, group?: Path) {
     const groupInfo = group ? { 'group-path': group,
       invitees: [],
diff --git a/pkg/interface/src/logic/reducers/group-update.ts b/pkg/interface/src/logic/reducers/group-update.ts
index 09adb35b26..5862aaca1d 100644
--- a/pkg/interface/src/logic/reducers/group-update.ts
+++ b/pkg/interface/src/logic/reducers/group-update.ts
@@ -78,6 +78,7 @@ export default class GroupReducer<S extends GroupState> {
       this.addGroup(data, state);
       this.removeGroup(data, state);
       this.changePolicy(data, state);
+      this.expose(data, state);
     }
   }
 
@@ -187,6 +188,15 @@ export default class GroupReducer<S extends GroupState> {
     }
   }
 
+  expose(json: GroupUpdate, state: S) {
+    if( 'expose' in json && state) {
+      const { resource } = json.expose;
+      const resourcePath = resourceAsPath(resource);
+      state.groups[resourcePath].hidden = false;
+    }
+  }
+
+
   private inviteChangePolicy(diff: InvitePolicyDiff, policy: InvitePolicy) {
     if ('addInvites' in diff) {
       const { addInvites } = diff;

From 73881aa25f51275d49ec9ea1ccad9dab8d7d1b9d Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Tue, 8 Sep 2020 12:12:08 +1000
Subject: [PATCH 42/89] publish: add groupify to settings

---
 .../publish/components/lib/MetadataForm.tsx   | 120 ++++++++++++++++
 .../apps/publish/components/lib/Notebook.tsx  |   1 +
 .../apps/publish/components/lib/Settings.tsx  | 129 ++++--------------
 3 files changed, 148 insertions(+), 102 deletions(-)
 create mode 100644 pkg/interface/src/views/apps/publish/components/lib/MetadataForm.tsx

diff --git a/pkg/interface/src/views/apps/publish/components/lib/MetadataForm.tsx b/pkg/interface/src/views/apps/publish/components/lib/MetadataForm.tsx
new file mode 100644
index 0000000000..35932b701b
--- /dev/null
+++ b/pkg/interface/src/views/apps/publish/components/lib/MetadataForm.tsx
@@ -0,0 +1,120 @@
+import React, { useEffect } from "react";
+import { AsyncButton } from "../../../../components/AsyncButton";
+import * as Yup from "yup";
+import {
+  Box,
+  Input,
+  Checkbox,
+  Col,
+  InputLabel,
+  InputCaption,
+  Button,
+  Center,
+} from "@tlon/indigo-react";
+import { Formik, Form, useFormikContext, FormikHelpers } from "formik";
+import GlobalApi from "~/logic/api/global";
+import { Notebook } from "~/types/publish-update";
+import { Contacts } from "~/types/contact-update";
+import { FormError } from "~/views/components/FormError";
+import { RouteComponentProps, useHistory } from "react-router-dom";
+
+interface MetadataFormProps {
+  host: string;
+  book: string;
+  notebook: Notebook;
+  contacts: Contacts;
+  api: GlobalApi;
+}
+
+interface FormSchema {
+  name: string;
+  description: string;
+  comments: boolean;
+}
+
+const formSchema = Yup.object({
+  name: Yup.string().required("Notebook must have a name"),
+  description: Yup.string(),
+  comments: Yup.boolean(),
+});
+
+const ResetOnPropsChange = (props: { init: FormSchema; book: string }) => {
+  const { resetForm } = useFormikContext<FormSchema>();
+  useEffect(() => {
+    resetForm({ values: props.init });
+  }, [props.book]);
+
+  return null;
+};
+
+
+export function MetadataForm(props: MetadataFormProps) {
+  const { host, notebook, api, book } = props;
+  const history = useHistory();
+  const initialValues: FormSchema = {
+    name: notebook?.title,
+    description: notebook?.about,
+    comments: notebook?.comments,
+  };
+
+  const onSubmit = async (
+    values: FormSchema,
+    actions: FormikHelpers<FormSchema>
+  ) => {
+    try {
+      const { name, description, comments } = values;
+      await api.publish.editBook(book, name, description, comments);
+      api.publish.fetchNotebook(host, book);
+      actions.setStatus({ success: null });
+    } catch (e) {
+      console.log(e);
+      actions.setStatus({ error: e.message });
+    }
+  };
+
+  const onDelete = async () => {
+    await api.publish.delBook(book);
+    history.push("/~publish");
+  };
+
+  return (
+    <Formik
+      validationSchema={formSchema}
+      initialValues={initialValues}
+      onSubmit={onSubmit}
+    >
+      <Form style={{ display: "contents" }}>
+          <Col mb={4}>
+            <InputLabel>Delete Notebook</InputLabel>
+            <InputCaption>
+              Permanently delete this notebook. (All current members will no
+              longer see this notebook.)
+            </InputCaption>
+            <Button onClick={onDelete} mt={1} border error>
+              Delete this notebook
+            </Button>
+          </Col>
+          <Input
+            id="name"
+            label="Rename"
+            caption="Change the name of this notebook"
+          />
+          <Input
+            id="description"
+            label="Change description"
+            caption="Change the description of this notebook"
+          />
+          <Checkbox
+            id="comments"
+            label="Comments"
+            caption="Subscribers may comment when enabled"
+          />
+          <ResetOnPropsChange init={initialValues} book={book} />
+          <AsyncButton primary loadingText="Updating.." border>
+            Save
+          </AsyncButton>
+          <FormError message="Failed to update settings" />
+      </Form>
+    </Formik>
+  );
+}
diff --git a/pkg/interface/src/views/apps/publish/components/lib/Notebook.tsx b/pkg/interface/src/views/apps/publish/components/lib/Notebook.tsx
index 86c94dabc9..22febfcb7d 100644
--- a/pkg/interface/src/views/apps/publish/components/lib/Notebook.tsx
+++ b/pkg/interface/src/views/apps/publish/components/lib/Notebook.tsx
@@ -130,6 +130,7 @@ export function Notebook(props: NotebookProps & RouteComponentProps) {
                 api={api}
                 notebook={notebook}
                 contacts={notebookContacts}
+                groups={groups}
               />
             </TabPanel>
           </TabPanels>
diff --git a/pkg/interface/src/views/apps/publish/components/lib/Settings.tsx b/pkg/interface/src/views/apps/publish/components/lib/Settings.tsx
index aba15abf14..29c9004b13 100644
--- a/pkg/interface/src/views/apps/publish/components/lib/Settings.tsx
+++ b/pkg/interface/src/views/apps/publish/components/lib/Settings.tsx
@@ -1,128 +1,53 @@
 import React, { useEffect } from "react";
-import { AsyncButton } from "../../../../components/AsyncButton";
-import * as Yup from "yup";
-import {
-  Box,
-  Input,
-  Checkbox,
-  Col,
-  InputLabel,
-  InputCaption,
-  Button,
-  Center,
-} from "@tlon/indigo-react";
-import { Formik, Form, useFormikContext, FormikHelpers } from "formik";
+import { Box, Col, Button, InputLabel, InputCaption } from "@tlon/indigo-react";
 import GlobalApi from "~/logic/api/global";
 import { Notebook } from "~/types/publish-update";
 import { Contacts } from "~/types/contact-update";
-import { FormError } from "~/views/components/FormError";
-import { RouteComponentProps, useHistory } from "react-router-dom";
+
+import { MetadataForm } from "./MetadataForm";
+import { Groups } from "~/types";
 
 interface SettingsProps {
   host: string;
   book: string;
   notebook: Notebook;
   contacts: Contacts;
+  groups: Groups;
   api: GlobalApi;
 }
 
-interface FormSchema {
-  name: string;
-  description: string;
-  comments: boolean;
-}
-
-const formSchema = Yup.object({
-  name: Yup.string().required("Notebook must have a name"),
-  description: Yup.string(),
-  comments: Yup.boolean(),
-});
-
-const ResetOnPropsChange = (props: { init: FormSchema; book: string }) => {
-  const { resetForm } = useFormikContext<FormSchema>();
-  useEffect(() => {
-    resetForm({ values: props.init });
-  }, [props.book]);
-
-  return null;
-};
-
 export function Settings(props: SettingsProps) {
-  const { host, notebook, api, book } = props;
-  const history = useHistory();
-  const initialValues: FormSchema = {
-    name: notebook?.title,
-    description: notebook?.about,
-    comments: notebook?.comments,
+  const onGroupify = () => {
+    return props.api.publish.groupify(props.book);
   };
 
-  const onSubmit = async (
-    values: FormSchema,
-    actions: FormikHelpers<FormSchema>
-  ) => {
-    try {
-      const { name, description, comments } = values;
-      await api.publish.editBook(book, name, description, comments);
-      api.publish.fetchNotebook(host, book);
-      actions.setStatus({ success: null });
-    } catch (e) {
-      console.log(e);
-      actions.setStatus({ error: e.message });
-    }
-  };
+  const groupPath = props.notebook?.["writers-group-path"];
 
-  const onDelete = async () => {
-    await api.publish.delBook(book);
-    history.push("/~publish");
-  };
+  const isUnmanaged = props.groups?.[groupPath]?.hidden || false;
 
   return (
-    <Formik
-      validationSchema={formSchema}
-      initialValues={initialValues}
-      onSubmit={onSubmit}
+    <Box
+      mx="auto"
+      maxWidth="300px"
+      mb={4}
+      gridTemplateColumns="1fr"
+      gridAutoRows="auto"
+      display="grid"
     >
-      <Form>
-        <Box
-          maxWidth="300px"
-          mb={4}
-          gridTemplateColumns="1fr"
-          gridAutoRows="auto"
-          display="grid"
-        >
+      {isUnmanaged && (
+        <>
           <Col mb={4}>
-            <InputLabel>Delete Notebook</InputLabel>
-            <InputCaption>
-              Permanently delete this notebook. (All current members will no
-              longer see this notebook.)
-            </InputCaption>
-            <Button onClick={onDelete} mt={1} border error>
-              Delete this notebook
+            <InputLabel>Groupify</InputLabel>
+            <InputCaption>Turn this notebook into a group</InputCaption>
+            <Button onClick={onGroupify} border>
+              Groupify
             </Button>
           </Col>
-          <Input
-            id="name"
-            label="Rename"
-            caption="Change the name of this notebook"
-          />
-          <Input
-            id="description"
-            label="Change description"
-            caption="Change the description of this notebook"
-          />
-          <Checkbox
-            id="comments"
-            label="Comments"
-            caption="Subscribers may comment when enabled"
-          />
-          <ResetOnPropsChange init={initialValues} book={book} />
-          <AsyncButton loadingText="Updating.." border>
-            Save
-          </AsyncButton>
-          <FormError message="Failed to update settings" />
-        </Box>
-      </Form>
-    </Formik>
+          <Box mb={4} borderBottom={1} borderBottomColor="washedGray" />
+        </>
+      )}
+      <MetadataForm {...props} />
+    </Box>
   );
 }
 

From 1d86072aa058f9d102110e74f07139eb7468d41f Mon Sep 17 00:00:00 2001
From: Tyler Brown Cifu Shuster <tyler@fivepaths.com>
Date: Thu, 20 Aug 2020 15:59:27 -0700
Subject: [PATCH 43/89] interface: changed virtual scroll implementation and
 added to chat

---
 pkg/interface/package-lock.json               |  22 +-
 pkg/interface/package.json                    |   2 +-
 pkg/interface/src/logic/api/chat.ts           |   2 +-
 .../src/logic/reducers/chat-update.ts         |  10 +-
 pkg/interface/src/types/chat-update.ts        |   4 +
 pkg/interface/src/views/apps/chat/app.tsx     |  89 +++--
 .../src/views/apps/chat/components/chat.tsx   |  32 +-
 .../apps/chat/components/lib/chat-message.tsx |  15 +-
 .../components/lib/chat-scroll-container.js   | 143 -------
 .../apps/chat/components/lib/chat-window.tsx  | 359 +++++++++++-------
 .../views/apps/chat/components/lib/message.js | 141 +++----
 .../apps/chat/components/lib/unread-notice.js |   4 +-
 .../groups/components/lib/contact-sidebar.tsx |  20 +-
 pkg/interface/src/views/components/Group.tsx  |  15 +-
 .../src/views/components/RemoteContent.tsx    |   5 +-
 15 files changed, 407 insertions(+), 456 deletions(-)
 delete mode 100644 pkg/interface/src/views/apps/chat/components/lib/chat-scroll-container.js

diff --git a/pkg/interface/package-lock.json b/pkg/interface/package-lock.json
index b3516b8918..f379ea40f2 100644
--- a/pkg/interface/package-lock.json
+++ b/pkg/interface/package-lock.json
@@ -6383,11 +6383,6 @@
         "p-is-promise": "^2.0.0"
       }
     },
-    "memoize-one": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.1.1.tgz",
-      "integrity": "sha512-HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA=="
-    },
     "memory-fs": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
@@ -7994,13 +7989,13 @@
       "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.0.tgz",
       "integrity": "sha512-IgmcegOSi5SNX+2Snh1vqmF0Vg/CbkycU9XZbOHJlZ6kMzTmi3yc254oB1WCkgA7OQtIAoLmcSFuHTc/tlcqXg=="
     },
-    "react-window": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.5.tgz",
-      "integrity": "sha512-HeTwlNa37AFa8MDZFZOKcNEkuF2YflA0hpGPiTT9vR7OawEt+GZbfM6wqkBahD3D3pUjIabQYzsnY/BSJbgq6Q==",
+    "react-virtuoso": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/react-virtuoso/-/react-virtuoso-0.20.0.tgz",
+      "integrity": "sha512-h+U6t/+m91AzfUe6bBfaacdLLJl1y8v7CfcXwPgQ/Dic+vNlgQmi6cIKTq18zuF+kI8Q7QN0ojIeqPHWbU8TZA==",
       "requires": {
-        "@babel/runtime": "^7.0.0",
-        "memoize-one": ">=3.1.1 <6"
+        "resize-observer-polyfill": "^1.5.1",
+        "tslib": "^1.11.1"
       }
     },
     "readable-stream": {
@@ -8281,6 +8276,11 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
       "dev": true
     },
+    "resize-observer-polyfill": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
+    },
     "resolve": {
       "version": "1.17.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
diff --git a/pkg/interface/package.json b/pkg/interface/package.json
index 94a4caff76..45e644e8b4 100644
--- a/pkg/interface/package.json
+++ b/pkg/interface/package.json
@@ -32,7 +32,7 @@
     "react-markdown": "^4.3.1",
     "react-oembed-container": "^1.0.0",
     "react-router-dom": "^5.0.0",
-    "react-window": "^1.8.5",
+    "react-virtuoso": "^0.20.0",
     "remark-disable-tokenizers": "^1.0.24",
     "style-loader": "^1.2.1",
     "styled-components": "^5.1.0",
diff --git a/pkg/interface/src/logic/api/chat.ts b/pkg/interface/src/logic/api/chat.ts
index bd16529cfc..ad6e5029d0 100644
--- a/pkg/interface/src/logic/api/chat.ts
+++ b/pkg/interface/src/logic/api/chat.ts
@@ -12,7 +12,7 @@ export default class ChatApi extends BaseApi<StoreState> {
    * Fetch backlog
    */
   fetchMessages(start: number, end: number, path: Path) {
-    fetch(`/chat-view/paginate/${start}/${end}${path}`)
+    return fetch(`/chat-view/paginate/${start}/${end}${path}`)
       .then(response => response.json())
       .then((json) => {
         this.store.handleEvent({
diff --git a/pkg/interface/src/logic/reducers/chat-update.ts b/pkg/interface/src/logic/reducers/chat-update.ts
index 2921750381..531d97453a 100644
--- a/pkg/interface/src/logic/reducers/chat-update.ts
+++ b/pkg/interface/src/logic/reducers/chat-update.ts
@@ -1,8 +1,9 @@
 import _ from 'lodash';
-import { StoreState } from '../../../store/type';
+import { StoreState } from '~/logic/store/type';
 import { Cage } from '~/types/cage';
 import { ChatUpdate } from '~/types/chat-update';
 import { ChatHookUpdate } from '~/types/chat-hook-update';
+import { Envelope } from "~/types/chat-update";
 
 type ChatState = Pick<StoreState, 'chatInitialized' | 'chatSynced' | 'inbox' | 'pendingMessages'>;
 
@@ -49,8 +50,11 @@ export default class ChatReducer<S extends ChatState> {
   messages(json: ChatUpdate, state: S) {
     const data = _.get(json, 'messages', false);
     if (data) {
-      state.inbox[data.path].envelopes =
-        state.inbox[data.path].envelopes.concat(data.envelopes);
+      state.inbox[data.path].envelopes = _.unionBy(
+        state.inbox[data.path].envelopes,
+        data.envelopes,
+        (envelope: Envelope) => envelope.uid
+      );
     }
   }
 
diff --git a/pkg/interface/src/types/chat-update.ts b/pkg/interface/src/types/chat-update.ts
index 63b23eee11..6d03048f4e 100644
--- a/pkg/interface/src/types/chat-update.ts
+++ b/pkg/interface/src/types/chat-update.ts
@@ -73,6 +73,10 @@ export interface Envelope {
   letter: Letter;
 }
 
+export type IMessage = Envelope & {
+  pending?: boolean
+};
+
 interface LetterText {
   text: string;
 }
diff --git a/pkg/interface/src/views/apps/chat/app.tsx b/pkg/interface/src/views/apps/chat/app.tsx
index 9ce2a580c7..f7a91ca306 100644
--- a/pkg/interface/src/views/apps/chat/app.tsx
+++ b/pkg/interface/src/views/apps/chat/app.tsx
@@ -7,7 +7,6 @@ import './css/custom.css';
 import { Skeleton } from './components/skeleton';
 import { Sidebar } from './components/sidebar';
 import { ChatScreen } from './components/chat';
-import { MemberScreen } from './components/member';
 import { SettingsScreen } from './components/settings';
 import { NewScreen } from './components/new';
 import { JoinScreen } from './components/join';
@@ -227,57 +226,57 @@ export default class ChatApp extends React.Component<ChatAppProps, {}> {
               envelopes: []
             };
 
-              let roomContacts = {};
-              const associatedGroup =
-                station in associations['chat'] &&
-                'group-path' in associations.chat[station]
-                  ? associations.chat[station]['group-path']
-                  : '';
+            let roomContacts = {};
+            const associatedGroup =
+              station in associations['chat'] &&
+              'group-path' in associations.chat[station]
+                ? associations.chat[station]['group-path']
+                : '';
 
-              if (associations.chat[station] && associatedGroup in contacts) {
-                roomContacts = contacts[associatedGroup];
-              }
+            if (associations.chat[station] && associatedGroup in contacts) {
+              roomContacts = contacts[associatedGroup];
+            }
 
-              const association =
-                station in associations['chat'] ? associations.chat[station] : {};
+            const association =
+              station in associations['chat'] ? associations.chat[station] : {};
 
-              const group = groups[association['group-path']] || groupBunts.group();
+            const group = groups[association['group-path']] || groupBunts.group();
 
-              const popout = props.match.url.includes('/popout/');
+            const popout = props.match.url.includes('/popout/');
 
-              return (
-                <Skeleton
-                  associations={associations}
-                  invites={invites}
-                  sidebarHideOnMobile={true}
+            return (
+              <Skeleton
+                associations={associations}
+                invites={invites}
+                sidebarHideOnMobile={true}
+                popout={popout}
+                sidebarShown={sidebarShown}
+                sidebar={renderChannelSidebar(props, station)}
+              >
+                <ChatScreen
+                  chatSynced={chatSynced || {}}
+                  station={station}
+                  association={association}
+                  api={api}
+                  read={mailbox.config.read}
+                  mailboxSize={mailbox.config.length}
+                  envelopes={mailbox.envelopes}
+                  inbox={inbox}
+                  contacts={roomContacts}
+                  group={group}
+                  pendingMessages={pendingMessages}
+                  s3={s3}
                   popout={popout}
                   sidebarShown={sidebarShown}
-                  sidebar={renderChannelSidebar(props, station)}
-                >
-                  <ChatScreen
-                    chatSynced={chatSynced || {}}
-                    station={station}
-                    association={association}
-                    api={api}
-                    read={mailbox.config.read}
-                    length={mailbox.config.length}
-                    envelopes={mailbox.envelopes}
-                    inbox={inbox}
-                    contacts={roomContacts}
-                    group={group}
-                    pendingMessages={pendingMessages}
-                    s3={s3}
-                    popout={popout}
-                    sidebarShown={sidebarShown}
-                    chatInitialized={chatInitialized}
-                    hideAvatars={hideAvatars}
-                    hideNicknames={hideNicknames}
-                    remoteContentPolicy={remoteContentPolicy}
-                    {...props}
-                  />
-                </Skeleton>
-              );
-            }}
+                  chatInitialized={chatInitialized}
+                  hideAvatars={hideAvatars}
+                  hideNicknames={hideNicknames}
+                  remoteContentPolicy={remoteContentPolicy}
+                  {...props}
+                />
+              </Skeleton>
+            );
+          }}
           />
           <Route
             exact
diff --git a/pkg/interface/src/views/apps/chat/components/chat.tsx b/pkg/interface/src/views/apps/chat/components/chat.tsx
index 03b7579879..fa66fcc788 100644
--- a/pkg/interface/src/views/apps/chat/components/chat.tsx
+++ b/pkg/interface/src/views/apps/chat/components/chat.tsx
@@ -8,7 +8,6 @@ import { ChatHeader } from './lib/chat-header';
 import { ChatInput } from "./lib/chat-input";
 import { deSig } from "~/logic/lib/util";
 import { ChatHookUpdate } from "~/types/chat-hook-update";
-import ChatApi from "~/logic/api/chat";
 import { Inbox, Envelope } from "~/types/chat-update";
 import { Contacts } from "~/types/contact-update";
 import { Path, Patp } from "~/types/noun";
@@ -27,7 +26,7 @@ type ChatScreenProps = RouteComponentProps<{
   association: Association;
   api: GlobalApi;
   read: number;
-  length: number;
+  mailboxSize: number;
   inbox: Inbox;
   contacts: Contacts;
   group: Group;
@@ -99,42 +98,23 @@ export class ChatScreen extends Component<ChatScreenProps, ChatScreenState> {
       !(props.station in props.chatSynced) &&
       props.envelopes.length > 0;
 
-    const unreadCount = props.length - props.read;
+    const unreadCount = props.mailboxSize - props.read;
     const unreadMsg = unreadCount > 0 && props.envelopes[unreadCount - 1];
-
+    
     return (
       <div
         key={props.station}
         className="h-100 w-100 overflow-hidden flex flex-column relative">
-        <ChatHeader
-          match={props.match}
-          location={props.location}
-          api={props.api}
-          group={props.group}
-          association={props.association}
-          station={props.station}
-          sidebarShown={props.sidebarShown}
-          popout={props.popout} />
+        <ChatHeader {...props} />
         <ChatWindow
-          history={props.history}
           isChatMissing={isChatMissing}
           isChatLoading={isChatLoading}
           isChatUnsynced={isChatUnsynced}
           unreadCount={unreadCount}
           unreadMsg={unreadMsg}
-          pendingMessages={pendingMessages}
-          messages={props.envelopes}
-          length={props.length}
-          contacts={props.contacts}
-          association={props.association}
-          group={props.group}
+          stationPendingMessages={pendingMessages}
           ship={props.match.params.ship}
-          station={props.station}
-          api={props.api}
-          hideNicknames={props.hideNicknames}
-          hideAvatars={props.hideAvatars}
-          remoteContentPolicy={props.remoteContentPolicy}
-        />
+          {...props} />
         <ChatInput
           api={props.api}
           numMsgs={lastMsgNum}
diff --git a/pkg/interface/src/views/apps/chat/components/lib/chat-message.tsx b/pkg/interface/src/views/apps/chat/components/lib/chat-message.tsx
index 3def367c6a..12174803a1 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/chat-message.tsx
+++ b/pkg/interface/src/views/apps/chat/components/lib/chat-message.tsx
@@ -2,23 +2,23 @@ import React, { PureComponent, Fragment } from "react";
 import moment from "moment";
 
 import { Message } from "./message";
-
-type IMessage = Envelope & { pending?: boolean };
-
+import { Envelope } from "~/types/chat-update";
+import _ from "lodash";
 
 export const ChatMessage = (props) => {
   const {
     msg,
     previousMsg,
     nextMsg,
-    isLastUnread,
+    isFirstUnread,
     group,
     association,
     contacts,
     unreadRef,
     hideAvatars,
     hideNicknames,
-    remoteContentPolicy
+    remoteContentPolicy,
+    className = ''
   } = props;
 
   // Render sigil if previous message is not by the same sender
@@ -48,10 +48,11 @@ export const ChatMessage = (props) => {
       hideNicknames={hideNicknames}
       hideAvatars={hideAvatars}
       remoteContentPolicy={remoteContentPolicy}
+      className={className}
     />
   );
 
-  if (props.isLastUnread) {
+  if (isFirstUnread) {
     return (
       <Fragment key={msg.uid}>
         {messageElem}
@@ -75,12 +76,12 @@ export const ChatMessage = (props) => {
   } else if (dayBreak) {
     return (
       <Fragment key={msg.uid}>
-        {messageElem}
         <div
           className="pv3 gray2 b--gray2 flex items-center justify-center f9 "
         >
           <p>{moment(_.get(msg, when)).calendar()}</p>
         </div>
+        {messageElem}
       </Fragment>
     );
   } else {
diff --git a/pkg/interface/src/views/apps/chat/components/lib/chat-scroll-container.js b/pkg/interface/src/views/apps/chat/components/lib/chat-scroll-container.js
deleted file mode 100644
index 74580f9954..0000000000
--- a/pkg/interface/src/views/apps/chat/components/lib/chat-scroll-container.js
+++ /dev/null
@@ -1,143 +0,0 @@
-import React, { Component, Fragment } from "react";
-
-import { scrollIsAtTop, scrollIsAtBottom } from "~/logic/lib/util";
-
-// Restore chat position on FF when new messages come in
-const recalculateScrollTop = (lastScrollHeight, scrollContainer) => {
-  if (!scrollContainer || !lastScrollHeight) {
-    return;
-  }
-
-  const newScrollTop = scrollContainer.scrollHeight - lastScrollHeight;
-  if (scrollContainer.scrollTop !== 0 ||
-      scrollContainer.scrollTop === newScrollTop) {
-    return;
-  }
-
-  scrollContainer.scrollTop = scrollContainer.scrollHeight - lastScrollHeight;
-};
-
-
-export class ChatScrollContainer extends Component {
-  constructor(props) {
-    super(props);
-
-    // only for FF
-    this.state = {
-      lastScrollHeight: null
-    };
-
-    this.isTriggeredScroll = false;
-
-    this.isAtBottom = true;
-    this.isAtTop = false;
-
-    this.containerDidScroll = this.containerDidScroll.bind(this);
-
-    this.containerRef = React.createRef();
-    this.scrollRef = React.createRef();
-  }
-  
-  containerDidScroll(e) {
-    const { props } = this;
-    if (scrollIsAtTop(e.target)) {
-      // Save scroll position for FF
-      if (navigator.userAgent.includes("Firefox")) {
-        this.setState({
-          lastScrollHeight: e.target.scrollHeight,
-        });
-      }
-
-      if (!this.isAtTop) {
-        props.scrollIsAtTop();
-      }
-
-      this.isTriggeredScroll = false;
-      this.isAtBottom = false;
-      this.isAtTop = true;
-    } else if (scrollIsAtBottom(e.target) && !this.isTriggeredScroll) {
-      if (!this.isAtBottom) {
-        props.scrollIsAtBottom();
-      }
-
-      this.isTriggeredScroll = false;
-      this.isAtBottom = true;
-      this.isAtTop = false;
-    } else {
-      this.isAtBottom = false;
-      this.isAtTop = false;
-      this.isTriggeredScroll = false;
-    }
-  }
-
-  render() {
-    // Replace with just the "not Firefox" implementation
-    // when Firefox #1042151 is patched.
-
-    if (navigator.userAgent.includes("Firefox")) {
-      return this.firefoxScrollContainer();
-    } else {
-      return this.normalScrollContainer();
-    }
-  }
-
-  firefoxScrollContainer() {
-    return (
-      <div
-        className="relative overflow-y-scroll h-100"
-        onScroll={this.containerDidScroll}
-        ref={this.containerRef}>
-        <div
-          className="bg-white bg-gray0-d pt3 pb2 flex flex-column-reverse"
-          style={{ resize: "vertical" }}>
-          <div ref={this.scrollRef}></div>
-          {this.props.children}
-        </div>
-      </div>
-    );
-  }
-
-  normalScrollContainer() {
-    return (
-      <div
-        className={
-          "overflow-y-scroll bg-white bg-gray0-d pt3 pb2 flex " +
-          "flex-column-reverse relative"
-        }
-        style={{ height: "100%", resize: "vertical" }}
-        onScroll={this.containerDidScroll}>
-        <div ref={this.scrollRef}></div>
-        {this.props.children}
-      </div>
-    );
-  }
-
-  scrollToBottom() {
-    this.isTriggeredScroll = true;
-    if (this.scrollRef.current) {
-      this.scrollRef.current.scrollIntoView(false);
-    }
-
-    if (navigator.userAgent.includes("Firefox")) {
-      recalculateScrollTop(
-        this.state.lastScrollHeight,
-        this.scrollContainer
-      );
-    }
-  }
-
-  scrollToReference(ref) {
-    this.isTriggeredScroll = true;
-    if (this.scrollRef.current && ref.current) {
-      ref.current.scrollIntoView({ block: 'center' });
-    }
-
-    if (navigator.userAgent.includes("Firefox")) {
-      recalculateScrollTop(
-        this.state.lastScrollHeight,
-        this.scrollContainer
-      );
-    }
-  }
-
-}
diff --git a/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx b/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx
index ebb9952837..137a4f9c4c 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx
+++ b/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx
@@ -1,54 +1,140 @@
 import React, { Component, Fragment } from "react";
+import { Virtuoso as VirtualList, VirtuosoMethods } from 'react-virtuoso';
 
 import { ChatMessage } from './chat-message';
-import { ChatScrollContainer } from "./chat-scroll-container";
 import { UnreadNotice } from "./unread-notice";
 import { ResubscribeElement } from "./resubscribe-element";
 import { BacklogElement } from "./backlog-element";
+import { Envelope, IMessage } from "~/types/chat-update";
+import { RouteComponentProps } from "react-router-dom";
+import { Patp, Path } from "~/types/noun";
+import { Contacts } from "~/types/contact-update";
+import { Association } from "~/types/metadata-update";
+import { Group } from "~/types/group-update";
+import GlobalApi from "~/logic/api/global";
+import _ from "lodash";
+import { LocalUpdateRemoteContentPolicy } from "~/types";
+import { ListRange } from "react-virtuoso/dist/engines/scrollSeekEngine";
+
 
-const MAX_BACKLOG_SIZE = 1000;
-const DEFAULT_BACKLOG_SIZE = 200;
-const PAGE_SIZE = 50;
 const INITIAL_LOAD = 20;
+const DEFAULT_BACKLOG_SIZE = 200;
+const IDLE_THRESHOLD = 3;
+
+const Placeholder = ({ height, index, className = '', style = {}, ...props }) => (
+  <div className={`w-100 f7 pl3 pt4 pr3 cf flex lh-copy ${className}`} style={{ height, ...style }} {...props}>
+      <div className="fl pr3 v-top bg-white bg-gray0-d">
+        <span
+          className="db bg-gray2 bg-white-d"
+          style={{
+            width: "24px",
+            height: "24px",
+            borderRadius: "50%",
+            visibility: (index % 5 == 0) ? "initial" : "hidden",
+          }}
+        ></span>
+      </div>
+      <div className="fr clamp-message white-d" style={{ flexGrow: 1, marginTop: -8 }}>
+        <div className="hide-child" style={{paddingTop: "6px", visibility: (index % 5 == 0) ? "initial" : "hidden" }}>
+          <p className={`v-mid f9 gray2 dib mr3 c-default`}>
+            <span className="mw5 db"><span className="bg-gray5 bg-gray1-d db w-100 h-100"></span></span>
+          </p>
+          <p className="v-mid mono f9 gray2 dib"><span className="bg-gray5 bg-gray1-d db w-100 h-100" style={{height: "1em", width: `${(index % 3 + 1) * 3}em`}}></span></p>
+          <p className="v-mid mono f9 ml2 gray2 dib child dn-s"><span className="bg-gray5 bg-gray1-d db w-100 h-100"></span></p>
+        </div>
+        <span className="bg-gray5 bg-gray1-d db w-100 h-100 db" style={{height: `1em`, width: `${(index % 5) * 20}%`}}></span>
+      </div>
+    </div>
+);
 
 
-export class ChatWindow extends Component {
+type ChatWindowProps = RouteComponentProps<{
+  ship: Patp;
+  station: string;
+}> & {
+  unreadCount: number;
+  envelopes: Envelope[];
+  isChatMissing: boolean;
+  isChatLoading: boolean;
+  isChatUnsynced: boolean;
+  unreadMsg: Envelope | false;
+  stationPendingMessages: IMessage[];
+  mailboxSize: number;
+  contacts: Contacts;
+  association: Association;
+  group: Group;
+  ship: Patp;
+  station: any;
+  api: GlobalApi;
+  hideNicknames: boolean;
+  hideAvatars: boolean;
+  remoteContentPolicy: LocalUpdateRemoteContentPolicy;
+}
+
+interface ChatWindowState {
+  fetchPending: boolean;
+  idle: boolean;
+  range: ListRange;
+  initialized: boolean;
+}
+
+export class ChatWindow extends Component<ChatWindowProps, ChatWindowState> {
+  private unreadReference: React.RefObject<Component>;
+  private virtualList: React.RefObject<VirtuosoMethods>;
+
   constructor(props) {
     super(props);
-    this.state = {
-      numPages: 1,
-    };
 
-    this.hasAskedForMessages = false;
+    this.state = {
+      fetchPending: false,
+      idle: (this.initialIndex() < props.mailboxSize - IDLE_THRESHOLD) ? true : false,
+      range: { startIndex: 0, endIndex: 0},
+      initialized: false
+    };
     
     this.dismissUnread = this.dismissUnread.bind(this);
-    this.scrollIsAtBottom = this.scrollIsAtBottom.bind(this);
-    this.scrollIsAtTop = this.scrollIsAtTop.bind(this);
+    this.initialIndex = this.initialIndex.bind(this);
+    this.scrollToUnread = this.scrollToUnread.bind(this);
 
-    this.scrollReference = React.createRef();
     this.unreadReference = React.createRef();
+    this.virtualList = React.createRef();
   }
 
   componentDidMount() {
     this.initialFetch();
+  }
 
-    if (this.state.numPages === 1 && this.props.unreadCount < INITIAL_LOAD) {
-      this.dismissUnread();
-      this.scrollToBottom();
-    }
+  initialIndex() {
+    const { mailboxSize, unreadCount } = this.props;
+    return Math.min(Math.max(mailboxSize - 1 < INITIAL_LOAD
+      ? 0
+      : unreadCount // otherwise if there are unread messages
+        ? mailboxSize - unreadCount - 1 // put the one right before at the top
+        : mailboxSize - 1,
+    0), mailboxSize);
   }
 
   initialFetch() {
-    const { props } = this;
-    if (props.messages.length > 0) {
-      const unreadUnloaded = props.unreadCount - props.messages.length;
-
-      if (unreadUnloaded <= MAX_BACKLOG_SIZE &&
-          unreadUnloaded + INITIAL_LOAD > DEFAULT_BACKLOG_SIZE) {
-        this.fetchBacklog(unreadUnloaded + INITIAL_LOAD);
-      } else {
-        this.fetchBacklog(DEFAULT_BACKLOG_SIZE);
+    const { envelopes, mailboxSize, unreadCount } = this.props;
+    if (envelopes.length > 0) {
+      const start = Math.min(mailboxSize - unreadCount, mailboxSize - DEFAULT_BACKLOG_SIZE);
+      this.fetchMessages(start, start + DEFAULT_BACKLOG_SIZE, true);
+      const initialIndex = this.initialIndex();
+      if (initialIndex < mailboxSize - IDLE_THRESHOLD) {
+        this.setState({ idle: true });
       }
+      if (unreadCount !== mailboxSize) {
+        this.virtualList.current?.scrollToIndex({
+          index: initialIndex,
+          align: initialIndex <= 1 ? 'end' : 'start'
+        });
+        setTimeout(() => {
+          this.setState({ initialized: true });
+        }, 500);
+      } else {
+        this.setState({ initialized: true });
+      }
+      
     } else {
       setTimeout(() => {
         this.initialFetch();
@@ -57,141 +143,156 @@ export class ChatWindow extends Component {
   }
 
   componentDidUpdate(prevProps, prevState) {
-    const { props, state } = this;
+    const { isChatMissing, history, envelopes, mailboxSize, unreadCount } = this.props;
+    let { idle } = this.state;
 
-    if (props.isChatMissing) {
-      props.history.push("/~chat");
-    } else if (props.messages.length >= prevProps.messages.length + 10) {
-      this.hasAskedForMessages = false;
-      let numPages = props.unreadCount > 0 ? 
-        Math.ceil(props.unreadCount / PAGE_SIZE) : this.state.numPages;
+    if (isChatMissing) {
+      history.push("/~chat");
+    } else if (envelopes.length !== prevProps.envelopes.length && this.state.fetchPending) {
+      this.setState({ fetchPending: false });
+    }
 
-      if (this.state.numPages === numPages) {
-        if (props.unreadCount > 20) {
-          this.scrollToUnread();    
+    if (this.state.range.endIndex !== prevState.range.endIndex) {
+      if (this.state.range.endIndex < mailboxSize - IDLE_THRESHOLD) {
+        if (!idle) {
+          idle = true;
         }
-      } else {
-        this.setState({ numPages }, () => {
-          if (props.unreadCount > 20) {
-            this.scrollToUnread();    
-          }
-        });
+      } else if (idle) {
+        idle = false;
       }
-    } else if (
-      state.numPages === 1 &&
-      this.props.unreadCount < INITIAL_LOAD &&
-      this.props.unreadCount > 0
-    ) {
-      this.dismissUnread();
-      this.scrollToBottom();
+      this.setState({ idle });
     }
-  }
 
-  scrollIsAtTop() {
-    const { props, state } = this;
-    this.setState({ numPages: state.numPages + 1 }, () => {
-      if (state.numPages * PAGE_SIZE < props.length) {
-        this.fetchBacklog(DEFAULT_BACKLOG_SIZE);
-      }
-    });
-  }
-
-  scrollIsAtBottom() {
-    if (this.state.numPages !== 1) {
-      this.setState({ numPages: 1 });
-      this.dismissUnread();
+    if (!idle && idle !== prevState.idle) {
+      setTimeout(() => {
+        this.virtualList.current?.scrollToIndex(mailboxSize);
+      }, 500)
     }
-  }
 
-  scrollToBottom() {
-    if (this.scrollReference.current) {
-      this.scrollReference.current.scrollToBottom();
-    }
-    if (this.state.numPages !== 1) {
-      this.setState({ numPages: 1 });
+    if (!idle && prevProps.unreadCount !== unreadCount) {
+      this.virtualList.current?.scrollToIndex(mailboxSize);
     }
   }
 
   scrollToUnread() {
-    if (this.scrollReference.current && this.unreadReference.current) {
-      this.scrollReference.current.scrollToReference(this.unreadReference);
-    }
+    const { mailboxSize, unreadCount } = this.props;
+    this.virtualList.current?.scrollToIndex({
+      index: mailboxSize - unreadCount,
+      align: 'center'
+    });
   }
 
   dismissUnread() {
     this.props.api.chat.read(this.props.station);
   }
 
-  fetchBacklog(size) {
-    const { props } = this;
+  fetchMessages(start, end, force = false) {
+    start = Math.max(start, 0);
+    end = Math.max(end, 0);
+    const { api, mailboxSize, station } = this.props;
 
     if (
-      props.messages.length >= props.length ||
-      this.hasAskedForMessages ||
-      props.length <= 0
+      (this.state.fetchPending ||
+      mailboxSize <= 0)
+      && !force
     ) {
       return;
     }
+      
+    api.chat
+      .fetchMessages(Math.max(mailboxSize - end, 0), Math.min(mailboxSize - start, mailboxSize), station)
+      .finally(() => {
+        this.setState({ fetchPending: false });
+      });
 
-    const start =
-      props.length - props.messages[props.messages.length - 1].number;
-    if (start > 0) {
-      const end = start + size < props.length ? start + size : props.length;
-      props.api.chat.fetchMessages(start + 1, end, props.station);
-      this.hasAskedForMessages = true;
-    }
+    this.setState({ fetchPending: true });
   }
 
   render() {
-    const { props, state } = this;
-    const sliceLength = Math.min(
-      state.numPages * PAGE_SIZE,
-      props.messages.length + props.pendingMessages.length
-    );
-    const messages =
-      props.pendingMessages
-        .concat(props.messages)
-        .slice(0, sliceLength);
+    const {
+      envelopes,
+      stationPendingMessages,
+      unreadCount,
+      unreadMsg,
+      isChatLoading,
+      isChatUnsynced,
+      api,
+      ship,
+      station,
+      association,
+      group,
+      contacts,
+      mailboxSize,
+      hideAvatars,
+      hideNicknames,
+      remoteContentPolicy,
+    } = this.props;
+    
+    const messages: Envelope[] = [];
+    const debouncedFetch = _.debounce(this.fetchMessages, 500).bind(this);
 
+    envelopes
+      .concat(stationPendingMessages)
+      .forEach((message) => {
+        messages[message.number] = message;
+      });
+    
     return (
       <Fragment>
         <UnreadNotice
-          unreadCount={props.unreadCount}
-          unreadMsg={props.unreadMsg}
-          dismissUnread={this.dismissUnread} />
-        <ChatScrollContainer
-          ref={this.scrollReference}
-          scrollIsAtBottom={this.scrollIsAtBottom}
-          scrollIsAtTop={this.scrollIsAtTop}>
-          <BacklogElement isChatLoading={props.isChatLoading} />
-          <ResubscribeElement
-            api={props.api}
-            host={props.ship}
-            station={props.station}
-            isChatUnsynced={props.isChatUnsynced}
-          />
-          { messages.map((msg, i) => (
-              <ChatMessage
-                key={msg.uid}
-                unreadRef={this.unreadReference}
-                isLastUnread={
-                  props.unreadCount > 0 &&
-                  i === props.unreadCount - 1 &&
-                  state.numPages !== 1
-                }
-                msg={msg}
-                previousMsg={messages[i - 1]}
-                nextMsg={messages[i + 1]}
-                association={props.association}
-                group={props.group}
-                contacts={props.contacts} 
-                hideAvatars={props.hideAvatars}
-                hideNicknames={props.hideNicknames}
-                remoteContentPolicy={props.remoteContentPolicy}
-              />
-            ))
-          }
-        </ChatScrollContainer>
+          unreadCount={unreadCount}
+          unreadMsg={unreadMsg}
+          dismissUnread={this.dismissUnread}
+          onClick={this.scrollToUnread}
+        />
+        <BacklogElement isChatLoading={isChatLoading} />
+        <ResubscribeElement {...{ api, host: ship, station, isChatUnsynced}} />
+        {messages.length ? <VirtualList
+          ref={this.virtualList}
+          style={{height: '100%', width: '100%', visibility: this.state.initialized ? 'initial' : 'hidden'}}
+          totalCount={mailboxSize}
+          followOutput={!this.state.idle}
+          endReached={this.dismissUnread}
+          scrollSeek={{
+            enter: velocity => Math.abs(velocity) > 2000,
+            exit: velocity => Math.abs(velocity) < 200,
+            change: (_velocity, _range) => {},
+            placeholder: this.state.initialized ? Placeholder : () => <div></div>
+          }}
+          startReached={() => debouncedFetch(0, DEFAULT_BACKLOG_SIZE)}
+          overscan={DEFAULT_BACKLOG_SIZE}
+          rangeChanged={(range) => {
+            this.setState({ range });
+            debouncedFetch(range.startIndex - (DEFAULT_BACKLOG_SIZE / 2), range.endIndex + (DEFAULT_BACKLOG_SIZE / 2));
+          }}
+          item={(i) => {
+            const number = i + 1;
+            const msg = messages[number];
+            
+            if (!msg) {
+              debouncedFetch(number - DEFAULT_BACKLOG_SIZE, number + DEFAULT_BACKLOG_SIZE);
+              return <Placeholder index={number} height="0px" style={{overflow: 'hidden'}} />;
+            }
+            return  <ChatMessage
+              key={number}
+              unreadRef={this.unreadReference}
+              isFirstUnread={
+                unreadCount
+                && mailboxSize - unreadCount === number
+              }
+              msg={msg}
+              previousMsg={messages[number + 1]}
+              nextMsg={messages[number - 1]}
+              association={association}
+              group={group}
+              contacts={contacts}
+              hideAvatars={hideAvatars}
+              hideNicknames={hideNicknames}
+              remoteContentPolicy={remoteContentPolicy}
+              className={number === mailboxSize ? 'pb3' : ''}
+            />
+          }}
+        /> : null}
       </Fragment>
     );
   }
diff --git a/pkg/interface/src/views/apps/chat/components/lib/message.js b/pkg/interface/src/views/apps/chat/components/lib/message.js
index f4753bdb57..6174afd0bb 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/message.js
+++ b/pkg/interface/src/views/apps/chat/components/lib/message.js
@@ -6,15 +6,21 @@ import moment from 'moment';
 
 
 export const Message = (props) => {
-  const pending = props.msg.pending ? ' o-40' : '';
+  const {
+    msg,
+    renderSigil,
+    remoteContentPolicy,
+    className = ''
+  } = props;
+  const pending = msg.pending ? ' o-40' : '';
   const containerClass =
-    props.renderSigil ?
-      `w-100 f7 pl3 pt4 pr3 cf flex lh-copy ` + pending :
-      'w-100 pr3 cf hide-child flex' + pending;
+    renderSigil
+      ? `w-100 f7 pl3 pt4 pr3 cf flex lh-copy ${pending} ${className}`
+      : `w-100 pr3 cf hide-child flex ${pending} ${className}`;
 
   const timestamp =
-    moment.unix(props.msg.when / 1000).format(
-      props.renderSigil ? 'hh:mm a' : 'hh:mm'
+    moment.unix(msg.when / 1000).format(
+      renderSigil ? 'hh:mm a' : 'hh:mm'
     );
 
 
@@ -24,14 +30,14 @@ export const Message = (props) => {
            minHeight: 'min-content'
          }}>
       {
-        props.renderSigil ? (
+        renderSigil ? (
           renderWithSigil(props, timestamp)
         ) : (
           <div className="flex w-100">
             <p className="child pt2 pl2 pr1 mono f9 gray2 dib">{timestamp}</p>
             <div className="fr f7 clamp-message white-d pr3 lh-copy"
                  style={{ flexGrow: 1 }}>
-              <MessageContent letter={props.msg.letter} remoteContentPolicy={props.remoteContentPolicy}/>
+              <MessageContent letter={msg.letter} remoteContentPolicy={remoteContentPolicy}/>
             </div>
           </div>
         )
@@ -41,66 +47,67 @@ export const Message = (props) => {
 };
 
 const renderWithSigil = (props, timestamp) => {
-    const paddingTop = props.paddingTop ? { 'paddingTop': '6px' } : '';
-    const datestamp =
-      '~' + moment.unix(props.msg.when / 1000).format('YYYY.M.D');
 
-    const contact = props.msg.author in props.contacts
-      ? props.contacts[props.msg.author] : false;
-    const showNickname = !props.hideNicknames && contact?.nickname;
-    let name = `~${props.msg.author}`;
-    let color = '#000000';
-    let sigilClass = 'mix-blend-diff';
-    if (contact) {
-      name = showNickname
-        ? contact.nickname
-        : `~${props.msg.author}`;
-      color = `#${uxToHex(contact.color)}`;
-      sigilClass = '';
-    }
+  const paddingTop = props.paddingTop ? { 'paddingTop': '6px' } : '';
+  const datestamp =
+    '~' + moment.unix(props.msg.when / 1000).format('YYYY.M.D');
 
-    if (`~${props.msg.author}` === name) {
-      name = cite(props.msg.author);
-    }
-
-    return (
-      <div className="flex w-100">
-        <OverlaySigil
-          ship={props.msg.author}
-          contact={contact}
-          color={color}
-          sigilClass={sigilClass}
-          association={props.association}
-          group={props.group}
-          hideAvatars={props.hideAvatars}
-          hideNicknames={props.hideNicknames}
-          className="fl pr3 v-top bg-white bg-gray0-d"
-        />
-        <div className="fr clamp-message white-d"
-             style={{ flexGrow: 1, marginTop: -8 }}>
-          <div className="hide-child" style={paddingTop}>
-            <p className={`v-mid f9 gray2 dib mr3 c-default`}>
-              <span
-                className={
-                  'mw5 db truncate pointer ' +
-                  (showNickname ? '' : 'mono')
-                }
-                onClick={() => {
-                  writeText(props.msg.author);
-                }}
-                title={`~${props.msg.author}`}
-              >
-                {name}
-              </span>
-            </p>
-            <p className={`v-mid mono f9 gray2 dib`}>{timestamp}</p>
-            <p className={`v-mid mono f9 ml2 gray2 dib child dn-s`}>
-              {datestamp}
-            </p>
-          </div>
-          <MessageContent letter={props.msg.letter} remoteContentPolicy={props.remoteContentPolicy} />
-        </div>
-      </div>
-    );
+  const contact = props.msg.author in props.contacts
+    ? props.contacts[props.msg.author] : false;
+  const showNickname = !props.hideNicknames && contact?.nickname;
+  let name = `~${props.msg.author}`;
+  let color = '#000000';
+  let sigilClass = 'mix-blend-diff';
+  if (contact) {
+    name = showNickname
+      ? contact.nickname
+      : `~${props.msg.author}`;
+    color = `#${uxToHex(contact.color)}`;
+    sigilClass = '';
   }
 
+  if (`~${props.msg.author}` === name) {
+    name = cite(props.msg.author);
+  }
+
+  return (
+    <div className="flex w-100">
+      <OverlaySigil
+        ship={props.msg.author}
+        contact={contact}
+        color={color}
+        sigilClass={sigilClass}
+        association={props.association}
+        group={props.group}
+        hideAvatars={props.hideAvatars}
+        hideNicknames={props.hideNicknames}
+        className="fl pr3 v-top bg-white bg-gray0-d"
+      />
+      <div className="fr clamp-message white-d"
+            style={{ flexGrow: 1, marginTop: -8 }}>
+        <div className="hide-child" style={paddingTop}>
+          <p className={`v-mid f9 gray2 dib mr3 c-default`}>
+            <span
+              className={
+                'mw5 db truncate pointer ' +
+                (showNickname ? '' : 'mono')
+              }
+              onClick={() => {
+                writeText(props.msg.author);
+              }}
+              title={`~${props.msg.author}`}
+            >
+              {name}
+            </span>
+          </p>
+          <p className={`v-mid mono f9 gray2 dib`}>{timestamp}</p>
+          <p className={`v-mid mono f9 ml2 gray2 dib child dn-s`}>
+            {datestamp}
+          </p>
+        </div>
+        <MessageContent letter={props.msg.letter} remoteContentPolicy={props.remoteContentPolicy} />
+      </div>
+    </div>
+  );
+}
+
diff --git a/pkg/interface/src/views/apps/chat/components/lib/unread-notice.js b/pkg/interface/src/views/apps/chat/components/lib/unread-notice.js
index 2724d23c9b..954ed33578 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/unread-notice.js
+++ b/pkg/interface/src/views/apps/chat/components/lib/unread-notice.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import moment from 'moment';
 
 export const UnreadNotice = (props) => {
-  const { unreadCount, unreadMsg, dismissUnread } = props;
+  const { unreadCount, unreadMsg, dismissUnread, onClick } = props;
 
   if (!unreadMsg || (unreadCount === 0)) {
     return null;
@@ -22,7 +22,7 @@ export const UnreadNotice = (props) => {
         "ba b--green2 green2 bg-white bg-gray0-d flex items-center " +
         "pa2 f9 justify-between br1"
       }>
-        <p className="lh-copy db">
+        <p className="lh-copy db pointer" onClick={onClick}>
           {unreadCount} new messages since{' '}
           {datestamp && (
             <>
diff --git a/pkg/interface/src/views/apps/groups/components/lib/contact-sidebar.tsx b/pkg/interface/src/views/apps/groups/components/lib/contact-sidebar.tsx
index f337efee5d..60ab9a0035 100644
--- a/pkg/interface/src/views/apps/groups/components/lib/contact-sidebar.tsx
+++ b/pkg/interface/src/views/apps/groups/components/lib/contact-sidebar.tsx
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
-import { FixedSizeList as List } from 'react-window';
+import { Virtuoso as VirtualList } from 'react-virtuoso';
 
 import { ContactItem } from './contact-item';
 import { ShareSheet } from './share-sheet';
@@ -180,19 +180,17 @@ export class ContactSidebar extends Component<ContactSidebarProps, ContactSideba
           >Channels</Link>
           {shareSheet}
           <h2 className="f9 pt4 pr4 pb2 pl4 gray2 c-default">Members</h2>
-          <List
-            height={this.state.memberboxHeight}
+          <VirtualList
+            style={{ height: this.state.memberboxHeight, width: '100%' }}
             className="flex-auto"
-            itemCount={contactItems.length + groupItems.length}
-            itemSize={44}
-            width="100%"
-          >
-            {({ index, style }) => (<div style={style}>{
-              index <= (contactItems.length - 1) // If the index is within the length of contact items,
+            totalCount={contactItems.length + groupItems.length}
+            itemHeight={44} // We happen to know this
+            item={
+              (index) =>  index <= (contactItems.length - 1) // If the index is within the length of contact items,
                 ? contactItems[index] // show a contact item
                 : groupItems[index - contactItems.length] // Otherwise show a group item
-              }</div>)}
-          </List>
+            }
+          />
 
         </div>
         <Spinner awaiting={this.state.awaiting} text="Removing from group..." classes="pa2 ba absolute right-1 bottom-1 b--gray1-d" />
diff --git a/pkg/interface/src/views/components/Group.tsx b/pkg/interface/src/views/components/Group.tsx
index e364c0aeb4..1e635cb8f1 100644
--- a/pkg/interface/src/views/components/Group.tsx
+++ b/pkg/interface/src/views/components/Group.tsx
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import _, { capitalize } from 'lodash';
-import { FixedSizeList as List } from 'react-window';
+import { Virtuoso as VirtualList } from 'react-virtuoso';
 
 import { cite, deSig } from '~/logic/lib/util';
 import { roleForShip, resourceFromPath } from '~/logic/lib/group';
@@ -334,14 +334,11 @@ export class GroupView extends Component<
         {'open' in group.policy && this.renderBanned(group.policy)}
         <div className='flex flex-column'>
           <div className='f9 gray2 mt6 mb3'>Members</div>
-          <List
-            height={500}
-            itemCount={memberElements.length}
-            itemSize={44}
-            width="100%"
-          >
-          {({ index, style }) => <div key={index} style={style} className='flex flex-column pv3'>{memberElements[index]}</div>}
-          </List>
+          <VirtualList
+            style={{ height: '500px', width: '100%' }}
+            totalCount={memberElements.length}
+            item={(index) => <div key={index} className='flex flex-column pv3'>{memberElements[index]}</div>}
+          />
         </div>
 
         <Spinner
diff --git a/pkg/interface/src/views/components/RemoteContent.tsx b/pkg/interface/src/views/components/RemoteContent.tsx
index d57b20b616..892f1168ec 100644
--- a/pkg/interface/src/views/components/RemoteContent.tsx
+++ b/pkg/interface/src/views/components/RemoteContent.tsx
@@ -116,7 +116,10 @@ export default class RemoteContent extends Component<RemoteContentProps, RemoteC
         </>
       );
     } else if (isOembed && remoteContentPolicy.oembedShown) {
-      this.loadOembed();
+      if (!this.state.embed) {
+        this.loadOembed();
+      }
+
       return (
         <Fragment>
           {renderUrl ? this.wrapInLink(this.state.embed && this.state.embed.title ? this.state.embed.title : url) : null}

From 952af5cf0e03636872205b394581bd013e9a6fc6 Mon Sep 17 00:00:00 2001
From: Tyler Brown Cifu Shuster <tyler@fivepaths.com>
Date: Mon, 7 Sep 2020 20:59:03 -0700
Subject: [PATCH 44/89] chat: added ability to blur chat editor

---
 .../src/views/apps/chat/components/lib/chat-editor.js          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/interface/src/views/apps/chat/components/lib/chat-editor.js b/pkg/interface/src/views/apps/chat/components/lib/chat-editor.js
index be7dd64bef..fbae6c1741 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/chat-editor.js
+++ b/pkg/interface/src/views/apps/chat/components/lib/chat-editor.js
@@ -116,6 +116,9 @@ export default class ChatEditor extends Component {
       extraKeys: {
         'Enter': () => {
           this.submit();
+        },
+        'Esc': () => {
+          this.editor?.getInputField().blur();
         }
       }
     };

From f3206312302b50a584fa1a25d63ced9812298f69 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Tue, 8 Sep 2020 15:04:45 +1000
Subject: [PATCH 45/89] publish: choose group for groupify

---
 pkg/interface/src/logic/api/publish.ts        |  4 +-
 pkg/interface/src/views/apps/publish/app.tsx  |  1 +
 .../publish/components/lib/GroupifyForm.tsx   | 77 +++++++++++++++++++
 .../publish/components/lib/MetadataForm.tsx   | 16 ----
 .../apps/publish/components/lib/Notebook.tsx  |  3 +
 .../publish/components/lib/NotebookRoutes.tsx |  3 +-
 .../apps/publish/components/lib/Settings.tsx  | 36 ++++++---
 .../src/views/components/GroupSearch.tsx      |  2 +-
 8 files changed, 110 insertions(+), 32 deletions(-)
 create mode 100644 pkg/interface/src/views/apps/publish/components/lib/GroupifyForm.tsx

diff --git a/pkg/interface/src/logic/api/publish.ts b/pkg/interface/src/logic/api/publish.ts
index ad99dc077e..5b49aabfc9 100644
--- a/pkg/interface/src/logic/api/publish.ts
+++ b/pkg/interface/src/logic/api/publish.ts
@@ -82,11 +82,11 @@ export default class PublishApi extends BaseApi {
     return this.action('publish', 'publish-action', act);
   }
 
-  groupify(bookId: string) {
+  groupify(bookId: string, group: Path | null) {
     return this.publishAction({
       groupify: {
         book: bookId,
-        target: null,
+        target: group,
         inclusive: false
       }
     });
diff --git a/pkg/interface/src/views/apps/publish/app.tsx b/pkg/interface/src/views/apps/publish/app.tsx
index 3bcedd386c..cc161f1719 100644
--- a/pkg/interface/src/views/apps/publish/app.tsx
+++ b/pkg/interface/src/views/apps/publish/app.tsx
@@ -163,6 +163,7 @@ export default function PublishApp(props: PublishAppProps) {
                     hideNicknames={hideNicknames}
                     hideAvatars={hideAvatars}
                     remoteContentPolicy={remoteContentPolicy}
+                    associations={associations}
                     {...props}
                   />
                 );
diff --git a/pkg/interface/src/views/apps/publish/components/lib/GroupifyForm.tsx b/pkg/interface/src/views/apps/publish/components/lib/GroupifyForm.tsx
new file mode 100644
index 0000000000..3ceb350895
--- /dev/null
+++ b/pkg/interface/src/views/apps/publish/components/lib/GroupifyForm.tsx
@@ -0,0 +1,77 @@
+import React, { useEffect } from "react";
+import { Box, Col, Button, InputLabel, InputCaption } from "@tlon/indigo-react";
+import * as Yup from "yup";
+import GlobalApi from "~/logic/api/global";
+import { Notebook } from "~/types/publish-update";
+import { Contacts } from "~/types/contact-update";
+
+import { MetadataForm } from "./MetadataForm";
+import { Groups, Associations } from "~/types";
+import { Formik, FormikHelpers, Form } from "formik";
+import GroupSearch from "~/views/components/GroupSearch";
+import { AsyncButton } from "~/views/components/AsyncButton";
+
+const formSchema = Yup.object({
+  group: Yup.string().nullable(),
+});
+
+interface FormSchema {
+  group: string | null;
+}
+
+interface GroupifyFormProps {
+  host: string;
+  book: string;
+  notebook: Notebook;
+  groups: Groups;
+  api: GlobalApi;
+  associations: Associations;
+}
+
+export function GroupifyForm(props: GroupifyFormProps) {
+  const onGroupify = async (
+    values: FormSchema,
+    actions: FormikHelpers<FormSchema>
+  ) => {
+    try {
+      await props.api.publish.groupify(props.book, values.group);
+      actions.setStatus({ success: null });
+    } catch (e) {
+      actions.setStatus({ error: e.message });
+    }
+  };
+
+  const groupPath = props.notebook?.["writers-group-path"];
+
+  const isUnmanaged = props.groups?.[groupPath]?.hidden || false;
+
+  if (!isUnmanaged) {
+    return null;
+  }
+
+  const initialValues: FormSchema = {
+    group: null
+  };
+
+  return (
+    <Formik
+      validationSchema={formSchema}
+      initialValues={initialValues}
+      onSubmit={onGroupify}
+    >
+      <Form style={{ display: "contents" }}>
+        <GroupSearch
+          id="group"
+          label="Group"
+          caption="What group should this notebook be added to? If blank, a new group will be made for the notebook"
+          associations={props.associations}
+        />
+        <AsyncButton loadingText="Groupifying..." border>
+          Groupify
+        </AsyncButton>
+      </Form>
+    </Formik>
+  );
+}
+
+export default GroupifyForm;
diff --git a/pkg/interface/src/views/apps/publish/components/lib/MetadataForm.tsx b/pkg/interface/src/views/apps/publish/components/lib/MetadataForm.tsx
index 35932b701b..4209817ef4 100644
--- a/pkg/interface/src/views/apps/publish/components/lib/MetadataForm.tsx
+++ b/pkg/interface/src/views/apps/publish/components/lib/MetadataForm.tsx
@@ -50,7 +50,6 @@ const ResetOnPropsChange = (props: { init: FormSchema; book: string }) => {
 
 export function MetadataForm(props: MetadataFormProps) {
   const { host, notebook, api, book } = props;
-  const history = useHistory();
   const initialValues: FormSchema = {
     name: notebook?.title,
     description: notebook?.about,
@@ -72,11 +71,6 @@ export function MetadataForm(props: MetadataFormProps) {
     }
   };
 
-  const onDelete = async () => {
-    await api.publish.delBook(book);
-    history.push("/~publish");
-  };
-
   return (
     <Formik
       validationSchema={formSchema}
@@ -84,16 +78,6 @@ export function MetadataForm(props: MetadataFormProps) {
       onSubmit={onSubmit}
     >
       <Form style={{ display: "contents" }}>
-          <Col mb={4}>
-            <InputLabel>Delete Notebook</InputLabel>
-            <InputCaption>
-              Permanently delete this notebook. (All current members will no
-              longer see this notebook.)
-            </InputCaption>
-            <Button onClick={onDelete} mt={1} border error>
-              Delete this notebook
-            </Button>
-          </Col>
           <Input
             id="name"
             label="Rename"
diff --git a/pkg/interface/src/views/apps/publish/components/lib/Notebook.tsx b/pkg/interface/src/views/apps/publish/components/lib/Notebook.tsx
index 22febfcb7d..f98f2e6ac4 100644
--- a/pkg/interface/src/views/apps/publish/components/lib/Notebook.tsx
+++ b/pkg/interface/src/views/apps/publish/components/lib/Notebook.tsx
@@ -20,6 +20,7 @@ import { Groups } from "~/types/group-update";
 import { Contacts, Rolodex } from "~/types/contact-update";
 import GlobalApi from "~/logic/api/global";
 import styled from "styled-components";
+import {Associations} from "~/types";
 
 const TabList = styled(_TabList)`
   margin-bottom: ${(p) => p.theme.space[4]}px;
@@ -38,6 +39,7 @@ interface NotebookProps {
   contacts: Rolodex;
   groups: Groups;
   hideNicknames: boolean;
+  associations: Associations;
 }
 
 export function Notebook(props: NotebookProps & RouteComponentProps) {
@@ -130,6 +132,7 @@ export function Notebook(props: NotebookProps & RouteComponentProps) {
                 api={api}
                 notebook={notebook}
                 contacts={notebookContacts}
+                associations={props.associations}
                 groups={groups}
               />
             </TabPanel>
diff --git a/pkg/interface/src/views/apps/publish/components/lib/NotebookRoutes.tsx b/pkg/interface/src/views/apps/publish/components/lib/NotebookRoutes.tsx
index 385c316375..efe2f4449e 100644
--- a/pkg/interface/src/views/apps/publish/components/lib/NotebookRoutes.tsx
+++ b/pkg/interface/src/views/apps/publish/components/lib/NotebookRoutes.tsx
@@ -9,7 +9,7 @@ import { Contacts, Rolodex } from "../../../../types/contact-update";
 import Notebook from "./Notebook";
 import NewPost from "./new-post";
 import { NoteRoutes } from './NoteRoutes';
-import { LocalUpdateRemoteContentPolicy } from "~/types";
+import { LocalUpdateRemoteContentPolicy, Associations } from "~/types";
 
 interface NotebookRoutesProps {
   api: GlobalApi;
@@ -23,6 +23,7 @@ interface NotebookRoutesProps {
   hideAvatars: boolean;
   hideNicknames: boolean;
   remoteContentPolicy: LocalUpdateRemoteContentPolicy;
+  associations: Associations;
 }
 
 export function NotebookRoutes(
diff --git a/pkg/interface/src/views/apps/publish/components/lib/Settings.tsx b/pkg/interface/src/views/apps/publish/components/lib/Settings.tsx
index 29c9004b13..3bb3693c8d 100644
--- a/pkg/interface/src/views/apps/publish/components/lib/Settings.tsx
+++ b/pkg/interface/src/views/apps/publish/components/lib/Settings.tsx
@@ -5,7 +5,9 @@ import { Notebook } from "~/types/publish-update";
 import { Contacts } from "~/types/contact-update";
 
 import { MetadataForm } from "./MetadataForm";
-import { Groups } from "~/types";
+import { Groups, Associations } from "~/types";
+import GroupifyForm from "./GroupifyForm";
+import { useHistory } from "react-router-dom";
 
 interface SettingsProps {
   host: string;
@@ -14,13 +16,18 @@ interface SettingsProps {
   contacts: Contacts;
   groups: Groups;
   api: GlobalApi;
+  associations: Associations;
 }
 
+const Divider = (props) => (
+  <Box {...props} mb={4} borderBottom={1} borderBottomColor="lightGray" />
+);
 export function Settings(props: SettingsProps) {
-  const onGroupify = () => {
-    return props.api.publish.groupify(props.book);
+  const history = useHistory();
+  const onDelete = async () => {
+    await props.api.publish.delBook(props.book);
+    history.push("/~publish");
   };
-
   const groupPath = props.notebook?.["writers-group-path"];
 
   const isUnmanaged = props.groups?.[groupPath]?.hidden || false;
@@ -36,17 +43,22 @@ export function Settings(props: SettingsProps) {
     >
       {isUnmanaged && (
         <>
-          <Col mb={4}>
-            <InputLabel>Groupify</InputLabel>
-            <InputCaption>Turn this notebook into a group</InputCaption>
-            <Button onClick={onGroupify} border>
-              Groupify
-            </Button>
-          </Col>
-          <Box mb={4} borderBottom={1} borderBottomColor="washedGray" />
+          <GroupifyForm {...props} />
+          <Divider mt={4} />
         </>
       )}
       <MetadataForm {...props} />
+      <Divider />
+      <Col mb={4}>
+        <InputLabel>Delete Notebook</InputLabel>
+        <InputCaption>
+          Permanently delete this notebook. (All current members will no longer
+          see this notebook.)
+        </InputCaption>
+        <Button onClick={onDelete} mt={1} border error>
+          Delete this notebook
+        </Button>
+      </Col>
     </Box>
   );
 }
diff --git a/pkg/interface/src/views/components/GroupSearch.tsx b/pkg/interface/src/views/components/GroupSearch.tsx
index 5315d34c2b..1cf3032dfd 100644
--- a/pkg/interface/src/views/components/GroupSearch.tsx
+++ b/pkg/interface/src/views/components/GroupSearch.tsx
@@ -88,7 +88,7 @@ export function GroupSearch(props: InviteSearchProps) {
       caption={props.caption}
       candidates={groups}
       renderCandidate={renderCandidate}
-      disabled={value.length !== 0}
+      disabled={value && value.length !== 0}
       search={(s: string, a: Association) =>
         a.metadata.title.toLowerCase().startsWith(s.toLowerCase())
       }

From 55039f28790ca7f7c316da395e103fa611f19f20 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@sunshinegardens.org>
Date: Tue, 8 Sep 2020 13:57:07 -0400
Subject: [PATCH 46/89] profile: add z-index for iOS safari

Fixes #3383.
---
 pkg/interface/src/views/apps/profile/profile.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkg/interface/src/views/apps/profile/profile.tsx b/pkg/interface/src/views/apps/profile/profile.tsx
index a3f5219d07..1b986d33e3 100644
--- a/pkg/interface/src/views/apps/profile/profile.tsx
+++ b/pkg/interface/src/views/apps/profile/profile.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-import { Box, Text, Row, Col, Center, Icon } from "@tlon/indigo-react";
+import { Box, Text, Row, Col, Icon } from "@tlon/indigo-react";
 
 import { Sigil } from "~/logic/lib/sigil";
 import { uxToHex, MOBILE_BROWSER_REGEX } from "~/logic/lib/util";
@@ -15,7 +15,6 @@ const SidebarItem = ({ children, view, current }) => {
   return (
     <Link to={`/~profile/${view}`}>
       <Row
-        display="flex"
         alignItems="center"
         verticalAlign="middle"
         py={1}
@@ -85,7 +84,7 @@ export default function ProfileScreen(props: any) {
                     <Sigil ship={`~${ship}`} size={80} color={sigilColor} />
                   </Box>
                 </Box>
-                <Box width="100%" py={3}>
+                <Box width="100%" py={3} zIndex='2'>
                   <SidebarItem current={view} view="identity">
                     Your Identity
                   </SidebarItem>

From 694c752b3f139cdeb71c711e3ec7a984cd606be2 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@sunshinegardens.org>
Date: Tue, 8 Sep 2020 13:59:39 -0400
Subject: [PATCH 47/89] profile: add react-helmet

---
 pkg/interface/src/views/apps/profile/profile.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkg/interface/src/views/apps/profile/profile.tsx b/pkg/interface/src/views/apps/profile/profile.tsx
index 1b986d33e3..735a5f7690 100644
--- a/pkg/interface/src/views/apps/profile/profile.tsx
+++ b/pkg/interface/src/views/apps/profile/profile.tsx
@@ -1,4 +1,6 @@
 import React from "react";
+import { Route, Link, Switch } from "react-router-dom";
+import Helmet from 'react-helmet';
 
 import { Box, Text, Row, Col, Icon } from "@tlon/indigo-react";
 
@@ -6,7 +8,6 @@ import { Sigil } from "~/logic/lib/sigil";
 import { uxToHex, MOBILE_BROWSER_REGEX } from "~/logic/lib/util";
 
 import Settings from "./components/settings";
-import { Route, Link } from "react-router-dom";
 import { ContactCard } from "../groups/components/lib/ContactCard";
 
 const SidebarItem = ({ children, view, current }) => {
@@ -33,6 +34,11 @@ const SidebarItem = ({ children, view, current }) => {
 export default function ProfileScreen(props: any) {
   const { ship, dark } = props;
   return (
+    <>
+    <Helmet defer={false}>
+      <title>OS1 - Profile</title>
+    </Helmet>
+    <Switch>
     <Route
       path={["/~profile/:view", "/~profile"]}
       render={({ match, history }) => {
@@ -119,5 +125,7 @@ export default function ProfileScreen(props: any) {
         );
       }}
     ></Route>
+      </Switch>
+    </>
   );
 }

From c9aa908838f4cb569318097a9e106c89b7cc765e Mon Sep 17 00:00:00 2001
From: Tyler Brown Cifu Shuster <tyler@fivepaths.com>
Date: Fri, 4 Sep 2020 09:37:15 -0700
Subject: [PATCH 48/89] links, chat: add drag and drop

---
 .../src/views/apps/chat/components/chat.tsx   |  41 ++-
 .../apps/chat/components/lib/chat-editor.js   |  16 +-
 .../lib/{chat-input.js => chat-input.tsx}     | 108 ++++++--
 .../apps/links/components/lib/link-submit.js  | 153 -----------
 .../apps/links/components/lib/link-submit.tsx | 255 ++++++++++++++++++
 pkg/interface/src/views/components/Spinner.js |  36 ++-
 .../src/views/components/s3-upload.js         | 118 --------
 .../src/views/components/s3-upload.tsx        | 142 ++++++++++
 8 files changed, 544 insertions(+), 325 deletions(-)
 rename pkg/interface/src/views/apps/chat/components/lib/{chat-input.js => chat-input.tsx} (64%)
 delete mode 100644 pkg/interface/src/views/apps/links/components/lib/link-submit.js
 create mode 100644 pkg/interface/src/views/apps/links/components/lib/link-submit.tsx
 delete mode 100644 pkg/interface/src/views/components/s3-upload.js
 create mode 100644 pkg/interface/src/views/components/s3-upload.tsx

diff --git a/pkg/interface/src/views/apps/chat/components/chat.tsx b/pkg/interface/src/views/apps/chat/components/chat.tsx
index fa66fcc788..2fabcbf758 100644
--- a/pkg/interface/src/views/apps/chat/components/chat.tsx
+++ b/pkg/interface/src/views/apps/chat/components/chat.tsx
@@ -15,6 +15,8 @@ import GlobalApi from "~/logic/api/global";
 import { Association } from "~/types/metadata-update";
 import {Group} from "~/types/group-update";
 import { LocalUpdateRemoteContentPolicy } from "~/types";
+import { S3Upload, SubmitDragger } from '~/views/components/s3-upload';
+import { IUnControlledCodeMirror } from "react-codemirror2";
 
 
 type ChatScreenProps = RouteComponentProps<{
@@ -43,9 +45,11 @@ type ChatScreenProps = RouteComponentProps<{
 
 interface ChatScreenState {
   messages: Map<string, string>;
+  dragover: boolean;
 }
 
 export class ChatScreen extends Component<ChatScreenProps, ChatScreenState> {
+  private chatInput: React.RefObject<ChatInput>;
   lastNumPending = 0;
   activityTimeout: NodeJS.Timeout | null = null;
 
@@ -54,8 +58,11 @@ export class ChatScreen extends Component<ChatScreenProps, ChatScreenState> {
 
     this.state = {
       messages: new Map(),
+      dragover: false,
     };
 
+    this.chatInput = React.createRef();
+
     moment.updateLocale("en", {
       calendar: {
         sameDay: "[Today]",
@@ -68,6 +75,26 @@ export class ChatScreen extends Component<ChatScreenProps, ChatScreenState> {
     });
   }
 
+  readyToUpload(): boolean {
+    return Boolean(this.chatInput.current?.s3Uploader.current?.inputRef.current);
+  }
+
+  onDragEnter() {
+    if (!this.readyToUpload()) {
+      return;
+    }
+    this.setState({ dragover: true });
+  }
+
+  onDrop(event: DragEvent) {
+    this.setState({ dragover: false });
+    if (!event.dataTransfer || !event.dataTransfer.files.length) {
+      return;
+    }
+    event.preventDefault();
+    this.chatInput.current?.uploadFiles(event.dataTransfer.files);
+  }
+
   render() {
     const { props, state } = this;
 
@@ -104,7 +131,18 @@ export class ChatScreen extends Component<ChatScreenProps, ChatScreenState> {
     return (
       <div
         key={props.station}
-        className="h-100 w-100 overflow-hidden flex flex-column relative">
+        className="h-100 w-100 overflow-hidden flex flex-column relative"
+        onDragEnter={this.onDragEnter.bind(this)}
+        onDragOver={event => {
+          event.preventDefault();
+          if (!this.state.dragover) {
+            this.setState({ dragover: true });
+          }
+        }}
+        onDragLeave={() => this.setState({ dragover: false })}
+        onDrop={this.onDrop.bind(this)}
+      >
+        {this.state.dragover ? <SubmitDragger /> : null}
         <ChatHeader {...props} />
         <ChatWindow
           isChatMissing={isChatMissing}
@@ -116,6 +154,7 @@ export class ChatScreen extends Component<ChatScreenProps, ChatScreenState> {
           ship={props.match.params.ship}
           {...props} />
         <ChatInput
+          ref={this.chatInput}
           api={props.api}
           numMsgs={lastMsgNum}
           station={props.station}
diff --git a/pkg/interface/src/views/apps/chat/components/lib/chat-editor.js b/pkg/interface/src/views/apps/chat/components/lib/chat-editor.js
index fbae6c1741..681c6828f2 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/chat-editor.js
+++ b/pkg/interface/src/views/apps/chat/components/lib/chat-editor.js
@@ -101,9 +101,14 @@ export default class ChatEditor extends Component {
   }
 
   render() {
-    const { props } = this;
+    const {
+      inCodeMode,
+      placeholder,
+      message,
+      ...props
+    } = this.props;
 
-    const codeTheme = props.inCodeMode ? ' code' : '';
+    const codeTheme = inCodeMode ? ' code' : '';
 
     const options = {
       mode: MARKDOWN_CONFIG,
@@ -112,7 +117,7 @@ export default class ChatEditor extends Component {
       lineWrapping: true,
       scrollbarStyle: 'native',
       cursorHeight: 0.85,
-      placeholder: props.inCodeMode ? 'Code...' : props.placeholder,
+      placeholder: inCodeMode ? 'Code...' : placeholder,
       extraKeys: {
         'Enter': () => {
           this.submit();
@@ -127,11 +132,11 @@ export default class ChatEditor extends Component {
       <div
         className={
           'chat fr h-100 flex bg-gray0-d lh-copy pl2 w-100 items-center' +
-          (props.inCodeMode ? ' code' : '')
+          (inCodeMode ? ' code' : '')
         }
         style={{ flexGrow: 1, maxHeight: '224px', width: 'calc(100% - 72px)' }}>
         <CodeEditor
-          value={props.message}
+          value={message}
           options={options}
           onChange={(e, d, v) => this.messageChange(e, d, v)}
           editorDidMount={(editor) => {
@@ -140,6 +145,7 @@ export default class ChatEditor extends Component {
               editor.focus();
             }
           }}
+          {...props}
         />
       </div>
     );
diff --git a/pkg/interface/src/views/apps/chat/components/lib/chat-input.js b/pkg/interface/src/views/apps/chat/components/lib/chat-input.tsx
similarity index 64%
rename from pkg/interface/src/views/apps/chat/components/lib/chat-input.js
rename to pkg/interface/src/views/apps/chat/components/lib/chat-input.tsx
index 9b69a7ac44..ba76714638 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/chat-input.js
+++ b/pkg/interface/src/views/apps/chat/components/lib/chat-input.tsx
@@ -1,38 +1,57 @@
 import React, { Component } from 'react';
 import ChatEditor from './chat-editor';
-import { S3Upload } from '~/views/components/s3-upload'
+import { S3Upload, SubmitDragger } from '~/views/components/s3-upload'
 ;
 import { uxToHex } from '~/logic/lib/util';
 import { Sigil } from '~/logic/lib/sigil';
 import tokenizeMessage, { isUrl } from '~/logic/lib/tokenizeMessage';
+import GlobalApi from '~/logic/api/global';
+import { Envelope } from '~/types/chat-update';
+import { Contacts, S3Configuration } from '~/types';
+
+interface ChatInputProps {
+  api: GlobalApi;
+  numMsgs: number;
+  station: any;
+  owner: string;
+  ownerContact: any;
+  envelopes: Envelope[];
+  contacts: Contacts;
+  onUnmount(msg: string): void;
+  s3: any;
+  placeholder: string;
+  message: string;
+  deleteMessage(): void;
+  hideAvatars: boolean;
+  onPaste?(): void;
+}
+
+interface ChatInputState {
+  inCodeMode: boolean;
+  submitFocus: boolean;
+  uploadingPaste: boolean;
+}
 
 
+export class ChatInput extends Component<ChatInputProps, ChatInputState> {
+  public s3Uploader: React.RefObject<S3Upload>;
+  private chatEditor: React.RefObject<ChatEditor>;
 
-
-export class ChatInput extends Component {
   constructor(props) {
     super(props);
 
     this.state = {
       inCodeMode: false,
+      submitFocus: false,
+      uploadingPaste: false,
     };
 
+    this.s3Uploader = React.createRef();
+    this.chatEditor = React.createRef();
+
     this.submit = this.submit.bind(this);
     this.toggleCode = this.toggleCode.bind(this);
-  }
-
-  uploadSuccess(url) {
-    const { props } = this;
-    props.api.chat.message(
-      props.station,
-      `~${window.ship}`,
-      Date.now(),
-      { url }
-    );
-  }
-
-  uploadError(error) {
-    //  no-op for now
+    
   }
 
   toggleCode() {
@@ -105,18 +124,48 @@ export class ChatInput extends Component {
 
   uploadSuccess(url) {
     const { props } = this;
-    props.api.chat.message(
-      props.station,
-      `~${window.ship}`,
-      Date.now(),
-      { url }
-    );
+    if (this.state.uploadingPaste) {
+      this.chatEditor.current.editor.setValue(url);
+      this.setState({ uploadingPaste: false });
+    } else {
+      props.api.chat.message(
+        props.station,
+        `~${window.ship}`,
+        Date.now(),
+        { url }
+      );
+    }
+    
   }
 
   uploadError(error) {
     //  no-op for now
   }
 
+  readyToUpload(): boolean {
+    return Boolean(this.s3Uploader.current?.inputRef.current);
+  }
+
+  onPaste(codemirrorInstance, event: ClipboardEvent) {
+    if (!event.clipboardData || !event.clipboardData.files.length) {
+      return;
+    }
+    this.setState({ uploadingPaste: true });
+    event.preventDefault();
+    event.stopPropagation();
+    this.uploadFiles(event.clipboardData.files);
+  }
+
+  uploadFiles(files: FileList) {
+    if (!this.readyToUpload()) {
+      return;
+    }
+    this.s3Uploader.current.inputRef.current.files = files;
+    const fire = document.createEvent("HTMLEvents");
+    fire.initEvent("change", true, true);
+    this.s3Uploader.current?.inputRef.current?.dispatchEvent(fire);
+  }
+
   render() {
     const { props, state } = this;
 
@@ -143,7 +192,8 @@ export class ChatInput extends Component {
              "pa3 cf flex black white-d bt b--gray4 b--gray1-d bg-white " +
              "bg-gray0-d relative"
            }
-           style={{ flexGrow: 1 }}>
+           style={{ flexGrow: 1 }}
+           >
         <div className="fl"
              style={{
                 marginTop: 6,
@@ -153,11 +203,14 @@ export class ChatInput extends Component {
           {avatar}
         </div>
         <ChatEditor
+          ref={this.chatEditor}
           inCodeMode={state.inCodeMode}
           submit={this.submit}
           onUnmount={props.onUnmount}
           message={props.message}
-          placeholder='Message...' />
+          onPaste={this.onPaste.bind(this)}
+          placeholder='Message...'
+        />
         <div className="ml2 mr2"
              style={{
                 height: '16px',
@@ -166,11 +219,12 @@ export class ChatInput extends Component {
                 marginTop: 10
               }}>
           <S3Upload
+            ref={this.s3Uploader}
             configuration={props.s3.configuration}
             credentials={props.s3.credentials}
             uploadSuccess={this.uploadSuccess.bind(this)}
             uploadError={this.uploadError.bind(this)}
-            accept="image/*"
+            accept="*"
           >
             <img
               className="invert-d"
@@ -187,7 +241,7 @@ export class ChatInput extends Component {
             marginTop: 10
           }}>
           <img style={{
-              filter: state.inCodeMode && 'invert(100%)',
+              filter: state.inCodeMode ? 'invert(100%)' : '',
               height: '14px',
               width: '14px',
             }}
diff --git a/pkg/interface/src/views/apps/links/components/lib/link-submit.js b/pkg/interface/src/views/apps/links/components/lib/link-submit.js
deleted file mode 100644
index 042ce804e5..0000000000
--- a/pkg/interface/src/views/apps/links/components/lib/link-submit.js
+++ /dev/null
@@ -1,153 +0,0 @@
-import React, { Component } from 'react';
-
-import { S3Upload } from '~/views/components/s3-upload';
-import { Spinner } from '~/views/components/Spinner';
-import { Icon } from "@tlon/indigo-react";
-
-export class LinkSubmit extends Component {
-  constructor() {
-    super();
-    this.state = {
-      linkValue: '',
-      linkTitle: '',
-      linkValid: false,
-      submitFocus: false,
-      disabled: false
-    };
-    this.setLinkValue = this.setLinkValue.bind(this);
-    this.setLinkTitle = this.setLinkTitle.bind(this);
-  }
-
-  onClickPost() {
-    const link = this.state.linkValue;
-    const title = this.state.linkTitle
-      ? this.state.linkTitle
-      : this.state.linkValue;
-      this.setState({ disabled: true });
-    this.props.api.links.postLink(this.props.resourcePath, link, title).then((r) => {
-      this.setState({
-        disabled: false,
-        linkValue: '',
-        linkTitle: '',
-        linkValid: false
-      });
-    });
-  }
-
-  setLinkValid(link) {
-    const URLparser = new RegExp(
-      /((?:([\w\d\.-]+)\:\/\/?){1}(?:(www)\.?){0,1}(((?:[\w\d-]+\.)*)([\w\d-]+\.[\w\d]+))){1}(?:\:(\d+)){0,1}((\/(?:(?:[^\/\s\?]+\/)*))(?:([^\?\/\s#]+?(?:.[^\?\s]+){0,1}){0,1}(?:\?([^\s#]+)){0,1})){0,1}(?:#([^#\s]+)){0,1}/
-    );
-
-    const validURL = URLparser.exec(link);
-
-    if (!validURL) {
-      const checkProtocol = URLparser.exec('http://' + link);
-      if (checkProtocol) {
-        this.setState({ linkValid: true });
-        this.setState({ linkValue: 'http://' + link });
-      } else {
-        this.setState({ linkValid: false });
-      }
-    } else if (validURL) {
-      this.setState({ linkValid: true });
-    }
-  }
-
-  setLinkValue(event) {
-    this.setState({ linkValue: event.target.value });
-    this.setLinkValid(event.target.value);
-  }
-
-  setLinkTitle(event) {
-    this.setState({ linkTitle: event.target.value });
-  }
-
-  uploadSuccess(url) {
-    this.setState({ linkValue: url });
-    this.setLinkValid(url);
-  }
-
-  uploadError(error) {
-    //  no-op for now
-  }
-
-  render() {
-    console.log('s3', this.props.s3);
-    const activeClasses = (this.state.linkValid && !this.state.disabled)
-      ? 'green2 pointer' : 'gray2';
-
-    const focus = (this.state.submitFocus)
-      ? 'b--black b--white-d'
-      : 'b--gray4 b--gray2-d';
-    
-    return (
-      <div className={'relative ba br1 w-100 mb6 ' + focus}>
-        <input
-          type="url"
-          className="pl2 bg-gray0-d white-d w-100 f8 pt2"
-          placeholder="Paste link here"
-          onChange={this.setLinkValue}
-          onBlur={() => this.setState({ submitFocus: false })}
-          onFocus={() => this.setState({ submitFocus: true })}
-          spellCheck="false"
-          rows={1}
-          onKeyPress={(e) => {
-            if (e.key === 'Enter') {
-              e.preventDefault();
-              this.onClickPost();
-            }
-          }}
-          value={this.state.linkValue}
-        />
-        <div className="flex flex-auto mt2 pt2">
-          <input
-            type="text"
-            className="pl2 bg-gray0-d white-d w-100 f8"
-            style={{
-              resize: 'none',
-              height: 40
-            }}
-            placeholder="Enter title"
-            onChange={this.setLinkTitle}
-            onBlur={() => this.setState({ submitFocus: false })}
-            onFocus={() => this.setState({ submitFocus: true })}
-            spellCheck="false"
-            rows={1}
-            onKeyPress={(e) => {
-              if (e.key === 'Enter') {
-                e.preventDefault();
-                this.onClickPost();
-              }
-            }}
-            value={this.state.linkTitle}
-          />
-          {!this.state.disabled ? <S3Upload
-            configuration={this.props.s3.configuration}
-            credentials={this.props.s3.credentials}
-            uploadSuccess={this.uploadSuccess.bind(this)}
-            uploadError={this.uploadError.bind(this)}
-            className="nowrap flex items-center pr2 h-100"
-          ><span className="green2 f8">Upload File</span></S3Upload> : null}
-          {!this.state.disabled ? <button
-            className={
-              'bg-gray0-d f8 flex-shrink-0 pr2 ' + activeClasses
-            }
-            disabled={!this.state.linkValid || this.state.disabled}
-            onClick={this.onClickPost.bind(this)}
-            style={{
-              bottom: 12,
-              right: 8
-            }}
-          >
-            Post
-          </button> : null}
-          <Spinner awaiting={this.state.disabled} classes="nowrap flex items-center pr2" style={{flex: '1 1 14rem'}} text="Posting to collection..." />
-        </div>
-        
-      </div>
-    ) ;
-  }
-}
-
-export default LinkSubmit;
diff --git a/pkg/interface/src/views/apps/links/components/lib/link-submit.tsx b/pkg/interface/src/views/apps/links/components/lib/link-submit.tsx
new file mode 100644
index 0000000000..1c78aacc51
--- /dev/null
+++ b/pkg/interface/src/views/apps/links/components/lib/link-submit.tsx
@@ -0,0 +1,255 @@
+import React, { Component } from 'react';
+import { hasProvider } from 'oembed-parser';
+
+import { S3Upload, SubmitDragger } from '~/views/components/s3-upload';
+import { Spinner } from '~/views/components/Spinner';
+import { Icon } from "@tlon/indigo-react";
+import GlobalApi from '~/logic/api/global';
+import { S3State } from '~/types';
+
+interface LinkSubmitProps {
+  api: GlobalApi;
+  resourcePath: string;
+  s3: S3State;
+}
+
+interface LinkSubmitState {
+  linkValue: string;
+  linkTitle: string;
+  linkValid: boolean;
+  submitFocus: boolean;
+  urlFocus: boolean;
+  disabled: boolean;
+  dragover: boolean;
+}
+
+export class LinkSubmit extends Component<LinkSubmitProps, LinkSubmitState> {
+  private s3Uploader: React.RefObject<S3Upload>;
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      linkValue: '',
+      linkTitle: '',
+      linkValid: false,
+      submitFocus: false,
+      urlFocus: false,
+      disabled: false,
+      dragover: false
+    };
+    this.setLinkValue = this.setLinkValue.bind(this);
+    this.setLinkTitle = this.setLinkTitle.bind(this);
+    this.onDragEnter = this.onDragEnter.bind(this);
+    this.onDrop = this.onDrop.bind(this);
+    this.onPaste = this.onPaste.bind(this);
+    this.uploadFiles = this.uploadFiles.bind(this);
+    this.s3Uploader = React.createRef();
+  }
+
+  onClickPost() {
+    const link = this.state.linkValue;
+    const title = this.state.linkTitle
+      ? this.state.linkTitle
+      : this.state.linkValue;
+      this.setState({ disabled: true });
+    this.props.api.links.postLink(this.props.resourcePath, link, title).then((r) => {
+      this.setState({
+        disabled: false,
+        linkValue: '',
+        linkTitle: '',
+        linkValid: false
+      });
+    });
+  }
+
+  setLinkValid(linkValue) {
+    const URLparser = new RegExp(
+      /((?:([\w\d\.-]+)\:\/\/?){1}(?:(www)\.?){0,1}(((?:[\w\d-]+\.)*)([\w\d-]+\.[\w\d]+))){1}(?:\:(\d+)){0,1}((\/(?:(?:[^\/\s\?]+\/)*))(?:([^\?\/\s#]+?(?:.[^\?\s]+){0,1}){0,1}(?:\?([^\s#]+)){0,1})){0,1}(?:#([^#\s]+)){0,1}/
+    );;
+
+    let linkValid = URLparser.test(linkValue);
+
+    if (!linkValid) {
+      linkValid = URLparser.test(`http://${linkValue}`);
+      if (linkValid) {
+        linkValue = `http://${linkValue}`;
+      }
+    }
+
+    this.setState({ linkValid, linkValue });
+
+    if (linkValid) {
+      if (hasProvider(linkValue)) {
+        fetch(`https://noembed.com/embed?url=${linkValue}`)
+        .then(response => response.json())
+        .then((result) => {
+          if (result.title) {
+            this.setState({ linkTitle: result.title });
+          }
+        }).catch((error) => {/*noop*/});
+      } else {
+        this.setState({
+          linkTitle: decodeURIComponent(linkValue
+            .split('/')
+            .pop()
+            .split('.')
+            .slice(0, -1)
+            .join('.')
+            .replace('_', ' ')
+            .replace(/\d{4}\.\d{1,2}\.\d{2}\.\.\d{2}\.\d{2}\.\d{2}-/, '')
+            )
+        })
+      }
+    }
+  }
+
+  setLinkValue(event) {
+    this.setState({ linkValue: event.target.value });
+    this.setLinkValid(event.target.value);
+  }
+
+  setLinkTitle(event) {
+    this.setState({ linkTitle: event.target.value });
+  }
+
+  uploadSuccess(url) {
+    this.setState({ linkValue: url });
+    this.setLinkValid(url);
+  }
+
+  uploadError(error) {
+    //  no-op for now
+  }
+
+  readyToUpload(): boolean {
+    return Boolean(this.s3Uploader.current && this.s3Uploader.current.inputRef.current);
+  }
+
+  onDragEnter() {
+    if (!this.readyToUpload()) {
+      return;
+    }
+    this.setState({ dragover: true });
+  }
+
+  onDrop(event: DragEvent) {
+    this.setState({ dragover: false });
+    if (!event.dataTransfer || !event.dataTransfer.files.length) {
+      return;
+    }
+    event.preventDefault();
+    this.uploadFiles(event.dataTransfer.files);
+  }
+
+  onPaste(event: ClipboardEvent) {
+    if (!event.clipboardData || !event.clipboardData.files.length) {
+      return;
+    }
+    event.preventDefault();
+    event.stopPropagation();
+    this.uploadFiles(event.clipboardData.files);
+  }
+
+  uploadFiles(files: FileList) {
+    if (!this.readyToUpload()) {
+      return;
+    }
+    this.s3Uploader.current.inputRef.current.files = files;
+    const fire = document.createEvent("HTMLEvents");
+    fire.initEvent("change", true, true);
+    this.s3Uploader.current?.inputRef.current?.dispatchEvent(fire);
+  }
+
+  render() {
+    const activeClasses = (this.state.linkValid && !this.state.disabled)
+      ? 'green2 pointer' : 'gray2';
+
+    const focus = (this.state.submitFocus)
+      ? 'b--black b--white-d'
+      : 'b--gray4 b--gray2-d';
+
+    return (
+      <div
+        className={`relative ba br1 w-100 mb6 ${focus}`}
+        onDragEnter={this.onDragEnter.bind(this)}
+        onDragOver={e => {e.preventDefault();this.setState({ dragover: true})}}
+        onDragLeave={() => this.setState({ dragover: false })}
+        onDrop={this.onDrop}
+      >
+        {this.state.dragover ? <SubmitDragger /> : null}
+        <div className="relative">
+          {(this.state.linkValue || this.state.urlFocus || this.state.disabled) ? null : <span className="gray2 absolute pl2 pt3 pb2 f8" style={{pointerEvents: 'none'}}>
+            Drop or <span className="pointer green2" style={{pointerEvents: 'all'}} onClick={(event) => {
+              if (!this.readyToUpload()) {
+                return;
+              }
+               this.s3Uploader.current.inputRef.current.click();
+            }}>upload</span> a file, or paste a link here
+          </span>}
+          {!this.state.disabled ? <S3Upload
+            ref={this.s3Uploader}
+            configuration={this.props.s3.configuration}
+            credentials={this.props.s3.credentials}
+            uploadSuccess={this.uploadSuccess.bind(this)}
+            uploadError={this.uploadError.bind(this)}
+            className="dn absolute pt3 pb2 pl2 w-100"
+          ></S3Upload> : null}
+          <input
+            type="url"
+            className="pl2 w-100 f8 pt3 pb2 white-d bg-transparent"
+            onChange={this.setLinkValue}
+            onBlur={() => this.setState({ submitFocus: false, urlFocus: false })}
+            onFocus={() => this.setState({ submitFocus: true, urlFocus: true })}
+            spellCheck="false"
+            onPaste={this.onPaste}
+            onKeyPress={(e) => {
+              if (e.key === 'Enter') {
+                e.preventDefault();
+                this.onClickPost();
+              }
+            }}
+            value={this.state.linkValue}
+          />
+        </div>
+          <input
+            type="text"
+            className="pl2 bg-transparent w-100 f8 white-d"
+            style={{
+              resize: 'none',
+              height: 40
+            }}
+            placeholder="Provide a title"
+            onChange={this.setLinkTitle}
+            onBlur={() => this.setState({ submitFocus: false })}
+            onFocus={() => this.setState({ submitFocus: true })}
+            spellCheck="false"
+            onKeyPress={(e) => {
+              if (e.key === 'Enter') {
+                e.preventDefault();
+                this.onClickPost();
+              }
+            }}
+            value={this.state.linkTitle}
+          />
+          {!this.state.disabled ? <button
+            className={
+              'bg-transparent f8 flex-shrink-0 pr2 pl2 pt2 pb3 ' + activeClasses
+            }
+            disabled={!this.state.linkValid || this.state.disabled}
+            onClick={this.onClickPost.bind(this)}
+            style={{
+              bottom: 12,
+              right: 8
+            }}
+          >
+            Post link
+          </button> : null}
+          <Spinner awaiting={this.state.disabled} classes="nowrap flex items-center pr2 pl2 pt2 pb4" style={{flex: '1 1 14rem'}} text="Posting to collection..." />
+        
+        
+      </div>
+    ) ;
+  }
+}
+
+export default LinkSubmit;
diff --git a/pkg/interface/src/views/components/Spinner.js b/pkg/interface/src/views/components/Spinner.js
index 7ee4a67ce7..e2225ffa53 100644
--- a/pkg/interface/src/views/components/Spinner.js
+++ b/pkg/interface/src/views/components/Spinner.js
@@ -1,24 +1,18 @@
 import React, { Component } from 'react';
 
-export class Spinner extends Component {
-  render() {
-    const classes = this.props.classes ? this.props.classes : '';
-    const text = this.props.text ? this.props.text : '';
-    const awaiting = this.props.awaiting ? this.props.awaiting : false;
+const Spinner = ({
+  classes = '',
+  text = '',
+  awaiting = false
+}) => awaiting ? (
+  <div className={classes + ' z-2 bg-white bg-gray0-d white-d flex'}>
+    <img className="invert-d spin-active v-mid"
+      src="/~landscape/img/Spinner.png"
+      width={16}
+      height={16}
+    />
+    <p className="dib f9 ml2 v-mid inter">{text}</p>
+  </div>
+) : null;
 
-    if (awaiting) {
-      return (
-        <div className={classes + ' z-2 bg-white bg-gray0-d white-d flex'}>
-          <img className="invert-d spin-active v-mid"
-            src="/~landscape/img/Spinner.png"
-            width={16}
-            height={16}
-          />
-          <p className="dib f9 ml2 v-mid inter">{text}</p>
-        </div>
-      );
-    } else {
-      return null;
-    }
-  }
-}
+export { Spinner as default, Spinner };
\ No newline at end of file
diff --git a/pkg/interface/src/views/components/s3-upload.js b/pkg/interface/src/views/components/s3-upload.js
deleted file mode 100644
index 4cb37bd6d0..0000000000
--- a/pkg/interface/src/views/components/s3-upload.js
+++ /dev/null
@@ -1,118 +0,0 @@
-import React, { Component } from 'react'
-import { Icon } from "@tlon/indigo-react";
-
-import S3Client from '~/logic/lib/s3';
-import { Spinner } from './Spinner';
-
-export class S3Upload extends Component {
-
-  constructor(props) {
-    super(props);
-    this.state = {
-      isUploading: false
-    };
-    this.s3 = new S3Client();
-    this.setCredentials(props.credentials, props.configuration);
-    this.inputRef = React.createRef();
-  }
-
-  isReady(creds, config) {
-    return (
-      !!creds &&
-      'endpoint' in creds &&
-      'accessKeyId' in creds &&
-      'secretAccessKey' in creds &&
-      creds.endpoint !== '' &&
-      creds.accessKeyId !== '' &&
-      creds.secretAccessKey !== '' &&
-      !!config &&
-      'currentBucket' in config &&
-      config.currentBucket !== ''
-    );
-  }
-
-  componentDidUpdate(prevProps) {
-    const { props } = this;
-    this.setCredentials(props.credentials, props.configuration);
-  }
-
-  setCredentials(credentials, configuration) {
-    if (!this.isReady(credentials, configuration)) { return; }
-    this.s3.setCredentials(
-      credentials.endpoint,
-      credentials.accessKeyId,
-      credentials.secretAccessKey
-    );
-  }
-
-  getFileUrl(endpoint, filename) {
-    return endpoint + '/' + filename;
-  }
-
-  onChange() {
-    const { props } = this;
-    if (!this.inputRef.current) { return; }
-    let files = this.inputRef.current.files;
-    if (files.length <= 0) { return; }
-
-    let file = files.item(0);
-    let bucket = props.configuration.currentBucket;
-
-    this.setState({ isUploading: true });
-
-    this.s3.upload(bucket, file.name, file)
-      .then((data) => {
-        if (!data || !('Location' in data)) {
-          return;
-        }
-        this.props.uploadSuccess(data.Location);
-      })
-      .catch((err) => {
-        console.error(err);
-        this.props.uploadError(err);
-      })
-      .finally(() => {
-        this.setState({ isUploading: false });
-      });
-  }
-
-  onClick() {
-    if (!this.inputRef.current) { return; }
-    this.inputRef.current.click();
-  }
-
-  render() {
-    const {
-      credentials,
-      configuration,
-      className,
-      accept = '*',
-      children = false
-    } = this.props;
-    if (!this.isReady(credentials, configuration)) {
-      return <div></div>;
-    } else {
-      let classes = !!className
-        ? "pointer " + className
-        : "pointer";
-      const display = children || <Icon icon='ArrowNorth' />;
-      return (
-        <div>
-          <input
-            className="dn"
-            type="file"
-            id="fileElement"
-            ref={this.inputRef}
-            accept={accept}
-            onChange={this.onChange.bind(this)} />
-          {this.state.isUploading
-            ? <Spinner awaiting={true} classes={className} />
-            : <span className={`pointer ${className}`} onClick={this.onClick.bind(this)}>{display}</span>
-          }
-          
-        </div>
-      );
-    }
-  }
-}
-
diff --git a/pkg/interface/src/views/components/s3-upload.tsx b/pkg/interface/src/views/components/s3-upload.tsx
new file mode 100644
index 0000000000..81232c1481
--- /dev/null
+++ b/pkg/interface/src/views/components/s3-upload.tsx
@@ -0,0 +1,142 @@
+import React, { Component } from 'react'
+import { Icon } from "@tlon/indigo-react";
+
+import S3Client from '~/logic/lib/s3';
+import { Spinner } from './Spinner';
+import { S3Credentials, S3Configuration } from '~/types';
+import { dateToDa, deSig } from '~/logic/lib/util';
+
+export const SubmitDragger = () => (
+  <div
+    className="top-0 bottom-0 left-0 right-0 absolute bg-gray5 h-100 w-100 flex items-center justify-center z-999"
+    style={{pointerEvents: 'none'}}
+  >Drop a file to upload</div>
+);
+
+interface S3UploadProps {
+  credentials: S3Credentials;
+  configuration: S3Configuration;
+  uploadSuccess: Function;
+  uploadError: Function;
+  className?: string;
+  accept: string;
+}
+
+interface S3UploadState {
+  isUploading: boolean;
+}
+
+export class S3Upload extends Component<S3UploadProps, S3UploadState> {
+  private s3: S3Client;
+  public inputRef: React.RefObject<HTMLInputElement>;
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      isUploading: false
+    };
+    this.s3 = new S3Client();
+    this.setCredentials(props.credentials, props.configuration);
+    this.inputRef = React.createRef();
+  }
+
+  isReady(creds, config): boolean {
+    return (
+      !!creds &&
+      'endpoint' in creds &&
+      'accessKeyId' in creds &&
+      'secretAccessKey' in creds &&
+      creds.endpoint !== '' &&
+      creds.accessKeyId !== '' &&
+      creds.secretAccessKey !== '' &&
+      !!config &&
+      'currentBucket' in config &&
+      config.currentBucket !== ''
+    );
+  }
+
+  componentDidUpdate(prevProps): void {
+    const { props } = this;
+    if (!props.credentials !== prevProps.credentials || props.configuration !== prevProps.configuration) {
+      this.setCredentials(props.credentials, props.configuration);
+    }
+  }
+
+  setCredentials(credentials, configuration): void {
+    if (!this.isReady(credentials, configuration)) { return; }
+    this.s3.setCredentials(
+      credentials.endpoint,
+      credentials.accessKeyId,
+      credentials.secretAccessKey
+    );
+  }
+
+  onChange(): void {
+    const { props } = this;
+    if (!this.inputRef.current) { return; }
+    let files = this.inputRef.current.files;
+    if (!files || files.length <= 0) { return; }
+
+    let file = files.item(0);
+    if (!file) { return; }
+    const fileParts = file.name.split('.');
+    const fileName = fileParts.slice(0, -1);
+    const fileExtension = fileParts.pop();
+    const timestamp = deSig(dateToDa(new Date()));
+    let bucket = props.configuration.currentBucket;
+
+    this.setState({ isUploading: true });
+
+    this.s3.upload(bucket, `${window.ship}/${timestamp}-${fileName}.${fileExtension}`, file)
+      .then((data) => {
+        if (!data || !('Location' in data)) {
+          return;
+        }
+        this.props.uploadSuccess(data.Location);
+      })
+      .catch((err) => {
+        console.error(err);
+        this.props.uploadError(err);
+      })
+      .finally(() => {
+        this.setState({ isUploading: false });
+      });
+  }
+
+  onClick() {
+    if (!this.inputRef.current) { return; }
+    this.inputRef.current.click();
+  }
+
+  render() {
+    const {
+      credentials,
+      configuration,
+      className = '',
+      accept = '*',
+      children = false
+    } = this.props;
+    
+    if (!this.isReady(credentials, configuration)) {
+      return null;
+    }
+
+    const display = children || <Icon icon='ArrowNorth' />;
+    return (
+      <>
+        <input
+          className="dn"
+          type="file"
+          id="fileElement"
+          ref={this.inputRef}
+          accept={accept}
+          onChange={this.onChange.bind(this)} />
+        {this.state.isUploading
+          ? <Spinner awaiting={true} classes={className} />
+          : <span className={`pointer ${className}`} onClick={this.onClick.bind(this)}>{display}</span>
+        }
+      </>
+    );
+  }
+}
+

From d04f62a9077c872df16bda3dda7da381b4b163c4 Mon Sep 17 00:00:00 2001
From: Tyler Brown Cifu Shuster <tyler@fivepaths.com>
Date: Tue, 8 Sep 2020 12:35:44 -0700
Subject: [PATCH 49/89] chat: check for cited participants in sidebar

Fixes #3438
---
 .../src/views/apps/chat/components/lib/group-item.js          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/interface/src/views/apps/chat/components/lib/group-item.js b/pkg/interface/src/views/apps/chat/components/lib/group-item.js
index 495e16812d..6f047232a3 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/group-item.js
+++ b/pkg/interface/src/views/apps/chat/components/lib/group-item.js
@@ -1,13 +1,13 @@
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
 import { ChannelItem } from './channel-item';
-import { deSig } from "~/logic/lib/util";
+import { deSig, cite } from "~/logic/lib/util";
 
 export class GroupItem extends Component {
   render() {
     const { props } = this;
     const association = props.association ? props.association : {};
-    const DEFAULT_TITLE_REGEX = new RegExp(`(( <-> )?~${deSig(window.ship)}( <-> )?)`);
+    const DEFAULT_TITLE_REGEX = new RegExp(`(( <-> )?~(?:${window.ship}|${deSig(cite(window.ship))})( <-> )?)`);
 
     let title = association['app-path'] ? association['app-path'] : 'Direct Messages';
     if (association.metadata && association.metadata.title) {

From f1a75b7af9ec5e4c45c48aa2973533b4e18e2279 Mon Sep 17 00:00:00 2001
From: Tyler Brown Cifu Shuster <tyler@fivepaths.com>
Date: Tue, 8 Sep 2020 13:04:36 -0700
Subject: [PATCH 50/89] chat: added placeholder for empty room

---
 .../src/views/apps/chat/components/lib/chat-window.tsx          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx b/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx
index 137a4f9c4c..18853f5e0e 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx
+++ b/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx
@@ -292,7 +292,7 @@ export class ChatWindow extends Component<ChatWindowProps, ChatWindowState> {
               className={number === mailboxSize ? 'pb3' : ''}
             />
           }}
-        /> : null}
+        /> : <div style={{height: '100%', width: '100%'}}></div>}
       </Fragment>
     );
   }

From 01a75d540f7b197d42cd0bf8c47776c39eabdcbc Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@sunshinegardens.org>
Date: Tue, 8 Sep 2020 17:08:15 -0400
Subject: [PATCH 51/89] leap: use a instead of Link if not default app

Logging out currently doesn't work via Leap because we only use
react-router. This adds selection and navigation logic that passes
both app name and link href and compares app name against the default
app lib. This makes leap extensible for third party apps, too.
---
 .../src/views/components/leap/Omnibox.js      | 46 ++++++++++++-------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/pkg/interface/src/views/components/leap/Omnibox.js b/pkg/interface/src/views/components/leap/Omnibox.js
index 4a4b484ace..adceb3aeaa 100644
--- a/pkg/interface/src/views/components/leap/Omnibox.js
+++ b/pkg/interface/src/views/components/leap/Omnibox.js
@@ -6,6 +6,8 @@ import Mousetrap from 'mousetrap';
 import OmniboxInput from './OmniboxInput';
 import OmniboxResult from './OmniboxResult';
 
+import defaultApps from '~/logic/lib/default-apps';
+
 export class Omnibox extends Component {
   constructor(props) {
     super(props);
@@ -13,7 +15,7 @@ export class Omnibox extends Component {
       index: new Map([]),
       query: '',
       results: this.initialResults(),
-      selected: ''
+      selected: []
     };
     this.handleClickOutside = this.handleClickOutside.bind(this);
     this.search = this.search.bind(this);
@@ -77,9 +79,11 @@ export class Omnibox extends Component {
     if (evt.key === 'Enter') {
       evt.preventDefault();
       if (this.state.selected !== '') {
-        this.navigate(this.state.selected);
+        this.navigate(this.state.selected[0], this.state.selected[1]);
       } else {
-        this.navigate(Array.from(this.state.results.values()).flat()[0].link);
+        this.navigate(
+          Array.from(this.state.results.values()).flat()[0].app,
+          Array.from(this.state.results.values()).flat()[0].link);
       }
     }
   }
@@ -107,11 +111,15 @@ export class Omnibox extends Component {
     }));
   }
 
-  navigate(link) {
+  navigate(app, link) {
     const { props } = this;
     this.setState({ results: this.initialResults(), query: '' }, () => {
       props.api.local.setOmnibox();
-      props.history.push(link);
+      if (defaultApps.includes(app.toLowerCase()) || app === 'profile') {
+        props.history.push(link);
+      } else {
+        window.location.href = link;
+      }
     });
   }
 
@@ -165,19 +173,22 @@ export class Omnibox extends Component {
     if (current !== '') {
       const currentIndex = flattenedResults.indexOf(
         ...flattenedResults.filter((e) => {
-          return e.link === current;
+          return e.link === current[1];
         })
       );
       if (currentIndex > 0) {
+        const nextApp = flattenedResults[currentIndex - 1].app;
         const nextLink = flattenedResults[currentIndex - 1].link;
-        this.setState({ selected: nextLink });
+        this.setState({ selected: [nextApp, nextLink] });
       } else {
+        const nextApp = flattenedResults[totalLength - 1].app;
         const nextLink = flattenedResults[totalLength - 1].link;
-        this.setState({ selected: nextLink });
+        this.setState({ selected: [nextApp, nextLink] });
       }
     } else {
+      const nextApp = flattenedResults[totalLength - 1].app;
       const nextLink = flattenedResults[totalLength - 1].link;
-      this.setState({ selected: nextLink });
+      this.setState({ selected: [nextApp, nextLink] });
     }
   }
 
@@ -187,19 +198,22 @@ export class Omnibox extends Component {
     if (current !== '') {
       const currentIndex = flattenedResults.indexOf(
         ...flattenedResults.filter((e) => {
-          return e.link === current;
+          return e.link === current[1];
         })
       );
       if (currentIndex < flattenedResults.length - 1) {
+      const nextApp = flattenedResults[currentIndex + 1].app;
       const nextLink = flattenedResults[currentIndex + 1].link;
-      this.setState({ selected: nextLink });
+      this.setState({ selected: [nextApp, nextLink] });
       } else {
+      const nextApp = flattenedResults[0].app;
       const nextLink = flattenedResults[0].link;
-      this.setState({ selected: nextLink });
+      this.setState({ selected: [nextApp, nextLink] });
       }
     } else {
+      const nextApp = flattenedResults[0].app;
       const nextLink = flattenedResults[0].link;
-      this.setState({ selected: nextLink });
+      this.setState({ selected: [nextApp, nextLink] });
     }
   }
 
@@ -228,8 +242,8 @@ export class Omnibox extends Component {
                 text={result.title}
                 subtext={result.host}
                 link={result.link}
-                navigate={() => this.navigate(result.link)}
-                selected={this.state.selected}
+                navigate={() => this.navigate(result.app, result.link)}
+                selected={this.state.selected[1]}
                 dark={props.dark} />
             ))}
           </Box>
@@ -241,7 +255,7 @@ export class Omnibox extends Component {
 
   render() {
     const { props, state } = this;
-    if (!state.selected && Array.from(this.state.results.values()).flat().length) {
+    if (state?.selected.length === 0 && Array.from(this.state.results.values()).flat().length) {
       this.setNextSelected();
     }
     return (

From 990d46dd9e29db3050378171b38eac32cb53d6b4 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@sunshinegardens.org>
Date: Tue, 8 Sep 2020 17:16:45 -0400
Subject: [PATCH 52/89] error: add background style

If you've set an image background, it can make it hard to read 404s or
error messages. This adds the default bg color.
---
 pkg/interface/src/views/components/Error.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/interface/src/views/components/Error.tsx b/pkg/interface/src/views/components/Error.tsx
index 95f89d99ed..de502d72d6 100644
--- a/pkg/interface/src/views/components/Error.tsx
+++ b/pkg/interface/src/views/components/Error.tsx
@@ -12,7 +12,7 @@ class ErrorComponent extends Component<ErrorProps> {
   render () {
     const { code, error, history, description } = this.props;
     return (
-      <Col alignItems="center" justifyContent="center" height="100%" p={4}>
+      <Col alignItems="center" justifyContent="center" height="100%" p="4" backgroundColor="white">
         <Box mb={4}>
           <Text fontSize={3}>
            {code ? code : 'Error'}

From 27fd31b0b3c6bfeea1b817d68697d43f8323c599 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@sunshinegardens.org>
Date: Tue, 8 Sep 2020 17:22:42 -0400
Subject: [PATCH 53/89] interface: embeds on by default

---
 pkg/interface/src/logic/store/store.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/interface/src/logic/store/store.ts b/pkg/interface/src/logic/store/store.ts
index 63d3bb0167..8bb5794d9b 100644
--- a/pkg/interface/src/logic/store/store.ts
+++ b/pkg/interface/src/logic/store/store.ts
@@ -58,7 +58,7 @@ export default class GlobalStore extends BaseStore<StoreState> {
         imageShown: true,
         audioShown: true,
         videoShown: true,
-        oembedShown: false,
+        oembedShown: true,
       },
       hideAvatars: false,
       hideNicknames: false,

From f9cf98438163eb2380906033d599ad1554bda1a2 Mon Sep 17 00:00:00 2001
From: Tyler Brown Cifu Shuster <tyler@fivepaths.com>
Date: Tue, 8 Sep 2020 15:20:40 -0700
Subject: [PATCH 54/89] chat: prevent message rerender

---
 .../apps/chat/components/lib/chat-message.tsx | 165 +++++++++---------
 1 file changed, 83 insertions(+), 82 deletions(-)

diff --git a/pkg/interface/src/views/apps/chat/components/lib/chat-message.tsx b/pkg/interface/src/views/apps/chat/components/lib/chat-message.tsx
index 12174803a1..e29e18802c 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/chat-message.tsx
+++ b/pkg/interface/src/views/apps/chat/components/lib/chat-message.tsx
@@ -5,87 +5,88 @@ import { Message } from "./message";
 import { Envelope } from "~/types/chat-update";
 import _ from "lodash";
 
-export const ChatMessage = (props) => {
-  const {
-    msg,
-    previousMsg,
-    nextMsg,
-    isFirstUnread,
-    group,
-    association,
-    contacts,
-    unreadRef,
-    hideAvatars,
-    hideNicknames,
-    remoteContentPolicy,
-    className = ''
-  } = props;
-
-  // Render sigil if previous message is not by the same sender
-  const aut = ["author"];
-  const renderSigil =
-    _.get(nextMsg, aut) !== _.get(msg, aut, msg.author);
-  const paddingTop = renderSigil;
-  const paddingBot =
-    _.get(previousMsg, aut) !== _.get(msg, aut, msg.author);
-
-  const when = ["when"];
-  const dayBreak =
-    moment(_.get(nextMsg, when)).format("YYYY.MM.DD") !==
-    moment(_.get(msg, when)).format("YYYY.MM.DD");
-
-  const messageElem = (
-    <Message
-      key={msg.uid}
-      msg={msg}
-      renderSigil={renderSigil}
-      paddingTop={paddingTop}
-      paddingBot={paddingBot}
-      pending={Boolean(msg.pending)}
-      group={group}
-      contacts={contacts}
-      association={association}
-      hideNicknames={hideNicknames}
-      hideAvatars={hideAvatars}
-      remoteContentPolicy={remoteContentPolicy}
-      className={className}
-    />
-  );
-
-  if (isFirstUnread) {
-    return (
-      <Fragment key={msg.uid}>
-        {messageElem}
-        <div ref={unreadRef}
-             className="mv2 green2 flex items-center f9">
-          <hr className="dn-s ma0 w2 b--green2 bt-0" />
-          <p className="mh4">New messages below</p>
-          <hr className="ma0 flex-grow-1 b--green2 bt-0" />
-          {dayBreak && (
-            <p className="gray2 mh4">
-              {moment(_.get(msg, when)).calendar()}
-            </p>
-          )}
-          <hr
-            style={{ width: "calc(50% - 48px)" }}
-            className="b--green2 ma0 bt-0"
-          />
-        </div>
-      </Fragment>
+export class ChatMessage extends PureComponent {
+  render() {
+    const {
+      msg,
+      previousMsg,
+      nextMsg,
+      isFirstUnread,
+      group,
+      association,
+      contacts,
+      unreadRef,
+      hideAvatars,
+      hideNicknames,
+      remoteContentPolicy,
+      className = ''
+    } = this.props;
+  
+    // Render sigil if previous message is not by the same sender
+    const aut = ["author"];
+    const renderSigil =
+      _.get(nextMsg, aut) !== _.get(msg, aut, msg.author);
+    const paddingTop = renderSigil;
+    const paddingBot =
+      _.get(previousMsg, aut) !== _.get(msg, aut, msg.author);
+  
+    const when = ["when"];
+    const dayBreak =
+      moment(_.get(nextMsg, when)).format("YYYY.MM.DD") !==
+      moment(_.get(msg, when)).format("YYYY.MM.DD");
+  
+    const messageElem = (
+      <Message
+        key={msg.uid}
+        msg={msg}
+        renderSigil={renderSigil}
+        paddingTop={paddingTop}
+        paddingBot={paddingBot}
+        pending={Boolean(msg.pending)}
+        group={group}
+        contacts={contacts}
+        association={association}
+        hideNicknames={hideNicknames}
+        hideAvatars={hideAvatars}
+        remoteContentPolicy={remoteContentPolicy}
+        className={className}
+      />
     );
-  } else if (dayBreak) {
-    return (
-      <Fragment key={msg.uid}>
-        <div
-          className="pv3 gray2 b--gray2 flex items-center justify-center f9 "
-        >
-          <p>{moment(_.get(msg, when)).calendar()}</p>
-        </div>
-        {messageElem}
-      </Fragment>
-    );
-  } else {
-    return messageElem;
+  
+    if (isFirstUnread) {
+      return (
+        <Fragment key={msg.uid}>
+          {messageElem}
+          <div ref={unreadRef}
+               className="mv2 green2 flex items-center f9">
+            <hr className="dn-s ma0 w2 b--green2 bt-0" />
+            <p className="mh4">New messages below</p>
+            <hr className="ma0 flex-grow-1 b--green2 bt-0" />
+            {dayBreak && (
+              <p className="gray2 mh4">
+                {moment(_.get(msg, when)).calendar()}
+              </p>
+            )}
+            <hr
+              style={{ width: "calc(50% - 48px)" }}
+              className="b--green2 ma0 bt-0"
+            />
+          </div>
+        </Fragment>
+      );
+    } else if (dayBreak) {
+      return (
+        <Fragment key={msg.uid}>
+          <div
+            className="pv3 gray2 b--gray2 flex items-center justify-center f9 "
+          >
+            <p>{moment(_.get(msg, when)).calendar()}</p>
+          </div>
+          {messageElem}
+        </Fragment>
+      );
+    } else {
+      return messageElem;
+    }
   }
-};
-
+}
\ No newline at end of file

From c3a2e664120ccb7f67c5b3eed2dad4fbd91526fa Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Wed, 9 Sep 2020 08:26:03 +1000
Subject: [PATCH 55/89] publish: scroll markdown editor correctly

---
 .../src/views/apps/publish/components/lib/MarkdownField.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/interface/src/views/apps/publish/components/lib/MarkdownField.tsx b/pkg/interface/src/views/apps/publish/components/lib/MarkdownField.tsx
index b60af6a5cf..507460f5c2 100644
--- a/pkg/interface/src/views/apps/publish/components/lib/MarkdownField.tsx
+++ b/pkg/interface/src/views/apps/publish/components/lib/MarkdownField.tsx
@@ -12,7 +12,7 @@ export const MarkdownField = ({ id, ...rest }: { id: string; } & Parameters<type
   const [{ value }, { error, touched }, { setValue, setTouched }] = useField(id);
 
   return (
-    <Box height="100%" width="100%" display="flex" flexDirection="column" {...rest}>
+    <Box overflowY="hidden" height="100%" width="100%" display="flex" flexDirection="column" {...rest}>
       <MarkdownEditor
         onFocus={() => setTouched(true)}
         onBlur={() => setTouched(false)}

From d80e5cac49637c2d1b53ec097644c76b396ecb95 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Wed, 9 Sep 2020 08:51:17 +1000
Subject: [PATCH 56/89] publish: mobile scrolling fix

---
 .../src/views/apps/publish/components/lib/MarkdownField.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/interface/src/views/apps/publish/components/lib/MarkdownField.tsx b/pkg/interface/src/views/apps/publish/components/lib/MarkdownField.tsx
index 507460f5c2..cec0f6d5ef 100644
--- a/pkg/interface/src/views/apps/publish/components/lib/MarkdownField.tsx
+++ b/pkg/interface/src/views/apps/publish/components/lib/MarkdownField.tsx
@@ -12,7 +12,7 @@ export const MarkdownField = ({ id, ...rest }: { id: string; } & Parameters<type
   const [{ value }, { error, touched }, { setValue, setTouched }] = useField(id);
 
   return (
-    <Box overflowY="hidden" height="100%" width="100%" display="flex" flexDirection="column" {...rest}>
+    <Box overflowY="hidden" width="100%" display="flex" flexDirection="column" {...rest}>
       <MarkdownEditor
         onFocus={() => setTouched(true)}
         onBlur={() => setTouched(false)}

From 7fe9caf554fc34109e0ab7b0e9c773a2d865b02a Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@sunshinegardens.org>
Date: Tue, 8 Sep 2020 18:57:56 -0400
Subject: [PATCH 57/89] interface: always show home button

---
 pkg/interface/src/views/components/StatusBar.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkg/interface/src/views/components/StatusBar.js b/pkg/interface/src/views/components/StatusBar.js
index f6b9acdf50..d6d6f0d12f 100644
--- a/pkg/interface/src/views/components/StatusBar.js
+++ b/pkg/interface/src/views/components/StatusBar.js
@@ -32,7 +32,6 @@ const StatusBar = (props) => {
       px={3}
       >
       <Row collapse>
-        {atHome ? null : (
           <StatusBarItem mr={2} onClick={() => props.history.push('/')}>
             <img
               className='invert-d'
@@ -41,7 +40,6 @@ const StatusBar = (props) => {
               width='11'
             />
           </StatusBarItem>
-        )}
         <StatusBarItem mr={2} onClick={() => props.api.local.setOmnibox()}>
           <Text display='inline-block' style={{ transform: 'rotate(180deg)' }}>
             ↩
@@ -53,7 +51,7 @@ const StatusBar = (props) => {
             {metaKey}/
           </Text>
         </StatusBarItem>
-        <StatusBarItem 
+        <StatusBarItem
           onClick={() => props.history.push('/~groups')}
           badge={Object.keys(invites).length > 0}>
           <img

From 71867d1d5c37bc7b2df026cfcab32bff8b808846 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@sunshinegardens.org>
Date: Tue, 8 Sep 2020 19:44:51 -0400
Subject: [PATCH 58/89] links: pipe remoteContentPolicy to pending comments

---
 pkg/interface/src/views/apps/links/components/link.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/interface/src/views/apps/links/components/link.js b/pkg/interface/src/views/apps/links/components/link.js
index 646891578b..72aad4557f 100644
--- a/pkg/interface/src/views/apps/links/components/link.js
+++ b/pkg/interface/src/views/apps/links/components/link.js
@@ -123,6 +123,7 @@ export class LinkDetail extends Component {
           pending={true}
           content={com}
           member={our.member}
+          remoteContentPolicy={props.remoteContentPolicy}
           time={new Date().getTime()}
         />
       );

From 76d4f73942c4d040aa5b9956e2c0ed8e37bf624c Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@sunshinegardens.org>
Date: Tue, 8 Sep 2020 20:01:45 -0400
Subject: [PATCH 59/89] statusBar: prepend sig to ship settings button

---
 pkg/interface/src/views/components/StatusBar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/interface/src/views/components/StatusBar.js b/pkg/interface/src/views/components/StatusBar.js
index d6d6f0d12f..0e17ab495b 100644
--- a/pkg/interface/src/views/components/StatusBar.js
+++ b/pkg/interface/src/views/components/StatusBar.js
@@ -70,7 +70,7 @@ const StatusBar = (props) => {
       <Row justifyContent="flex-end" collapse>
         <StatusBarItem onClick={() => props.history.push('/~profile')}>
           <Sigil ship={props.ship} size={24} color={"#000000"} classes="dib mix-blend-diff" />
-          <Text ml={2} display={["none", "inline"]} fontFamily="mono">{props.ship}</Text>
+          <Text ml={2} display={["none", "inline"]} fontFamily="mono">~{props.ship}</Text>
         </StatusBarItem>
       </Row>
     </Box>

From 042cdcf69896579969100bb868b089368d92742d Mon Sep 17 00:00:00 2001
From: Tyler Brown Cifu Shuster <tyler@fivepaths.com>
Date: Tue, 8 Sep 2020 17:06:08 -0700
Subject: [PATCH 60/89] chat: show pending messages again

---
 .../src/views/apps/chat/components/lib/chat-window.tsx   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx b/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx
index 18853f5e0e..b5ca26c32e 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx
+++ b/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx
@@ -232,11 +232,14 @@ export class ChatWindow extends Component<ChatWindowProps, ChatWindowState> {
     const debouncedFetch = _.debounce(this.fetchMessages, 500).bind(this);
 
     envelopes
-      .concat(stationPendingMessages)
       .forEach((message) => {
         messages[message.number] = message;
       });
     
+    stationPendingMessages.sort((a, b) => a.when - b.when).forEach((message, index) => {
+      messages[mailboxSize + index + 1] = message;
+    });
+    
     return (
       <Fragment>
         <UnreadNotice
@@ -250,7 +253,7 @@ export class ChatWindow extends Component<ChatWindowProps, ChatWindowState> {
         {messages.length ? <VirtualList
           ref={this.virtualList}
           style={{height: '100%', width: '100%', visibility: this.state.initialized ? 'initial' : 'hidden'}}
-          totalCount={mailboxSize}
+          totalCount={mailboxSize + stationPendingMessages.length}
           followOutput={!this.state.idle}
           endReached={this.dismissUnread}
           scrollSeek={{
@@ -289,7 +292,7 @@ export class ChatWindow extends Component<ChatWindowProps, ChatWindowState> {
               hideAvatars={hideAvatars}
               hideNicknames={hideNicknames}
               remoteContentPolicy={remoteContentPolicy}
-              className={number === mailboxSize ? 'pb3' : ''}
+              className={number === mailboxSize + stationPendingMessages.length ? 'pb3' : ''}
             />
           }}
         /> : <div style={{height: '100%', width: '100%'}}></div>}

From 7d857d3a83a54d66e37de0ac200e669900bf2be7 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@sunshinegardens.org>
Date: Tue, 8 Sep 2020 20:39:36 -0400
Subject: [PATCH 61/89] glob: update to 0v6.vnpkl.sq452.quabg.73g7k.dhi55

---
 bin/solid.pill                    | 4 ++--
 pkg/arvo/app/glob.hoon            | 2 +-
 pkg/arvo/app/landscape/index.html | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/solid.pill b/bin/solid.pill
index b17328bd83..8471abcaff 100644
--- a/bin/solid.pill
+++ b/bin/solid.pill
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1c22402da73118aad41deafbefce58afcb642feee21fcf0619927a3ddc0fc3cc
-size 6264167
+oid sha256:4bc9dff86bd4f81ad8de1149bf8bab458495bd3b75dc54129e1d4d5f1d39b1c6
+size 6268475
diff --git a/pkg/arvo/app/glob.hoon b/pkg/arvo/app/glob.hoon
index e55e0407ff..ea9d3cb051 100644
--- a/pkg/arvo/app/glob.hoon
+++ b/pkg/arvo/app/glob.hoon
@@ -5,7 +5,7 @@
 /-  glob
 /+  default-agent, verb, dbug
 |%
-++  hash  0v5.g2nge.n1pgc.v5326.ivfqv.7ici2
+++  hash  0v6.vnpkl.sq452.quabg.73g7k.dhi55
 +$  state-0  [%0 hash=@uv glob=(unit (each glob:glob tid=@ta))]
 +$  all-states
   $%  state-0
diff --git a/pkg/arvo/app/landscape/index.html b/pkg/arvo/app/landscape/index.html
index 855f1d87f5..cef54b1547 100644
--- a/pkg/arvo/app/landscape/index.html
+++ b/pkg/arvo/app/landscape/index.html
@@ -23,7 +23,7 @@
     <div id="root"></div>
     <script src="/~landscape/js/channel.js"></script>
     <script src="/~landscape/js/session.js"></script>
-    <script src="/~landscape/js/bundle/index.58a0b8803ec6f99b878c.js"></script>
+    <script src="/~landscape/js/bundle/index.5290d177ff8dd23d2abd.js"></script>
     <script src="https://sdk.amazonaws.com/js/aws-sdk-2.1.12.min.js"></script>
   </body>
 </html>

From bb44f39491424819715bfc6e9a30d4b98fa35559 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@sunshinegardens.org>
Date: Tue, 8 Sep 2020 21:57:47 -0400
Subject: [PATCH 62/89] leap: safety check state.selected

---
 pkg/interface/src/views/components/leap/Omnibox.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkg/interface/src/views/components/leap/Omnibox.js b/pkg/interface/src/views/components/leap/Omnibox.js
index adceb3aeaa..21e6af3952 100644
--- a/pkg/interface/src/views/components/leap/Omnibox.js
+++ b/pkg/interface/src/views/components/leap/Omnibox.js
@@ -78,7 +78,7 @@ export class Omnibox extends Component {
 
     if (evt.key === 'Enter') {
       evt.preventDefault();
-      if (this.state.selected !== '') {
+      if (this.state.selected !== []) {
         this.navigate(this.state.selected[0], this.state.selected[1]);
       } else {
         this.navigate(
@@ -133,7 +133,7 @@ export class Omnibox extends Component {
 
     // wipe results if backspacing
     if (query.length === 0) {
-      this.setState({ results: results, selected: '' });
+      this.setState({ results: results, selected: [] });
       return;
     }
 
@@ -170,7 +170,7 @@ export class Omnibox extends Component {
     const current = this.state.selected;
     const flattenedResults = Array.from(this.state.results.values()).flat();
     const totalLength = flattenedResults.length;
-    if (current !== '') {
+    if (current !== []) {
       const currentIndex = flattenedResults.indexOf(
         ...flattenedResults.filter((e) => {
           return e.link === current[1];
@@ -195,7 +195,7 @@ export class Omnibox extends Component {
   setNextSelected() {
     const current = this.state.selected;
     const flattenedResults = Array.from(this.state.results.values()).flat();
-    if (current !== '') {
+    if (current !== []) {
       const currentIndex = flattenedResults.indexOf(
         ...flattenedResults.filter((e) => {
           return e.link === current[1];
@@ -232,6 +232,7 @@ export class Omnibox extends Component {
         .map(({ category, categoryResults }, i) => {
           const categoryTitle = (category === 'other')
             ? null : <Text gray ml={2}>{category.charAt(0).toUpperCase() + category.slice(1)}</Text>;
+          const selected = this.state.selected?.length ? this.state.selected[1] : '';
           return (<Box key={i} width='max(50vw, 300px)' maxWidth='600px'>
             <Rule borderTopWidth="0.5px" color="washedGray" />
             {categoryTitle}
@@ -243,7 +244,7 @@ export class Omnibox extends Component {
                 subtext={result.host}
                 link={result.link}
                 navigate={() => this.navigate(result.app, result.link)}
-                selected={this.state.selected[1]}
+                selected={selected}
                 dark={props.dark} />
             ))}
           </Box>
@@ -255,7 +256,7 @@ export class Omnibox extends Component {
 
   render() {
     const { props, state } = this;
-    if (state?.selected.length === 0 && Array.from(this.state.results.values()).flat().length) {
+    if (state?.selected?.length === 0 && Array.from(this.state.results.values()).flat().length) {
       this.setNextSelected();
     }
     return (

From 05dd5d65cb69323bbd8d6cafe805bb1e6e1d6281 Mon Sep 17 00:00:00 2001
From: Tyler Brown Cifu Shuster <tyler@fivepaths.com>
Date: Tue, 8 Sep 2020 19:56:07 -0700
Subject: [PATCH 63/89] chat: hotfix new message indicator

---
 .../src/views/apps/chat/components/lib/chat-window.tsx   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx b/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx
index b5ca26c32e..9cfd6d2d85 100644
--- a/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx
+++ b/pkg/interface/src/views/apps/chat/components/lib/chat-window.tsx
@@ -157,7 +157,7 @@ export class ChatWindow extends Component<ChatWindowProps, ChatWindowState> {
         if (!idle) {
           idle = true;
         }
-      } else if (idle) {
+      } else if (idle && (unreadCount === 0 || this.state.range.endIndex === 0)) {
         idle = false;
       }
       this.setState({ idle });
@@ -172,6 +172,10 @@ export class ChatWindow extends Component<ChatWindowProps, ChatWindowState> {
     if (!idle && prevProps.unreadCount !== unreadCount) {
       this.virtualList.current?.scrollToIndex(mailboxSize);
     }
+
+    if  (!idle && envelopes.length !== prevProps.envelopes.length) {
+      this.virtualList.current?.scrollToIndex(mailboxSize);
+    }
   }
 
   scrollToUnread() {
@@ -244,7 +248,7 @@ export class ChatWindow extends Component<ChatWindowProps, ChatWindowState> {
       <Fragment>
         <UnreadNotice
           unreadCount={unreadCount}
-          unreadMsg={unreadMsg}
+          unreadMsg={this.state.idle ? unreadMsg : false}
           dismissUnread={this.dismissUnread}
           onClick={this.scrollToUnread}
         />
@@ -282,6 +286,7 @@ export class ChatWindow extends Component<ChatWindowProps, ChatWindowState> {
               isFirstUnread={
                 unreadCount
                 && mailboxSize - unreadCount === number
+                && this.state.idle
               }
               msg={msg}
               previousMsg={messages[number + 1]}

From a2adf7359d31d9e0772cb52b39650dc16a206991 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@sunshinegardens.org>
Date: Wed, 9 Sep 2020 00:19:14 -0400
Subject: [PATCH 64/89] glob: update to 0v4.kdc52.27is2.c7mnh.7vsrb.ij4jo

---
 bin/solid.pill                    | 4 ++--
 pkg/arvo/app/glob.hoon            | 2 +-
 pkg/arvo/app/landscape/index.html | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/solid.pill b/bin/solid.pill
index 8471abcaff..437b4aac8a 100644
--- a/bin/solid.pill
+++ b/bin/solid.pill
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4bc9dff86bd4f81ad8de1149bf8bab458495bd3b75dc54129e1d4d5f1d39b1c6
-size 6268475
+oid sha256:3f5741b71f11a562d443fc619eb1b6bb1ccf419375aa2f1eebbd1c06dce20cd0
+size 6268477
diff --git a/pkg/arvo/app/glob.hoon b/pkg/arvo/app/glob.hoon
index ea9d3cb051..951c95e616 100644
--- a/pkg/arvo/app/glob.hoon
+++ b/pkg/arvo/app/glob.hoon
@@ -5,7 +5,7 @@
 /-  glob
 /+  default-agent, verb, dbug
 |%
-++  hash  0v6.vnpkl.sq452.quabg.73g7k.dhi55
+++  hash  0v4.kdc52.27is2.c7mnh.7vsrb.ij4jo
 +$  state-0  [%0 hash=@uv glob=(unit (each glob:glob tid=@ta))]
 +$  all-states
   $%  state-0
diff --git a/pkg/arvo/app/landscape/index.html b/pkg/arvo/app/landscape/index.html
index cef54b1547..17031a9338 100644
--- a/pkg/arvo/app/landscape/index.html
+++ b/pkg/arvo/app/landscape/index.html
@@ -23,7 +23,7 @@
     <div id="root"></div>
     <script src="/~landscape/js/channel.js"></script>
     <script src="/~landscape/js/session.js"></script>
-    <script src="/~landscape/js/bundle/index.5290d177ff8dd23d2abd.js"></script>
+    <script src="/~landscape/js/bundle/index.ecc81763be57d23e6028.js"></script>
     <script src="https://sdk.amazonaws.com/js/aws-sdk-2.1.12.min.js"></script>
   </body>
 </html>

From 1f6f1fcd53b9e6e6cecab4b3900b74cb1e2fac8c Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@sunshinegardens.org>
Date: Wed, 9 Sep 2020 21:20:59 -0400
Subject: [PATCH 65/89] leap: ensure selected is always an array

Fixes #3462.
---
 pkg/interface/src/views/components/leap/Omnibox.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkg/interface/src/views/components/leap/Omnibox.js b/pkg/interface/src/views/components/leap/Omnibox.js
index 21e6af3952..bedbee1dce 100644
--- a/pkg/interface/src/views/components/leap/Omnibox.js
+++ b/pkg/interface/src/views/components/leap/Omnibox.js
@@ -58,7 +58,7 @@ export class Omnibox extends Component {
   control(evt) {
     if (evt.key === 'Escape') {
       if (this.state.query.length > 0) {
-        this.setState({ query: '', results: this.initialResults() });
+        this.setState({ query: '', results: this.initialResults(), selected: [] });
       } else if (this.props.show) {
         this.props.api.local.setOmnibox();
       }
@@ -78,8 +78,10 @@ export class Omnibox extends Component {
 
     if (evt.key === 'Enter') {
       evt.preventDefault();
-      if (this.state.selected !== []) {
+      if (this.state.selected.length > 0) {
         this.navigate(this.state.selected[0], this.state.selected[1]);
+      } else if (Array.from(this.state.results.values()).flat().length === 0) {
+        return;
       } else {
         this.navigate(
           Array.from(this.state.results.values()).flat()[0].app,
@@ -90,7 +92,7 @@ export class Omnibox extends Component {
 
   handleClickOutside(evt) {
     if (this.props.show && !this.omniBox.contains(evt.target)) {
-      this.setState({ results: this.initialResults(), query: '' }, () => {
+      this.setState({ results: this.initialResults(), query: '', selected: [] }, () => {
         this.props.api.local.setOmnibox();
       });
     }
@@ -158,9 +160,9 @@ export class Omnibox extends Component {
       );
     });
 
-    const flattenedResultLinks = Array.from(results.values()).flat().map(result => result.link);
+    const flattenedResultLinks = Array.from(results.values()).flat().map(result => [result.app, result.link]);
     if (!flattenedResultLinks.includes(selected)) {
-      selected = flattenedResultLinks[0];
+      selected = flattenedResultLinks[0] || [];
     }
 
     this.setState({ results, selected });

From c3fd4922aa63ada757ce0897a87a2dc10bde284a Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Wed, 2 Sep 2020 15:17:34 +1000
Subject: [PATCH 66/89] lib/strandio: add +scry

---
 pkg/arvo/lib/strandio.hoon | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkg/arvo/lib/strandio.hoon b/pkg/arvo/lib/strandio.hoon
index 71299cb8bc..8da72d0bea 100644
--- a/pkg/arvo/lib/strandio.hoon
+++ b/pkg/arvo/lib/strandio.hoon
@@ -241,6 +241,15 @@
   ;<  our=@p  bind:m  get-our
   (watch wire [our term] path)
 ::
+++  scry
+  |*  [=mold =path]
+  =/  m  (strand mold)
+  ?>  ?=(^ path)
+  ?>  ?=(^ t.path)
+  ;<  =bowl:spider  bind:m  get-bowl
+  %-  pure:m
+  .^(mold i.path (scot %p our.bowl) i.t.path (scot %da now.bowl) t.t.path)
+::
 ++  leave
   |=  [=wire =dock]
   =/  m  (strand ,~)

From 19371c46c2552b1faa69515df15bed3e99ba964f Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Wed, 2 Sep 2020 15:18:07 +1000
Subject: [PATCH 67/89] graph-view: added create,join threads

---
 pkg/arvo/sur/graph-view.hoon   | 25 +++++++++++++++
 pkg/arvo/ted/graph/create.hoon | 57 ++++++++++++++++++++++++++++++++++
 pkg/arvo/ted/graph/join.hoon   | 52 +++++++++++++++++++++++++++++++
 3 files changed, 134 insertions(+)
 create mode 100644 pkg/arvo/sur/graph-view.hoon
 create mode 100644 pkg/arvo/ted/graph/create.hoon
 create mode 100644 pkg/arvo/ted/graph/join.hoon

diff --git a/pkg/arvo/sur/graph-view.hoon b/pkg/arvo/sur/graph-view.hoon
new file mode 100644
index 0000000000..0c0bfdc271
--- /dev/null
+++ b/pkg/arvo/sur/graph-view.hoon
@@ -0,0 +1,25 @@
+/-  group
+/+  resource
+^?
+|%
+++  error
+  $%
+    [%offline =ship]
+    [%no-permissions ~]
+  ==
+++  action      
+  $%
+    $:  %create
+        rid=resource
+        title=@t
+        description=@t
+        mark=(unit mark)
+        associated=(each resource policy:group)
+    ==
+    [%delete rid=resource ~]
+    [%join rid=resource =ship] 
+    [%invite rid=resource ships=(set ship)]
+    [%groupify rid=resource title=@t description=@t]
+  ==
+--
+
diff --git a/pkg/arvo/ted/graph/create.hoon b/pkg/arvo/ted/graph/create.hoon
new file mode 100644
index 0000000000..54fca38522
--- /dev/null
+++ b/pkg/arvo/ted/graph/create.hoon
@@ -0,0 +1,57 @@
+/-  spider, graph-view, graph=graph-store, *metadata-store, *group, group-store
+/+  strandio, resource
+=>
+|% 
+++  strand  strand:spider
+++  poke  poke:strandio
+++  poke-our   poke-our:strandio
+++  handle-group
+  |=  [rid=resource associated=(each resource policy)]
+  =/  m  (strand ,resource)
+  ?:  ?=(%& -.associated)
+    (pure:m p.associated)
+  =/  =action:group-store
+    [%add-group rid p.associated %&]
+  ;<  ~  bind:m  (poke-our %group-store %group-action !>(action))
+  ;<  ~  bind:m
+    (poke-our %group-push-hook %push-hook-action !>([%add rid]))
+  (pure:m rid)
+  
+--
+=,  strand=strand:spider
+^-  thread:spider
+|=  arg=vase
+=/  m  (strand ,vase)
+^-  form:m
+=+  !<([=action:graph-view ~] arg)
+?>  ?=(%create -.action)
+;<  =bowl:spider  bind:m  get-bowl:strandio
+::  Add graph to graph-store
+::
+=/  =update:graph
+  [%0 now.bowl %add-graph rid.action *graph:graph mark.action]
+;<  ~  bind:m  (poke-our %graph-store %graph-update !>(update))
+::;<  ~  bind:m
+::  (poke-our %graph-push-hook %push-hook-action !>([%add rid.action]))
+::  Add group, if graph is unmanaged
+::
+;<  group=resource  bind:m
+  (handle-group rid.action associated.action)
+=/  group-path=path
+  (en-path:resource group)
+::  Setup metadata
+::
+=/  =metadata
+  %*  .  *metadata
+    title  title.action
+    description  description.action
+    date-created  now.bowl
+    creator  our.bowl
+  ==
+=/  act=metadata-action
+  [%add group-path [%graph (en-path:resource rid.action)] metadata]
+;<  ~  bind:m  (poke-our %metadata-hook %metadata-action !>(act))
+;<  ~  bind:m
+  (poke-our %metadata-hook %metadata-hook-action !>([%add-owned group-path]))
+(pure:m !>(~))
+
diff --git a/pkg/arvo/ted/graph/join.hoon b/pkg/arvo/ted/graph/join.hoon
new file mode 100644
index 0000000000..968e842120
--- /dev/null
+++ b/pkg/arvo/ted/graph/join.hoon
@@ -0,0 +1,52 @@
+/-  spider, graph-view, graph=graph-store, *metadata-store, *group
+/+  strandio, resource
+=>
+|% 
+++  strand  strand:spider
+++  poke  poke:strandio
+++  poke-our   poke-our:strandio
+++  scry-metadata
+  |=  rid=resource
+  =/  m  (strand ,(unit resource))
+  ;<  pax=(unit path)  bind:m
+    %+  scry:strandio   ,(unit path)
+    ;:  weld
+      /gx/metadata-store/resource/graph
+      (en-path:resource rid)
+      /noun
+    ==
+  (pure:m (bind pax de-path:resource))
+--
+^-  thread:spider
+|=  arg=vase
+=/  m  (strand ,vase)
+^-  form:m
+=+  !<(=action:graph-view arg)
+?>  ?=(%join -.action)
+;<  =bowl:spider  bind:m  get-bowl:strandio
+?<  =(our.bowl entity.rid.action)
+;<  group=(unit resource)  bind:m  
+  (scry-metadata rid.action)
+?^  group
+  ::  We have group, graph is managed
+  :: ;<  ~  bind:m  
+  ::   %+  poke-our   %graph-pull-hook
+  ::   pull-hook-action+!>([%add ship.action rid.action])
+  (pure:m !>(~))
+:: Else, add group then join
+;<  ~  bind:m  
+  %+  poke
+    [ship.action %group-push-hook]
+  group-update+!>([%add-members rid.action (sy our.bowl ~)])
+::
+;<  ~  bind:m
+  %+  poke-our  %group-pull-hook
+  pull-hook-action+!>([%add ship.action rid.action])
+::
+;<  ~  bind:m
+  %+  poke-our  %metadata-hook
+  metadata-hook-action+!>([%add-synced ship.action rid.action])
+;<  ~  bind:m  
+  (poke-our %graph-pull-hook %pull-hook-action !>([%add ship.action rid.action]))
+(pure:m !>(~))
+

From 06012abe2e8d3b9f7c1e1ccc8cf5abb9f45281a7 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Thu, 3 Sep 2020 14:47:34 +1000
Subject: [PATCH 68/89] spider: add HTTP interface

---
 pkg/arvo/app/spider.hoon | 79 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 75 insertions(+), 4 deletions(-)

diff --git a/pkg/arvo/app/spider.hoon b/pkg/arvo/app/spider.hoon
index a6286ba8cb..051c66bfa0 100644
--- a/pkg/arvo/app/spider.hoon
+++ b/pkg/arvo/app/spider.hoon
@@ -1,5 +1,5 @@
 /-  spider
-/+  libstrand=strand, default-agent, verb
+/+  libstrand=strand, default-agent, verb, server
 =,  strand=strand:libstrand
 |%
 +$  card         card:agent:gall
@@ -17,6 +17,7 @@
   $:  starting=(map yarn [=trying =vase])
       running=trie
       tid=(map tid yarn)
+      serving=(map tid [@ta =mark])
   ==
 ::
 +$  clean-slate-any
@@ -30,18 +31,21 @@
       starting=(map yarn [=trying =vase])
       running=(list yarn)
       tid=(map tid yarn)
+      serving=(map tid [@ta =mark])
   ==
 ::
 +$  clean-slate-ket
   $:  starting=(map yarn [trying=?(%build %find %none) =vase])
       running=(list yarn)
       tid=(map tid yarn)
+      serving=(map tid [@ta =mark])
   ==
 ::
 +$  clean-slate-sig
   $:  starting=~
       running=(list yarn)
       tid=(map tid yarn)
+      serving=(map tid [@ta =mark])
   ==
 ::
 +$  start-args
@@ -133,7 +137,10 @@
       sc           ~(. spider-core bowl)
       def          ~(. (default-agent this %|) bowl)
   ::
-  ++  on-init   on-init:def
+  ++  on-init   
+    ^-  (quip card _this)
+    :_  this
+    [%pass /bind %arvo %e %connect [~ /spider] %spider]~
   ++  on-save   clean-state:sc
   ++  on-load
     |^
@@ -172,6 +179,9 @@
         %spider-input  (on-poke-input:sc !<(input vase))
         %spider-start  (handle-start-thread:sc !<(start-args vase))
         %spider-stop   (handle-stop-thread:sc !<([tid ?] vase))
+      ::
+          %handle-http-request   
+        (handle-http-request:sc !<([@ta =inbound-request:eyre] vase))
       ==
     [cards this]
   ::
@@ -182,6 +192,7 @@
       ?+  path  (on-watch:def path)
         [%thread @ *]         (on-watch:sc t.path)
         [%thread-result @ ~]  (on-watch-result:sc i.t.path)
+        [%http-response *]     `state
       ==
     [cards this]
   ::
@@ -228,6 +239,36 @@
   --
 ::
 |_  =bowl:gall
+++  handle-http-request
+  |=  [eyre-id=@ta =inbound-request:eyre]
+  ^-  (quip card _state)
+  ?>  authenticated.inbound-request
+  =/  url 
+    (parse-request-line:server url.request.inbound-request)
+  ?>  ?=([%spider @t @t @t ~] site.url)
+  =*  input-mark   i.t.site.url
+  =*  thread       i.t.t.site.url
+  =*  output-mark  i.t.t.t.site.url
+  =/  =tid
+    (scot %uv (sham eny.bowl))
+  =.  serving.state
+    (~(put by serving.state) tid [eyre-id output-mark])
+  =+  .^
+      =tube:clay
+      %cc 
+      /(scot %p our.bowl)/[q.byk.bowl]/(scot %da now.bowl)/json/[input-mark]
+    ==
+  ?>  ?=(^ body.request.inbound-request)
+  =/  body=json
+    (need (de-json:html q.u.body.request.inbound-request))
+  =/  input=vase
+    (tube !>(body))
+  =/  =start-args
+    [~ `tid thread input]
+  =^  cards  state
+    (handle-start-thread start-args)
+  [cards state]
+::
 ++  on-poke-input
   |=  input
   =/  yarn  (~(got by tid.state) tid)
@@ -394,6 +435,17 @@
   :~  [%give %fact ~[/thread-result/[tid]] %thread-fail !>([term tang])]
       [%give %kick ~[/thread-result/[tid]] ~]
   ==
+++  thread-http-fail
+  |=  [=tid =term =tang]
+  ^-  (quip card ^state)
+  =-  (fall - `state)
+  %+  bind  
+    (~(get by serving.state) tid)
+  |=  [eyre-id=@ta output=mark]
+  :_  state(serving (~(del by serving.state) tid))
+  %+  give-simple-payload:app:server  eyre-id
+  ^-  simple-payload:http
+  [[500 ~] ~]
 ::
 ++  thread-fail
   |=  [=yarn =term =tang]
@@ -402,7 +454,24 @@
   =/  =tid  (yarn-to-tid yarn)
   =/  fail-cards  (thread-say-fail tid term tang)
   =^  cards  state  (thread-clean yarn)
-  [(weld fail-cards cards) state]
+  =^  http-cards  state  (thread-http-fail tid term tang)
+  [:(weld fail-cards cards http-cards) state]
+::
+++  thread-http-response
+  |=  [=tid =vase]
+  ^-  (quip card ^state)
+  =-  (fall - `state)
+  %+  bind  
+    (~(get by serving.state) tid)
+  |=  [eyre-id=@ta output=mark]
+  =+    .^
+      =tube:clay
+      %cc
+      /(scot %p our.bowl)/[q.byk.bowl]/(scot %da now.bowl)/[output]/json
+    ==
+  :_  state(serving (~(del by serving.state) tid))
+  %+  give-simple-payload:app:server  eyre-id
+  (json-response:gen:server !<(json (tube vase)))
 ::
 ++  thread-done
   |=  [=yarn =vase]
@@ -413,8 +482,10 @@
     :~  [%give %fact ~[/thread-result/[tid]] %thread-done vase]
         [%give %kick ~[/thread-result/[tid]] ~]
     ==
+  =^  http-cards  state
+    (thread-http-response tid vase)
   =^  cards  state  (thread-clean yarn)
-  [(weld done-cards cards) state]
+  [:(weld done-cards cards http-cards) state]
 ::
 ++  thread-clean
   |=  =yarn

From 47561d806f7c1e20d2d6b991a531c7748721dbaf Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Thu, 3 Sep 2020 15:04:11 +1000
Subject: [PATCH 69/89] spider: add state adapters for HTTP interface

---
 pkg/arvo/app/spider.hoon | 44 ++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/pkg/arvo/app/spider.hoon b/pkg/arvo/app/spider.hoon
index 051c66bfa0..51e6c60cf2 100644
--- a/pkg/arvo/app/spider.hoon
+++ b/pkg/arvo/app/spider.hoon
@@ -23,29 +23,35 @@
 +$  clean-slate-any
   $^  clean-slate-ket
   $%  clean-slate-sig
+      clean-slate-1
       clean-slate
   ==
 ::
 +$  clean-slate
-  $:  %1
+  $:  %2
       starting=(map yarn [=trying =vase])
       running=(list yarn)
       tid=(map tid yarn)
       serving=(map tid [@ta =mark])
   ==
 ::
++$  clean-slate-1
+  $:  %1
+      starting=(map yarn [=trying =vase])
+      running=(list yarn)
+      tid=(map tid yarn)
+  ==
+::
 +$  clean-slate-ket
   $:  starting=(map yarn [trying=?(%build %find %none) =vase])
       running=(list yarn)
       tid=(map tid yarn)
-      serving=(map tid [@ta =mark])
   ==
 ::
 +$  clean-slate-sig
   $:  starting=~
       running=(list yarn)
       tid=(map tid yarn)
-      serving=(map tid [@ta =mark])
   ==
 ::
 +$  start-args
@@ -140,7 +146,7 @@
   ++  on-init   
     ^-  (quip card _this)
     :_  this
-    [%pass /bind %arvo %e %connect [~ /spider] %spider]~
+    ~[bind-eyre:sc]
   ++  on-save   clean-state:sc
   ++  on-load
     |^
@@ -148,7 +154,9 @@
     =+  !<(any=clean-slate-any old-state)
     =?  any  ?=(^ -.any)  (old-to-1 any)
     =?  any  ?=(~ -.any)  (old-to-1 any)
-    ?>  ?=(%1 -.any)
+    =^  upgrade-cards  any  
+      (old-to-2 any)
+    ?>  ?=(%2 -.any)
     ::
     =.  tid.state  tid.any
     =/  yarns=(list yarn)
@@ -161,12 +169,26 @@
       (handle-stop-thread:sc (yarn-to-tid i.yarns) |)
     =^  cards-2  this
       $(yarns t.yarns)
-    [(weld cards-1 cards-2) this]
+    [:(weld upgrade-cards cards-1 cards-2) this]
     ::
     ++  old-to-1
       |=  old=clean-slate-ket
-      ^-  clean-slate
+      ^-  clean-slate-1
       1+old(starting (~(run by starting.old) |=([* v=vase] none+v)))
+    ::
+    ++  old-to-2
+      |=  old=clean-slate-any
+      ^-  (quip card clean-slate)
+      ?>  ?=(?(%1 %2) -.old)
+      ?:  ?=(%2 -.old)
+        `old
+      :-  ~[bind-eyre:sc]
+      :*  %2
+        starting.old
+        running.old
+        tid.old
+        ~
+      ==
     --
   ::
   ++  on-poke
@@ -227,6 +249,7 @@
       ?+  wire  (on-arvo:def wire sign-arvo)
         [%thread @ *]  (handle-sign:sc i.t.wire t.t.wire sign-arvo)
         [%build @ ~]   (handle-build:sc i.t.wire sign-arvo)
+        [%bind ~]      `state
       ==
     [cards this]
   ::  On unexpected failure, kill all outstanding strands
@@ -239,6 +262,11 @@
   --
 ::
 |_  =bowl:gall
+::
+++  bind-eyre
+  ^-  card
+  [%pass /bind %arvo %e %connect [~ /spider] %spider]
+::
 ++  handle-http-request
   |=  [eyre-id=@ta =inbound-request:eyre]
   ^-  (quip card _state)
@@ -545,5 +573,5 @@
 ::
 ++  clean-state
   !>  ^-  clean-slate
-  1+state(running (turn (tap-yarn running.state) head))
+  2+state(running (turn (tap-yarn running.state) head))
 --

From 08dab6c5b03710226c25a3b418198afff71feecf Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Thu, 3 Sep 2020 15:07:18 +1000
Subject: [PATCH 70/89] graph-view: add delete, leave threads

---
 pkg/arvo/sur/graph-view.hoon   | 23 +++++++++----
 pkg/arvo/ted/graph/delete.hoon | 61 ++++++++++++++++++++++++++++++++++
 pkg/arvo/ted/graph/join.hoon   |  6 ++--
 pkg/arvo/ted/graph/leave.hoon  | 61 ++++++++++++++++++++++++++++++++++
 4 files changed, 142 insertions(+), 9 deletions(-)
 create mode 100644 pkg/arvo/ted/graph/delete.hoon
 create mode 100644 pkg/arvo/ted/graph/leave.hoon

diff --git a/pkg/arvo/sur/graph-view.hoon b/pkg/arvo/sur/graph-view.hoon
index 0c0bfdc271..00cf4fe94c 100644
--- a/pkg/arvo/sur/graph-view.hoon
+++ b/pkg/arvo/sur/graph-view.hoon
@@ -2,12 +2,23 @@
 /+  resource
 ^?
 |%
-++  error
-  $%
-    [%offline =ship]
-    [%no-permissions ~]
-  ==
-++  action      
+::  $error: An error from a graph-view poke
+::  
+::    %offline: Ship is offline
+::    %bad-perms: Not permitted
+::    %unknown: Anything not described above
+::
++$  error
+  ?(%offline %bad-perms %unknown)
+::  $action: A semantic action on graphs
+::  
+::    %create: Create a graph and associated metadata
+::    %delete: Delete a graph
+::    %join: Join a graph
+::    %invite: Invite users to a graph
+::    %groupify: Make graph into managed group
+::
++$  action      
   $%
     $:  %create
         rid=resource
diff --git a/pkg/arvo/ted/graph/delete.hoon b/pkg/arvo/ted/graph/delete.hoon
new file mode 100644
index 0000000000..0df982b677
--- /dev/null
+++ b/pkg/arvo/ted/graph/delete.hoon
@@ -0,0 +1,61 @@
+/-  spider, graph-view, graph=graph-store, *metadata-store, *group
+/+  strandio, resource
+=>
+|% 
+++  strand  strand:spider
+++  poke  poke:strandio
+++  poke-our   poke-our:strandio
+++  scry-metadata
+  |=  rid=resource
+  =/  m  (strand ,(unit resource))
+  ;<  pax=(unit path)  bind:m
+    %+  scry:strandio   ,(unit path)
+    ;:  weld
+      /gx/metadata-store/resource/graph
+      (en-path:resource rid)
+      /noun
+    ==
+  (pure:m (bind pax de-path:resource))
+++  scry-group
+  |=  rid=resource
+  =/  m  (strand ,(unit resource))
+  ;<  ugroup=(unit group)  bind:m
+    %+  scry:strandio   ,(unit group)
+    ;:  weld
+      /gx/group-store/resource/graph
+      (en-path:resource rid)
+      /noun
+    ==
+  (pure:m (need ugroup))
+++  delete-graph
+  |=  rid=resource
+  =/  m  (strand ,~)
+  ;<  ~  bind:m
+    (poke-our %graph-push-hook %push-hook-action [%remove rid.action])
+  ;<  ~  bind:m
+    (poke-our %graph-store %graph-update [%archive-graph rid.action])
+  (pure:m ~)
+--
+^-  thread:spider
+|=  arg=vase
+=/  m  (strand ,vase)
+^-  form:m
+=+  !<([=action:graph-view ~] arg)
+?>  ?=(%delete -.action)
+;<  =bowl:spider  bind:m  get-bowl:strandio
+?>  =(our.bowl entity.rid.action)
+;<  ugroup-rid=(unit resource)  bind:m  
+  (scry-metadata rid.action)
+?~  ugroup-rid  (fail:m %nonexistent)
+;<  ugroup=(unit group)
+  (scry-group u.ugroup-rid)
+?~  ugroup  (fail:m %nonexistent)
+?.  hidden.u.ugroup
+  (delete-graph rid.action)
+;<  ~  bind:m
+  (poke-our %group-push-hook %pull-hook-action [%remove rid.action])
+;<  ~  bind:m
+  (poke-our %group-store %group-action !>([%remove-group rid.action])
+;<  ~  bind:m  (delete-graph rid.action)
+(pure:m !>(~))
+
diff --git a/pkg/arvo/ted/graph/join.hoon b/pkg/arvo/ted/graph/join.hoon
index 968e842120..5882785678 100644
--- a/pkg/arvo/ted/graph/join.hoon
+++ b/pkg/arvo/ted/graph/join.hoon
@@ -29,9 +29,9 @@
   (scry-metadata rid.action)
 ?^  group
   ::  We have group, graph is managed
-  :: ;<  ~  bind:m  
-  ::   %+  poke-our   %graph-pull-hook
-  ::   pull-hook-action+!>([%add ship.action rid.action])
+  ;<  ~  bind:m  
+     %+  poke-our   %graph-pull-hook
+     pull-hook-action+!>([%add ship.action rid.action])
   (pure:m !>(~))
 :: Else, add group then join
 ;<  ~  bind:m  
diff --git a/pkg/arvo/ted/graph/leave.hoon b/pkg/arvo/ted/graph/leave.hoon
new file mode 100644
index 0000000000..aa2fe45e36
--- /dev/null
+++ b/pkg/arvo/ted/graph/leave.hoon
@@ -0,0 +1,61 @@
+/-  spider, graph-view, graph=graph-store, *metadata-store, *group
+/+  strandio, resource
+=>
+|% 
+++  strand  strand:spider
+++  poke  poke:strandio
+++  poke-our   poke-our:strandio
+++  scry-metadata
+  |=  rid=resource
+  =/  m  (strand ,(unit resource))
+  ;<  pax=(unit path)  bind:m
+    %+  scry:strandio   ,(unit path)
+    ;:  weld
+      /gx/metadata-store/resource/graph
+      (en-path:resource rid)
+      /noun
+    ==
+  (pure:m (bind pax de-path:resource))
+++  scry-group
+  |=  rid=resource
+  =/  m  (strand ,(unit resource))
+  ;<  ugroup=(unit group)  bind:m
+    %+  scry:strandio   ,(unit group)
+    ;:  weld
+      /gx/group-store/resource/graph
+      (en-path:resource rid)
+      /noun
+    ==
+  (pure:m (need ugroup))
+++  delete-graph
+  |=  rid=resource
+  =/  m  (strand ,~)
+  ;<  ~  bind:m
+    (poke-our %graph-pull-hook %pull-hook-action [%remove rid.action])
+  ;<  ~  bind:m
+    (poke-our %graph-store %graph-update [%archive-graph rid.action])
+  (pure:m ~)
+--
+^-  thread:spider
+|=  arg=vase
+=/  m  (strand ,vase)
+^-  form:m
+=+  !<([=action:graph-view ~] arg)
+?>  ?=(%leave -.action)
+;<  =bowl:spider  bind:m  get-bowl:strandio
+?<  =(our.bowl entity.rid.action)
+;<  ugroup-rid=(unit resource)  bind:m  
+  (scry-metadata rid.action)
+?~  ugroup-rid  (fail:m %nonexistent)
+;<  ugroup=(unit group)
+  (scry-group u.ugroup-rid)
+?~  ugroup  (fail:m %nonexistent)
+?.  hidden.u.ugroup
+  (delete-graph rid.action)
+;<  ~  bind:m
+  (poke-our %group-push-hook %pull-hook-action [%remove rid.action])
+;<  ~  bind:m
+  (poke-our %group-store %group-action !>([%remove-group rid.action])
+;<  ~  bind:m  (delete-graph rid.action)
+(pure:m !>(~))
+

From 2a9c1bf3faa42cf49b2c88694bf81b4b43e5fcd0 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Thu, 3 Sep 2020 15:07:35 +1000
Subject: [PATCH 71/89] Revert "graph-hooks: deleted for now until we can test
 them with a UI"

This reverts commit 738481ff71a50dc9011ab37b6ee6241500bbf01e.
---
 pkg/arvo/app/graph-pull-hook.hoon |  44 ++++++++++++
 pkg/arvo/app/graph-push-hook.hoon | 115 ++++++++++++++++++++++++++++++
 2 files changed, 159 insertions(+)
 create mode 100644 pkg/arvo/app/graph-pull-hook.hoon
 create mode 100644 pkg/arvo/app/graph-push-hook.hoon

diff --git a/pkg/arvo/app/graph-pull-hook.hoon b/pkg/arvo/app/graph-pull-hook.hoon
new file mode 100644
index 0000000000..c6429c036e
--- /dev/null
+++ b/pkg/arvo/app/graph-pull-hook.hoon
@@ -0,0 +1,44 @@
+/-  *resource
+/+  store=graph-store, graph, default-agent, verb, dbug, pull-hook
+~%  %graph-pull-hook-top  ..is  ~
+|%
++$  card  card:agent:gall
+++  config
+  ^-  config:pull-hook
+  :*  %graph-store
+      update:store
+      %graph-update
+      %graph-push-hook
+  ==
+--
+::
+%-  agent:dbug
+^-  agent:gall
+%-  (agent:pull-hook config)
+^-  (pull-hook:pull-hook config)
+|_  =bowl:gall
++*  this  .
+    def   ~(. (default-agent this %|) bowl)
+    dep   ~(. (default:pull-hook this config) bowl)
+::
+++  on-init       on-init:def
+++  on-save       !>(~)
+++  on-load       on-load:def
+++  on-poke       on-poke:def
+++  on-peek       on-peek:def
+++  on-arvo       on-arvo:def
+++  on-fail       on-fail:def
+++  on-agent      on-agent:def
+++  on-watch      on-watch:def
+++  on-leave      on-leave:def
+++  on-pull-nack
+  ::  TODO: archive the graph
+  on-pull-nack:dep
+::
+++  on-pull-kick
+  |=  =resource
+  ^-  (unit path)
+  =/  maybe-time  (peek-log:graph resource)
+  ?~  maybe-time  `/
+  `/(scot %da u.maybe-time)
+--
diff --git a/pkg/arvo/app/graph-push-hook.hoon b/pkg/arvo/app/graph-push-hook.hoon
new file mode 100644
index 0000000000..08d36c8cfe
--- /dev/null
+++ b/pkg/arvo/app/graph-push-hook.hoon
@@ -0,0 +1,115 @@
+/+  store=graph-store
+/+  res=resource
+/+  graph
+/+  group
+/+  default-agent
+/+  dbug
+/+  push-hook
+~%  %graph-push-hook-top  ..is  ~
+|%
++$  card  card:agent:gall
+++  config
+  ^-  config:push-hook
+  :*  %graph-store
+      /updates
+      update:store
+      %graph-update
+      %graph-pull-hook
+  ==
+::
++$  agent  (push-hook:push-hook config)
+--
+::
+%-  agent:dbug
+^-  agent:gall
+%-  (agent:push-hook config)
+^-  agent
+|_  =bowl:gall
++*  this  .
+    def   ~(. (default-agent this %|) bowl)
+    grp   ~(. group bowl)
+    gra   ~(. graph bowl)
+::
+++  on-init   on-init:def
+++  on-save   !>(~)
+++  on-load   on-load:def
+++  on-poke   on-poke:def
+++  on-agent  on-agent:def
+++  on-watch  on-watch:def
+++  on-leave  on-leave:def
+++  on-peek   on-peek:def
+++  on-arvo   on-arvo:def
+++  on-fail   on-fail:def
+::
+++  should-proxy-update
+  |=  =vase
+  ^-  ?
+  =/  =update:store  !<(update:store vase)
+  ?-  -.q.update
+      %add-graph          %.y
+      %remove-graph       %.y
+      %add-nodes          %.y
+      %remove-nodes       %.y
+      %add-signatures     %.y
+      %remove-signatures  %.y
+      %archive-graph      %.y
+      %unarchive-graph    %.n
+      %add-tag            %.n
+      %remove-tag         %.n
+      %keys               %.n
+      %tags               %.n
+      %tag-queries        %.n
+      %run-updates        %.y
+  ==
+::
+++  resource-for-update
+  |=  =vase
+  ^-  (unit resource:res)
+  =/  =update:store  !<(update:store vase)
+  ?-  -.q.update
+      %add-graph          `resource.q.update
+      %remove-graph       `resource.q.update
+      %add-nodes          `resource.q.update
+      %remove-nodes       `resource.q.update
+      %add-signatures     `resource.uid.q.update
+      %remove-signatures  `resource.uid.q.update
+      %archive-graph      `resource.q.update
+      %unarchive-graph    ~
+      %add-tag            ~
+      %remove-tag         ~
+      %run-updates        `resource.q.update
+      %keys               ~
+      %tags               ~
+      %tag-queries        ~
+  ==
+::
+++  initial-watch
+  |=  [=path =resource:res]
+  ^-  vase
+  ?>  (can-join:grp resource src.bowl)
+  ?~  path
+    ::  new subscribe
+    =/  [=graph:store mark=(unit mark:store)]
+      (get-graph:gra resource)
+    !>  ^-  update:store
+    [%0 now.bowl [%add-graph resource graph mark]]
+  ::  resubscribe
+  ::
+  ::  TODO: use action-log
+  ::
+  !!
+::
+++  take-update
+  |=  =vase
+  ^-  [(list card) agent]
+  =/  =update:store  !<(update:store vase)
+  ?+  -.q.update       [~ this]
+      %remove-graph
+    :_  this
+    [%give %kick ~[resource+(en-path:res resource.q.update)] ~]~
+  ::
+      %archive-graph
+    :_  this
+    [%give %kick ~[resource+(en-path:res resource.q.update)] ~]~
+  ==
+--

From ff1219bbdae376d8220bf174790a83cfbf3205f6 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Fri, 4 Sep 2020 00:12:12 +1000
Subject: [PATCH 72/89] marks: add graph-view marks

---
 pkg/arvo/lib/graph-view.hoon        | 62 +++++++++++++++++++++++++++++
 pkg/arvo/lib/strandio.hoon          |  3 +-
 pkg/arvo/mar/graph/update.hoon      |  2 +
 pkg/arvo/mar/graph/view-action.hoon | 13 ++++++
 pkg/arvo/sur/graph-view.hoon        | 22 +++++++---
 5 files changed, 95 insertions(+), 7 deletions(-)
 create mode 100644 pkg/arvo/lib/graph-view.hoon
 create mode 100644 pkg/arvo/mar/graph/view-action.hoon

diff --git a/pkg/arvo/lib/graph-view.hoon b/pkg/arvo/lib/graph-view.hoon
new file mode 100644
index 0000000000..e5a83018b9
--- /dev/null
+++ b/pkg/arvo/lib/graph-view.hoon
@@ -0,0 +1,62 @@
+/-  sur=graph-view
+/+  resource, group-store
+^?
+=<  [sur .]
+=,  sur
+|%
+++  app-to-mark
+  |=  app=app-name
+  ?+  app  !!
+    %chat  %graph-validator-chat
+  ==
+++  dejs
+  =,  dejs:format
+  |%
+  ++  action
+    |^
+    ^-  $-(json ^action)
+    %-  of
+    :~  create+create
+        delete+delete
+        join+join
+        ::groupify+groupify
+        ::invite+invite
+    ==
+    ::
+    ++  create
+      %-  ot
+      :~  resource+dejs:resource
+          title+so
+          description+so
+          app+app
+          associated+associated
+      ==
+    ++  app
+      |=  jon=json
+      ^-  app-name
+      ?>  ?=(%s -.jon)
+      ~!  app-name
+      %chat
+    ::
+    ++  delete
+      %-  ot
+      :~  resource+dejs:resource
+      ==
+    ::
+    ++  join
+      %-  ot
+      :~  resource+dejs:resource
+          ship+(su ;~(pfix sig fed:ag))
+      ==
+    ::
+    ++  groupify  !!
+    ++  invite    !!
+    ++  associated
+      %-  of
+      :~  group+dejs:resource
+          policy+policy:dejs:group-store
+      ==
+
+    --
+  --
+--
diff --git a/pkg/arvo/lib/strandio.hoon b/pkg/arvo/lib/strandio.hoon
index 8da72d0bea..7eaa8c288d 100644
--- a/pkg/arvo/lib/strandio.hoon
+++ b/pkg/arvo/lib/strandio.hoon
@@ -243,7 +243,8 @@
 ::
 ++  scry
   |*  [=mold =path]
-  =/  m  (strand mold)
+  =/  m  (strand ,mold)
+  ^-  form:m
   ?>  ?=(^ path)
   ?>  ?=(^ t.path)
   ;<  =bowl:spider  bind:m  get-bowl
diff --git a/pkg/arvo/mar/graph/update.hoon b/pkg/arvo/mar/graph/update.hoon
index d5f0f4abec..1cd2a20686 100644
--- a/pkg/arvo/mar/graph/update.hoon
+++ b/pkg/arvo/mar/graph/update.hoon
@@ -1,7 +1,9 @@
 /+  *graph-store
 |_  upd=update
+++  grad  %noun
 ++  grow
   |%
+  ++  noun  upd
   ++  json  (update:enjs upd)
   --
 ::
diff --git a/pkg/arvo/mar/graph/view-action.hoon b/pkg/arvo/mar/graph/view-action.hoon
new file mode 100644
index 0000000000..ab8b0ef12e
--- /dev/null
+++ b/pkg/arvo/mar/graph/view-action.hoon
@@ -0,0 +1,13 @@
+/+  *graph-view
+|_  act=action
+++  grad  %noun
+++  grow
+  |%
+  ++  noun  act
+  --
+++  grab
+  |%
+  ++  noun  action
+  ++  json  action:dejs
+  --
+--
diff --git a/pkg/arvo/sur/graph-view.hoon b/pkg/arvo/sur/graph-view.hoon
index 00cf4fe94c..1d54897600 100644
--- a/pkg/arvo/sur/graph-view.hoon
+++ b/pkg/arvo/sur/graph-view.hoon
@@ -1,7 +1,17 @@
-/-  group
+/-  *group
 /+  resource
 ^?
 |%
+::  $associated: A group to associate, or a policy if it is unmanaged
+::
++$  associated
+  $%  [%group rid=resource]
+      [%policy =policy]
+  ==
+::  $app: An app that is associated to a graph-store mark
+::
++$  app-name  ?(%chat %publish %links)
+::
 ::  $error: An error from a graph-view poke
 ::  
 ::    %offline: Ship is offline
@@ -24,13 +34,13 @@
         rid=resource
         title=@t
         description=@t
-        mark=(unit mark)
-        associated=(each resource policy:group)
+        app=app-name
+        =associated
     ==
-    [%delete rid=resource ~]
+    [%delete rid=resource]
     [%join rid=resource =ship] 
-    [%invite rid=resource ships=(set ship)]
-    [%groupify rid=resource title=@t description=@t]
+    ::[%invite rid=resource ships=(set ship)]
+    :: [%groupify rid=resource title=@t description=@t]
   ==
 --
 

From cd0ca3a1b40456a05e216ee6722766302a0aa790 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Fri, 4 Sep 2020 17:42:20 +1000
Subject: [PATCH 73/89] lib/graph: fix scries

---
 pkg/arvo/lib/graph.hoon        | 10 ++++++++--
 pkg/arvo/ted/graph/create.hoon | 26 +++++++++++++-------------
 pkg/arvo/ted/graph/join.hoon   | 24 +++++++++++++++++++-----
 3 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/pkg/arvo/lib/graph.hoon b/pkg/arvo/lib/graph.hoon
index 395c0554fa..ae347b73fa 100644
--- a/pkg/arvo/lib/graph.hoon
+++ b/pkg/arvo/lib/graph.hoon
@@ -13,10 +13,16 @@
 ::
 ++  get-graph
   |=  res=resource
-  ^-  marked-graph:store
-  %+  scry-for  marked-graph:store
+  ^-  update:store
+  %+  scry-for  update:store
   /graph/(scot %p entity.res)/[name.res]
 ::
+++  get-update-log
+  |=  rid=resource 
+  ^-  update-log:store
+  %+  scry-for  update-log:store
+  /update-log/(scot %p entity.rid)/[name.rid]
+::
 ++  peek-log
   |=  res=resource
   ^-  (unit time)
diff --git a/pkg/arvo/ted/graph/create.hoon b/pkg/arvo/ted/graph/create.hoon
index 54fca38522..43fcabc5c3 100644
--- a/pkg/arvo/ted/graph/create.hoon
+++ b/pkg/arvo/ted/graph/create.hoon
@@ -1,38 +1,38 @@
-/-  spider, graph-view, graph=graph-store, *metadata-store, *group, group-store
-/+  strandio, resource
+/-  spider, graph=graph-store, *metadata-store, *group, group-store
+/+  strandio, resource, graph-view
 =>
 |% 
 ++  strand  strand:spider
 ++  poke  poke:strandio
 ++  poke-our   poke-our:strandio
 ++  handle-group
-  |=  [rid=resource associated=(each resource policy)]
+  |=  [rid=resource =associated:graph-view]
   =/  m  (strand ,resource)
-  ?:  ?=(%& -.associated)
-    (pure:m p.associated)
+  ?:  ?=(%group -.associated)
+    (pure:m rid.associated)
   =/  =action:group-store
-    [%add-group rid p.associated %&]
+    [%add-group rid policy.associated %&]
   ;<  ~  bind:m  (poke-our %group-store %group-action !>(action))
   ;<  ~  bind:m
     (poke-our %group-push-hook %push-hook-action !>([%add rid]))
   (pure:m rid)
-  
 --
 =,  strand=strand:spider
 ^-  thread:spider
 |=  arg=vase
 =/  m  (strand ,vase)
 ^-  form:m
-=+  !<([=action:graph-view ~] arg)
+=+  !<(=action:graph-view arg)
 ?>  ?=(%create -.action)
 ;<  =bowl:spider  bind:m  get-bowl:strandio
 ::  Add graph to graph-store
 ::
 =/  =update:graph
-  [%0 now.bowl %add-graph rid.action *graph:graph mark.action]
-;<  ~  bind:m  (poke-our %graph-store %graph-update !>(update))
-::;<  ~  bind:m
-::  (poke-our %graph-push-hook %push-hook-action !>([%add rid.action]))
+  [%0 now.bowl %add-graph rid.action *graph:graph `(app-to-mark:graph-view app.action)]
+;<  ~  bind:m
+  (poke-our %graph-store graph-update+!>(update))
+;<  ~  bind:m
+  (poke-our %graph-push-hook %push-hook-action !>([%add rid.action]))
 ::  Add group, if graph is unmanaged
 ::
 ;<  group=resource  bind:m
@@ -49,7 +49,7 @@
     creator  our.bowl
   ==
 =/  act=metadata-action
-  [%add group-path [%graph (en-path:resource rid.action)] metadata]
+  [%add group-path [app.action (en-path:resource rid.action)] metadata]
 ;<  ~  bind:m  (poke-our %metadata-hook %metadata-action !>(act))
 ;<  ~  bind:m
   (poke-our %metadata-hook %metadata-hook-action !>([%add-owned group-path]))
diff --git a/pkg/arvo/ted/graph/join.hoon b/pkg/arvo/ted/graph/join.hoon
index 5882785678..13c57cc35e 100644
--- a/pkg/arvo/ted/graph/join.hoon
+++ b/pkg/arvo/ted/graph/join.hoon
@@ -5,17 +5,29 @@
 ++  strand  strand:spider
 ++  poke  poke:strandio
 ++  poke-our   poke-our:strandio
+++  check-live
+  |=  who=ship
+  =/  m  (strand ,~)
+  ^-  form:m
+  %+  (set-timeout:strandio ,~)  ~s10
+  ;<  ~  bind:m
+    (poke [who %hood] %helm-hi !>(~))
+  (pure:m ~)
 ++  scry-metadata
   |=  rid=resource
   =/  m  (strand ,(unit resource))
-  ;<  pax=(unit path)  bind:m
-    %+  scry:strandio   ,(unit path)
+  ^-  form:m
+  ;<  pax=(unit (set path))  bind:m
+    %+  scry:strandio   ,(unit (set path))
     ;:  weld
-      /gx/metadata-store/resource/graph
+      /gx/metadata-store/resource/chat
       (en-path:resource rid)
       /noun
     ==
-  (pure:m (bind pax de-path:resource))
+  %-  pure:m
+  ?~  pax  ~
+  ?~  u.pax  ~
+  `(de-path:resource n.u.pax)
 --
 ^-  thread:spider
 |=  arg=vase
@@ -27,6 +39,7 @@
 ?<  =(our.bowl entity.rid.action)
 ;<  group=(unit resource)  bind:m  
   (scry-metadata rid.action)
+;<  ~  bind:m  (check-live entity.rid.action)
 ?^  group
   ::  We have group, graph is managed
   ;<  ~  bind:m  
@@ -47,6 +60,7 @@
   %+  poke-our  %metadata-hook
   metadata-hook-action+!>([%add-synced ship.action rid.action])
 ;<  ~  bind:m  
-  (poke-our %graph-pull-hook %pull-hook-action !>([%add ship.action rid.action]))
+  %+  poke-our  %graph-pull-hook
+  pull-hook-action+!>([%add ship.action rid.action]))
 (pure:m !>(~))
 

From 556759ee3ff9d10682b8ae9c913b7a91e9755d0b Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Fri, 4 Sep 2020 17:51:28 +1000
Subject: [PATCH 74/89] graph-view: address review comments

---
 pkg/arvo/lib/graph-view.hoon   | 10 ++++++++--
 pkg/arvo/sur/graph-view.hoon   |  1 +
 pkg/arvo/ted/graph/create.hoon |  3 ++-
 pkg/arvo/ted/graph/delete.hoon |  7 +++++--
 pkg/arvo/ted/graph/join.hoon   |  6 ++++--
 pkg/arvo/ted/graph/leave.hoon  |  5 ++++-
 6 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/pkg/arvo/lib/graph-view.hoon b/pkg/arvo/lib/graph-view.hoon
index e5a83018b9..f208accf31 100644
--- a/pkg/arvo/lib/graph-view.hoon
+++ b/pkg/arvo/lib/graph-view.hoon
@@ -19,6 +19,7 @@
     :~  create+create
         delete+delete
         join+join
+        leave+leave
         ::groupify+groupify
         ::invite+invite
     ==
@@ -31,13 +32,18 @@
           app+app
           associated+associated
       ==
+    ::
     ++  app
       |=  jon=json
       ^-  app-name
       ?>  ?=(%s -.jon)
-      ~!  app-name
       %chat
     ::
+    ++  leave
+      %-  ot
+      :~  resource+dejs:resource
+      ==
+    ::
     ++  delete
       %-  ot
       :~  resource+dejs:resource
@@ -51,12 +57,12 @@
     ::
     ++  groupify  !!
     ++  invite    !!
+    ::
     ++  associated
       %-  of
       :~  group+dejs:resource
           policy+policy:dejs:group-store
       ==
-
     --
   --
 --
diff --git a/pkg/arvo/sur/graph-view.hoon b/pkg/arvo/sur/graph-view.hoon
index 1d54897600..d465c48ab8 100644
--- a/pkg/arvo/sur/graph-view.hoon
+++ b/pkg/arvo/sur/graph-view.hoon
@@ -38,6 +38,7 @@
         =associated
     ==
     [%delete rid=resource]
+    [%leave rid=resource]
     [%join rid=resource =ship] 
     ::[%invite rid=resource ships=(set ship)]
     :: [%groupify rid=resource title=@t description=@t]
diff --git a/pkg/arvo/ted/graph/create.hoon b/pkg/arvo/ted/graph/create.hoon
index 43fcabc5c3..bb86d14db1 100644
--- a/pkg/arvo/ted/graph/create.hoon
+++ b/pkg/arvo/ted/graph/create.hoon
@@ -5,6 +5,7 @@
 ++  strand  strand:spider
 ++  poke  poke:strandio
 ++  poke-our   poke-our:strandio
+::
 ++  handle-group
   |=  [rid=resource =associated:graph-view]
   =/  m  (strand ,resource)
@@ -17,6 +18,7 @@
     (poke-our %group-push-hook %push-hook-action !>([%add rid]))
   (pure:m rid)
 --
+::
 =,  strand=strand:spider
 ^-  thread:spider
 |=  arg=vase
@@ -54,4 +56,3 @@
 ;<  ~  bind:m
   (poke-our %metadata-hook %metadata-hook-action !>([%add-owned group-path]))
 (pure:m !>(~))
-
diff --git a/pkg/arvo/ted/graph/delete.hoon b/pkg/arvo/ted/graph/delete.hoon
index 0df982b677..54de93faab 100644
--- a/pkg/arvo/ted/graph/delete.hoon
+++ b/pkg/arvo/ted/graph/delete.hoon
@@ -5,6 +5,7 @@
 ++  strand  strand:spider
 ++  poke  poke:strandio
 ++  poke-our   poke-our:strandio
+::
 ++  scry-metadata
   |=  rid=resource
   =/  m  (strand ,(unit resource))
@@ -16,6 +17,7 @@
       /noun
     ==
   (pure:m (bind pax de-path:resource))
+::
 ++  scry-group
   |=  rid=resource
   =/  m  (strand ,(unit resource))
@@ -27,6 +29,7 @@
       /noun
     ==
   (pure:m (need ugroup))
+::
 ++  delete-graph
   |=  rid=resource
   =/  m  (strand ,~)
@@ -36,6 +39,7 @@
     (poke-our %graph-store %graph-update [%archive-graph rid.action])
   (pure:m ~)
 --
+::
 ^-  thread:spider
 |=  arg=vase
 =/  m  (strand ,vase)
@@ -53,9 +57,8 @@
 ?.  hidden.u.ugroup
   (delete-graph rid.action)
 ;<  ~  bind:m
-  (poke-our %group-push-hook %pull-hook-action [%remove rid.action])
+  (poke-our %group-push-hook %push-hook-action [%remove rid.action])
 ;<  ~  bind:m
   (poke-our %group-store %group-action !>([%remove-group rid.action])
 ;<  ~  bind:m  (delete-graph rid.action)
 (pure:m !>(~))
-
diff --git a/pkg/arvo/ted/graph/join.hoon b/pkg/arvo/ted/graph/join.hoon
index 13c57cc35e..a61d20c91c 100644
--- a/pkg/arvo/ted/graph/join.hoon
+++ b/pkg/arvo/ted/graph/join.hoon
@@ -5,14 +5,16 @@
 ++  strand  strand:spider
 ++  poke  poke:strandio
 ++  poke-our   poke-our:strandio
+::
 ++  check-live
   |=  who=ship
   =/  m  (strand ,~)
   ^-  form:m
-  %+  (set-timeout:strandio ,~)  ~s10
+  %+  (set-timeout:strandio ,~)  ~s20
   ;<  ~  bind:m
     (poke [who %hood] %helm-hi !>(~))
   (pure:m ~)
+::
 ++  scry-metadata
   |=  rid=resource
   =/  m  (strand ,(unit resource))
@@ -29,6 +31,7 @@
   ?~  u.pax  ~
   `(de-path:resource n.u.pax)
 --
+::
 ^-  thread:spider
 |=  arg=vase
 =/  m  (strand ,vase)
@@ -63,4 +66,3 @@
   %+  poke-our  %graph-pull-hook
   pull-hook-action+!>([%add ship.action rid.action]))
 (pure:m !>(~))
-
diff --git a/pkg/arvo/ted/graph/leave.hoon b/pkg/arvo/ted/graph/leave.hoon
index aa2fe45e36..84660d109e 100644
--- a/pkg/arvo/ted/graph/leave.hoon
+++ b/pkg/arvo/ted/graph/leave.hoon
@@ -5,6 +5,7 @@
 ++  strand  strand:spider
 ++  poke  poke:strandio
 ++  poke-our   poke-our:strandio
+::
 ++  scry-metadata
   |=  rid=resource
   =/  m  (strand ,(unit resource))
@@ -16,6 +17,7 @@
       /noun
     ==
   (pure:m (bind pax de-path:resource))
+::
 ++  scry-group
   |=  rid=resource
   =/  m  (strand ,(unit resource))
@@ -27,6 +29,7 @@
       /noun
     ==
   (pure:m (need ugroup))
+::
 ++  delete-graph
   |=  rid=resource
   =/  m  (strand ,~)
@@ -36,6 +39,7 @@
     (poke-our %graph-store %graph-update [%archive-graph rid.action])
   (pure:m ~)
 --
+::
 ^-  thread:spider
 |=  arg=vase
 =/  m  (strand ,vase)
@@ -58,4 +62,3 @@
   (poke-our %group-store %group-action !>([%remove-group rid.action])
 ;<  ~  bind:m  (delete-graph rid.action)
 (pure:m !>(~))
-

From 4008fb34b1b17fb35d19e18111eeb3a3722bbd5e Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Thu, 10 Sep 2020 20:05:11 +1000
Subject: [PATCH 75/89] interface: expand graph api

---
 pkg/interface/src/logic/api/base.ts           | 12 ++++
 pkg/interface/src/logic/api/graph.ts          | 63 +++++++++++++++++--
 pkg/interface/src/logic/lib/group.ts          |  5 ++
 .../src/logic/reducers/graph-update.js        | 21 ++++---
 pkg/interface/src/logic/store/type.ts         |  3 +-
 pkg/interface/src/types/index.ts              |  1 +
 6 files changed, 92 insertions(+), 13 deletions(-)

diff --git a/pkg/interface/src/logic/api/base.ts b/pkg/interface/src/logic/api/base.ts
index b18a345162..42019ba41d 100644
--- a/pkg/interface/src/logic/api/base.ts
+++ b/pkg/interface/src/logic/api/base.ts
@@ -57,4 +57,16 @@ export default class BaseApi<S extends object = {}> {
   scry<T>(app: string, path: Path): Promise<T> {
     return fetch(`/~/scry/${app}${path}.json`).then(r => r.json() as Promise<T>);
   }
+
+
+  async spider<T>(inputMark: string, outputMark: string, threadName: string, body: any): Promise<T> {
+
+    const res = await fetch(`/spider/${inputMark}/${threadName}/${outputMark}.json`, {
+      method: 'POST',
+      body: JSON.stringify(body)
+    });
+
+    return res.json();
+  }
+
 }
diff --git a/pkg/interface/src/logic/api/graph.ts b/pkg/interface/src/logic/api/graph.ts
index d583322021..4e64d50f46 100644
--- a/pkg/interface/src/logic/api/graph.ts
+++ b/pkg/interface/src/logic/api/graph.ts
@@ -1,7 +1,9 @@
 import BaseApi from './base';
 import { StoreState } from '../store/type';
 import { Patp, Path, PatpNoSig } from '~/types/noun';
-
+import _ from 'lodash';
+import {makeResource, resourceFromPath} from '../lib/group';
+import {GroupPolicy, Enc} from '~/types';
 
 export const createPost = (contents: Object[], parentIndex: string = '') => {
   return {
@@ -20,6 +22,58 @@ export default class GraphApi extends BaseApi<StoreState> {
     return this.action('graph-store', 'graph-update', action)
   }
 
+  private viewAction(threadName: string, action: any) {
+    return this.spider('graph-view-action', 'json', threadName, action);
+  }
+
+  createManagedGraph(name: string, title: string, description: string, app: string, group: Path) {
+    const associated = { group: resourceFromPath(group) };
+
+    const resource = makeResource(`~${window.ship}`, name);
+    return this.viewAction('graph-create', {
+      "create": {
+        resource,
+        title,
+        description,
+        app,
+        associated
+      }
+    });
+  }
+
+  createUnmanagedGraph(name: string, title: string, description: string, app: string, policy: Enc<GroupPolicy>) {
+
+    const resource = makeResource(`~${window.ship}`, name);
+    return this.viewAction('graph-create', {
+      "create": {
+        resource,
+        title,
+        description,
+        app,
+        associated: { policy }
+      }
+    });
+  }
+
+  joinGraph(ship: Patp, name: string) {
+    const resource = makeResource(ship, name);
+    return this.viewAction('graph-join', {
+      join: {
+        resource,
+        ship
+      }
+    });
+  }
+
+  deleteGraph(name: string) {
+    const resource = makeResource(`~${window.ship}`, name);
+    return this.viewAction('graph-delete', {
+      "delete": {
+        resource
+      }
+    });
+  }
+
   addGraph(ship: Patp, name: string, graph: any, mark: any) {
     this.storeAction({
       'add-graph': {
@@ -40,14 +94,15 @@ export default class GraphApi extends BaseApi<StoreState> {
 
   addPost(ship: Patp, name: string, post: Object) {
     let nodes = {};
+    const resource = { ship, name };
     nodes[post.index] = {
       post,
       children: { empty: null }
     };
 
-    this.storeAction({
+    return this.storeAction({
       'add-nodes': {
-        resource: { ship, name },
+        resource,
         nodes
       }
     });
@@ -63,7 +118,7 @@ export default class GraphApi extends BaseApi<StoreState> {
   }
 
   removeNodes(ship: Patp, name: string, indices: string[]) {
-    this.storeAction({
+    return this.storeAction({
       'remove-nodes': {
         resource: { ship, name },
         indices
diff --git a/pkg/interface/src/logic/lib/group.ts b/pkg/interface/src/logic/lib/group.ts
index 64b035b51d..bd4939c2f5 100644
--- a/pkg/interface/src/logic/lib/group.ts
+++ b/pkg/interface/src/logic/lib/group.ts
@@ -13,3 +13,8 @@ export function resourceFromPath(path: Path): Resource {
   const [, , ship, name] = path.split('/');
   return { ship, name }
 }
+
+export function makeResource(ship: string, name:string) {
+  return { ship, name };
+}
+
diff --git a/pkg/interface/src/logic/reducers/graph-update.js b/pkg/interface/src/logic/reducers/graph-update.js
index c8253f229c..54047e72a5 100644
--- a/pkg/interface/src/logic/reducers/graph-update.js
+++ b/pkg/interface/src/logic/reducers/graph-update.js
@@ -140,10 +140,21 @@ const addNodes = (json, state) => {
 };
 
 const removeNodes = (json, state) => {
+  const _remove = (graph, index) => {
+    if (index.length === 1) {
+        graph.delete(index[0]);
+      } else {
+        const child = graph.get(index[0]);
+        _remove(child.children, index.slice(1));
+        graph.set(index[0], child);
+      }
+  };
   const data = _.get(json, 'remove-nodes', false);
   if (data) {
     console.log(data);
-    if (!(data.resource in state.graphs)) { return; }
+    const { ship, name } = data.resource;
+    const res = `${ship}/${name}`;
+    if (!(res in state.graphs)) { return; }
 
     data.indices.forEach((index) => {
       console.log(index);
@@ -151,13 +162,7 @@ const removeNodes = (json, state) => {
       let indexArr = index.split('/').slice(1).map((ind) => {
         return parseInt(ind, 10);
       });
-
-      if (indexArr.length === 1) {
-        state.graphs[data.resource].delete(indexArr[0]);
-      } else {
-        // TODO: recursive
-      }
-
+      _remove(state.graphs[res], indexArr);
     });
   }
 };
diff --git a/pkg/interface/src/logic/store/type.ts b/pkg/interface/src/logic/store/type.ts
index ffb989fa50..6e94da33d6 100644
--- a/pkg/interface/src/logic/store/type.ts
+++ b/pkg/interface/src/logic/store/type.ts
@@ -12,6 +12,7 @@ import { LaunchState, WeatherState } from '~/types/launch-update';
 import { LinkComments, LinkCollections, LinkSeen } from '~/types/link-update';
 import { ConnectionStatus } from '~/types/connection';
 import { BackgroundConfig, LocalUpdateRemoteContentPolicy } from '~/types/local-update';
+import {Graphs} from '~/types/graph-update';
 
 export interface StoreState {
   // local state
@@ -36,7 +37,7 @@ export interface StoreState {
   groupKeys: Set<Path>;
   permissions: Permissions;
   s3: S3State;
-  graphs: Object;
+  graphs: Graphs;
   graphKeys: Set<String>;
 
 
diff --git a/pkg/interface/src/types/index.ts b/pkg/interface/src/types/index.ts
index 3f7cda54c5..44a608d9c2 100644
--- a/pkg/interface/src/types/index.ts
+++ b/pkg/interface/src/types/index.ts
@@ -5,6 +5,7 @@ export * from './connection';
 export * from './contact-update';
 export * from './global';
 export * from './group-update';
+export * from './graph-update';
 export * from './invite-update';
 export * from './launch-update';
 export * from './link-listen-update';

From 574e6de9844e941a7a4591ed786ee894b40ae645 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Thu, 10 Sep 2020 20:20:00 +1000
Subject: [PATCH 76/89] graph-view: refine threads

---
 pkg/arvo/lib/graph-view.hoon            |  9 ++++--
 pkg/arvo/sur/graph-view.hoon            |  2 +-
 pkg/arvo/ted/graph/delete.hoon          | 40 ++++++++++++++-----------
 pkg/arvo/ted/graph/join.hoon            |  7 +++--
 pkg/arvo/ted/graph/leave.hoon           |  4 +--
 pkg/interface/src/logic/api/graph.ts    | 11 +++----
 pkg/interface/src/types/graph-update.ts | 30 +++++++++++++++++++
 7 files changed, 72 insertions(+), 31 deletions(-)
 create mode 100644 pkg/interface/src/types/graph-update.ts

diff --git a/pkg/arvo/lib/graph-view.hoon b/pkg/arvo/lib/graph-view.hoon
index f208accf31..9127bf0906 100644
--- a/pkg/arvo/lib/graph-view.hoon
+++ b/pkg/arvo/lib/graph-view.hoon
@@ -6,8 +6,9 @@
 |%
 ++  app-to-mark
   |=  app=app-name
-  ?+  app  !!
+  ?+  app  ~|("nonexistent app" !!)
     %chat  %graph-validator-chat
+    %publish  %graph-validator-publish
   ==
 ++  dejs
   =,  dejs:format
@@ -37,7 +38,10 @@
       |=  jon=json
       ^-  app-name
       ?>  ?=(%s -.jon)
-      %chat
+      ?+  p.jon  !!
+        %chat     %chat
+        %publish  %publish
+      ==
     ::
     ++  leave
       %-  ot
@@ -53,6 +57,7 @@
       %-  ot
       :~  resource+dejs:resource
           ship+(su ;~(pfix sig fed:ag))
+          app+app
       ==
     ::
     ++  groupify  !!
diff --git a/pkg/arvo/sur/graph-view.hoon b/pkg/arvo/sur/graph-view.hoon
index d465c48ab8..0397cf9bd2 100644
--- a/pkg/arvo/sur/graph-view.hoon
+++ b/pkg/arvo/sur/graph-view.hoon
@@ -39,7 +39,7 @@
     ==
     [%delete rid=resource]
     [%leave rid=resource]
-    [%join rid=resource =ship] 
+    [%join rid=resource =ship app=app-name] 
     ::[%invite rid=resource ships=(set ship)]
     :: [%groupify rid=resource title=@t description=@t]
   ==
diff --git a/pkg/arvo/ted/graph/delete.hoon b/pkg/arvo/ted/graph/delete.hoon
index 54de93faab..d9ff09fc8e 100644
--- a/pkg/arvo/ted/graph/delete.hoon
+++ b/pkg/arvo/ted/graph/delete.hoon
@@ -9,34 +9,37 @@
 ++  scry-metadata
   |=  rid=resource
   =/  m  (strand ,(unit resource))
-  ;<  pax=(unit path)  bind:m
-    %+  scry:strandio   ,(unit path)
+  ;<  paxs=(unit (set path))  bind:m
+    %+  scry:strandio   ,(unit (set path))
     ;:  weld
-      /gx/metadata-store/resource/graph
+      /gx/metadata-store/resource/publish
       (en-path:resource rid)
       /noun
     ==
-  (pure:m (bind pax de-path:resource))
+  ?~  paxs  (pure:m ~)
+  ?~  u.paxs  (pure:m ~)
+  (pure:m `(de-path:resource n.u.paxs))
 ::
 ++  scry-group
   |=  rid=resource
-  =/  m  (strand ,(unit resource))
+  =/  m  (strand ,group)
   ;<  ugroup=(unit group)  bind:m
     %+  scry:strandio   ,(unit group)
     ;:  weld
-      /gx/group-store/resource/graph
+      /gx/group-store/groups
       (en-path:resource rid)
       /noun
     ==
   (pure:m (need ugroup))
 ::
 ++  delete-graph
-  |=  rid=resource
+  |=  [group=resource rid=resource app=app-name:graph-view]
   =/  m  (strand ,~)
+  ::;<  ~  bind:m
+  ::  (poke-our %graph-push-hook %push-hook-action [%remove rid.action])
+  ;<  =bowl:spider  bind:m  get-bowl:strandio
   ;<  ~  bind:m
-    (poke-our %graph-push-hook %push-hook-action [%remove rid.action])
-  ;<  ~  bind:m
-    (poke-our %graph-store %graph-update [%archive-graph rid.action])
+    (poke-our %graph-store %graph-update !>([%0 now.bowl %archive-graph rid]))
   (pure:m ~)
 --
 ::
@@ -44,21 +47,22 @@
 |=  arg=vase
 =/  m  (strand ,vase)
 ^-  form:m
-=+  !<([=action:graph-view ~] arg)
+=+  !<(=action:graph-view arg)
 ?>  ?=(%delete -.action)
 ;<  =bowl:spider  bind:m  get-bowl:strandio
 ?>  =(our.bowl entity.rid.action)
 ;<  ugroup-rid=(unit resource)  bind:m  
   (scry-metadata rid.action)
-?~  ugroup-rid  (fail:m %nonexistent)
-;<  ugroup=(unit group)
+?~  ugroup-rid  !!
+;<  =group  bind:m
   (scry-group u.ugroup-rid)
-?~  ugroup  (fail:m %nonexistent)
-?.  hidden.u.ugroup
-  (delete-graph rid.action)
+?.  hidden.group
+  ;<  ~  bind:m
+    (delete-graph rid.action)
+  (pure:m !>(~))
 ;<  ~  bind:m
-  (poke-our %group-push-hook %push-hook-action [%remove rid.action])
+  (poke-our %group-push-hook %push-hook-action !>([%remove rid.action]))
 ;<  ~  bind:m
-  (poke-our %group-store %group-action !>([%remove-group rid.action])
+  (poke-our %group-store %group-action !>([%remove-group rid.action]))
 ;<  ~  bind:m  (delete-graph rid.action)
 (pure:m !>(~))
diff --git a/pkg/arvo/ted/graph/join.hoon b/pkg/arvo/ted/graph/join.hoon
index a61d20c91c..976c0ef635 100644
--- a/pkg/arvo/ted/graph/join.hoon
+++ b/pkg/arvo/ted/graph/join.hoon
@@ -16,13 +16,13 @@
   (pure:m ~)
 ::
 ++  scry-metadata
-  |=  rid=resource
+  |=  [app=app-name:graph-view rid=resource]
   =/  m  (strand ,(unit resource))
   ^-  form:m
   ;<  pax=(unit (set path))  bind:m
     %+  scry:strandio   ,(unit (set path))
     ;:  weld
-      /gx/metadata-store/resource/chat
+      /gx/metadata-store/resource/[app]
       (en-path:resource rid)
       /noun
     ==
@@ -62,7 +62,8 @@
 ;<  ~  bind:m
   %+  poke-our  %metadata-hook
   metadata-hook-action+!>([%add-synced ship.action rid.action])
+::
 ;<  ~  bind:m  
   %+  poke-our  %graph-pull-hook
-  pull-hook-action+!>([%add ship.action rid.action]))
+  pull-hook-action+!>([%add ship.action rid.action])
 (pure:m !>(~))
diff --git a/pkg/arvo/ted/graph/leave.hoon b/pkg/arvo/ted/graph/leave.hoon
index 84660d109e..60b1957781 100644
--- a/pkg/arvo/ted/graph/leave.hoon
+++ b/pkg/arvo/ted/graph/leave.hoon
@@ -50,14 +50,14 @@
 ?<  =(our.bowl entity.rid.action)
 ;<  ugroup-rid=(unit resource)  bind:m  
   (scry-metadata rid.action)
-?~  ugroup-rid  (fail:m %nonexistent)
+?~  ugroup-rid  !!
 ;<  ugroup=(unit group)
   (scry-group u.ugroup-rid)
 ?~  ugroup  (fail:m %nonexistent)
 ?.  hidden.u.ugroup
   (delete-graph rid.action)
 ;<  ~  bind:m
-  (poke-our %group-push-hook %pull-hook-action [%remove rid.action])
+  (poke-our %group-push-hook %pull-hook-action !>([%remove rid.action]))
 ;<  ~  bind:m
   (poke-our %group-store %group-action !>([%remove-group rid.action])
 ;<  ~  bind:m  (delete-graph rid.action)
diff --git a/pkg/interface/src/logic/api/graph.ts b/pkg/interface/src/logic/api/graph.ts
index 4e64d50f46..da4cc56e01 100644
--- a/pkg/interface/src/logic/api/graph.ts
+++ b/pkg/interface/src/logic/api/graph.ts
@@ -3,7 +3,7 @@ import { StoreState } from '../store/type';
 import { Patp, Path, PatpNoSig } from '~/types/noun';
 import _ from 'lodash';
 import {makeResource, resourceFromPath} from '../lib/group';
-import {GroupPolicy, Enc} from '~/types';
+import {GroupPolicy, Enc, Post} from '~/types';
 
 export const createPost = (contents: Object[], parentIndex: string = '') => {
   return {
@@ -55,12 +55,13 @@ export default class GraphApi extends BaseApi<StoreState> {
     });
   }
 
-  joinGraph(ship: Patp, name: string) {
+  joinGraph(ship: Patp, name: string, app: string) {
     const resource = makeResource(ship, name);
     return this.viewAction('graph-join', {
       join: {
         resource,
-        ship
+        ship,
+        app
       }
     });
   }
@@ -92,7 +93,7 @@ export default class GraphApi extends BaseApi<StoreState> {
     });
   }
 
-  addPost(ship: Patp, name: string, post: Object) {
+  addPost(ship: Patp, name: string, post: Post) {
     let nodes = {};
     const resource = { ship, name };
     nodes[post.index] = {
@@ -162,7 +163,7 @@ export default class GraphApi extends BaseApi<StoreState> {
       });
   }
 
-  getGraphSubset(ship: string, resource: string, start: string, end: start) {
+  getGraphSubset(ship: string, resource: string, start: string, end: string) {
     this.scry<any>(
       'graph-store',
       `/graph-subset/${ship}/${resource}/${end}/${start}`
diff --git a/pkg/interface/src/types/graph-update.ts b/pkg/interface/src/types/graph-update.ts
new file mode 100644
index 0000000000..c9fb6a19c9
--- /dev/null
+++ b/pkg/interface/src/types/graph-update.ts
@@ -0,0 +1,30 @@
+import {Patp} from "./noun";
+
+
+export interface TextContent { text: string; };
+export interface UrlContent { url: string; }
+export interface CodeContent { expresssion: string; output: string; };
+export interface ReferenceContent { uid: string; }
+export type Content =  TextContent | UrlContent | CodeContent | ReferenceContent;
+
+export interface Post {
+  author: Patp;
+  contents: Content[];
+  hash?: string;
+  index: string;
+  pending?: boolean;
+  signatures: string[];
+  'time-sent': number;
+}
+
+
+export interface GraphNode {
+  children: Graph;
+  post: Post;
+}
+
+export type Graph = Map<number, GraphNode>;
+
+export type Graphs = { [rid: string]: Graph };
+
+

From af77d47e73f9c3495e2e44926289973f987fab10 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Thu, 10 Sep 2020 21:36:00 +1000
Subject: [PATCH 77/89] graph-view: revived groupify

---
 pkg/arvo/app/graph-pull-hook.hoon    |  44 ----------
 pkg/arvo/app/graph-push-hook.hoon    | 115 ---------------------------
 pkg/arvo/lib/graph-view.hoon         |   9 ++-
 pkg/arvo/sur/graph-view.hoon         |   2 +-
 pkg/arvo/ted/graph/groupify.hoon     |  72 +++++++++++++++++
 pkg/interface/src/logic/api/graph.ts |  13 +++
 6 files changed, 93 insertions(+), 162 deletions(-)
 delete mode 100644 pkg/arvo/app/graph-pull-hook.hoon
 delete mode 100644 pkg/arvo/app/graph-push-hook.hoon
 create mode 100644 pkg/arvo/ted/graph/groupify.hoon

diff --git a/pkg/arvo/app/graph-pull-hook.hoon b/pkg/arvo/app/graph-pull-hook.hoon
deleted file mode 100644
index c6429c036e..0000000000
--- a/pkg/arvo/app/graph-pull-hook.hoon
+++ /dev/null
@@ -1,44 +0,0 @@
-/-  *resource
-/+  store=graph-store, graph, default-agent, verb, dbug, pull-hook
-~%  %graph-pull-hook-top  ..is  ~
-|%
-+$  card  card:agent:gall
-++  config
-  ^-  config:pull-hook
-  :*  %graph-store
-      update:store
-      %graph-update
-      %graph-push-hook
-  ==
---
-::
-%-  agent:dbug
-^-  agent:gall
-%-  (agent:pull-hook config)
-^-  (pull-hook:pull-hook config)
-|_  =bowl:gall
-+*  this  .
-    def   ~(. (default-agent this %|) bowl)
-    dep   ~(. (default:pull-hook this config) bowl)
-::
-++  on-init       on-init:def
-++  on-save       !>(~)
-++  on-load       on-load:def
-++  on-poke       on-poke:def
-++  on-peek       on-peek:def
-++  on-arvo       on-arvo:def
-++  on-fail       on-fail:def
-++  on-agent      on-agent:def
-++  on-watch      on-watch:def
-++  on-leave      on-leave:def
-++  on-pull-nack
-  ::  TODO: archive the graph
-  on-pull-nack:dep
-::
-++  on-pull-kick
-  |=  =resource
-  ^-  (unit path)
-  =/  maybe-time  (peek-log:graph resource)
-  ?~  maybe-time  `/
-  `/(scot %da u.maybe-time)
---
diff --git a/pkg/arvo/app/graph-push-hook.hoon b/pkg/arvo/app/graph-push-hook.hoon
deleted file mode 100644
index 08d36c8cfe..0000000000
--- a/pkg/arvo/app/graph-push-hook.hoon
+++ /dev/null
@@ -1,115 +0,0 @@
-/+  store=graph-store
-/+  res=resource
-/+  graph
-/+  group
-/+  default-agent
-/+  dbug
-/+  push-hook
-~%  %graph-push-hook-top  ..is  ~
-|%
-+$  card  card:agent:gall
-++  config
-  ^-  config:push-hook
-  :*  %graph-store
-      /updates
-      update:store
-      %graph-update
-      %graph-pull-hook
-  ==
-::
-+$  agent  (push-hook:push-hook config)
---
-::
-%-  agent:dbug
-^-  agent:gall
-%-  (agent:push-hook config)
-^-  agent
-|_  =bowl:gall
-+*  this  .
-    def   ~(. (default-agent this %|) bowl)
-    grp   ~(. group bowl)
-    gra   ~(. graph bowl)
-::
-++  on-init   on-init:def
-++  on-save   !>(~)
-++  on-load   on-load:def
-++  on-poke   on-poke:def
-++  on-agent  on-agent:def
-++  on-watch  on-watch:def
-++  on-leave  on-leave:def
-++  on-peek   on-peek:def
-++  on-arvo   on-arvo:def
-++  on-fail   on-fail:def
-::
-++  should-proxy-update
-  |=  =vase
-  ^-  ?
-  =/  =update:store  !<(update:store vase)
-  ?-  -.q.update
-      %add-graph          %.y
-      %remove-graph       %.y
-      %add-nodes          %.y
-      %remove-nodes       %.y
-      %add-signatures     %.y
-      %remove-signatures  %.y
-      %archive-graph      %.y
-      %unarchive-graph    %.n
-      %add-tag            %.n
-      %remove-tag         %.n
-      %keys               %.n
-      %tags               %.n
-      %tag-queries        %.n
-      %run-updates        %.y
-  ==
-::
-++  resource-for-update
-  |=  =vase
-  ^-  (unit resource:res)
-  =/  =update:store  !<(update:store vase)
-  ?-  -.q.update
-      %add-graph          `resource.q.update
-      %remove-graph       `resource.q.update
-      %add-nodes          `resource.q.update
-      %remove-nodes       `resource.q.update
-      %add-signatures     `resource.uid.q.update
-      %remove-signatures  `resource.uid.q.update
-      %archive-graph      `resource.q.update
-      %unarchive-graph    ~
-      %add-tag            ~
-      %remove-tag         ~
-      %run-updates        `resource.q.update
-      %keys               ~
-      %tags               ~
-      %tag-queries        ~
-  ==
-::
-++  initial-watch
-  |=  [=path =resource:res]
-  ^-  vase
-  ?>  (can-join:grp resource src.bowl)
-  ?~  path
-    ::  new subscribe
-    =/  [=graph:store mark=(unit mark:store)]
-      (get-graph:gra resource)
-    !>  ^-  update:store
-    [%0 now.bowl [%add-graph resource graph mark]]
-  ::  resubscribe
-  ::
-  ::  TODO: use action-log
-  ::
-  !!
-::
-++  take-update
-  |=  =vase
-  ^-  [(list card) agent]
-  =/  =update:store  !<(update:store vase)
-  ?+  -.q.update       [~ this]
-      %remove-graph
-    :_  this
-    [%give %kick ~[resource+(en-path:res resource.q.update)] ~]~
-  ::
-      %archive-graph
-    :_  this
-    [%give %kick ~[resource+(en-path:res resource.q.update)] ~]~
-  ==
---
diff --git a/pkg/arvo/lib/graph-view.hoon b/pkg/arvo/lib/graph-view.hoon
index 9127bf0906..c8d7f6ae91 100644
--- a/pkg/arvo/lib/graph-view.hoon
+++ b/pkg/arvo/lib/graph-view.hoon
@@ -21,7 +21,7 @@
         delete+delete
         join+join
         leave+leave
-        ::groupify+groupify
+        groupify+groupify
         ::invite+invite
     ==
     ::
@@ -60,7 +60,12 @@
           app+app
       ==
     ::
-    ++  groupify  !!
+    ++  groupify  
+      %-  ou
+      :~  resource+(un dejs:resource)
+          app+(un app)
+          to+(uf ~ (mu dejs:resource))
+      ==
     ++  invite    !!
     ::
     ++  associated
diff --git a/pkg/arvo/sur/graph-view.hoon b/pkg/arvo/sur/graph-view.hoon
index 0397cf9bd2..df9d70fcf6 100644
--- a/pkg/arvo/sur/graph-view.hoon
+++ b/pkg/arvo/sur/graph-view.hoon
@@ -41,7 +41,7 @@
     [%leave rid=resource]
     [%join rid=resource =ship app=app-name] 
     ::[%invite rid=resource ships=(set ship)]
-    :: [%groupify rid=resource title=@t description=@t]
+    [%groupify rid=resource app=app-name to=(unit resource)]
   ==
 --
 
diff --git a/pkg/arvo/ted/graph/groupify.hoon b/pkg/arvo/ted/graph/groupify.hoon
new file mode 100644
index 0000000000..c3f2dda03d
--- /dev/null
+++ b/pkg/arvo/ted/graph/groupify.hoon
@@ -0,0 +1,72 @@
+/-  spider, graph-view, graph=graph-store, *metadata-store, *group, *metadata-store
+/+  strandio, resource
+=>
+|% 
+++  strand  strand:spider
+++  poke  poke:strandio
+++  poke-our   poke-our:strandio
+::
+++  check-live
+  |=  who=ship
+  =/  m  (strand ,~)
+  ^-  form:m
+  %+  (set-timeout:strandio ,~)  ~s20
+  ;<  ~  bind:m
+    (poke [who %hood] %helm-hi !>(~))
+  (pure:m ~)
+::
+++  scry-group
+  |=  rid=resource
+  =/  m  (strand ,group)
+  ^-  form:m
+  ;<  ugroup=(unit group)  bind:m
+    %+  scry:strandio  (unit group)
+    %+  weld  /gx/group-store/groups
+    (snoc (en-path:resource rid) %noun)
+  ?>  ?=(^ ugroup)
+  (pure:m u.ugroup)
+::
+++  scry-metadatum
+  |=  [app=app-name:graph-view rid=resource]
+  =/  m  (strand ,metadata)
+  ^-  form:m
+  =/  enc-path=@t
+    (scot %t (spat (en-path:resource rid)))
+  ;<  umeta=(unit metadata)  bind:m
+    %+  scry:strandio  (unit metadata)
+    %+  weld  /gx/metadata-store/metadata
+    /[enc-path]/[app]/[enc-path]/noun
+  ?>  ?=(^ umeta)
+  (pure:m u.umeta)
+--
+::
+^-  thread:spider
+|=  arg=vase
+=/  m  (strand ,vase)
+^-  form:m
+=+  !<(=action:graph-view arg)
+?>  ?=(%groupify -.action)
+;<  =group  bind:m  (scry-group rid.action)
+?>  hidden.group
+;<  =metadata  bind:m
+  (scry-metadatum app.action rid.action)
+?~  to.action
+  ;<  ~  bind:m
+    %+  poke-our  %contact-view
+    contact-view-action+!>([%groupify rid.action title.metadata description.metadata])
+  (pure:m !>(~))
+;<  new=^group  bind:m  (scry-group u.to.action)
+?<  hidden.new
+=/  new-path
+  (en-path:resource u.to.action)
+=/  app-path
+  (en-path:resource rid.action)
+=/  add-md=metadata-action
+  [%add new-path [app.action app-path] metadata]
+;<  ~  bind:m
+  (poke-our %metadata-store metadata-action+!>(add-md))
+;<  ~  bind:m
+  (poke-our %metadata-store metadata-action+!>([%remove app-path [app.action app-path]]))
+;<  ~  bind:m
+  (poke-our %group-store %group-update !>([%remove-group rid.action]))
+(pure:m !>(~))
diff --git a/pkg/interface/src/logic/api/graph.ts b/pkg/interface/src/logic/api/graph.ts
index da4cc56e01..4b9791c727 100644
--- a/pkg/interface/src/logic/api/graph.ts
+++ b/pkg/interface/src/logic/api/graph.ts
@@ -75,6 +75,19 @@ export default class GraphApi extends BaseApi<StoreState> {
     });
   }
 
+  groupifyGraph(ship: Patp, name: string, app: string, toPath?: string) {
+    const resource = makeResource(ship, name);
+    const to = toPath && resourceFromPath(toPath);
+
+    return this.viewAction('graph-groupify', {
+      groupify: {
+        resource,
+        app,
+        to
+      }
+    });
+  }
+
   addGraph(ship: Patp, name: string, graph: any, mark: any) {
     this.storeAction({
       'add-graph': {

From e206b9c95192fa408dc8fdb848ff3e29037ffe9e Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Fri, 11 Sep 2020 10:10:44 +1000
Subject: [PATCH 78/89] graph-view: fix app-name in metadata

---
 pkg/arvo/lib/graph-view.hoon  |  4 +++-
 pkg/arvo/sur/graph-view.hoon  |  6 ++---
 pkg/arvo/ted/graph/join.hoon  |  2 +-
 pkg/arvo/ted/graph/leave.hoon | 44 +++++++++++++++++++----------------
 4 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/pkg/arvo/lib/graph-view.hoon b/pkg/arvo/lib/graph-view.hoon
index c8d7f6ae91..2d35223f6f 100644
--- a/pkg/arvo/lib/graph-view.hoon
+++ b/pkg/arvo/lib/graph-view.hoon
@@ -46,18 +46,20 @@
     ++  leave
       %-  ot
       :~  resource+dejs:resource
+          app+app
       ==
     ::
     ++  delete
       %-  ot
       :~  resource+dejs:resource
+          app+app
       ==
     ::
     ++  join
       %-  ot
       :~  resource+dejs:resource
-          ship+(su ;~(pfix sig fed:ag))
           app+app
+          ship+(su ;~(pfix sig fed:ag))
       ==
     ::
     ++  groupify  
diff --git a/pkg/arvo/sur/graph-view.hoon b/pkg/arvo/sur/graph-view.hoon
index df9d70fcf6..a218f4e72f 100644
--- a/pkg/arvo/sur/graph-view.hoon
+++ b/pkg/arvo/sur/graph-view.hoon
@@ -37,9 +37,9 @@
         app=app-name
         =associated
     ==
-    [%delete rid=resource]
-    [%leave rid=resource]
-    [%join rid=resource =ship app=app-name] 
+    [%delete rid=resource app=app-name]
+    [%leave rid=resource app=app-name]
+    [%join rid=resource app=app-name =ship] 
     ::[%invite rid=resource ships=(set ship)]
     [%groupify rid=resource app=app-name to=(unit resource)]
   ==
diff --git a/pkg/arvo/ted/graph/join.hoon b/pkg/arvo/ted/graph/join.hoon
index 976c0ef635..6f14236ee2 100644
--- a/pkg/arvo/ted/graph/join.hoon
+++ b/pkg/arvo/ted/graph/join.hoon
@@ -41,7 +41,7 @@
 ;<  =bowl:spider  bind:m  get-bowl:strandio
 ?<  =(our.bowl entity.rid.action)
 ;<  group=(unit resource)  bind:m  
-  (scry-metadata rid.action)
+  (scry-metadata app.action rid.action)
 ;<  ~  bind:m  (check-live entity.rid.action)
 ?^  group
   ::  We have group, graph is managed
diff --git a/pkg/arvo/ted/graph/leave.hoon b/pkg/arvo/ted/graph/leave.hoon
index 60b1957781..3333d0c734 100644
--- a/pkg/arvo/ted/graph/leave.hoon
+++ b/pkg/arvo/ted/graph/leave.hoon
@@ -7,24 +7,28 @@
 ++  poke-our   poke-our:strandio
 ::
 ++  scry-metadata
-  |=  rid=resource
-  =/  m  (strand ,(unit resource))
-  ;<  pax=(unit path)  bind:m
-    %+  scry:strandio   ,(unit path)
+  |=  [app=app-name:graph-view rid=resource]
+  =/  m  (strand ,resource)
+  ^-  form:m
+  ;<  pax=(unit (set path))  bind:m
+    %+  scry:strandio   ,(unit (set path))
     ;:  weld
-      /gx/metadata-store/resource/graph
+      /gx/metadata-store/resource/[app]
       (en-path:resource rid)
       /noun
     ==
-  (pure:m (bind pax de-path:resource))
+  ?>  ?=(^ pax)
+  ?>  ?=(^ u.pax)
+  (pure:m (de-path:resource n.u.pax))
 ::
 ++  scry-group
-  |=  rid=resource
-  =/  m  (strand ,(unit resource))
+  |=  [app=app-name:graph-view rid=resource]
+  =/  m  (strand ,group)
+  ^-  form:m
   ;<  ugroup=(unit group)  bind:m
     %+  scry:strandio   ,(unit group)
     ;:  weld
-      /gx/group-store/resource/graph
+      /gx/group-store/resource/[app]
       (en-path:resource rid)
       /noun
     ==
@@ -33,10 +37,11 @@
 ++  delete-graph
   |=  rid=resource
   =/  m  (strand ,~)
+  ^-  form:m
   ;<  ~  bind:m
-    (poke-our %graph-pull-hook %pull-hook-action [%remove rid.action])
+    (poke-our %graph-pull-hook %pull-hook-action !>([%remove rid]))
   ;<  ~  bind:m
-    (poke-our %graph-store %graph-update [%archive-graph rid.action])
+    (poke-our %graph-store %graph-update !>([%archive-graph rid]))
   (pure:m ~)
 --
 ::
@@ -48,17 +53,16 @@
 ?>  ?=(%leave -.action)
 ;<  =bowl:spider  bind:m  get-bowl:strandio
 ?<  =(our.bowl entity.rid.action)
-;<  ugroup-rid=(unit resource)  bind:m  
-  (scry-metadata rid.action)
-?~  ugroup-rid  !!
-;<  ugroup=(unit group)
-  (scry-group u.ugroup-rid)
-?~  ugroup  (fail:m %nonexistent)
-?.  hidden.u.ugroup
-  (delete-graph rid.action)
+;<  group-rid=resource  bind:m  
+  (scry-metadata app.action rid.action)
+;<  g=group  bind:m
+  (scry-group app.action group-rid)
+?.  hidden.g
+  ;<  ~  bind:m  (delete-graph rid.action)
+  (pure:m !>(~))
 ;<  ~  bind:m
   (poke-our %group-push-hook %pull-hook-action !>([%remove rid.action]))
 ;<  ~  bind:m
-  (poke-our %group-store %group-action !>([%remove-group rid.action])
+  (poke-our %group-store %group-action !>([%remove-group rid.action]))
 ;<  ~  bind:m  (delete-graph rid.action)
 (pure:m !>(~))

From 9ef2adf9da99c48c5b5d01dc0c5155d0e4c1942e Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Fri, 11 Sep 2020 13:08:16 +1000
Subject: [PATCH 79/89] graph-view: error-handling pass

---
 pkg/arvo/app/spider.hoon         | 12 ++++++++++--
 pkg/arvo/lib/strandio.hoon       | 14 ++++++++++++++
 pkg/arvo/sur/spider.hoon         |  6 ++++++
 pkg/arvo/ted/graph/create.hoon   |  2 ++
 pkg/arvo/ted/graph/delete.hoon   | 10 ++++++----
 pkg/arvo/ted/graph/groupify.hoon |  3 ++-
 pkg/arvo/ted/graph/join.hoon     |  7 ++++++-
 pkg/arvo/ted/graph/leave.hoon    |  3 ++-
 8 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/pkg/arvo/app/spider.hoon b/pkg/arvo/app/spider.hoon
index 51e6c60cf2..6a974f5006 100644
--- a/pkg/arvo/app/spider.hoon
+++ b/pkg/arvo/app/spider.hoon
@@ -1,5 +1,5 @@
 /-  spider
-/+  libstrand=strand, default-agent, verb, server
+/+  libstrand=strand, default-agent, verb, server 
 =,  strand=strand:libstrand
 |%
 +$  card         card:agent:gall
@@ -473,7 +473,15 @@
   :_  state(serving (~(del by serving.state) tid))
   %+  give-simple-payload:app:server  eyre-id
   ^-  simple-payload:http
-  [[500 ~] ~]
+  :_  ~  :_  ~
+  ?.  ?=(http-error:spider term)
+    ((slog tang) 500)
+  ?-  term
+    %bad-request  400
+    %forbidden    403
+    %nonexistent  404
+    %offline      504
+  ==
 ::
 ++  thread-fail
   |=  [=yarn =term =tang]
diff --git a/pkg/arvo/lib/strandio.hoon b/pkg/arvo/lib/strandio.hoon
index 7eaa8c288d..93e3a24c8a 100644
--- a/pkg/arvo/lib/strandio.hoon
+++ b/pkg/arvo/lib/strandio.hoon
@@ -295,6 +295,20 @@
     [%pass /wait/(scot %da until) %arvo %b %wait until]
   (send-raw-card card)
 ::
+++  map-err
+  |*  computation-result=mold
+  =/  m  (strand ,computation-result)
+  |=  [f=$-([term tang] [term tang]) computation=form:m]
+  ^-  form:m
+  |=  tin=strand-input:strand
+  =*  loop  $
+  =/  c-res  (computation tin)
+  ?:  ?=(%cont -.next.c-res)
+    c-res(self.next ..loop(computation self.next.c-res))
+  ?.  ?=(%fail -.next.c-res)
+    c-res
+  c-res(err.next (f err.next.c-res))
+::
 ++  set-timeout
   |*  computation-result=mold
   =/  m  (strand ,computation-result)
diff --git a/pkg/arvo/sur/spider.hoon b/pkg/arvo/sur/spider.hoon
index f9035a91e5..5fe7a76268 100644
--- a/pkg/arvo/sur/spider.hoon
+++ b/pkg/arvo/sur/spider.hoon
@@ -5,4 +5,10 @@
 +$  input   [=tid =cage]
 +$  tid     tid:strand
 +$  bowl    bowl:strand
++$  http-error
+  $?  %bad-request   :: 400
+      %forbidden     :: 403
+      %nonexistent   :: 404
+      %offline       :: 504
+  ==
 --
diff --git a/pkg/arvo/ted/graph/create.hoon b/pkg/arvo/ted/graph/create.hoon
index bb86d14db1..a8043b39c5 100644
--- a/pkg/arvo/ted/graph/create.hoon
+++ b/pkg/arvo/ted/graph/create.hoon
@@ -29,6 +29,8 @@
 ;<  =bowl:spider  bind:m  get-bowl:strandio
 ::  Add graph to graph-store
 ::
+?.  =(our.bowl entity.rid.action)
+  (strand-fail:strandio %bad-request ~)
 =/  =update:graph
   [%0 now.bowl %add-graph rid.action *graph:graph `(app-to-mark:graph-view app.action)]
 ;<  ~  bind:m
diff --git a/pkg/arvo/ted/graph/delete.hoon b/pkg/arvo/ted/graph/delete.hoon
index d9ff09fc8e..70c7911949 100644
--- a/pkg/arvo/ted/graph/delete.hoon
+++ b/pkg/arvo/ted/graph/delete.hoon
@@ -33,10 +33,11 @@
   (pure:m (need ugroup))
 ::
 ++  delete-graph
-  |=  [group=resource rid=resource app=app-name:graph-view]
+  |=  rid=resource
   =/  m  (strand ,~)
-  ::;<  ~  bind:m
-  ::  (poke-our %graph-push-hook %push-hook-action [%remove rid.action])
+  ^-  form:m
+  ;<  ~  bind:m
+    (poke-our %graph-push-hook %push-hook-action !>([%remove rid]))
   ;<  =bowl:spider  bind:m  get-bowl:strandio
   ;<  ~  bind:m
     (poke-our %graph-store %graph-update !>([%0 now.bowl %archive-graph rid]))
@@ -50,7 +51,8 @@
 =+  !<(=action:graph-view arg)
 ?>  ?=(%delete -.action)
 ;<  =bowl:spider  bind:m  get-bowl:strandio
-?>  =(our.bowl entity.rid.action)
+?.  =(our.bowl entity.rid.action)
+  (strand-fail:strandio %bad-request ~)
 ;<  ugroup-rid=(unit resource)  bind:m  
   (scry-metadata rid.action)
 ?~  ugroup-rid  !!
diff --git a/pkg/arvo/ted/graph/groupify.hoon b/pkg/arvo/ted/graph/groupify.hoon
index c3f2dda03d..e5664a8061 100644
--- a/pkg/arvo/ted/graph/groupify.hoon
+++ b/pkg/arvo/ted/graph/groupify.hoon
@@ -47,7 +47,8 @@
 =+  !<(=action:graph-view arg)
 ?>  ?=(%groupify -.action)
 ;<  =group  bind:m  (scry-group rid.action)
-?>  hidden.group
+?.  hidden.group
+  (strand-fail:strandio %bad-request ~)
 ;<  =metadata  bind:m
   (scry-metadatum app.action rid.action)
 ?~  to.action
diff --git a/pkg/arvo/ted/graph/join.hoon b/pkg/arvo/ted/graph/join.hoon
index 6f14236ee2..f7b201c876 100644
--- a/pkg/arvo/ted/graph/join.hoon
+++ b/pkg/arvo/ted/graph/join.hoon
@@ -3,6 +3,7 @@
 =>
 |% 
 ++  strand  strand:spider
+++  fail    strand-fail:strand
 ++  poke  poke:strandio
 ++  poke-our   poke-our:strandio
 ::
@@ -10,6 +11,8 @@
   |=  who=ship
   =/  m  (strand ,~)
   ^-  form:m
+  %+  (map-err:strandio ,~)  
+    |=(* [%offline *tang])
   %+  (set-timeout:strandio ,~)  ~s20
   ;<  ~  bind:m
     (poke [who %hood] %helm-hi !>(~))
@@ -39,7 +42,8 @@
 =+  !<(=action:graph-view arg)
 ?>  ?=(%join -.action)
 ;<  =bowl:spider  bind:m  get-bowl:strandio
-?<  =(our.bowl entity.rid.action)
+?:  =(our.bowl entity.rid.action)
+  (fail %bad-request ~)
 ;<  group=(unit resource)  bind:m  
   (scry-metadata app.action rid.action)
 ;<  ~  bind:m  (check-live entity.rid.action)
@@ -51,6 +55,7 @@
   (pure:m !>(~))
 :: Else, add group then join
 ;<  ~  bind:m  
+  %+  (map-err:strandio ,~)  |=(* [%forbidden ~])
   %+  poke
     [ship.action %group-push-hook]
   group-update+!>([%add-members rid.action (sy our.bowl ~)])
diff --git a/pkg/arvo/ted/graph/leave.hoon b/pkg/arvo/ted/graph/leave.hoon
index 3333d0c734..2b56942f65 100644
--- a/pkg/arvo/ted/graph/leave.hoon
+++ b/pkg/arvo/ted/graph/leave.hoon
@@ -52,7 +52,8 @@
 =+  !<([=action:graph-view ~] arg)
 ?>  ?=(%leave -.action)
 ;<  =bowl:spider  bind:m  get-bowl:strandio
-?<  =(our.bowl entity.rid.action)
+?:  =(our.bowl entity.rid.action)
+  (strand-fail:strandio %bad-request ~)
 ;<  group-rid=resource  bind:m  
   (scry-metadata app.action rid.action)
 ;<  g=group  bind:m

From 1f02c594a8e6b97dcbfa3d47904281297899d4e7 Mon Sep 17 00:00:00 2001
From: Logan Allen <loganallc@gmail.com>
Date: Mon, 14 Sep 2020 14:49:41 -0500
Subject: [PATCH 80/89] userspace: addressed TODOs and made %link-store compile

---
 pkg/arvo/app/link-listen-hook.hoon | 7 +++++--
 pkg/arvo/app/link-proxy-hook.hoon  | 8 ++++++--
 pkg/arvo/app/link-store.hoon       | 2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkg/arvo/app/link-listen-hook.hoon b/pkg/arvo/app/link-listen-hook.hoon
index 5c1fade7cf..b9cd262669 100644
--- a/pkg/arvo/app/link-listen-hook.hoon
+++ b/pkg/arvo/app/link-listen-hook.hoon
@@ -29,9 +29,12 @@
 ++  on-load
   |=  =vase
   ^-  (quip card _this)
-  ::  TODO: get rid of all subscriptions in bowl
   :_  this
-  [%pass /groups %agent [our.bowl %group-store] %leave ~]~
+  :-  [%pass /groups %agent [our.bowl %group-store] %leave ~]
+  %+  turn  ~(tap in ~(key by wex.bowl))
+  |=  [=wire =ship =term]
+  ^-  card
+  [%pass wire %agent [ship term] %leave ~]
 ::
 ++  on-agent  on-agent:def
 ++  on-poke   on-poke:def
diff --git a/pkg/arvo/app/link-proxy-hook.hoon b/pkg/arvo/app/link-proxy-hook.hoon
index 0eab5a3923..9557d0f185 100644
--- a/pkg/arvo/app/link-proxy-hook.hoon
+++ b/pkg/arvo/app/link-proxy-hook.hoon
@@ -27,9 +27,13 @@
 ++  on-load
   |=  old-vase=vase
   ^-  (quip card _this)
-  ::  TODO: get rid of all subscriptions in bowl
+  =/  paths
+    %+  turn  ~(val by sup.bowl)
+    |=([=ship =path] path)
   :_  this
-  [%pass /groups %agent [our.bowl %group-store] %leave ~]~
+  :-  [%pass /groups %agent [our.bowl %group-store] %leave ~]
+  ?~  paths  ~
+  [%give %kick paths ~]~
 ::
 ++  on-watch  on-watch:def
 ++  on-leave  on-leave:def
diff --git a/pkg/arvo/app/link-store.hoon b/pkg/arvo/app/link-store.hoon
index 485be958d1..ab6edcfc33 100644
--- a/pkg/arvo/app/link-store.hoon
+++ b/pkg/arvo/app/link-store.hoon
@@ -150,7 +150,7 @@
   ::
   ++  on-bad-path
     |=  [=path =links]
-    ^-  (unit card)
+    ^-  (list card)
     ~|  discarding-malformed-links+[path links]
     ~
   ::

From cfe94840870719200ad77f0d970529e6ff40361c Mon Sep 17 00:00:00 2001
From: Logan Allen <loganallc@gmail.com>
Date: Mon, 14 Sep 2020 14:50:27 -0500
Subject: [PATCH 81/89] graph-validator-link: removed unicode characters

---
 pkg/arvo/mar/graph/validator/link.hoon | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/arvo/mar/graph/validator/link.hoon b/pkg/arvo/mar/graph/validator/link.hoon
index a9c1cbb309..02de528df2 100644
--- a/pkg/arvo/mar/graph/validator/link.hoon
+++ b/pkg/arvo/mar/graph/validator/link.hoon
@@ -11,7 +11,7 @@
     =/  ip  ;;(indexed-post p)
     ?+    index.p.ip  ~|(index+index.p.ip !!)
         ::  top-level link post; title and url
-        ::
+        ::
         [@ ~]
       ?>  ?=([[%text @] [%url @] ~] contents.p.ip)
       ip

From 8106be7c16614eab0dc694e06e27c579159068c3 Mon Sep 17 00:00:00 2001
From: Logan Allen <loganallc@gmail.com>
Date: Mon, 14 Sep 2020 14:52:09 -0500
Subject: [PATCH 82/89] link-view: removed TODO

---
 pkg/arvo/app/link-view.hoon | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/arvo/app/link-view.hoon b/pkg/arvo/app/link-view.hoon
index 9ddb2b8811..0850862124 100644
--- a/pkg/arvo/app/link-view.hoon
+++ b/pkg/arvo/app/link-view.hoon
@@ -27,7 +27,6 @@
   |=  old-vase=vase
   ^-  (quip card _this)
   :_  this(state [%2 ~])
-  ::  TODO: leave all subscriptions
   [%pass /connect %arvo %e %disconnect [~ /'~link']]~
 ::
 ++  on-poke   on-poke:def

From 61e1a40650e3d8cfacecbc0b377ffede6fb4e921 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Tue, 15 Sep 2020 11:23:13 +1000
Subject: [PATCH 83/89] graph-view: remove typing of app

---
 pkg/arvo/lib/graph-view.hoon   | 36 +++++++++++-----------------------
 pkg/arvo/sur/graph-view.hoon   | 14 ++++++-------
 pkg/arvo/ted/graph/create.hoon |  2 +-
 3 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/pkg/arvo/lib/graph-view.hoon b/pkg/arvo/lib/graph-view.hoon
index 2d35223f6f..efc6fa59d7 100644
--- a/pkg/arvo/lib/graph-view.hoon
+++ b/pkg/arvo/lib/graph-view.hoon
@@ -4,12 +4,6 @@
 =<  [sur .]
 =,  sur
 |%
-++  app-to-mark
-  |=  app=app-name
-  ?+  app  ~|("nonexistent app" !!)
-    %chat  %graph-validator-chat
-    %publish  %graph-validator-publish
-  ==
 ++  dejs
   =,  dejs:format
   |%
@@ -26,46 +20,38 @@
     ==
     ::
     ++  create
-      %-  ot
-      :~  resource+dejs:resource
-          title+so
-          description+so
-          app+app
-          associated+associated
-      ==
-    ::
-    ++  app
-      |=  jon=json
-      ^-  app-name
-      ?>  ?=(%s -.jon)
-      ?+  p.jon  !!
-        %chat     %chat
-        %publish  %publish
+      %-  ou
+      :~  resource+(un dejs:resource)
+          title+(un so)
+          description+(un so)
+          mark+(uf ~ (mu so))
+          app+(un so)
+          associated+(un associated)
       ==
     ::
     ++  leave
       %-  ot
       :~  resource+dejs:resource
-          app+app
+          app+so
       ==
     ::
     ++  delete
       %-  ot
       :~  resource+dejs:resource
-          app+app
+          app+so
       ==
     ::
     ++  join
       %-  ot
       :~  resource+dejs:resource
-          app+app
+          app+so
           ship+(su ;~(pfix sig fed:ag))
       ==
     ::
     ++  groupify  
       %-  ou
       :~  resource+(un dejs:resource)
-          app+(un app)
+          app+(un so)
           to+(uf ~ (mu dejs:resource))
       ==
     ++  invite    !!
diff --git a/pkg/arvo/sur/graph-view.hoon b/pkg/arvo/sur/graph-view.hoon
index a218f4e72f..17ea8acd44 100644
--- a/pkg/arvo/sur/graph-view.hoon
+++ b/pkg/arvo/sur/graph-view.hoon
@@ -8,9 +8,6 @@
   $%  [%group rid=resource]
       [%policy =policy]
   ==
-::  $app: An app that is associated to a graph-store mark
-::
-+$  app-name  ?(%chat %publish %links)
 ::
 ::  $error: An error from a graph-view poke
 ::  
@@ -34,14 +31,15 @@
         rid=resource
         title=@t
         description=@t
-        app=app-name
+        mark=(unit mark)
+        app=@tas
         =associated
     ==
-    [%delete rid=resource app=app-name]
-    [%leave rid=resource app=app-name]
-    [%join rid=resource app=app-name =ship] 
+    [%delete rid=resource app=@tas]
+    [%leave rid=resource app=@tas]
+    [%join rid=resource app=@tas =ship] 
     ::[%invite rid=resource ships=(set ship)]
-    [%groupify rid=resource app=app-name to=(unit resource)]
+    [%groupify rid=resource app=@tas to=(unit resource)]
   ==
 --
 
diff --git a/pkg/arvo/ted/graph/create.hoon b/pkg/arvo/ted/graph/create.hoon
index a8043b39c5..98b37fd6fb 100644
--- a/pkg/arvo/ted/graph/create.hoon
+++ b/pkg/arvo/ted/graph/create.hoon
@@ -32,7 +32,7 @@
 ?.  =(our.bowl entity.rid.action)
   (strand-fail:strandio %bad-request ~)
 =/  =update:graph
-  [%0 now.bowl %add-graph rid.action *graph:graph `(app-to-mark:graph-view app.action)]
+  [%0 now.bowl %add-graph rid.action *graph:graph mark.action]
 ;<  ~  bind:m
   (poke-our %graph-store graph-update+!>(update))
 ;<  ~  bind:m

From e2670deba327838c6f9c13cb763628fdd9b6fdb5 Mon Sep 17 00:00:00 2001
From: Logan Allen <loganallc@gmail.com>
Date: Tue, 15 Sep 2020 11:32:29 -0500
Subject: [PATCH 84/89] graph-push-hook: check whether someone is a member, not
 whether they can join

---
 pkg/arvo/app/graph-push-hook.hoon | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkg/arvo/app/graph-push-hook.hoon b/pkg/arvo/app/graph-push-hook.hoon
index f93fefed7b..c42a885111 100644
--- a/pkg/arvo/app/graph-push-hook.hoon
+++ b/pkg/arvo/app/graph-push-hook.hoon
@@ -44,23 +44,30 @@
 ++  should-proxy-update
   |=  =vase
   ^-  ?
+  |^
   =/  =update:store  !<(update:store vase)
   ?-  -.q.update
-      %add-graph          %.y
-      %remove-graph       %.y
-      %add-nodes          %.y
-      %remove-nodes       %.y
-      %add-signatures     %.y
-      %remove-signatures  %.y
-      %archive-graph      %.y
+      %add-graph          (is-member resource.q.update)
+      %remove-graph       (is-member resource.q.update)
+      %add-nodes          (is-member resource.q.update)
+      %remove-nodes       (is-member resource.q.update)
+      %add-signatures     (is-member resource.uid.q.update)
+      %remove-signatures  (is-member resource.uid.q.update)
+      %archive-graph      (is-member resource.q.update)
       %unarchive-graph    %.n
       %add-tag            %.n
       %remove-tag         %.n
       %keys               %.n
       %tags               %.n
       %tag-queries        %.n
-      %run-updates        %.y
+      %run-updates        (is-member resource.q.update)
   ==
+  ::
+  ++  is-member
+    |=  =resource:res
+    ^-  ?
+    (is-member:grp src.bowl (en-path:res resource))
+  --
 ::
 ++  resource-for-update
   |=  =vase
@@ -86,7 +93,7 @@
 ++  initial-watch
   |=  [=path =resource:res]
   ^-  vase
-  ?>  (can-join:grp resource src.bowl)
+  ?>  (is-member:grp src.bowl (en-path:res resource))
   !>  ^-  update:store
   ?~  path
     ::  new subscribe

From 5d5d93e663b8d2325bdee747238f036ac2c7bb2f Mon Sep 17 00:00:00 2001
From: Logan Allen <loganallc@gmail.com>
Date: Tue, 15 Sep 2020 12:29:26 -0500
Subject: [PATCH 85/89] graph-push-hook: find group associated with app
 resource

---
 pkg/arvo/app/graph-push-hook.hoon | 34 ++++++++++++++++---------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/pkg/arvo/app/graph-push-hook.hoon b/pkg/arvo/app/graph-push-hook.hoon
index c42a885111..d05b2dd031 100644
--- a/pkg/arvo/app/graph-push-hook.hoon
+++ b/pkg/arvo/app/graph-push-hook.hoon
@@ -1,4 +1,5 @@
 /+  store=graph-store
+/+  met=metadata
 /+  res=resource
 /+  graph
 /+  group
@@ -18,6 +19,14 @@
   ==
 ::
 +$  agent  (push-hook:push-hook config)
+::
+++  is-member
+  |=  [=resource:res =bowl:gall]
+  ^-  ?
+  =/  grp  ~(. group bowl)
+  =/  group-paths  (groups-from-resource:met [%graph (en-path:res resource)])
+  ?~  group-paths  %.n
+  (is-member:grp src.bowl i.group-paths)
 --
 ::
 %-  agent:dbug
@@ -44,30 +53,23 @@
 ++  should-proxy-update
   |=  =vase
   ^-  ?
-  |^
   =/  =update:store  !<(update:store vase)
   ?-  -.q.update
-      %add-graph          (is-member resource.q.update)
-      %remove-graph       (is-member resource.q.update)
-      %add-nodes          (is-member resource.q.update)
-      %remove-nodes       (is-member resource.q.update)
-      %add-signatures     (is-member resource.uid.q.update)
-      %remove-signatures  (is-member resource.uid.q.update)
-      %archive-graph      (is-member resource.q.update)
+      %add-graph          (is-member resource.q.update bowl)
+      %remove-graph       (is-member resource.q.update bowl)
+      %add-nodes          (is-member resource.q.update bowl)
+      %remove-nodes       (is-member resource.q.update bowl)
+      %add-signatures     (is-member resource.uid.q.update bowl)
+      %remove-signatures  (is-member resource.uid.q.update bowl)
+      %archive-graph      (is-member resource.q.update bowl)
       %unarchive-graph    %.n
       %add-tag            %.n
       %remove-tag         %.n
       %keys               %.n
       %tags               %.n
       %tag-queries        %.n
-      %run-updates        (is-member resource.q.update)
+      %run-updates        (is-member resource.q.update bowl)
   ==
-  ::
-  ++  is-member
-    |=  =resource:res
-    ^-  ?
-    (is-member:grp src.bowl (en-path:res resource))
-  --
 ::
 ++  resource-for-update
   |=  =vase
@@ -93,7 +95,7 @@
 ++  initial-watch
   |=  [=path =resource:res]
   ^-  vase
-  ?>  (is-member:grp src.bowl (en-path:res resource))
+  ?>  (is-member resource bowl)
   !>  ^-  update:store
   ?~  path
     ::  new subscribe

From 183e7210ccf1010a4597155a93d9de38b9be1fa7 Mon Sep 17 00:00:00 2001
From: Ted Blackman <ted@tlon.io>
Date: Tue, 15 Sep 2020 16:10:12 -0400
Subject: [PATCH 86/89] -graph-join: remove timeout

---
 pkg/arvo/lib/strandio.hoon   | 11 +++++++++++
 pkg/arvo/ted/graph/join.hoon | 14 +-------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkg/arvo/lib/strandio.hoon b/pkg/arvo/lib/strandio.hoon
index 93e3a24c8a..80c4178a1e 100644
--- a/pkg/arvo/lib/strandio.hoon
+++ b/pkg/arvo/lib/strandio.hoon
@@ -502,6 +502,17 @@
       `[%skip ~]
     `[%done +>.sign-arvo.u.in.tin]
   ==
+::  +check-online: require that peer respond before timeout
+::
+++  check-online
+  |=  [who=ship lag=@dr]
+  =/  m  (strand ,~)
+  ^-  form:m
+  %+  (map-err ,~)  |=(* [%offline *tang])
+  %+  (set-timeout ,~)  lag
+  ;<  ~  bind:m
+    (poke [who %hood] %helm-hi !>(~))
+  (pure:m ~)
 ::
 ::  Queue on skip, try next on fail %ignore
 ::
diff --git a/pkg/arvo/ted/graph/join.hoon b/pkg/arvo/ted/graph/join.hoon
index f7b201c876..e191c1e792 100644
--- a/pkg/arvo/ted/graph/join.hoon
+++ b/pkg/arvo/ted/graph/join.hoon
@@ -7,19 +7,8 @@
 ++  poke  poke:strandio
 ++  poke-our   poke-our:strandio
 ::
-++  check-live
-  |=  who=ship
-  =/  m  (strand ,~)
-  ^-  form:m
-  %+  (map-err:strandio ,~)  
-    |=(* [%offline *tang])
-  %+  (set-timeout:strandio ,~)  ~s20
-  ;<  ~  bind:m
-    (poke [who %hood] %helm-hi !>(~))
-  (pure:m ~)
-::
 ++  scry-metadata
-  |=  [app=app-name:graph-view rid=resource]
+  |=  [app=@tas rid=resource]
   =/  m  (strand ,(unit resource))
   ^-  form:m
   ;<  pax=(unit (set path))  bind:m
@@ -46,7 +35,6 @@
   (fail %bad-request ~)
 ;<  group=(unit resource)  bind:m  
   (scry-metadata app.action rid.action)
-;<  ~  bind:m  (check-live entity.rid.action)
 ?^  group
   ::  We have group, graph is managed
   ;<  ~  bind:m  

From 9d4e10ff4811542da985465b2a6b90e9b727dc1a Mon Sep 17 00:00:00 2001
From: Ted Blackman <ted@tlon.io>
Date: Tue, 15 Sep 2020 16:25:58 -0400
Subject: [PATCH 87/89] graph-view: hard-code app-name to %graph on server-side

---
 pkg/arvo/lib/graph-view.hoon     |  5 -----
 pkg/arvo/sur/graph-view.hoon     |  9 ++++-----
 pkg/arvo/ted/graph/create.hoon   |  2 +-
 pkg/arvo/ted/graph/groupify.hoon | 11 ++++++-----
 pkg/arvo/ted/graph/join.hoon     |  7 +++----
 pkg/arvo/ted/graph/leave.hoon    | 14 ++++++--------
 6 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/pkg/arvo/lib/graph-view.hoon b/pkg/arvo/lib/graph-view.hoon
index efc6fa59d7..2d0b473bbc 100644
--- a/pkg/arvo/lib/graph-view.hoon
+++ b/pkg/arvo/lib/graph-view.hoon
@@ -25,33 +25,28 @@
           title+(un so)
           description+(un so)
           mark+(uf ~ (mu so))
-          app+(un so)
           associated+(un associated)
       ==
     ::
     ++  leave
       %-  ot
       :~  resource+dejs:resource
-          app+so
       ==
     ::
     ++  delete
       %-  ot
       :~  resource+dejs:resource
-          app+so
       ==
     ::
     ++  join
       %-  ot
       :~  resource+dejs:resource
-          app+so
           ship+(su ;~(pfix sig fed:ag))
       ==
     ::
     ++  groupify  
       %-  ou
       :~  resource+(un dejs:resource)
-          app+(un so)
           to+(uf ~ (mu dejs:resource))
       ==
     ++  invite    !!
diff --git a/pkg/arvo/sur/graph-view.hoon b/pkg/arvo/sur/graph-view.hoon
index 17ea8acd44..56aec7dbbe 100644
--- a/pkg/arvo/sur/graph-view.hoon
+++ b/pkg/arvo/sur/graph-view.hoon
@@ -32,14 +32,13 @@
         title=@t
         description=@t
         mark=(unit mark)
-        app=@tas
         =associated
     ==
-    [%delete rid=resource app=@tas]
-    [%leave rid=resource app=@tas]
-    [%join rid=resource app=@tas =ship] 
+    [%delete rid=resource]
+    [%leave rid=resource]
+    [%join rid=resource =ship] 
     ::[%invite rid=resource ships=(set ship)]
-    [%groupify rid=resource app=@tas to=(unit resource)]
+    [%groupify rid=resource to=(unit resource)]
   ==
 --
 
diff --git a/pkg/arvo/ted/graph/create.hoon b/pkg/arvo/ted/graph/create.hoon
index 98b37fd6fb..580d26019b 100644
--- a/pkg/arvo/ted/graph/create.hoon
+++ b/pkg/arvo/ted/graph/create.hoon
@@ -53,7 +53,7 @@
     creator  our.bowl
   ==
 =/  act=metadata-action
-  [%add group-path [app.action (en-path:resource rid.action)] metadata]
+  [%add group-path graph+(en-path:resource rid.action) metadata]
 ;<  ~  bind:m  (poke-our %metadata-hook %metadata-action !>(act))
 ;<  ~  bind:m
   (poke-our %metadata-hook %metadata-hook-action !>([%add-owned group-path]))
diff --git a/pkg/arvo/ted/graph/groupify.hoon b/pkg/arvo/ted/graph/groupify.hoon
index e5664a8061..ca9c26edfe 100644
--- a/pkg/arvo/ted/graph/groupify.hoon
+++ b/pkg/arvo/ted/graph/groupify.hoon
@@ -27,7 +27,7 @@
   (pure:m u.ugroup)
 ::
 ++  scry-metadatum
-  |=  [app=app-name:graph-view rid=resource]
+  |=  rid=resource
   =/  m  (strand ,metadata)
   ^-  form:m
   =/  enc-path=@t
@@ -35,7 +35,7 @@
   ;<  umeta=(unit metadata)  bind:m
     %+  scry:strandio  (unit metadata)
     %+  weld  /gx/metadata-store/metadata
-    /[enc-path]/[app]/[enc-path]/noun
+    /[enc-path]/graph/[enc-path]/noun
   ?>  ?=(^ umeta)
   (pure:m u.umeta)
 --
@@ -50,7 +50,7 @@
 ?.  hidden.group
   (strand-fail:strandio %bad-request ~)
 ;<  =metadata  bind:m
-  (scry-metadatum app.action rid.action)
+  (scry-metadatum rid.action)
 ?~  to.action
   ;<  ~  bind:m
     %+  poke-our  %contact-view
@@ -63,11 +63,12 @@
 =/  app-path
   (en-path:resource rid.action)
 =/  add-md=metadata-action
-  [%add new-path [app.action app-path] metadata]
+  [%add new-path graph+app-path metadata]
 ;<  ~  bind:m
   (poke-our %metadata-store metadata-action+!>(add-md))
 ;<  ~  bind:m
-  (poke-our %metadata-store metadata-action+!>([%remove app-path [app.action app-path]]))
+  %+  poke-our  %metadata-store
+  metadata-action+!>([%remove app-path graph+app-path])
 ;<  ~  bind:m
   (poke-our %group-store %group-update !>([%remove-group rid.action]))
 (pure:m !>(~))
diff --git a/pkg/arvo/ted/graph/join.hoon b/pkg/arvo/ted/graph/join.hoon
index e191c1e792..59b48ec927 100644
--- a/pkg/arvo/ted/graph/join.hoon
+++ b/pkg/arvo/ted/graph/join.hoon
@@ -8,13 +8,13 @@
 ++  poke-our   poke-our:strandio
 ::
 ++  scry-metadata
-  |=  [app=@tas rid=resource]
+  |=  rid=resource
   =/  m  (strand ,(unit resource))
   ^-  form:m
   ;<  pax=(unit (set path))  bind:m
     %+  scry:strandio   ,(unit (set path))
     ;:  weld
-      /gx/metadata-store/resource/[app]
+      /gx/metadata-store/resource/graph
       (en-path:resource rid)
       /noun
     ==
@@ -33,8 +33,7 @@
 ;<  =bowl:spider  bind:m  get-bowl:strandio
 ?:  =(our.bowl entity.rid.action)
   (fail %bad-request ~)
-;<  group=(unit resource)  bind:m  
-  (scry-metadata app.action rid.action)
+;<  group=(unit resource)  bind:m  (scry-metadata rid.action)
 ?^  group
   ::  We have group, graph is managed
   ;<  ~  bind:m  
diff --git a/pkg/arvo/ted/graph/leave.hoon b/pkg/arvo/ted/graph/leave.hoon
index 2b56942f65..edc9af6636 100644
--- a/pkg/arvo/ted/graph/leave.hoon
+++ b/pkg/arvo/ted/graph/leave.hoon
@@ -7,13 +7,13 @@
 ++  poke-our   poke-our:strandio
 ::
 ++  scry-metadata
-  |=  [app=app-name:graph-view rid=resource]
+  |=  rid=resource
   =/  m  (strand ,resource)
   ^-  form:m
   ;<  pax=(unit (set path))  bind:m
     %+  scry:strandio   ,(unit (set path))
     ;:  weld
-      /gx/metadata-store/resource/[app]
+      /gx/metadata-store/resource/graph
       (en-path:resource rid)
       /noun
     ==
@@ -22,13 +22,13 @@
   (pure:m (de-path:resource n.u.pax))
 ::
 ++  scry-group
-  |=  [app=app-name:graph-view rid=resource]
+  |=  rid=resource
   =/  m  (strand ,group)
   ^-  form:m
   ;<  ugroup=(unit group)  bind:m
     %+  scry:strandio   ,(unit group)
     ;:  weld
-      /gx/group-store/resource/[app]
+      /gx/group-store/resource/graph
       (en-path:resource rid)
       /noun
     ==
@@ -54,10 +54,8 @@
 ;<  =bowl:spider  bind:m  get-bowl:strandio
 ?:  =(our.bowl entity.rid.action)
   (strand-fail:strandio %bad-request ~)
-;<  group-rid=resource  bind:m  
-  (scry-metadata app.action rid.action)
-;<  g=group  bind:m
-  (scry-group app.action group-rid)
+;<  group-rid=resource  bind:m  (scry-metadata rid.action)
+;<  g=group  bind:m  (scry-group group-rid)
 ?.  hidden.g
   ;<  ~  bind:m  (delete-graph rid.action)
   (pure:m !>(~))

From 3d834ffaf9ce9eb4d0baf142717fed40b6d17c03 Mon Sep 17 00:00:00 2001
From: Ted Blackman <ted@tlon.io>
Date: Tue, 15 Sep 2020 16:29:12 -0400
Subject: [PATCH 88/89] interface: remove app-name from graph commands

---
 pkg/interface/src/logic/api/graph.ts | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkg/interface/src/logic/api/graph.ts b/pkg/interface/src/logic/api/graph.ts
index 4b9791c727..78885bbaed 100644
--- a/pkg/interface/src/logic/api/graph.ts
+++ b/pkg/interface/src/logic/api/graph.ts
@@ -26,7 +26,7 @@ export default class GraphApi extends BaseApi<StoreState> {
     return this.spider('graph-view-action', 'json', threadName, action);
   }
 
-  createManagedGraph(name: string, title: string, description: string, app: string, group: Path) {
+  createManagedGraph(name: string, title: string, description: string, group: Path) {
     const associated = { group: resourceFromPath(group) };
 
     const resource = makeResource(`~${window.ship}`, name);
@@ -35,13 +35,12 @@ export default class GraphApi extends BaseApi<StoreState> {
         resource,
         title,
         description,
-        app,
         associated
       }
     });
   }
 
-  createUnmanagedGraph(name: string, title: string, description: string, app: string, policy: Enc<GroupPolicy>) {
+  createUnmanagedGraph(name: string, title: string, description: string, policy: Enc<GroupPolicy>) {
 
     const resource = makeResource(`~${window.ship}`, name);
     return this.viewAction('graph-create', {
@@ -49,19 +48,17 @@ export default class GraphApi extends BaseApi<StoreState> {
         resource,
         title,
         description,
-        app,
         associated: { policy }
       }
     });
   }
 
-  joinGraph(ship: Patp, name: string, app: string) {
+  joinGraph(ship: Patp, name: string) {
     const resource = makeResource(ship, name);
     return this.viewAction('graph-join', {
       join: {
         resource,
         ship,
-        app
       }
     });
   }
@@ -75,14 +72,13 @@ export default class GraphApi extends BaseApi<StoreState> {
     });
   }
 
-  groupifyGraph(ship: Patp, name: string, app: string, toPath?: string) {
+  groupifyGraph(ship: Patp, name: string, toPath?: string) {
     const resource = makeResource(ship, name);
     const to = toPath && resourceFromPath(toPath);
 
     return this.viewAction('graph-groupify', {
       groupify: {
         resource,
-        app,
         to
       }
     });

From 0211cdd73c06fcfaf118adcb9e2d4ae9e52a4ecc Mon Sep 17 00:00:00 2001
From: Logan Allen <loganallc@gmail.com>
Date: Thu, 17 Sep 2020 13:56:21 -0500
Subject: [PATCH 89/89] graph-thread: %forward an update to the appropriate
 %graph-push-hook

---
 pkg/arvo/sur/graph-view.hoon    |  3 ++-
 pkg/arvo/ted/graph/forward.hoon | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 pkg/arvo/ted/graph/forward.hoon

diff --git a/pkg/arvo/sur/graph-view.hoon b/pkg/arvo/sur/graph-view.hoon
index 56aec7dbbe..6514f2a49d 100644
--- a/pkg/arvo/sur/graph-view.hoon
+++ b/pkg/arvo/sur/graph-view.hoon
@@ -1,4 +1,4 @@
-/-  *group
+/-  *group, store=graph-store
 /+  resource
 ^?
 |%
@@ -39,6 +39,7 @@
     [%join rid=resource =ship] 
     ::[%invite rid=resource ships=(set ship)]
     [%groupify rid=resource to=(unit resource)]
+    [%forward rid=resource =update:store]
   ==
 --
 
diff --git a/pkg/arvo/ted/graph/forward.hoon b/pkg/arvo/ted/graph/forward.hoon
new file mode 100644
index 0000000000..8f4f2c4e42
--- /dev/null
+++ b/pkg/arvo/ted/graph/forward.hoon
@@ -0,0 +1,20 @@
+/-  spider, graph-view, graph=graph-store, *metadata-store, *group
+/+  strandio, resource
+=>
+|% 
+++  strand    strand:spider
+++  poke      poke:strandio
+--
+::
+^-  thread:spider
+|=  arg=vase
+=/  m  (strand ,vase)
+^-  form:m
+=+  !<(=action:graph-view arg)
+?>  ?=(%forward -.action)
+;<  ~  bind:m  
+  %+  (map-err:strandio ,~)  |=(* [%forbidden ~])
+  %+  poke
+    [entity.rid.action %graph-push-hook]
+  [%graph-update !>(update.action)]
+(pure:m !>(~))