diff --git a/ape/bit.hoon b/ape/bit.hoon index 59b2e317ce..ec4818029e 100644 --- a/ape/bit.hoon +++ b/ape/bit.hoon @@ -47,7 +47,7 @@ $: cred=(unit ,[app-secret=@t client-id=@t]) ++ hostname ^- hart ?+ (clan our.hid) !! %czar [| ?+(our.hid `8.443 %~fyr `8.444) `/localhost] - %duke [| `8.444 `/org/urbit/(crip +:)] + %duke [| `8.443 `/org/urbit/(crip +:)] == ++ auth-url %+ weld "https://sandbox.coinbase.com/oauth/authorize" diff --git a/arvo/ames.hoon b/arvo/ames.hoon index 4146199598..c876dae1e7 100644 --- a/arvo/ames.hoon +++ b/arvo/ames.hoon @@ -413,7 +413,7 @@ vix=(bex +((cut 0 [25 2] mag))) :: width of sender tay=(cut 0 [27 5] mag) :: message type == - ?> =(7 vez) + ?> =(0 vez) ?> =(chk (end 0 20 (mug bod))) :+ [(end 3 wix bod) (cut 3 [wix vix] bod)] (kins tay) @@ -433,7 +433,7 @@ =+ tay=(ksin q.kec) %+ mix %+ can 0 - :~ [3 7] + :~ [3 0] [20 (mug bod)] [2 yax] [2 qax] @@ -1018,7 +1018,7 @@ ++ gnaw :: gnaw:am |= [kay=cape ryn=lane pac=rock] :: process packet ^- [p=(list boon) q=fort] - ?. =(7 (end 0 3 pac)) [~ fox] + ?. =(0 (end 0 3 pac)) [~ fox] =+ kec=(bite pac) ?: (goop p.p.kec) [~ fox] ?. (~(has by urb.ton.fox) q.p.kec) diff --git a/arvo/ford.hoon b/arvo/ford.hoon index a468fadc4c..6d2a3e85bb 100644 --- a/arvo/ford.hoon +++ b/arvo/ford.hoon @@ -1778,7 +1778,7 @@ ?~ dif =- (flaw cof leaf/"{} data with bad diff" -) [>type=p.q.coy< >want=p:!>(*(urge cord))< ~] - =+ pac=(role (lurk (lore (cat 3 u.txt '\0a')) u.dif)) + =+ pac=(role (lurk (lore u.txt) u.dif)) (fine cof %& p.cay [%atom %t] (end 3 (dec (met 3 pac)) pac)) :: %+ cope (fang cof p.cay) diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index c595bf6117..45af7c677f 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -4788,20 +4788,31 @@ |= lub=@ =| tez=(list ,@t) |- ^+ tez + =+ ^= wor + =+ [meg=0 i=0] + |- ^- [meg=@ i=@ end=@f] + =+ gam=(cut 3 [i 1] lub) + ?: =(0 gam) + [meg i %.y] + ?: =(10 gam) + [meg i %.n] + $(meg (cat 3 meg gam), i +(i)) + ?: end.wor + (flop ^+(tez [meg.wor tez])) ?: =(0 lub) (flop tez) - =+ ^= meg - =+ meg=0 - |- ^- @ud - =+ gam=(cut 3 [meg 1] lub) - ?:(|(=(10 gam) =(0 gam)) meg $(meg +(meg))) - =+ res=(rsh 3 +(meg) lub) - ?: &(=(0 (cut 3 [meg 1] lub)) !=(0 res)) - !! - $(lub res, tez [(end 3 meg lub) tez]) + $(lub (rsh 3 +(i.wor) lub), tez [meg.wor tez]) :: ++ role :: line list to atom |= tez=(list ,@t) - (rap 3 (turn tez |=(a=@t (cat 3 a 10)))) + =| [our=@ i=@ud] + |- ^- @ + ?~ tez + our + ?: =(0 i.tez) + $(i +(i), tez t.tez, our (cat 3 our 10)) + ?: =(0 i) + $(i +(i), tez t.tez, our i.tez) + $(i +(i), tez t.tez, our (cat 3 (cat 3 our 10) i.tez)) :: ++ lump :: apply patch |= [don=udon src=*] diff --git a/gen/hood/merge.hoon b/gen/hood/merge.hoon index c3a5c5dafd..e7a91a4203 100644 --- a/gen/hood/merge.hoon +++ b/gen/hood/merge.hoon @@ -14,6 +14,7 @@ |= $: [now=@da eny=@uvI bek=beak] [arg=[?(sorc [syd=$|(desk beaky) sorc])] cas=case gem=?(%auto germ)] == +=. cas ?:(=(*case cas) da/now cas) =* our p.bek |^ :- %kiln-merge ^- [syd=desk her=ship sud=desk cas=case gem=?(%auto germ)] diff --git a/lib/kiln.hoon b/lib/kiln.hoon index e7557abe9c..42c4cf10f3 100644 --- a/lib/kiln.hoon +++ b/lib/kiln.hoon @@ -11,6 +11,9 @@ $: rem=(map desk kiln-desk) :: syn=(map kiln-sync ,[let=@ud ust=bone]) :: autoload=? :: + cur-hoon=@uvI :: + cur-zuse=@uvI :: + cur-vanes=(map ,@tas ,@uvI) :: == :: ++ kiln-desk :: per-desk state $: auto=? :: escalate on failure @@ -173,14 +176,21 @@ :: ++ poke-start-autoload |= ~ + =. cur-hoon + ((hard ,@uvI) .^(%cz /(scot %p our)/home/(scot %da now)/arvo/hoon/hoon)) + =. cur-zuse + ((hard ,@uvI) .^(%cz /(scot %p our)/home/(scot %da now)/arvo/zuse/hoon)) + =. cur-vanes + %- mo + %+ turn `(list ,@tas)`~[%ames %behn %clay %dill %eyre %ford %gall] + |= syd=@tas + :- syd + ((hard ,@uvI) .^(%cz /(scot %p our)/home/(scot %da now)/arvo/[syd]/hoon)) =< abet - %- emil - %+ turn - `(list term)`~[%ames %behn %clay %dill %eyre %ford %gall %zuse %hoon] - |= syd=term + %- emit ^- card - :* %warp /kiln/autoload/[syd] [our our] %home ~ - %next %z da/now /arvo/[syd]/hoon + :* %warp /kiln/autoload [our our] %home ~ + %next %z da/now /arvo == :: ++ poke-overload @@ -222,19 +232,55 @@ :: ++ take-writ-autoload |= [way=wire rot=riot] - ?> ?=([@ ~] way) + ?> ?=(~ way) ?> ?=(^ rot) - =+ syd=(slav %tas i.way) + =+ vanes=`(list ,@tas)`~[%ames %behn %clay %dill %eyre %ford %gall] =. +>.$ ?. autoload +>.$ - ?: ?=(%hoon syd) - (emit %poke /kiln/reload/[syd] [our %hood] %helm-reset ~) - (emit %poke /kiln/reload/[syd] [our %hood] %helm-reload ~[syd]) + =+ ^= new-hoon + ((hard ,@uvI) .^(%cz /(scot %p our)/home/(scot %da now)/arvo/hoon/hoon)) + ?: !=(new-hoon cur-hoon) + =. cur-hoon new-hoon + =. cur-vanes + %- mo + %+ turn `(list ,@tas)`(turn (~(tap by cur-vanes)) head) + |= syd=@tas + :- syd + %- (hard ,@uvI) + .^(%cz /(scot %p our)/home/(scot %da now)/arvo/[syd]/hoon) + (emit %poke /kiln/reload/hoon [our %hood] %helm-reset ~) + :: XX updates cur-vanes? + =+ ^= new-zuse + ((hard ,@uvI) .^(%cz /(scot %p our)/home/(scot %da now)/arvo/zuse/hoon)) + ?: !=(new-zuse cur-zuse) + =. cur-zuse new-zuse + =. cur-vanes + %- mo + %+ turn `(list ,@tas)`(turn (~(tap by cur-vanes)) head) + |= syd=@tas + :- syd + %- (hard ,@uvI) + .^(%cz /(scot %p our)/home/(scot %da now)/arvo/[syd]/hoon) + (emit %poke /kiln/reload/zuse [our %hood] %helm-reload [%zuse vanes]) + :: XX updates cur-vanes? + =- =. ^cur-vanes cur-vanes + (emil cards) + %+ roll `(list ,@tas)`vanes + =< %_(. cur-vanes ^cur-vanes) + ::^- $+([@tas _+>.^$] _+>.^$) + |= [syd=@tas cur-vanes=(map ,@tas ,@uvI) cards=(list card)] + =+ ^= new-vane + %- (hard ,@uvI) + .^(%cz /(scot %p our)/home/(scot %da now)/arvo/[syd]/hoon) + ?: =(`new-vane (~(get by cur-vanes) syd)) + [cur-vanes cards] + :- (~(put by cur-vanes) syd new-vane) + [[%poke /kiln/reload/[syd] [our %hood] %helm-reload ~[syd]] cards] =. +>.$ %- emit :* - %warp /kiln/autoload/[syd] [our our] %home ~ - %next %z da/now /arvo/[syd]/hoon + %warp /kiln/autoload [our our] %home ~ + %next %z da/now /arvo == abet :: @@ -392,7 +438,7 @@ :: ++ perform :: ^+ . - (blab =-(~&([%blabbing -] -) [ost %merg /kiln/[syd] our syd her sud cas gem]) ~) + (blab [ost %merg /kiln/[syd] our syd her sud cas gem] ~) :: ++ fancy-merge :: send to self |= [syd=desk her=@p sud=desk gem=?(%auto germ)] diff --git a/mar/hook.hoon b/mar/hook.hoon index 0a6dc3a0f8..55da9fe090 100644 --- a/mar/hook.hoon +++ b/mar/hook.hoon @@ -36,16 +36,13 @@ ;script:'CodeMirror.fromTextArea(src, {lineNumbers:true, readOnly:true})' == == - ++ txt (lore (cat 3 own '\0a')) + ++ txt (lore own) -- ++ grab |% :: convert from ++ mime |=([p=mite q=octs] q.q) ++ noun ,@t :: clam from %noun - ++ txt - |= wan=wain - =+ (role wan) - (end 3 (dec (met 3 -)) -) + ++ txt role -- ++ grad %txt -- diff --git a/mar/hoon.hoon b/mar/hoon.hoon index 08a085ead7..d1036a9bc0 100644 --- a/mar/hoon.hoon +++ b/mar/hoon.hoon @@ -37,17 +37,13 @@ == == ++ txt - (lore (cat 3 own '\0a')) + (lore own) -- ++ grab |% :: convert from ++ mime |=([p=mite q=octs] q.q) ++ noun ,@t :: clam from %noun - ++ txt - |= wan=wain - ^- @t - =+ (role wan) - (end 3 (dec (met 3 -)) -) + ++ txt role -- ++ grad %txt -- diff --git a/mar/markdown.hoon b/mar/markdown.hoon index 5017e8870d..0f358d5e30 100644 --- a/mar/markdown.hoon +++ b/mar/markdown.hoon @@ -9,17 +9,14 @@ ++ mime [/text/x-markdown (taco mud)] ++ md mud ++ txt - (lore (cat 3 mud '\0a')) + (lore mud) -- ++ grab |% ++ mime |=([p=mite q=octs] q.q) ++ noun ,@t ++ md |=(@t +<) - ++ txt - |= wan=wain - =+ (role wan) - (end 3 (dec (met 3 -)) -) + ++ txt role -- ++ grad %txt -- diff --git a/mar/md.hoon b/mar/md.hoon index fa2e3d9b0c..3d938f942f 100644 --- a/mar/md.hoon +++ b/mar/md.hoon @@ -8,16 +8,13 @@ |% ++ mime [/text/x-markdown (taco mud)] ++ txt - (lore (cat 3 mud '\0a')) + (lore mud) -- ++ grab |% ++ mime |=([p=mite q=octs] q.q) ++ noun ,@t - ++ txt - |= wan=wain - =+ (role wan) - (end 3 (dec (met 3 -)) -) + ++ txt role -- ++ grad %txt -- diff --git a/pub/bit/fab/hymn.hook b/pub/bit/fab/hymn.hook index bf0fdcdf1d..0d0f9e2bc2 100644 --- a/pub/bit/fab/hymn.hook +++ b/pub/bit/fab/hymn.hook @@ -24,9 +24,9 @@ ;script: authcode = {(pojo %s authcode)} ;script:''' if (authcode) - urb.send({ + urb.send(authcode, + { appl: "bit", - data: authcode, mark: "oauth2-code" }, function(){ }) diff --git a/pub/docs/user/appliance.md b/pub/docs/user/appliance.md index 64d257f941..7c532ed9d2 100644 --- a/pub/docs/user/appliance.md +++ b/pub/docs/user/appliance.md @@ -83,7 +83,7 @@ possible; it's not well-optimized. There's a web interface to `:talk` at - http://localhost:8080/~~/home/pub/talk/fab + http://localhost:8080/~~/home/pub/talk and a dojo interface at diff --git a/pub/docs/user/talk.md b/pub/docs/user/talk.md index e9528c1a9c..c8e6f27a98 100644 --- a/pub/docs/user/talk.md +++ b/pub/docs/user/talk.md @@ -75,7 +75,7 @@ You'll see: ---------:talk| don't be rude ---------:talk| urbit-meta is politically correct and safe for work ~doznec= ~fintud-macrep admitted to %urbit-meta - ~fintud-macrep:talk= + ~fintud-macrep:talk> Notice the character assignment - stations you're subscribed to are assigned [consistent ASCII glyphs](#-station-glyphs), which you'll @@ -84,16 +84,16 @@ when you're talking to them. Post a line to `/urbit-meta`: - ~fintud-macrep:talk= hello, world + ~fintud-macrep:talk> hello, world You'll see, echoed back at you through `~doznec`: - ~fintud-macrep:talk= hello, world + ~fintud-macrep> hello, world And of course, anyone else in `/urbit-meta` will see it as well. But you don't care about `/urbit-meta`, so leave it: - ~fintud-macrep:talk= ;leave + ~fintud-macrep:talk> ;leave > You'll see: @@ -103,7 +103,6 @@ Everyone else will see: ~doznec= ~fintud-macrep has left %urbit-meta - Now you're ready to use `:talk` for real! For general discussion about Urbit, we recommend `/urbit-meta`. @@ -234,7 +233,7 @@ most recent; etc. ### Nicknames -Partially implemented +Implemented, no autocompletion Sometimes you know your Urbit friends by other names, on or offline. Use the `;nick` command to assign or look up diff --git a/pub/talk/src/js/.main.js b/pub/talk/src/js/.main.js deleted file mode 100644 index e69de29bb2..0000000000