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

Conflicts:
	urb/urbit.pill

arvo/gall.hoon

@@ -261,6 +261,7 @@
       ^-  [p=(list move) q=_..^$]
       ?:  ?=(%crud +<.q.hin)
         ~&  [%gall-crud-error pax hen]
+        ~&  [%gall-crud-data (,[@tas (list tank)] +>.q.hin)]
         ?>  ?=(%g -.q.hin)
         ?~  pax  ~&  %strange-path  [~ ..^$]
         =+  lum=(lump t.pax)
@@ -671,14 +672,14 @@
       ::
       ++  blow
         ^+  .
-        =>  (give %nice ~)
+        ~&  [%gall-blow ost]
+        =>  (give %mean ~)
         =+  pax=+:(fall (~(get by sup.sat) ost) *[ship path])
         %=  +
           qic.sat  ~
           sup.sat  (~(del by sup.sat) ost)
           pus.sat  (~(del ju pus.sat) pax ost)
           peq.sat  (~(del by peq.sat) ost)
-          qel.sat  (~(del by qel.sat) ost)
         ==
       ::
       ++  cave                                          ::  vase as silk
@@ -929,6 +930,7 @@
             deal:(drum u.gad)
           ::
               %pull
+            ~&  [%more-pull pax]
             =^  gud  +>.$  (mack q.hin)
             ?^  gud  +>.$
             blow
@@ -1146,7 +1148,7 @@
         ::
             %took
           =+  qol=(~(get by qel.sat) ost)
-          ::  ~&  [%yawn-took-has qol [our hen]]
+          ::  ~&  [%yawn-took-has ost qol [our hen]]
           %=    +>.$
               qic.sat  ~
               qel.sat  
@@ -1160,12 +1162,13 @@
         ::
             %told
           =+  qol=(~(get by qel.sat) ost)
-          ::  ~&  [%yawn-told-has qol [our hen]]
+          ::  ~&  [%yawn-told-has ost qol [our hen]]
           =+  qul=?~(qol 1 +(u.qol))
+          =.  qel.sat  (~(put by qel.sat) ost qul)
           ?:  =(10 qul)
-            ~&  [%yawn-told-full our hen]
+            ~&  [%yawn-told-full ost our hen]
             +>.$(qic.sat ~, vey.sat (~(put to vey.sat) hen %nuke p.kon))
-          +>.$(qic.sat ~, qel.sat (~(put by qel.sat) ost qul))
+          +>.$(qic.sat ~)
         ::
             %load
           =+  [hom=(slot 2 q.p.kon) old=(slot 3 q.p.kon)]

main/app/rodeo/core.hook

@@ -204,12 +204,12 @@
   ++  ra-cancel                                         ::  drop a bone
     ^+  .
     =+  hap=(~(got by sup.hid) ost)
-    ~&  [%ra-cancel ost hap]
-    ?>  ?=([@ @ *] q.hap)
+    ?.  ?=([@ @ *] q.hap)
+      +(general (~(del in general) ost))
     =*  man  i.t.q.hap
     =+  pur=(~(get by stories) man)
     ?~  pur  +>
-    pa-abet:pa-cancel:(~(pa-notify pa man u.pur) p.hap %gone *human)
+    pa-abet:(pa-notify:~(pa-cancel pa man u.pur) p.hap %gone *human)
   ::
   ++  ra-human                                          ::  look up person
     |=  her=ship
@@ -363,8 +363,9 @@
           [%g %nice ~]
         ::  ~&  %pa-friend-nice 
         +>.$
+      ::
           [%g %mean *]
-        ~&  %pa-friend-mean
+        ::  ~&  %pa-friend-mean
         +>.$
       ::
           [%g %rush %rodeo-report *]
@@ -458,6 +459,7 @@
       pa-monitor
     ::
     ++  pa-cancel                                       ::  unsubscribe from
+      ~&  [%pa-cancel ost]
       %_  .
         guests  (~(del in guests) ost)
         viewers  (~(del in viewers) ost)
@@ -568,6 +570,7 @@
               ==
             old
           :-  p.old
+          ~&  [%pa-refresh-rush p.n.guests]
           [[p.n.guests %give %rush %rodeo-report %grams num gam ~] q.old]
       =.  moves  (welp q.moy moves)
       |-  ^+  +>.^$
@@ -668,7 +671,7 @@
 ++  pull
   |=  ost=bone
   ^-  [(list move) _+>]
-  ::  ~&  [%rodeo-pull ost]
+  ~&  [%rodeo-pull `*`ost]
   ra-abet:~(ra-cancel ra ost ~)
 ::
 ++  poke-bit