From a2e4eb27de545001c71a25165098abdd1511485f Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Wed, 10 Dec 2014 16:02:02 -0800
Subject: [PATCH] join command

---
 main/app/talk/core.hook | 60 +++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/main/app/talk/core.hook b/main/app/talk/core.hook
index fbc8248e5..76885346d 100644
--- a/main/app/talk/core.hook
+++ b/main/app/talk/core.hook
@@ -140,38 +140,39 @@
   =+  rey=(rush txt talk(lat lat.hid, our our.hid))
   ?~  rey
     [(send /out %give %rush %tang [%leaf "invalid input"] ~) +>.$]
+  =-  :_  ->
+      :_  ~
+      ^-  move
+      :*  ost  %pass  /command
+          %g   %mess  [our.hid /rodeo]  our.hid
+          [%radio-command !>(cod)]
+      ==
+  ^-  [cod=command _+>.$]
   ?+    -.u.rey  !!
       %def
     ?>  ?=(%say -.p.u.rey)
-    =+  ^=  tho
-        ^-  thought
-        :*  (shaf %foo eny.hid)
-            [[`station`[%& our.hid %main] %pending] ~ ~]
-            `statement`[lat.hid p.u.rey]
-        ==
-    :_  +>.$
-    :_  ~
-    ^-  move
-    :*  ost  %pass  /command
-        %g   %mess  [our.hid /rodeo]  our.hid
-        [%radio-command !>(`command`[%publish tho ~])]
+    =-  [[%publish - ~] +>.$]
+    ^-  thought
+    :*  (shaf %foo eny.hid)
+        [[`station`[%& our.hid %main] %pending] ~ ~]
+        `statement`[lat.hid p.u.rey]
     ==
+    ::
       %host
-    =+  cof=`config`[~ [%| ~]]
-    :_  +>.$
-    :_  ~
-    ^-  move
-    :*  ost  %pass  /command
-        %g   %mess  [our.hid /rodeo]  our.hid
-        [%radio-command !>(`command`[%design p.u.rey ~ cof])]
-    ==
+    [[%design p.u.rey ~ `config`[~ [%| ~]]] +>.$]
+    ::
+      %join
+    =.  src  (~(put in src) p.u.rey)
+    [[%design %main ~ `config`[src [%| ~]]] +>.$]
   ==
 ::
 ++  pour-report
   |=  [ost=bone rep=report]
   ^-  [(list move) _+>]
   ~&  [%pour-report rep]
-  ?+    -.rep  !! 
+  ?+    -.rep  !!
+      %config
+    `+>.$(src sources.rep)
       %grams
     :_  +>.$
     %-  zing  ^-  (list (list move))
@@ -214,7 +215,7 @@
     ?>  ?=(?(%mean %nice) +<.sih)
     [~ +>.$]
   ::
-      %fm
+      ?(%am %fm)
     ~&  talk-pour/sih
     ?+  &2.sih  !!
       ?(%nice %mean)  [~ +>.$]
@@ -233,16 +234,11 @@
           [our.hid /rodeo]  our.hid
           /fm/main
       ==
-      ::  ^-  move
-      ::  :*  ost
-      ::      %pass
-      ::      /am
-      ::      %g
-      ::      %show
-      ::      [our.hid /rodeo]
-      ::      our.hid
-      ::      /am/main
-      ::  == 
+       ^-  move
+       :*  ost  %pass  /am
+           %g   %show  [our.hid /rodeo]  our.hid
+           /am/main
+       == 
       (send /out %give %rush %prompt '& ' %text '')
   ==
 ::