ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-14 04:19:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix tree, per-day talk output format, rendering

Browse Source
This commit is contained in:
Anton Dyudin 2015-09-16 15:51:31 -07:00
parent 610cf1b95f
commit cf5a8c79c2
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ape/talk.hoon
View File

@ -1791,10 +1791,10 @@
++ log-to-file ++ log-to-file
|= man=span |= man=span
^- move ^- move
=+ =+ =+ (yore now.hid) =+ ^- paf=path
%^ cat 3 man =+ day=(year %*(. (yore now.hid) +.t +:*tarp))
`@t`(rsh 3 2 (scot %ui :(add d.t (mul 100 m) (mul 10.000 y)))) %+ tope [our.hid %home da/now.hid]
paf=/(scot %p our.hid)/home/(scot %da now.hid)/talk/[-]/talk-telegrams /talk-telegrams/(scot %da day)/[man]/talk
=+ grams:(~(got by stories) man) =+ grams:(~(got by stories) man)
[ost.hid %info /jamfile our.hid (foal paf [%talk-telegrams !>(-)])] [ost.hid %info /jamfile our.hid (foal paf [%talk-telegrams !>(-)])]
:: ::
@ -1810,10 +1810,7 @@
=+ ^= grams =+ ^= grams
%- (hard (list telegram)) %- (hard (list telegram))
.^ %cx .^ %cx
=+ =+ (yore now.hid) /(scot %p our.hid)/home/(scot %da now.hid)/talk/[man]/talk-telegrams
%^ cat 3 man
`@t`(rsh 3 2 (scot %ui :(add d.t (mul 100 m) (mul 10.000 y))))
/(scot %p our.hid)/home/(scot %da now.hid)/talk/[-]/talk-telegrams
== ==
=+ toy=(~(got by stories) man) =+ toy=(~(got by stories) man)
[~ +>.$(stories (~(put by stories) man toy(grams grams, count (lent grams))))] [~ +>.$(stories (~(put by stories) man toy(grams grams, count (lent grams))))]

10
arvo/ford.hoon
View File

@ -1495,17 +1495,17 @@
|= [cof=cafe bax=vase doe=term hon=horn] |= [cof=cafe bax=vase doe=term hon=horn]
^- (bolt vase) ^- (bolt vase)
%+ cope (lash cof how (flux (slat doe))) %+ cope (lash cof how (flux (slat doe)))
|= [cof=cafe yep=(map ,@ span)] |= [cof=cafe yep=(map span ,@)]
=+ ^= poy ^- (list (pair ,@ span)) =+ ^= poy ^- (list (pair span ,@))
%+ sort (~(tap by yep) ~) %+ sort (~(tap by yep) ~)
|=([a=[@ *] b=[@ *]] (lth -.a -.b)) |=([[* a=@] [* b=@]] (lth a b))
%+ cope %+ cope
|- ^- (bolt (list (pair ,@ vase))) |- ^- (bolt (list (pair ,@ vase)))
?~ poy (flue cof) ?~ poy (flue cof)
%+ cope $(poy t.poy) %+ cope $(poy t.poy)
|= [cof=cafe nex=(list (pair ,@ vase))] |= [cof=cafe nex=(list (pair ,@ vase))]
%+ cope (chap(s.how [q.i.poy s.how]) cof bax hon) %+ cope (chap(s.how [p.i.poy s.how]) cof bax hon)
(flux |=(elt=vase [[p.i.poy elt] nex])) (flux |=(elt=vase [[q.i.poy elt] nex]))
%- flux %- flux
|= yal=(list (pair ,@ vase)) ^- vase |= yal=(list (pair ,@ vase)) ^- vase
?~ yal [[%cube 0 [%atom %n]] 0] ?~ yal [[%cube 0 [%atom %n]] 0]

4
gen/tree.hoon
View File

@ -12,10 +12,10 @@
:- %tang %- flop :- %tang %- flop
|- ^- tang |- ^- tang
=+ ark=;;(arch .^(cy/pax)) =+ ark=;;(arch .^(cy/pax))
=- ?~ q.ark - =- ?~ fil.ark -
[(rend pax) -] [(rend pax) -]
%- zing %- zing
%+ turn %+ turn
(sort (~(tap by r.ark)) aor) (sort (~(tap by dir.ark)) aor)
|= [a=@t ~] |= [a=@t ~]
^$(pax (welp pax /[a])) ^$(pax (welp pax /[a]))

7
pub/talklog/hymn.hook
View File

@ -3,7 +3,12 @@
:::: /hook/hymn/talklog/pub :::: /hook/hymn/talklog/pub
:: ::
/? 310 /? 310
/= mez /: /===/talk /% /; pojo /json/ /= mez
/: /===/talk
/% 2
/; pojo
/; |=(a=(list ,[@ p=json]) =.(a (flop a) ?~(a [%a ~] p.i.a)))
/& /json/
|% |%
++ cdnj |=(a=tape ;script(src "//cdnjs.cloudflare.com/ajax/libs/{a}");) ++ cdnj |=(a=tape ;script(src "//cdnjs.cloudflare.com/ajax/libs/{a}");)
-- --