urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-14 01:08:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Galen Wolfe-Pauly 2015-01-26 14:44:02 -08:00
commit b39b85009d
5 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arvo/dill.hoon
View File

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

3
arvo/gall.hoon
View File

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

2
main/app/reload/core.hook
View File

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

12
main/app/rodeo/core.hook
View File

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

2
main/app/twit/core.hook
View File

@ -59,7 +59,7 @@
++ cull :: remove seen tweets ++ cull :: remove seen tweets
|= [pax=path rep=(list stat)] ^+ rep |= [pax=path rep=(list stat)] ^+ rep
=+ pev=(sa (turn (~(get ja fed) pax) |=(stat id))) =+ 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 ++ dely :: next polling timeout
|= pax=path |= pax=path