Merge branch 'test' of https://github.com/urbit/urbit into test

Conflicts:
	urb/urbit.pill

base/ape/hood/core.hook

@@ -96,6 +96,10 @@
   |=  [then @uvH (each gage tang)]
   (ably (take-made:(kiln-work [hid ost src] (able %kiln)) way +<+))
 ::
+++  note-helm                                           ::  
+  |=  [then (pair ,@tD tank)]
+  (ably (take-note:(helm-work [hid ost src] (able %helm)) way +<+))
+::
 ++  coup-kiln-fancy                                     ::
   |=  [then saw=(unit tang)]
   (ably (take-coup-fancy:(kiln-work [hid ost src] (able %kiln)) way +<+))

base/ape/talk/core.hook

@@ -1549,7 +1549,7 @@
       ==
     ==
   ++  ta-best                                           ::  most relevant 
-    |=(two=partner ?:((ta-beat two) one two))
+    |=(two=partner ?:((ta-beat two) two one))
   ::
   ++  ta-full  (ta-show ~)                              ::  render full width
   ++  ta-show                                           ::  render partner
@@ -1609,6 +1609,7 @@
     ==
   ::
   ++  te-whom                                           ::  render sender
+    ~&  [%te-whom man lix te-best te-maud]
     (~(ta-show ta man (need te-best)) ~ te-maud)
   --
 ::
@@ -1658,6 +1659,7 @@
 ++  peer                                                ::  accept subscription
   |=  [from pax=path]
   ^-  [(list move) _+>]
+  ::  ~&   [%talk-peer src ost pax]
   ?:  ?=([%sole *] pax)
     ?>  =(our.hid src)
     ?<  (~(has by shells) ost)
@@ -1714,9 +1716,9 @@
   ra-abet:(~(ra-quit ra ost ~) man cuz)
 ::
 ++  pull                                                ::
-  |=  [from *]
+  |=  [from pax=path]
   ^-  [(list move) _+>]
-  ::  ~&  [%talk-pull `*`ost]
+  ::  ~&  [%talk-pull src ost pax]
   =^  moz  +>.$  ra-abet:ra-ever:~(ra-cancel ra ost ~)
   [moz +>.$(shells (~(del by shells) ost))]
 ::

base/arvo/ames.hoon

@@ -1648,7 +1648,6 @@
       ==
     ::
         %cake
-      ~&  [%cake p.bon q.bon r.bon]
       :_  fox
       :~  [s.bon %give %woot q.p.bon r.bon]
       ==

base/arvo/clay.hoon

@@ -247,8 +247,6 @@
       ?.  ?=([%sing %v *] rav)  rav
       [%many %| [%ud let.dom] `case`q.p.rav r.p.rav]
     =+  inx=nix.u.ref
-    ~?  ?=([%sing %x *] vaw)
-      [%remote-x-ing vaw hen]
     %=  +>+.$
       say        [[hen [(scot %ud inx) ~] for [inx syd ~ vaw]] say]
       nix.u.ref  +(nix.u.ref)
@@ -865,8 +863,8 @@
       !!
     ::
         %x
-      =<  ?>  ?=(^ ref)  .
-      (rand-to-rant u.rut)
+      =<  ?>(?=(^ ref) .)
+      (validate-x p.p.u.rut q.p.u.rut q.u.rut r.u.rut)
     ::
         %w
       =.  haw.u.ref
@@ -933,6 +931,27 @@
     ::      ==
     ::  ==
   ::
+  ++  validate-x
+    |=  [car=care cas=case pax=path peg=page]
+    ^+  +>
+    =-  %_(+>.$ tag [- tag])
+    :*  hen  %pass
+        [%foreign-x (scot %p who) (scot %p for) syd car (scot cas) pax]
+        %f  %exec  who  [for syd cas]  ~
+        %vale  p.peg  for  q.peg
+    ==
+  ::
+  ++  take-foreign-x
+    |=  [car=care cas=case pax=path res=(each gage tang)]
+    ^+  +>
+    ?>  ?=(^ ref)
+    ?:  ?=(%| -.res)
+      ~|  "validate foreign plops failed"
+      ~|  [%plop-fail (turn p.res |=(tank ~(ram re +<)))]
+      !!
+    ?>  ?=(@ p.p.res)
+    wake(haw.u.ref (~(put by haw.u.ref) [car cas pax] `p.res))
+  ::
   ++  validate-plops
     |=  [cas=case pop=(set plop)]
     ^+  +>
@@ -2097,7 +2116,7 @@
             ?~  cay
               ~
             `[pax u.cay]
-        =^  hat  lat.ran                                ::  new content
+        =^  hot  lat.ran                                ::  new content
           ^-  [(map path lobe) (map lobe blob)]
           %+  roll  (~(tap by can))
           =<  .(lat lat.ran)
@@ -2112,13 +2131,13 @@
                 [(lobe-to-mark u.-) u.-]
               [p q.q]:cay
           [(~(put by hat) pax p.bol) (~(put by lat) p.bol bol)]
-        =.  hat                                         ::  all the content
+        =+  ^-  hat=(map path lobe)                     ::  all the content
           %-  ~(uni by old)
           %-  ~(uni by new.dal.dat)
           %-  ~(uni by new.dob.dat)
           %-  ~(uni by cal.dal.dat)
           %-  ~(uni by cal.dob.dat)
-          %-  ~(uni by hat)
+          %-  ~(uni by hot)
           cas
         =+  ^-  del=(map path ,?)
             (~(run by (~(uni by old.dal.dat) old.dob.dat)) |=(~ %|))
@@ -2127,7 +2146,13 @@
           (make-yaki [r.ali.dat r.bob.dat ~] hat now)
         =.  hut.ran  (~(put by hut.ran) r.new.dat new.dat)
         =.  erg.dat  %-  ~(uni by del)
-                     `(map path ,?)`(~(run by hat) |=(lobe %&))
+                     ^-  (map path ,?)
+                     %.  |=(lobe %&)
+                     %~  run  by
+                     %-  ~(uni by new.dal.dat)
+                     %-  ~(uni by cal.dal.dat)
+                     %-  ~(uni by cas)
+                     hot
         checkout
       ::
       ++  checkout
@@ -2594,7 +2619,7 @@
     =*  sud  i.t.t.t.t.tea
     =*  sat  i.t.t.t.t.t.tea
     =+  une=(un our now hen ruf)
-    =+  wak=wake:une
+    =+  wak=une
     =+  wex=(di:wak syd)
     =+  dat=?-(+<.q.hin %writ [%& p.q.hin], %made [%| q.q.hin])
     =+  ^-  kan=(unit ankh)
@@ -2605,7 +2630,8 @@
         ank.dom
     =+  wao=abet:(route:(me:ze:wex [her sud] kan) sat dat)
     =+  woo=abet:wao
-    [(weld -.wak -.woo) ..^$(ruf abet:(pish:une syd +.woo ran.wao))]
+    =+  sip=wake:(pish:une syd +.woo ran.wao)
+    [(weld -.sip -.woo) ..^$(ruf abet:[+.sip])]
   ?:  ?=([%auto @ @ @ @ ~] tea)
     =+  our=(slav %p i.t.tea)
     =*  syd  i.t.t.tea
@@ -2764,6 +2790,24 @@
         =+  zot=abet.zat
         [-.zot (posh her syd +.zot ruf)]
       [mos ..^$(ran.ruf ran.zat)]
+    ::
+        %foreign-x
+      ?>  ?=([@ @ @ @ @ *] t.tea)
+      =+  our=(slav %p i.t.tea)
+      =+  her=(slav %p i.t.t.tea)
+      =+  syd=(slav %tas i.t.t.t.tea)
+      =+  car=((hard care) i.t.t.t.t.tea)
+      =+  ^-  cas=case
+          =+  (slay i.t.t.t.t.t.tea)
+          ?>  ?=([~ %$ case] -)
+          ->+
+      =*  pax  t.t.t.t.t.t.tea
+      =+  zax=(do now hen [our her] syd ruf)
+      =+  zat=(take-foreign-x:zax car cas pax q.q.hin)
+      =^  mos  ruf
+        =+  zot=abet.zat
+        [-.zot (posh her syd +.zot ruf)]
+      [mos ..^$(ran.ruf ran.zat)]
     ==
   ::
       %mere  !!

base/arvo/eyre.hoon

@@ -1158,6 +1158,7 @@
     ::
     ++  del-subs                      ::  XX per path?
       |=  [a=dock %json b=wire c=path]  ^+  ..ix
+      ~&  [%eyre-del-subs +< hen]
       =.  ..ix  (hurl-note [a b] [%g %deal [him -.a] +.a %pull ~])
       (nice-json:pop-duct:(ire-ix ire))            ::  XX gall ack
     ::

base/arvo/gall.hoon

@@ -575,10 +575,10 @@
     ++  ap-fill                                         ::  add to queue
       ^-  [? _.]
       =+  suy=(fall (~(get by qel.ged) ost) 0)
-      ?:  =(8 suy)
+      ?:  =(20 suy)
         ~&  [%ap-fill-full [our dap] q.q.pry ost]
         [%| +]
-      ::  ~?  !=(8 suy)  [%ap-fill-add [[our dap] q.q.pry ost] +(suy)]
+      ::  ~?  !=(20 suy)  [%ap-fill-add [[our dap] q.q.pry ost] +(suy)]
       [%& +(qel.ged (~(put by qel.ged) ost +(suy)))]
     ::
     ++  ap-find                                         ::  general arm

base/lib/helm/core.hook

@@ -149,6 +149,10 @@
       %&  [%flog ~ %text "<{<p.saw>}>"]
     ==
   ::
+  ++  take-note                                         ::  result of %init
+    |=  [way=wire chr=@tD tan=tank]  =<  abet
+    (emit %flog ~ %text chr ' ' ~(ram re tan))
+  ::
   ++  take-went                                         ::  result of %want
     |=  [way=path her=ship kay=cape]  =<  abet
     (emit %flog ~ %text "went: {<[way kay]>}")

base/pub/talk/src/js/components/WritingComponent.coffee

@@ -46,6 +46,8 @@ module.exports = recl
     for s in listening
       if audi.indexOf(s) is -1
         cc = true
+    if listening.length is 0
+      cc = true
     if cc is true
       audi.push window.util.mainStationPath(window.urb.user)
     audi

base/pub/talk/src/js/main.js

@@ -708,6 +708,9 @@ module.exports = recl({
         cc = true;
       }
     }
+    if (listening.length === 0) {
+      cc = true;
+    }
     if (cc === true) {
       audi.push(window.util.mainStationPath(window.urb.user));
     }