From 52c26318fe723a42fe04b6c1b4184e262e64c72d Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Mon, 26 Jan 2015 13:53:35 -0800 Subject: [PATCH 1/3] ^X fix, flit cleaning --- arvo/dill.hoon | 10 +++------- arvo/gall.hoon | 1 + main/app/reload/core.hook | 2 +- main/app/twit/core.hook | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/arvo/dill.hoon b/arvo/dill.hoon index 36e3aafdb9..a38c75f88a 100644 --- a/arvo/dill.hoon +++ b/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 diff --git a/arvo/gall.hoon b/arvo/gall.hoon index 58f3a38963..54c22ff0d8 100644 --- a/arvo/gall.hoon +++ b/arvo/gall.hoon @@ -1222,6 +1222,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) diff --git a/main/app/reload/core.hook b/main/app/reload/core.hook index 987aa26513..4f595d3303 100644 --- a/main/app/reload/core.hook +++ b/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) diff --git a/main/app/twit/core.hook b/main/app/twit/core.hook index 065e4c357e..77818596d0 100644 --- a/main/app/twit/core.hook +++ b/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 From 353ff78e348db356af2acbf8ce2dc8fc01d59fef Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 26 Jan 2015 14:31:00 -0800 Subject: [PATCH 2/3] Various fixes. --- arvo/gall.hoon | 2 +- main/app/rodeo/core.hook | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/arvo/gall.hoon b/arvo/gall.hoon index 22081487dc..ed790a0122 100644 --- a/arvo/gall.hoon +++ b/arvo/gall.hoon @@ -1062,7 +1062,7 @@ ?: ?=(%mean p.p.q.caq) :- `[hon %nuke our] `[hon %give %mean (ares q.p.q.caq)] - :- ?. ?| ?=(?(%rush %rust) p.p.q.caq) + :- ?. ?| ?=(?(%rush %rust %nice) p.p.q.caq) ?& ?=(%meta p.p.q.caq) ?=([* ?(%rush %rust) *] q.p.q.caq) == == diff --git a/main/app/rodeo/core.hook b/main/app/rodeo/core.hook index f37ab95b40..56a7a3e4d4 100644 --- a/main/app/rodeo/core.hook +++ b/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,15 +360,16 @@ ^+ +> ?+ 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.config (~(del in sources.config) [%& her man])) :: [%g %rush %rodeo-report *] - :: ~& [%pa-friend-report +>+.sih] + ~& [%pa-friend-report +>+.sih] =. +> %+ pa-scrub ost :_ ~ :- /friend/show/(scot %p her)/[man] @@ -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) From 1ebd16fd2a95415038f34bb8c07addac4fbdbeb0 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 26 Jan 2015 14:41:24 -0800 Subject: [PATCH 3/3] Various fixes and improvements. --- arvo/gall.hoon | 4 ++-- main/app/rodeo/core.hook | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arvo/gall.hoon b/arvo/gall.hoon index 3bf7cb94d8..2621794363 100644 --- a/arvo/gall.hoon +++ b/arvo/gall.hoon @@ -1062,7 +1062,7 @@ ?: ?=(%mean p.p.q.caq) :- `[hon %nuke our] `[hon %give %mean (ares q.p.q.caq)] - :- ?. ?| ?=(?(%rush %rust %nice) p.p.q.caq) + :- ?. ?| ?=(?(%rush %rust) p.p.q.caq) ?& ?=(%meta p.p.q.caq) ?=([* ?(%rush %rust) *] q.p.q.caq) == == @@ -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) diff --git a/main/app/rodeo/core.hook b/main/app/rodeo/core.hook index 56a7a3e4d4..d9f982f987 100644 --- a/main/app/rodeo/core.hook +++ b/main/app/rodeo/core.hook @@ -366,10 +366,10 @@ ?~ +>.sih (pa-acquire [%& her man]~) ~& [%pa-friend-mean +>.sih] - pa-monitor(sources.config (~(del in sources.config) [%& her man])) + pa-monitor(sources.shape (~(del in sources.shape) [%& her man])) :: [%g %rush %rodeo-report *] - ~& [%pa-friend-report +>+.sih] + :: ~& [%pa-friend-report +>+.sih] =. +> %+ pa-scrub ost :_ ~ :- /friend/show/(scot %p her)/[man]