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

arvo/dill.hoon

@@ -66,15 +66,9 @@
           $%  [%logo p=@]                               ::
               [%mean p=ares]                            ::
               [%nice ~]                                 ::
-              $:  %rush                                 ::  XX
+              $:  %rush                                 ::
               $%  [%term-line q=term-line]              ::
                   [%hymn q=manx]                        ::
-                  [%json q=json]                        ::
-              ==  ==                                    ::
-              $:  %rust                                 ::
-              $%  [%term-line q=term-line]              ::
-                  [%hymn q=manx]                        ::
-                  [%json q=json]                        ::
               ==  ==                                    ::
               [%verb ~]                                 ::
               [%sage p=path q=*]                        ::
@@ -335,6 +329,8 @@
           ?:  =(q.s.yar p.a)  ~
           ~[(welp ~(ram re q.a) ~(ram re r.a))]
         ==
+      ?.  (levy r.q.sih |=(a=tark ?=(%stem -.a)))
+        +>.$                          ::  XX separate prompt/history messages
       %-  edit
       =|  bed=bein
       =+  ^=  hyt  ^-  hist

arvo/gall.hoon

@@ -1153,7 +1153,7 @@
               qic.sat  ~
               qel.sat  
             ?~  qol
-              ~&  [%took-underflow our hen]
+              ::  ~&  [%took-underflow our hen]
               qel.sat
             ?:  =(`1 qol)
               (~(del by qel.sat) ost)
@@ -1225,6 +1225,7 @@
           [%call (harm cog (conf (core u.huv.sat))) (cove %$ sam)]
         ::
             %show
+          ::  ~&  showing/[app.sat imp q.kon]
           ?:  (warm %peer)
             =+  sam=!>([ost p.kon q.kon])
             ?>  ?=(^ huv.sat)

main/app/reload/core.hook

@@ -21,7 +21,7 @@
     ?.  =(1 (met 3 nam))
       nam
     =+  ^-  zaz=(list ,[p=span ~])
-        (murn van (flit |=([a=term ~] =(nam (end 3 1 a)))))
+        (skim van |=([a=term ~] =(nam (end 3 1 a))))
     ?>  ?=([[@ ~] ~] zaz)
     `term`p.i.zaz
   =+  tip=(end 3 1 nam)

main/app/rodeo/core.hook

@@ -18,7 +18,6 @@
       $:  stories=(map span story)                      ::  conversations
           general=(set bone)                            ::  meta-subscribe
           outbox=(pair ,@ud (map ,@ud thought))         ::  urbit outbox
-          sent=(map ,@ud serial)                        ::  own tweets
           folks=(map ship human)                        ::  human identities
       ==                                                ::
     ++  house-0                                         ::  legacy state
@@ -361,12 +360,13 @@
       ^+  +>
       ?+    sih  ~&([%rodeo-bad-friend sih] !!)
           [%g %nice ~]
-        ::  ~&  %pa-friend-nice 
         +>.$
       ::
           [%g %mean *]
-        ::  ~&  %pa-friend-mean
-        +>.$
+        ?~  +>.sih
+          (pa-acquire [%& her man]~)
+        ~&  [%pa-friend-mean +>.sih]
+        pa-monitor(sources.shape (~(del in sources.shape) [%& her man]))
       ::
           [%g %rush %rodeo-report *]
         ::  ~&  [%pa-friend-report +>+.sih]
@@ -461,7 +461,7 @@
     ++  pa-cancel                                       ::  unsubscribe from
       ~&  [%pa-cancel ost]
       %_  .
-        guests  (~(del in guests) ost)
+        guests  (~(del by guests) ost)
         viewers  (~(del in viewers) ost)
         owners  (~(del in owners) ost)
       ==
@@ -570,7 +570,6 @@
               ==
             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)
       |-  ^+  +>.^$
@@ -707,7 +706,6 @@
   =-  :*  stories=-
           general=~
           outbox=[0 ~]
-          sent=~
           folks=~
       ==
   ^-  (map span story)

main/app/twit/core.hook

@@ -59,7 +59,7 @@
 ++  cull                                                ::  remove seen tweets
   |=  [pax=path rep=(list stat)]  ^+  rep
   =+  pev=(sa (turn (~(get ja fed) pax) |=(stat id)))
-  (murn rep (flit |=(stat !(~(has in pev) id))))
+  (skip rep |=(stat (~(has in pev) id)))
 ::
 ++  dely                                                ::  next polling timeout
   |=  pax=path