From c15c28f8a897823b118a8c4e09737f7e58eaca57 Mon Sep 17 00:00:00 2001
From: "C. Guy Yarvin" <cgyarvin@gmail.com>
Date: Fri, 8 Nov 2013 13:06:04 -0800
Subject: [PATCH] Some chat and chat related fixes.

---
 arvo/batz.hoon     |  6 +++++-
 main/bin/room.hoon |  2 +-
 main/bin/tach.hoon | 20 +++++++++++---------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/arvo/batz.hoon b/arvo/batz.hoon
index f9db83abe2..5d13f729db 100644
--- a/arvo/batz.hoon
+++ b/arvo/batz.hoon
@@ -272,6 +272,7 @@
       |=  [lap=wire ted=@ud]                            ::  XX ugly
       ^+  +>
       %=    +>
+          duv  :_(duv [[/b ~] [%hail ~]])
           paq.gyr
         %-  ~(gas to *(qeu gyro))  
         %+  skip
@@ -282,7 +283,10 @@
     ++  hoot                                            ::    hoot:fi:be
       |=  [lap=wire ted=@ud pod=prod]                   ::  install prompt
       ^+  +>
-      %_(+> paq.gyr (~(put to paq.gyr) [ted lap pod]))
+      %_  +>
+        duv  :_(duv [[/b ~] [%hail ~]])
+        paq.gyr (~(put to paq.gyr) [ted lap pod])
+      ==
     ::
     ++  kill
       ^+  .
diff --git a/main/bin/room.hoon b/main/bin/room.hoon
index b95bb0f928..4ca91e4926 100644
--- a/main/bin/room.hoon
+++ b/main/bin/room.hoon
@@ -125,7 +125,7 @@
                     ?:  ?=(?(%lord %lady) -.p.u.gos) 
                       r.p.p.u.gos 
                     ?:(?=(%punk -.p.u.gos) p.p.u.gos %white)
-                  &
+                  |
                   now
               ==
           ~(. of her ful)
diff --git a/main/bin/tach.hoon b/main/bin/tach.hoon
index 884970376d..22621c9409 100644
--- a/main/bin/tach.hoon
+++ b/main/bin/tach.hoon
@@ -103,7 +103,7 @@
             =+  wyt=?:(?=(& -.sad) !=(0 oot) (~(has by tod) p.sad))
             %+  weld
               ?:(?=(& -.sad) ?:(p.sad "&" "|") (scow %p p.sad))
-            ?:(wyt " " " ")
+            ?:(wyt "... " " ")
         ==
   --
 ::
@@ -128,7 +128,7 @@
     =+  dyt=(need (~(get by tod) u.hur))
     %_    +>.$
         tod 
-      ?:  =(0 dyt) 
+      ?:  =(1 dyt) 
         (~(del by tod) u.hur) 
       (~(put by tod) u.hur (dec dyt))
     ==
@@ -164,20 +164,22 @@
   =.  wak  (add ~m1 wak)
   ?.(=(0 oot) + (joke ~ `zing`[%ego est]))
 ::
-++  toke                                                ::  user prompt
+++  toke                                                ::  user action
   |=  txt=@t
   ^+  +>
   =+  rey=(rush txt chat)
   ?~  rey  
     (show %leaf "invalid input")
-  ?+  -.u.rey  
-          (joke ~ `zing`u.rey)
+  ?-  -.u.rey  
+    %all  (joke(sad [%& p.u.rey]) ~ `zing`u.rey)
     %def  %-  joke
-          [~ `zing`[%all %& p.u.rey]]
-          ::  ?:  ?=(& -.sad)
-          ::  [[~ p.sad] p.u.rey]
+          ?:  ?=(& -.sad)
+            [~ `zing`[%all p.sad p.u.rey]]
+          [[~ p.sad] `^mess`p.u.rey]
     %how  (show %leaf "help file goes here :-|")
-    %say  (joke [~ p.u.rey] `^mess`q.u.rey)
+    %out  (show(dun &) %leaf "thanks for chatting yo")
+    %say  (joke(sad [%| p.u.rey]) [~ p.u.rey] `^mess`q.u.rey)
+    %who  (joke ~ `zing`u.rey)
   ==
 ::
 ++  vent                                                ::  handle event