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

Various bugs and improvements.

Browse Source
This commit is contained in:
C. Guy Yarvin 2015-01-20 15:00:54 -08:00
parent d8da2f2828
commit a49087e6e1
5 changed files with 50 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
arvo/gall.hoon
View File

@ -351,7 +351,10 @@
|= [hen=duct law=(unit cuff)]
|= [our=@p imp=path kon=knob]
^- [(list move) _..^^$]
?> ?=(?(%mess %show %nuke) -.kon)
?> ?=(?(%mess %show %nuke %took) -.kon)
?: ?=(%took -.kon)
~& [%gape-took our imp hen]
[~ ..^^$]
=+ you=`ship`?-(-.kon %mess p.kon, %nuke p.kon, %show p.kon)
=+ mat=(~(got by pol.all) you)
=+ sad==+(sad=(~(get by sap.mat) our) ?^(sad u.sad [.(p 1)]:*scad))
@ -451,9 +454,7 @@
==
==
%s ?+ -.sih !!
%a ~& [%gave-a [our you num imp] -.+.sih]
~& [%gave-a-hen hen]
:_ ~ :- hen
%a :_ ~ :- hen
[%pass [%r pax] %g %took [our imp] you]
%g
:_ ~ :- hen
@ -694,20 +695,7 @@
[%done ~ cay]
::
++ deal :: reboot
^+ .
=. tik.sat +(tik.sat)
=+ pys=(~(tap by sup.sat) ~)
:: ~& [%gall-deal tik.sat pys]
|- ^+ +>.$
?~ pys +>.$
=. +>.$ $(pys t.pys)
%_ +>.$
mow
:_ mow
:+ (able p.i.pys)
%slip
[%g %show [our imp] q.i.pys]
==
.(tik.sat +(tik.sat))
::
++ deff
|= [wir=wire hon=duct caq=vase]
@ -1165,9 +1153,9 @@
=+ qol=(~(get by qel.sat) ost)
:: ~& [%yawn-told-has qol [our hen]]
=+ qul=?~(qol 1 +(u.qol))
?: =(10 qul)
~& [%yawn-told-full our hen]
+>.$(qic.sat `[hen %nuke p.kon])
:: ?: =(10 qul)
:: ~& [%yawn-told-full our hen]
:: +>.$(qic.sat `[hen %nuke p.kon])
+>.$(qic.sat ~, qel.sat (~(put by qel.sat) ost qul))
::
%load

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

@ -25,7 +25,7 @@
|= ost=bone
:_ +>.$
:* :* ost %pass /to-gan %g %mess [our.hid /began] our.hid
%began-args !>([his tic eny ges])
%began-args !>([his tic eny ges ~])
==
(spam %rush %prompt '[waiting...]' %text '')
==

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

@ -50,7 +50,7 @@
[%da p=@da] :: by date
== ::
++ gift :: result
$% [%rust %rodeo-report report] :: refresh
$% [%rush %rodeo-report report] :: refresh
[%mean ares] :: cancel
[%nice ~] :: accept
== ::
@ -61,7 +61,7 @@
$: %g :: application
$% [%mean p=ares] :: cancel
[%nice ~] :: acknowledge
[%rust %rodeo-report report] :: refresh
[%rush %rodeo-report report] :: refresh
== == ::
$: %t ::
$% [%wake ~] :: timer wakeup
@ -79,6 +79,7 @@
$% [%mess p=hapt q=ship r=cage] :: message
[%nuke p=hapt q=ship] :: cancel
[%show p=hapt q=ship r=path] :: subscribe
[%took p=hapt q=ship] :: acknowledge
== == ::
$: %t ::
$% [%wait p=@da] ::
@ -116,7 +117,7 @@
++ ra-house :: emit stations
|= ost=bone
%+ ra-emit ost
:^ %give %rust %rodeo-report
:^ %give %rush %rodeo-report
:- %house
%- ~(gas in *(set span))
^- (list span)
@ -168,11 +169,11 @@
?:(neu +>.$ ra-homes)
::
++ ra-friend :: %friend response
|= [man=span sih=sign]
|= [her=ship man=span sih=sign]
^+ +>
=+ pur=(~(get by stories) man)
?~ pur ~& [%ra-friend-none man] +>.$
pa-abet:(~(pa-friend pa man u.pur) sih)
pa-abet:(~(pa-friend pa man u.pur) her sih)
::
++ ra-stalk :: %stalk response
|= [man=span tay=station sih=sign]
@ -385,7 +386,7 @@
(pa-sauce ost [[%mean ~ %rodeo-master-unauthorized ~] ~])
=. owners (~(put in owners) ost)
:: ~& [%pa-master her man shape]
(pa-sauce ost [[%rust %rodeo-report %config shape] ~])
(pa-sauce ost [[%rush %rodeo-report %config shape] ~])
::
++ pa-display :: update presence
|= vew=(set bone)
@ -399,7 +400,7 @@
?~ vew +>.^$
=. +>.^$ $(vew l.vew)
=. +>.^$ $(vew r.vew)
(pa-sauce n.vew [[%rust %rodeo-report %group reg] ~])
(pa-sauce n.vew [[%rush %rodeo-report %group reg] ~])
::
++ pa-monitor :: update config
=+ owe=owners
@ -408,18 +409,22 @@
=. +> $(owe l.owe)
=. +> $(owe r.owe)
:: ~& [%pa-monitor man shape]
(pa-sauce n.owe [[%rust %rodeo-report %config shape] ~])
(pa-sauce n.owe [[%rush %rodeo-report %config shape] ~])
::
++ pa-friend :: subscribed update
|= sih=sign
|= [her=ship sih=sign]
^+ +>
?+ sih ~&([%rodeo-bad-friend sih] !!)
[%g %nice ~]
:: ~& %pa-friend-nice
+>.$
::
[%g %rust %rodeo-report *]
[%g %rush %rodeo-report *]
:: ~& [%pa-friend-report +>+.sih]
=. +> %+ pa-scrub ost
:_ ~
:- /friend/show/(scot %p her)/[man]
[%g %took [her /rodeo] our.hid]
?+ -.+>+.sih ~&([%rodeo-odd-friend sih] !!)
%config +>.$
%group +>.$
@ -435,7 +440,7 @@
:: ~& %pa-stalk-nice
+>.$
::
[%g %rust %rodeo-report *]
[%g %rush %rodeo-report *]
?+ -.+>+.sih ~&([%rodeo-odd-friend sih] !!)
%group
(pa-remind tay +.+>+.sih)
@ -487,7 +492,7 @@
!!
::
%& ~& [%pa-acquire [our.hid man] [p.p.tay q.p.tay]]
:~ :- /friend/show/[man]
:~ :- /friend/show/(scot %p p.p.tay)/[man]
[%g %show [p.p.tay /rodeo] our.hid /af/[q.p.tay]/(scot %ud num)]
==
==
@ -550,7 +555,7 @@
|= riv=river
^+ +>
=- ~& [%pa-start riv lab]
=. +>.$ (pa-sauce ost [[%rust %rodeo-report %grams q.lab r.lab] ~])
=. +>.$ (pa-sauce ost [[%rush %rodeo-report %grams q.lab r.lab] ~])
?: p.lab
(pa-sauce ost [[%mean ~] ~])
+>.$(guests (~(put by guests) ost riv))
@ -615,7 +620,7 @@
==
old
:- p.old
[[p.n.guests %give %rust %rodeo-report %grams num gam ~] q.old]
[[p.n.guests %give %rush %rodeo-report %grams num gam ~] q.old]
=. moves (welp q.moy moves)
|- ^+ +>.^$
?~ p.moy +>.^$
@ -694,11 +699,11 @@
==
::
[%friend *]
?> ?=([@ @ ~] t.pax)
?> ?=([@ @ @ ~] t.pax)
?. =(%show i.t.pax)
~& [%pour-friend-nuke-nuke pax]
[~ +>.$]
ra-abet:(~(ra-friend ra ost ~) i.t.t.pax sih)
ra-abet:(~(ra-friend ra ost ~) (slav %p i.t.t.pax) i.t.t.t.pax sih)
::
[%stalk *]
?> ?=([@ @ @ @ ~] t.pax)

33
main/app/talk/core.hook
View File

@ -65,7 +65,6 @@
$% [%mean ares]
[%nice ~]
[%rush iron]
[%rust iron]
==
++ hapt ,[p=ship q=path]
++ move ,[p=bone q=(mold note gift)]
@ -74,6 +73,7 @@
$% [%mess p=hapt q=ship r=cage]
[%nuke p=hapt q=ship]
[%show p=hapt q=ship r=path]
[%took p=hapt q=ship]
== ==
$: %t
$% [%wait p=@da]
@ -85,10 +85,6 @@
$= p
$% [%txt p=cord] :: input text
[%type p=?] :: typing notify
== ==
$: %rust
$= p
$% [%txt p=cord]
[%rodeo-report p=report]
== ==
==
@ -443,10 +439,7 @@
::+>(link %warm)
+>.$
::
%rush :: should use, don't
~&(%sy-sign-rush !!)
::
%rust :: direct update
%rush :: direct update
?: ?=(?(%cold %dead) link)
~& [%sy-sign-rust-bad `@tas`link]
+>.$
@ -612,21 +605,29 @@
?+ +<.sih !!
%nice [~ +>.$]
%mean ~&([%pour-mean-cmd-in +>.sih] !!)
?(%rush %rust)
%rush
?> ?=(%txt -.p.sih)
(pour-shell p.p.sih)
==
::
%cmd-ac
[~ +>.$]
?+ +<.sih !!
%nice [~ +>.$]
%mean ~&([%pour-mean-cmd-ac +>.sih] !!)
%rush
:_ +>.$
[ost %pass pax %g %took [our.hid +.imp.hid] our.hid]~
==
::
%server
?+ +<.sih !!
%nice [~ +>.$]
%mean ~&(%talk-server-crash !!)
?(%rush %rust)
%rush
?> ?=([%rodeo-report %house *] p.sih)
ny-abet:(ny-tell:ny +.p.p.sih)
=^ moz +>.$ ny-abet:(ny-tell:ny +.p.p.sih)
:_ +>.$
:_(moz [ost %pass pax %g %took [our.hid /rodeo] our.hid])
==
::
%time
@ -637,11 +638,13 @@
::
%fm
?> ?=([@ *] t.pax)
?. &(?=(^ live) =(u.live i.t.pax))
?. =(& &(?=(^ live) =(u.live i.t.pax)))
~& [%talk-wrong-story live i.t.pax]
[~ +>.$]
?> ?=(%g -.sih)
sy-abet:(sy-sign:(need (novel ~)) +.sih)
=^ moz +>.$ sy-abet:(sy-sign:(need (novel ~)) +.sih)
:_ +>.$
:_(moz `move`[ost %pass pax %g %took [our.hid /rodeo] our.hid])
==
::
++ poke-talk-args

2
main/sur/rodeo/core.hook
View File

@ -33,7 +33,7 @@
== ::
++ presence ?(%gone %hear %talk) :: status type
++ register (pair atlas (map station atlas)) :: ping me, ping srcs
++ report :: unified rush/rust
++ report :: radio update
$% [%config config] :: reconfigure
:: [%folder (list report)] :: multiple
[%grams (pair ,@ud (list telegram))] :: beginning, thoughts