diff --git a/base/ape/hood/core.hook b/base/ape/hood/core.hook index a037be6ae..dbd02a98b 100644 --- a/base/ape/hood/core.hook +++ b/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 +<+)) diff --git a/base/ape/talk/core.hook b/base/ape/talk/core.hook index 51038f566..78446c335 100644 --- a/base/ape/talk/core.hook +++ b/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))] :: diff --git a/base/arvo/ames.hoon b/base/arvo/ames.hoon index 7adecb07f..2a8f6b7c0 100644 --- a/base/arvo/ames.hoon +++ b/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] == diff --git a/base/arvo/eyre.hoon b/base/arvo/eyre.hoon index 92f310bbd..c85421bee 100644 --- a/base/arvo/eyre.hoon +++ b/base/arvo/eyre.hoon @@ -1135,6 +1135,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 :: diff --git a/base/arvo/gall.hoon b/base/arvo/gall.hoon index 43d09368c..9b2f1923b 100644 --- a/base/arvo/gall.hoon +++ b/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 diff --git a/base/lib/helm/core.hook b/base/lib/helm/core.hook index bab89d6d2..77c5523fe 100644 --- a/base/lib/helm/core.hook +++ b/base/lib/helm/core.hook @@ -149,6 +149,10 @@ %& [%flog ~ %text "<{