From 86f37ede6cb0ce855d7b10858286cfffd2905c4b Mon Sep 17 00:00:00 2001
From: Fang <git@fang.io>
Date: Wed, 9 Oct 2019 15:04:51 +0200
Subject: [PATCH 1/3] chat-cli: Remove prep printf

---
 pkg/arvo/app/chat-cli.hoon | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/arvo/app/chat-cli.hoon b/pkg/arvo/app/chat-cli.hoon
index 483278a41a..fa11269777 100644
--- a/pkg/arvo/app/chat-cli.hoon
+++ b/pkg/arvo/app/chat-cli.hoon
@@ -83,7 +83,6 @@
 ::
 ++  prep
   |=  old=(unit state)
-  ~&  %chat-cli-prep
   ?^  old
     [~ this(+<+ u.old)]
   =^  moves  this

From 79544a03d0d974b21d934071223afffc9ae61ac1 Mon Sep 17 00:00:00 2001
From: Fang <git@fang.io>
Date: Wed, 9 Oct 2019 15:30:26 +0200
Subject: [PATCH 2/3] chat-hook: Improve reap printf readability

---
 pkg/arvo/app/chat-hook.hoon | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkg/arvo/app/chat-hook.hoon b/pkg/arvo/app/chat-hook.hoon
index 9fe986a5c3..1665b5d0a0 100644
--- a/pkg/arvo/app/chat-hook.hoon
+++ b/pkg/arvo/app/chat-hook.hoon
@@ -258,8 +258,13 @@
   ?~  saw
     [~ this]
   ?>  ?=(^ wir)
-  ~&  %chat-hook-reap
-  [((slog u.saw) ~) this(synced (~(del by synced) t.wir))]
+  :_  this(synced (~(del by synced) t.wir))
+  %.  ~
+  %-  slog
+  :*  leaf+"chat-hook failed subscribe on {(spud t.wir)}"
+      leaf+"stack trace:"
+      u.saw
+  ==
 ::
 ++  chat-poke
   |=  act=chat-action

From 9d63a3e9c70eb820ecaed17932d9a8fb2c87c8e2 Mon Sep 17 00:00:00 2001
From: Fang <git@fang.io>
Date: Wed, 9 Oct 2019 18:02:03 +0200
Subject: [PATCH 3/3] drum: Ensure dojo prompt on-boot

The previous method for doing this relied on "dojo" being first when
sorting alphabetically, which is not the case anymore.
---
 pkg/arvo/lib/hood/drum.hoon | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkg/arvo/lib/hood/drum.hoon b/pkg/arvo/lib/hood/drum.hoon
index 34231fcb97..8e09277630 100644
--- a/pkg/arvo/lib/hood/drum.hoon
+++ b/pkg/arvo/lib/hood/drum.hoon
@@ -273,9 +273,14 @@
 ::
 ++  se-adit                                           ::  update servers
   ^+  .
-  ::  ensure dojo connects after talk
-  =*  dojo-on-top  aor
-  %+  roll  (sort ~(tap in ray) dojo-on-top)
+  %+  roll
+    ::  ensure dojo is first in the list,
+    ::  guaranteeing its display on-boot.
+    ::
+    %+  sort  ~(tap in ray)
+    |=  [a=well:gall b=well:gall]
+    ?:  |(=(%dojo q.a) =(%dojo q.b))  =(%dojo q.a)
+    (aor a b)
   =<  .(con +>)
   |:  $:{wel/well:gall con/_..se-adit}  ^+  con
   =.  +>.$  con