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

Merge branch 'master' of https://github.com/urbit/urbit

Browse Source
This commit is contained in:
ault011 2014-08-21 13:01:28 -07:00 committed by ault011
commit b32aa3064f
2 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arvo/ames.hoon
View File

@ -225,7 +225,7 @@
0w0 :: 54, ~wyd, Curtis Yarvin (sator) 0w0 :: 54, ~wyd, Curtis Yarvin (sator)
0w0 :: 55, ~tep, Curtis Yarvin (sator) 0w0 :: 55, ~tep, Curtis Yarvin (sator)
0w0 :: 56, ~bes, Curtis Yarvin (sator) 0w0 :: 56, ~bes, Curtis Yarvin (sator)
0w0 :: 57, ~dex, Curtis Yarvin (sator) 0w0 :: 57, ~dex, Jared Hance (aestas)
0w0 :: 58, ~sef, Curtis Yarvin (sator) 0w0 :: 58, ~sef, Curtis Yarvin (sator)
0w0 :: 59, ~wyc, Curtis Yarvin (sator) 0w0 :: 59, ~wyc, Curtis Yarvin (sator)
0w0 :: 60, ~bur, Curtis Yarvin (sator) 0w0 :: 60, ~bur, Curtis Yarvin (sator)
@ -240,7 +240,7 @@
0w0 :: 69, ~pet, Curtis Yarvin (sator) 0w0 :: 69, ~pet, Curtis Yarvin (sator)
0w0 :: 70, ~rul, Curtis Yarvin (sator) 0w0 :: 70, ~rul, Curtis Yarvin (sator)
0w0 :: 71, ~syn, Curtis Yarvin (sator) 0w0 :: 71, ~syn, Curtis Yarvin (sator)
0w0 :: 72, ~reg, Curtis Yarvin (sator) 0w0 :: 72, ~reg, Henry Ault (aestas)
0w0 :: 73, ~tyd, Curtis Yarvin (sator) 0w0 :: 73, ~tyd, Curtis Yarvin (sator)
0w0 :: 74, ~sup, Curtis Yarvin (sator) 0w0 :: 74, ~sup, Curtis Yarvin (sator)
0w0 :: 75, ~sem, ~boswed-nibnyd (fidelis) 0w0 :: 75, ~sem, ~boswed-nibnyd (fidelis)
@ -255,9 +255,9 @@
0w2x.~ldho.Oo7kE.QqNSx.XteFh :: 84, ~web, Ar Vicco (donum) 0w2x.~ldho.Oo7kE.QqNSx.XteFh :: 84, ~web, Ar Vicco (donum)
0w0 :: 85, ~sum, Curtis Yarvin (sator) 0w0 :: 85, ~sum, Curtis Yarvin (sator)
0w0 :: 86, ~mut, Curtis Yarvin (sator) 0w0 :: 86, ~mut, Curtis Yarvin (sator)
0w0 :: 87, ~nyx, urbit.org (civitas) 0w0 :: 87, ~nyx, Curtis Yarvin (sator)
0w30.UUr19.iBPlD.wfyJD.2CWPv :: 88, ~rex, Ben Davenport (angelus) 0w30.UUr19.iBPlD.wfyJD.2CWPv :: 88, ~rex, Ben Davenport (angelus)
0w0 :: 89, ~teb, urbit.org (civitas) 0w0 :: 89, ~teb, Curtis Yarvin (sator)
0w0 :: 90, ~fus, urbit.org (civitas) 0w0 :: 90, ~fus, urbit.org (civitas)
0w0 :: 91, ~hep, urbit.org (civitas) 0w0 :: 91, ~hep, urbit.org (civitas)
0w0 :: 92, ~ben, urbit.org (civitas) 0w0 :: 92, ~ben, urbit.org (civitas)
@ -277,7 +277,7 @@
0w0 :: 106, ~bet, urbit.org (civitas) 0w0 :: 106, ~bet, urbit.org (civitas)
0w0 :: 107, ~bel, urbit.org (civitas) 0w0 :: 107, ~bel, urbit.org (civitas)
0w0 :: 108, ~tux, Chen Zheng (angelus) 0w0 :: 108, ~tux, Chen Zheng (angelus)
0w0 :: 109, ~tug, urbit.org (civitas) 0w0 :: 109, ~tug, Philip Monk (aestas)
0w0 :: 110, ~myr, urbit.org (civitas) 0w0 :: 110, ~myr, urbit.org (civitas)
0w0 :: 111, ~pel, urbit.org (civitas) 0w0 :: 111, ~pel, urbit.org (civitas)
0w0 :: 112, ~syp, urbit.org (civitas) 0w0 :: 112, ~syp, urbit.org (civitas)
@ -316,7 +316,7 @@
0w0 :: 145, ~leb, ~nosryl-tarpem (fidelis) 0w0 :: 145, ~leb, ~nosryl-tarpem (fidelis)
0w0 :: 146, ~dux, urbit.org (civitas) 0w0 :: 146, ~dux, urbit.org (civitas)
0w0 :: 147, ~ryn, urbit.org (civitas) 0w0 :: 147, ~ryn, urbit.org (civitas)
0w0 :: 148, ~num, urbit.org (civitas) 0w0 :: 148, ~num, Tlon (gleba)
0w0 :: 149, ~pyx, ~racbes-solmun (fidelis) 0w0 :: 149, ~pyx, ~racbes-solmun (fidelis)
0w2g.gLmg4.MtrHQ.A5VmH.WPk6G :: 150, ~ryg, Dan Haffey (fortuna) 0w2g.gLmg4.MtrHQ.A5VmH.WPk6G :: 150, ~ryg, Dan Haffey (fortuna)
0w0 :: 151, ~ryx, Tlon (gleba) 0w0 :: 151, ~ryx, Tlon (gleba)
@ -415,7 +415,7 @@
0w0 :: 244, ~byr, Tlon (gleba) 0w0 :: 244, ~byr, Tlon (gleba)
0w0 :: 245, ~sen, Tlon (gleba) 0w0 :: 245, ~sen, Tlon (gleba)
0w0 :: 246, ~weg, Tlon (gleba) 0w0 :: 246, ~weg, Tlon (gleba)
0w0 :: 247, ~fyr, Tlon (gleba) 0w0 :: 247, ~fyr, Anton Dyudin (aestas)
0w0 :: 248, ~mur, Tlon (gleba) 0w0 :: 248, ~mur, Tlon (gleba)
0w0 :: 249, ~tel, Tlon (gleba) 0w0 :: 249, ~tel, Tlon (gleba)
0w0 :: 250, ~rep, Tlon (gleba) 0w0 :: 250, ~rep, Tlon (gleba)
@ -439,7 +439,7 @@
vix=(bex +((cut 0 [25 2] mag))) :: width of sender vix=(bex +((cut 0 [25 2] mag))) :: width of sender
tay=(cut 0 [27 5] mag) :: message type tay=(cut 0 [27 5] mag) :: message type
== ==
?> =(1 vez) ?> =(2 vez)
?> =(chk (end 0 20 (mug bod))) ?> =(chk (end 0 20 (mug bod)))
:+ [(end 3 wix bod) (cut 3 [wix vix] bod)] :+ [(end 3 wix bod) (cut 3 [wix vix] bod)]
(kins tay) (kins tay)
@ -459,7 +459,7 @@
=+ tay=(ksin q.kec) =+ tay=(ksin q.kec)
%+ mix %+ mix
%+ can 0 %+ can 0
:~ [3 1] :~ [3 2]
[20 (mug bod)] [20 (mug bod)]
[2 yax] [2 yax]
[2 qax] [2 qax]
@ -1047,7 +1047,7 @@
++ gnaw :: gnaw:am ++ gnaw :: gnaw:am
|= [kay=cape ryn=lane pac=rock] :: process packet |= [kay=cape ryn=lane pac=rock] :: process packet
^- [p=(list boon) q=fort] ^- [p=(list boon) q=fort]
?. =(1 (end 0 3 pac)) [~ fox] ?. =(2 (end 0 3 pac)) [~ fox]
=+ kec=(bite pac) =+ kec=(bite pac)
?: (goop p.p.kec) [~ fox] ?: (goop p.p.kec) [~ fox]
?. (~(has by urb.ton.fox) q.p.kec) ?. (~(has by urb.ton.fox) q.p.kec)

41
arvo/eyre.hoon
View File

@ -226,7 +226,8 @@
=+ ten=(~(get by q.moh) 'content-type') =+ ten=(~(get by q.moh) 'content-type')
?~ ten ~ ?~ ten ~
?~ u.ten ~ ?~ u.ten ~
?. =('text/json' (end 3 9 i.u.ten)) ~ ?. =('text/json' (end 3 9 i.u.ten))
~| %ecce-content-type ~
?~ r.moh ~ ?~ r.moh ~
`(unit json)`(rush q.u.r.moh apex:poja) `(unit json)`(rush q.u.r.moh apex:poja)
:: ::
@ -315,16 +316,18 @@
[%mid p.luv (tact rep)] [%mid p.luv (tact rep)]
== ==
++ lofe :: variables in head ++ lofe :: variables in head
|= [vaz=(list ,[p=cord q=tape]) luv=love] |= [vaz=(list ,[p=cord q=tape]) sip=(list manx) luv=love]
%- lofa %- lofa
:_ luv :_ luv
:_ ~ %- flop
^- (list manx)
:_ sip
^- manx ^- manx
:- [%script ~] :- [%script ~]
:- :/ "window.urb = \{};\0a" :- :/ "window.urb = \{};\0a"
(turn vaz |=([a=cord b=tape] :/("window.urb.{(trip a)}={b};\0a"))) (turn vaz |=([a=cord b=tape] :/("window.urb.{(trip a)}={b};\0a")))
:: ::
++ lofi :: insert in body ++ lofi :: XX unused
|= [mog=(list manx) luv=love] |= [mog=(list manx) luv=love]
^- love ^- love
?: =(~ mog) luv ?: =(~ mog) luv
@ -1156,15 +1159,17 @@
type:"heb", type:"heb",
ship:this.ship, ship:this.ship,
dely:30000, dely:30000,
seqn:function() {
return window.urb.seqn_h
},
incs:function() { incs:function() {
window.urb.seqn_h++ window.urb.seqn_h = window.urb.seqn_h+1
} }
},function() { },function() {
console.log('heartbeat.') console.log('heartbeat.')
}) })
} }
// XX 404 bug window.urb.heartbeat()
// window.urb.heartbeat()
''' '''
:: ::
++ duty ++ duty
@ -1241,8 +1246,11 @@
} }
window.urb.gsig = function(params) { window.urb.gsig = function(params) {
path = params.path
if(!path)
path = ""
return params.appl+","+ return params.appl+","+
params.path.replace(/[^\x00-\x7F]/g, "")+","+ path.replace(/[^\x00-\x7F]/g, "")+","+
params.ship params.ship
} }
@ -1251,16 +1259,23 @@
throw new Error("You must supply params to urb.poll.") throw new Error("You must supply params to urb.poll.")
var method, perm, url, $this var method, perm, url, $this
method = "get" method = "get"
perm = params.type ? this.perms[params.type] : "gie" perm = params.type ? this.perms[params.type] : "gie"
url = [perm,this.user,this.port,this.seqn_u] json = false
if(perm[0] == "t") {
method = "put"
json = true
}
seqn = this.seqn_u
if(params.seqn)
seqn = params.seqn()
url = [perm,this.user,this.port,seqn]
url = "/"+url.join("/") url = "/"+url.join("/")
this.puls = 1 this.puls = 1
$this = this $this = this
this.req(method,url,params,false,function(err,data) { this.req(method,url,params,json,function(err,data) {
if (data.data.reload) { if (data.data.reload) {
return document.location.reload() return document.location.reload()
} else { } else {
@ -1892,7 +1907,7 @@
:+ 500 :+ 500
~[content-type/'text/html'] ~[content-type/'text/html']
[~ (tact (xmlt | mad ~))] [~ (tact (xmlt | mad ~))]
& [%fin (lofe vaz.pip (lofi mog (lopo q.p.p.pez.pip)))] & [%fin (lofe vaz.pip mog (lopo q.p.p.pez.pip))]
== ==
== ==
:: ::
@ -2097,7 +2112,7 @@
=+ pip=u.pup =+ pip=u.pup
=+ ^= sip =+ ^= sip
?. =(%apg -.som.pip) sip.pip ?. =(%apg -.som.pip) sip.pip
[duti duty sip.pip] [duty duti sip.pip]
?~ huq +>.$(..yo (bust 404 num)) ?~ huq +>.$(..yo (bust 404 num))
%= +>.$ %= +>.$
q.rey q.rey