urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-30 01:33:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/urbit/arvo into remaint-merge-talk

Browse Source
This commit is contained in:
Fang 2017-10-24 15:21:15 +02:00
commit 31cd0593aa
12 changed files with 52 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gen/hood/init-oauth2/google.hoon
View File

@ -4,11 +4,14 @@
::
/? 314
/- sole
/+ old-zuse
=, old-zuse
::
::::
::
=, sole
=, html
=, format
:- %ask
|= $: {now/@da eny/@uvJ bec/beak}
{arg/$@($~ {jon/json $~})}

2
gen/hood/invite.hoon
View File

@ -12,6 +12,6 @@
{{who/@t $~} sta/@}
==
:- %womb-invite
^- {cord invite}:womb
^- {cord invite:womb}
=+ inv=(scot %uv (end 7 1 eny))
[inv [who 10 sta "You have been invited to Urbit: {(trip inv)}" "This is an invite of 10 planets"]]

2
gen/hood/merge.hoon
View File

@ -3,6 +3,8 @@
:::: /hoon/merge/hood/gen
::
/? 310
/+ *old-zuse
=, old-zuse
::
|%
++ beaky {knot knot knot $~}

2
gen/womb/balances.hoon
View File

@ -11,4 +11,4 @@
==
:- %womb-balance-all
=+ [him=(scot %p ?^(who u.who p.bec)) cas=(scot %da now)]
.^((set {passhash mail}:womb) %gx /[him]/hood/[cas]/womb/balance/womb-balance-all)
.^((set {passhash mail}):womb %gx /[him]/hood/[cas]/womb/balance/womb-balance-all)

1
lib/helm.hoon
View File

@ -181,7 +181,6 @@
|= {p/@tas q/path}
=+ way=`path`(welp top q)
=+ txt=.^(@ %cx (welp way /hoon))
~& [%reset-veer p way]
[%flog /reset %veer p way txt]
::
++ poke-meset :: reset system (new)

19
lib/oauth2.hoon
View File

@ -2,10 +2,12 @@
::
:::: /hoon/oauth2/lib
::
/+ hep-to-cab, interpolate
/+ hep-to-cab, interpolate, old-zuse
=, old-zuse
=, eyre
=, mimes:html
=, html
=, format
|%
++ parse-url parse-url:interpolate
++ join
@ -32,6 +34,21 @@
(need (;~(biff de-json b) q:(need r.a)))
--
::
::::
::
:: XX belongs back in zuse
|%
++ pack :: light path encoding
|= {a/term b/path} ^- knot
%+ rap 3 :- (wack a)
(turn b |=(c/knot (cat 3 '_' (wack c))))
::
++ pick :: light path decoding
=+ fel=(most cab (sear wick urt:ab))
|=(a/knot `(unit {p/term q/path})`(rush a fel))
::
--
::
::::
::
|%

11
mar/sole/action.hoon
View File

@ -27,11 +27,18 @@
|= c/json %. c
?.(=(%a -.c) b (pe -.a (ar +.a)))
::
++ change (ot ler+(at ni ni ~) ted+(cu |*(a/* [0v0 a]) edit) ~)
++ ke :: callbacks
|* {gar/* sef/(trap fist)}
|= jon/json ^- (unit _gar)
=- ~! gar ~! (need -) -
((sef) jon)
::
++ change (ot ler+(at ni ni ~) ted+(pe 0v0 edit) ~)
++ char (cu turf so)
++ edit
%+ ke *sole-edit |. ~+
%+ fo %nop
%+ ra mor+|=(json (edit +<))
%+ ra mor+edit
(of del+ni set+(cu tuba sa) ins+(ot at+ni cha+char ~) ~)
--
::

4
mar/womb/invite.hoon
View File

@ -7,11 +7,11 @@
:::: ~fyr
::
=, old-zuse
|_ {cord invite}:womb
|_ {cord invite:womb}
::
++ grab :: convert from
|%
++ noun {cord invite}:womb :: clam from %noun
++ noun {cord invite:womb} :: clam from %noun
++ json
%+ corl need
=> jo

4
sur/sole.hoon
View File

@ -86,8 +86,8 @@
{$get $-((sole-args) (sole-request (cask)))} :: scraper
== ::
++ sole-args :: generator arguments
|* _[* *] ::
{{now/@da eny/@uvJ bek/beak} {+<- +<+}} ::
|* _[* *] ::
{{now/@da eny/@uvJ bek/beak} {,+<- ,+<+}} ::
:: ::
:: ::
++ sole-so :: construct result

17
sys/hoon.hoon
View File

@ -9212,16 +9212,9 @@
%^ cat 3
%~ rent co
:+ %$ %ud
|- ^- @
?- q.s.q.sut
$~ 0
{* $~ $~} 1
{* $~ *} +($(q.s.q.sut r.q.s.q.sut))
{* * $~} +($(q.s.q.sut l.q.s.q.sut))
{* * *} .+ %+ add
$(q.s.q.sut l.q.s.q.sut)
$(q.s.q.sut r.q.s.q.sut)
== ==
%- ~(rep by (~(run by q.s.q.sut) |=(tomb ~(wyt by q))))
|=([[@ a=@u] b=@u] (add a b))
==
%^ cat 3
?-(p.q.sut $gold '.', $iron '|', $lead '?', $zinc '&')
=+ gum=(mug q.s.q.sut)
@ -9903,6 +9896,8 @@
:~
:- '_'
;~(pfix cab (stag %bccb wide))
:- ','
;~(pfix com (stag %bcsm wide))
:- '$'
;~ pose
;~ pfix buc
@ -10016,7 +10011,7 @@
:- '('
(stag %cnhp (ifix [pel per] (most ace wide)))
:- '{'
(stag %bccl (ifix [kel ker] (most ace wide)))
(stag %bccl (ifix [kel ker] (most ace wyde)))
:- '*'
;~ pose
(stag %bunt ;~(pfix tar wide))

12
sys/vane/eyre.hoon
View File

@ -78,8 +78,8 @@
++ mend ?($get $head) :: amend after building
++ whir $@ $~ :: wire subset
$% {$ac p/whir-ac} :: finish request
{$at p/cord:beak q/whir-ac} :: build request
{$ay p/knot:ship q/knot:@uvH $~} :: remote duct
{$at p/cord q/whir-ac} :: build request
{$ay p/knot q/knot $~} :: remote duct
{$hi p/knot q/mark $~} :: outbound HTTP
{$se p/whir-se q/{user (list @t)}} :: outbound to domain
{$si $~} :: response done
@ -95,7 +95,7 @@
{$liv p/hole q/ixor $~}
==
++ whir-ac {p/?($$ hole) q/mend r/$@($~ {p/@t $~})} :: auth? filter cookie?
++ whir-of {p/knot:ship q/term s/wire} :: path in dock
++ whir-of {p/knot q/term s/wire} :: path in dock
++ whir-se ?($core vi-arm) :: build/call
++ vi-arm
$? $filter-request :: ++out mod request
@ -231,7 +231,7 @@
%+ rap 3 :- (wack a)
(turn b |=(c/knot (cat 3 '_' (wack c))))
::
++ puck :: light path decoding
++ pick :: light path decoding
=+ fel=(most cab (sear wick urt:ab))
|=(a/knot `(unit {p/term q/path})`(rush a fel))
::
@ -1045,7 +1045,7 @@
(give-thou 307 [location+(crip url)]~ ~)
:: (give-html:abet 200 ~ (redir:xml url))
?. ?=($mime p.cay)
=+ bek=(norm-beak -:(need (de-beam (need (puck p.tee)))))
=+ bek=(norm-beak -:(need (de-beam (need (pick p.tee)))))
(exec-live ac+q.tee bek [%flag [p.sih `~] %cast %mime [%$ cay]])
(give-mime q.tee p.sih cay)
::
@ -1403,7 +1403,7 @@
?~ in-quy
(slav %ta i.t.but)
=+ src=~|(no+u.in-quy (~(got by (malt quy)) u.in-quy))
p:(need (puck src)) :: allow state=usr_other-data
p:(need (pick src)) :: allow state=usr_other-data
::
$at [%auth %at pok(q but)]
$as

4
sys/zuse.hoon
View File

@ -4219,11 +4219,11 @@
=> .(b `(tup -.a +.a)`b)
?~ +.a [(scot -.a b) ~]
[(scot -.a -.b) `(paf +.a)`(..$ +.a +.b)]
:- paf=|*(a/(pole) ?~(a $~ {(odo:raid -.a(. %ta)) (..$ +.a)}))
:- paf=|*(a/(pole) ?~(a $~ {,(odo:raid -.a(. %ta)) ,(..$ +.a)}))
^= tup
|* {a/@tas b/(pole @tas)}
=+ c=(odo:raid a)
?~(b c {c (..$ -.b +.b)})
?~(b c {c ,(..$ -.b +.b)})
:: :: ++raid:wired
++ raid :: demand path odors
::