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

Merge branch 'radio' of https://github.com/urbit/urbit into radio

Browse Source 
Conflicts:
	urb/urbit.pill
This commit is contained in:
C. Guy Yarvin 2014-12-09 11:14:59 -08:00
commit 26e5692f90
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/mar/radio-command/door.hook
View File

@ -64,7 +64,7 @@
%+ peach %+ peach
;~((glue fas) ;~(pfix sig fed:ag) urs:ab) ;~((glue fas) ;~(pfix sig fed:ag) urs:ab)
%+ sear (soft partner) %+ sear (soft partner)
;~((glue fas) sym (cook crip (star prn))) :: XX [a-z0-9_]+ ;~((glue fas) sym (cook crip (star prn))) :: XX [a-z0-9_]{1,15}
:: ::
++ stam ++ stam
^- $+(json (unit statement)) ^- $+(json (unit statement))

2
main/mar/radio-report/door.hook
View File

@ -23,7 +23,7 @@
%group %.(+.rep (jome phon stas)) %group %.(+.rep (jome phon stas))
== ==
++ joce |=(a=span [%s a]) ++ joce |=(a=span [%s a])
++ jope |=(a=ship (jape +:<a>)) ++ jope |=(a=ship [%s (crip +:(scow %p a))]
++ joke |=(a=tank [%s (role (turn (wash 0^80 a) crip))]) ++ joke |=(a=tank [%s (role (turn (wash 0^80 a) crip))])
++ jode |=(a=time (jone (div (mul (sub a ~1970.1.1) 1.000) ~s1))) ++ jode |=(a=time (jone (div (mul (sub a ~1970.1.1) 1.000) ~s1)))
:: ++ jase :: ++ jase

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

@ -8,8 +8,6 @@
[%publish (list thought)] :: originate [%publish (list thought)] :: originate
[%review (list thought)] :: deliver [%review (list thought)] :: deliver
[%ping (pair span presence)] :: declare status [%ping (pair span presence)] :: declare status
:: ping:{room:"foo" presence:"hear"}
:: ping:["foo", "hear"]
== :: == ::
++ config :: party configuration ++ config :: party configuration
$: sources=(set station) :: pulls from $: sources=(set station) :: pulls from