ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-14 17:41:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
it-new into radio
This commit is contained in:
Galen Wolfe-Pauly 2014-12-17 15:48:34 -08:00
commit 865f760fd5
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -429,6 +429,7 @@
|- ^- atlas |- ^- atlas
?~ locals ~ ?~ locals ~
[[p.n.locals q.q.n.locals] $(locals l.locals) $(locals r.locals)] [[p.n.locals q.q.n.locals] $(locals l.locals) $(locals r.locals)]
~& [%pa-display man reg]
|- ^+ +>.^$ |- ^+ +>.^$
?~ vew +>.^$ ?~ vew +>.^$
=. +>.^$ $(vew l.vew) =. +>.^$ $(vew l.vew)
@ -465,11 +466,10 @@
^+ +> ^+ +>
?+ sih ~&([%radio-bad-friend sih] !!) ?+ sih ~&([%radio-bad-friend sih] !!)
[%g %nice ~] [%g %nice ~]
~& %pa-friend-nice ~& %pa-stalk-nice
+>.$ +>.$
:: ::
[%g %rust %radio-report *] [%g %rust %radio-report *]
~& [%pa-friend-report +>+.sih]
?+ -.+>+.sih ~&([%radio-odd-friend sih] !!) ?+ -.+>+.sih ~&([%radio-odd-friend sih] !!)
%group %group
(pa-remind tay +.+>+.sih) (pa-remind tay +.+>+.sih)
@ -557,7 +557,7 @@
^+ +> ^+ +>
=+ guz=(~(get by locals) her) =+ guz=(~(get by locals) her)
=. locals (~(put by locals) her lat.hid saz) =. locals (~(put by locals) her lat.hid saz)
?. |(?=(~ guz) !=(per q.u.guz)) ?. |(?=(~ guz) !=(saz q.u.guz))
+>.$ +>.$
(pa-display viewers) (pa-display viewers)
:: ::
@ -581,9 +581,11 @@
%hear (~(put by loc) p.i.dur q.i.dur) %hear (~(put by loc) p.i.dur q.i.dur)
== ==
=+ gub=(~(get by remotes) tay) =+ gub=(~(get by remotes) tay)
?. |(?=(~ gub) =(buk u.gub)) ~& [%pa-remind tay gub buk]
?. |(?=(~ gub) !=(buk u.gub))
+>.$ +>.$
(pa-display(remotes (~(put by remotes) tay buk)) viewers) =. remotes (~(put by remotes) tay buk)
(pa-display viewers)
:: ::
++ pa-start :: start stream ++ pa-start :: start stream
|= riv=river |= riv=river

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

@ -171,6 +171,10 @@
?~ shape.u.pur ~ ?~ shape.u.pur ~
sources.u.shape.u.pur sources.u.shape.u.pur
:: ::
++ presentation
^- (map station presence)
(~(run by destination) |=(a=* mode))
::
++ pour-shell ++ pour-shell
|= [ost=bone txt=cord] |= [ost=bone txt=cord]
^- [(list move) _+>] ^- [(list move) _+>]
@ -376,6 +380,13 @@
'& ' '& '
(cat 3 u.live '& ') (cat 3 u.live '& ')
:: ::
++ present
^- (list move)
=+ taz=presentation
?~ taz
~
[(send-rodeo 0 %ping taz) ~]
::
++ peer ++ peer
|= [ost=bone you=ship pax=path] |= [ost=bone you=ship pax=path]
^- [(list move) _+>] ^- [(list move) _+>]
@ -404,23 +415,21 @@
%time %time
:_ +>.$ :_ +>.$
:* [0 %pass /time %t %wait (add ~s10 lat.hid)] :* [0 %pass /time %t %wait (add ~s10 lat.hid)]
?~ targets present
~
:_ ~
%+ send-rodeo 0
:- %ping
%- ~(gas by *(map station presence))
%+ turn (~(tap in u.targets) ~)
|=(a=station [a mode])
== ==
:: ::
%cmd-ac %cmd-ac
?+ +<.sih !! ?+ +<.sih !!
%nice [~ +>.$] %nice [~ +>.$]
%mean [(send /out %give +.sih) +>.$] %mean ~&(%cmd-ac-mean [~ +>.$])
?(%rush %rust) ?(%rush %rust)
?> ?=(%type -.p.sih) ?> ?=(%type -.p.sih)
[~ +>.$(mode ?:(p.p.sih %talk %hear))] =+ dom=`presence`?:(p.p.sih %talk %hear)
?: =(dom mode)
[~ +>.$]
~& [%cmd-ac-mode dom]
=. mode dom
[present +>.$]
== ==
:: ::
%command %command