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

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

Browse Source
This commit is contained in:
Galen Wolfe-Pauly 2015-01-26 17:59:52 -08:00
commit ec76d6a3cb
2 changed files with 26 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
main/app/chat/core.hook
View File

@ -59,6 +59,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]
== == ==
++ sign
$? $: %g
@ -141,7 +142,7 @@
[(send /out %give %rush %tang [%leaf "invalid input"] ~) +>.$]
|-
?- -.u.rey
%all =+ ^= mof
%all =+ ^= mof
?~ pom ~
(send /out %give %rush %prompt '& ' %text '')
=^ mow +>.^$
@ -219,9 +220,7 @@
;title: Radio
;script(type "text/javascript", src "//use.typekit.net/fkv0sjk.js");
;script(type "text/javascript", src "//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js");
;script:'''
try{Typekit.load();}catch(e){}
'''
;script:'try{Typekit.load();}catch(e){}'
;link(rel "stylesheet", type "text/css", href "/gen/main/pub/src/chat/main.css");
==
;body
@ -293,11 +292,17 @@
==
[~ +>.$]
::
++ pass-took
|= [moz=(list move) ost=bone pax=path imp=path]
:_ +>.$
:_(moz [ost %pass pax %g %took [our.hid imp] our.hid])
::
++ pour
|= [ost=bone pax=path sih=*]
^- [(list move) _+>]
:: ~& sih=sih
=+ sih=((hard sign) sih)
=+ took=|=([imp=path moz=(list move)] (pass-took moz ost pax imp))
?~ pax ~& %chat-pour-strange-path !!
:: ~& [%pour-mess pax]
?+ i.pax ~& %chat-pour-strange-path !!
@ -307,7 +312,8 @@
%mean [(send /out %give +.sih) +>.$]
?(%rush %rust)
?> ?=(%txt -.p.sih)
(exec-cmd ost p.p.sih)
=^ moz +>.$ (exec-cmd ost p.p.sih)
(took +.imp.hid moz)
==
::
?(%mesg %priv)
@ -319,8 +325,7 @@
[~ +>.$]
?> ?=(%rush +<.sih)
?> ?=(%zong -.p.sih)
:_ +>.$
(send /out %give %rush %tang (zong-to-tank & p.p.sih) ~)
(took /chat (send /out %give %rush %tang (zong-to-tank & p.p.sih) ~))
::
?(%radi-a %radi-m)
?: ?=(%nice +<.sih)
@ -365,7 +370,8 @@
=+ ^= pout ?:(=(i.pax %radi-a) %amigos %mensajes)
=. air (~(put by air) t.pax ya)
=+ mow=(send [pout t.pax] %give +.sih)
=< [mow +>.$]
=< (took /radio mow)
:: =< [mow +>.$]
:: XX yes, I just used an inline comment
:: XX and multiple XX's. why? because
:: XX tmi is incredibly lame.

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

@ -167,18 +167,11 @@
?:(neu +>.$ ra-homes)
::
++ ra-friend :: %friend response
|= [her=ship man=span sih=sign]
^+ +>
=+ pur=(~(get by stories) man)
?~ pur ~& [%ra-friend-none man] +>.$
pa-abet:(~(pa-friend pa man u.pur) her sih)
::
++ ra-stalk :: %stalk response
|= [man=span tay=partner sih=sign]
^+ +>
=+ pur=(~(get by stories) man)
?~ pur ~& [%ra-stalk-none man] +>.$
pa-abet:(~(pa-stalk pa man u.pur) tay sih)
?~ pur ~& [%ra-friend-none man] +>.$
pa-abet:(~(pa-friend pa man u.pur) tay sih)
::
++ ra-twitter :: %twitter response
|= [met=twim sih=sign]
@ -356,46 +349,32 @@
(pa-sauce n.owe [[%rush %rodeo-report %config shape] ~])
::
++ pa-friend :: subscribed update
|= [her=ship sih=sign]
|= [tay=partner sih=sign]
^+ +>
?> ?=(& -.tay)
?+ sih ~&([%rodeo-bad-friend sih] !!)
[%g %nice ~]
+>.$
::
[%g %mean *]
?~ +>.sih
(pa-acquire [%& her man]~)
(pa-acquire [tay ~])
~& [%pa-friend-mean +>.sih]
pa-monitor(sources.shape (~(del in sources.shape) [%& her man]))
pa-monitor(sources.shape (~(del in sources.shape) tay))
::
[%g %rush %rodeo-report *]
:: ~& [%pa-friend-report +>+.sih]
=. +> %+ pa-scrub ost
:_ ~
:- /friend/show/(scot %p her)/[man]
[%g %took [her /rodeo] our.hid]
:- /friend/show/[man]/(scot %p p.p.tay)/[q.p.tay]
[%g %took [p.p.tay /rodeo] our.hid]
?+ -.+>+.sih ~&([%rodeo-odd-friend sih] !!)
%config +>.$
%group +>.$
%group (pa-remind tay +.+>+.sih)
%grams (pa-lesson q.+.+>+.sih)
==
==
::
++ pa-stalk :: subscribed present
|= [tay=partner sih=sign]
^+ +>
?+ sih ~&([%rodeo-bad-friend sih] !!)
[%g %nice ~]
:: ~& %pa-stalk-nice
+>.$
::
[%g %rush %rodeo-report *]
?+ -.+>+.sih ~&([%rodeo-odd-friend sih] !!)
%group
(pa-remind tay +.+>+.sih)
==
==
::
++ pa-scrub :: pass forward
|= [ost=bone bub=(list (pair path note))]
%_ +>.$
@ -421,9 +400,7 @@
!!
::
%& :: ~& [%pa-abjure [our.hid man] [p.p.tay q.p.tay]]
:~ :- /friend/nuke/[man]
[%g %nuke [p.p.tay /rodeo] our.hid]
:- /stalk/nuke/[man]
:~ :- /friend/nuke/[man]/(scot %p p.p.tay)/[q.p.tay]
[%g %nuke [p.p.tay /rodeo] our.hid]
==
==
@ -441,7 +418,7 @@
!!
::
%& :: ~& [%pa-acquire [our.hid man] [p.p.tay q.p.tay]]
:~ :- /friend/show/(scot %p p.p.tay)/[man]
:~ :- /friend/show/[man]/(scot %p p.p.tay)/[q.p.tay]
[%g %show [p.p.tay /rodeo] our.hid /af/[q.p.tay]/(scot %ud num)]
==
==
@ -647,19 +624,12 @@
==
::
[%friend *]
?> ?=([@ @ @ ~] t.pax)
?. =(%show i.t.pax)
~& [%pour-friend-nuke-nuke pax]
[~ +>.$]
ra-abet:(~(ra-friend ra ost ~) (slav %p i.t.t.pax) i.t.t.t.pax sih)
::
[%stalk *]
?> ?=([@ @ @ @ ~] t.pax)
?. =(%show i.t.pax)
~& [%pour-friend-nuke-nuke pax]
[~ +>.$]
=+ [man tay]=[i.t.t.pax [%& (slav %p i.t.t.t.pax) i.t.t.t.t.pax]]
ra-abet:(~(ra-stalk ra ost ~) man tay sih)
ra-abet:(~(ra-friend ra ost ~) man tay sih)
::
[%repeat *]
?> ?=([@ @ @ ~] t.pax)