From 6b821a8b3ebff457a6e354616fd2abed877fe7cb Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Mon, 17 Oct 2016 16:20:59 -0700 Subject: [PATCH 01/18] mount %home on startup --- lib/kiln.hoon | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/kiln.hoon b/lib/kiln.hoon index ed5577bb7..1c27bf974 100644 --- a/lib/kiln.hoon +++ b/lib/kiln.hoon @@ -336,11 +336,14 @@ ++ start-sync |= reset/? =. +>.$ (spam (render "activated sync" sud her syd) ~) - %- blab - :~ :* ost %warp - [%kiln %sync syd (scot %p her) sud ?:(reset /reset /)] - [our her] sud ~ %sing %w [%da now] / - == == + =. +>.$ + %- blab + :~ :* ost %warp + [%kiln %sync syd (scot %p her) sud ?:(reset /reset /)] + [our her] sud ~ %sing %w [%da now] / + == == + ?. =(%home syd) +>.$ :: XX less hard-coding + (blab [ost %mont /mount syd our syd /]~) :: ++ writ |= {reset/? rot/riot} From 29f65801edd9b38f73a46bca0a7a3e48cb54c7a4 Mon Sep 17 00:00:00 2001 From: production server Date: Fri, 19 May 2017 19:14:30 +0000 Subject: [PATCH 02/18] HOTFIX disable presence reporting --- app/talk.hoon | 1 + 1 file changed, 1 insertion(+) diff --git a/app/talk.hoon b/app/talk.hoon index 4323b9d60..001ec6e55 100644 --- a/app/talk.hoon +++ b/app/talk.hoon @@ -1687,6 +1687,7 @@ :: ++ pa-report-group :: update presence |= vew/(set bone) + ?: [no-presence=&] +>.$ %^ pa-report vew %group :- %- ~(run by locals) |=({@ a/status} a) From a216565a14401ae11afeba749648e412b98e3ba9 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Wed, 24 May 2017 16:04:27 -0700 Subject: [PATCH 03/18] add |wipe-ford cache clear button --- app/hood.hoon | 1 + gen/hood/wipe-ford.hoon | 13 +++++++++++++ lib/kiln.hoon | 2 ++ 3 files changed, 16 insertions(+) create mode 100644 gen/hood/wipe-ford.hoon diff --git a/app/hood.hoon b/app/hood.hoon index a2d0b475f..4110cf014 100644 --- a/app/hood.hoon +++ b/app/hood.hoon @@ -155,6 +155,7 @@ ++ poke-kiln-sync (wrap poke-sync):from-kiln ++ poke-kiln-syncs (wrap poke-syncs):from-kiln ++ poke-kiln-start-autoload (wrap poke-start-autoload):from-kiln +++ poke-kiln-wipe-ford (wrap poke-wipe-ford):from-kiln ++ poke-kiln-autoload (wrap poke-autoload):from-kiln ++ poke-kiln-overload (wrap poke-overload):from-kiln ++ poke-kiln-unmount (wrap poke-unmount):from-kiln diff --git a/gen/hood/wipe-ford.hoon b/gen/hood/wipe-ford.hoon new file mode 100644 index 000000000..c34b9d9e2 --- /dev/null +++ b/gen/hood/wipe-ford.hoon @@ -0,0 +1,13 @@ +:: Kiln: wipe ford cache +:: +:::: /hoon/wipe-ford/hood/gen + :: +/? 310 +:: +:::: + !: +:- %say +|= $: {now/@da eny/@uvJ bec/beak} + {arg/$~ $~} + == +[%kiln-wipe-ford ~] diff --git a/lib/kiln.hoon b/lib/kiln.hoon index ed5577bb7..b65870588 100644 --- a/lib/kiln.hoon +++ b/lib/kiln.hoon @@ -203,6 +203,8 @@ |= tym/@dr abet:(emit %wait /kiln/overload/(scot %dr tym) (add ~s10 now)) :: +++ poke-wipe-ford |=($~ abet:(emit %wipe /kiln our ~)) +:: ++ take |=(way/wire ?>(?=({@ $~} way) (work i.way))) :: general handler ++ take-mere :: |= {way/wire are/(each (set path) (pair term tang))} From 5c6b95808fa98acef2632c52b7a3b79507622d4f Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Fri, 26 May 2017 15:59:13 -0700 Subject: [PATCH 04/18] tree@da7808a actually disable post box upon submission --- web/tree/main.js | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/web/tree/main.js b/web/tree/main.js index 34af95da0..3aa9584ad 100644 --- a/web/tree/main.js +++ b/web/tree/main.js @@ -1927,6 +1927,9 @@ module.exports = query({ }, onSubmit: function(e) { var comment, path, title; + this.setState({ + loading: true + }); title = this.refs["in"].title.value; comment = this.refs["in"].comment.value; path = this.props.path || "/"; @@ -1939,27 +1942,26 @@ module.exports = query({ }); }, render: function() { - var _attr, bodyTextArea, postButton, titleInput; - _attr = {}; - if (this.state.loading === true) { - _attr.disabled = "true"; - } - titleInput = input(_.create(_attr, { + var bodyTextArea, postButton, titleInput; + titleInput = input({ + disabled: this.state.loading ? "true" : void 0, type: "text", name: "title", placeholder: "Title" - })); - bodyTextArea = textarea(_.create(_attr, { + }); + bodyTextArea = textarea({ + disabled: this.state.loading ? "true" : void 0, type: "text", name: "comment", value: this.state.value, onChange: this.onChange - })); - postButton = input(_.create(_attr, { + }); + postButton = input({ + disabled: this.state.loading ? "true" : void 0, type: "submit", value: "Post", className: "btn btn-primary" - })); + }); return div({}, div({ className: "add-post" }, form({ @@ -3153,14 +3155,18 @@ module.exports = { } }, dateFromAtom: function(date) { - var __, day, hor, min, mon, ref, sec, str, yer; + var __, d, day, hor, min, mon, ref, sec, yer; ref = date.slice(1).split("."), yer = ref[0], mon = ref[1], day = ref[2], __ = ref[3], hor = ref[4], min = ref[5], sec = ref[6]; if (day != null) { - str = yer + "-" + mon + "-" + day; - if (hor != null) { - str += " " + hor + ":" + min + ":" + sec; - } - return new Date(str); + d = new Date(); + d.setYear(yer); + d.setMonth(mon - 1); + d.setDate(day); + } + if (hor != null) { + d.setHours(hor); + d.setMinutes(min); + return d.setSeconds(sec); } }, getKeys: function(kids, sortBy) { @@ -3341,8 +3347,12 @@ EventEmitter.prototype.emit = function(type) { er = arguments[1]; if (er instanceof Error) { throw er; // Unhandled 'error' event + } else { + // At least give some kind of context to the user + var err = new Error('Uncaught, unspecified "error" event. (' + er + ')'); + err.context = er; + throw err; } - throw TypeError('Uncaught, unspecified "error" event.'); } } From 457676f947e6f65695dffed6a419f1903ab9069d Mon Sep 17 00:00:00 2001 From: Keaton Dunsford Date: Tue, 30 May 2017 16:55:00 -0700 Subject: [PATCH 05/18] Add noun.hoon mark to /mar Fixes an issue where trivial moves to ++poke-noun app arms across ships wouldn't resolve, and ++coup in those apps would throw away the stack trace. See this Fora post: --- mar/noun.hoon | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 mar/noun.hoon diff --git a/mar/noun.hoon b/mar/noun.hoon new file mode 100644 index 000000000..e80ac367b --- /dev/null +++ b/mar/noun.hoon @@ -0,0 +1,11 @@ +:: +:::: /hoon/noun/mar + :: +/? 310 +!: +:::: A minimal noun mark +|_ non/* +++ grab |% + ++ noun * + -- +-- From e24c9028a859bd24ad7c257060bb6aba7305ed24 Mon Sep 17 00:00:00 2001 From: Raymond Pasco Date: Wed, 14 Jun 2017 10:40:02 -0700 Subject: [PATCH 06/18] Protocol to 6 for breach --- arvo/ames.hoon | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arvo/ames.hoon b/arvo/ames.hoon index 02d3c2952..53dd7d678 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 == - ?> =(5 vez) + ?> =(6 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 5] + :~ [3 6] [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} - ?. =(5 (end 0 3 pac)) [~ fox] + ?. =(6 (end 0 3 pac)) [~ fox] =+ kec=(bite pac) ?: (goop p.p.kec) [~ fox] ?. (~(has by urb.ton.fox) q.p.kec) From c5812429a9e71ecfb2fdeed1584a15b54c7f78da Mon Sep 17 00:00:00 2001 From: Raymond Pasco Date: Wed, 14 Jun 2017 11:07:32 -0700 Subject: [PATCH 07/18] Key ~sud ~pem ~lur ~def --- arvo/ames.hoon | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arvo/ames.hoon b/arvo/ames.hoon index 53dd7d678..163f0aa97 100644 --- a/arvo/ames.hoon +++ b/arvo/ames.hoon @@ -319,11 +319,11 @@ 0w0 :: 174, ~hut, Tlon 0w0 :: 175, ~tun, Tlon 0w0 :: 176, ~byl, Tlon - 0w0 :: 177, ~sud, Tlon - 0w0 :: 178, ~pem, Tlon + 0wq.wmRvk.V8tZ5.1lz5q.dbrYx :: 177, ~sud, Tlon + 0w3Q.0LYXy.LjTEu.~FjaT.OpTts :: 178, ~pem, Tlon 0wQ.uJzGo.M94yL.L7yw6.nGyfW :: 179, ~dev, Tlon - 0w0 :: 180, ~lur, Tlon - 0w0 :: 181, ~def, Tlon + 0w1B.LTLDt.3Yu~s.BuzYM.fjcS3 :: 180, ~lur, Tlon + 0w2B.9j6g-.q9DwV.tXzPz.DKEKq :: 181, ~def, Tlon 0w1m.CxbiW.SKF5E.11JQ6.yW~T4 :: 182, ~bus, Tlon 0w0 :: 183, ~bep, Tlon 0w0 :: 184, ~run, Tlon From f9fe3b644ebafd8251090d94bb1fc63311fb72a7 Mon Sep 17 00:00:00 2001 From: Joseph Bryan Date: Sun, 18 Jun 2017 16:23:20 -0400 Subject: [PATCH 08/18] adds warnings and a confirmation prompt to %/gen/moon --- gen/moon.hoon | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/gen/moon.hoon b/gen/moon.hoon index 2e26b875b..73194f327 100644 --- a/gen/moon.hoon +++ b/gen/moon.hoon @@ -3,18 +3,35 @@ :::: /hoon/moon/gen :: /? 310 +/- sole +[. sole] :: :::: !: -:- %say +:- %ask |= $: {now/@da eny/@uvJ bec/beak} $~ $~ == -:- %tang :_ ~ :- %leaf -=+ ran=(clan p.bec) +=/ ran (clan p.bec) ?: ?=({?($earl $pawn)} ran) - "can't create a moon from a {?:(?=($earl ran) "moon" "comet")}" -=+ mon=(mix (lsh 5 1 (end 5 1 eny)) p.bec) -=+ tic=.^(@ /a/(scot %p p.bec)/tick/(scot %da now)/(scot %p mon)) -"moon: {<`@p`mon>}; ticket: {<`@p`tic>}" + %- sole-so + :- %tang :_ ~ + leaf+"can't create a moon from a {?:(?=($earl ran) "moon" "comet")}" +=/ mon (mix (lsh 5 1 (end 5 1 eny)) p.bec) +=/ tic .^(@ /a/(scot %p p.bec)/tick/(scot %da now)/(scot %p mon)) +%+ sole-yo + leaf+"(see https://github.com/urbit/arvo/issues/327 for details)" +%+ sole-yo + :- %leaf + ;: weld + "WARNING: linking a moon to your " + ?-(ran $czar "galaxy", $king "star", $duke "planet") + " can cause networking bugs" + == +%+ sole-lo + [& %$ "enter y/yes to continue: "] +|= inp/tape +?. |(=("y" inp) =("yes" inp)) + (sole-so [%tang leaf+"canceled" ~]) +(sole-so [%tang leaf+"moon: {<`@p`mon>}; ticket: {<`@p`tic>}" leaf+"" ~]) From 67bb6fda34a4413625e5d97d235596359abfec97 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Mon, 19 Jun 2017 16:11:10 -0700 Subject: [PATCH 09/18] Honor previously-heard %received notifications --- app/talk.hoon | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/talk.hoon b/app/talk.hoon index 001ec6e55..c81a31bdd 100644 --- a/app/talk.hoon +++ b/app/talk.hoon @@ -1930,8 +1930,19 @@ ++ pa-revise :: revise existing |= {num/@ud gam/telegram} =+ way=(sub count num) - ?: =(gam (snag (dec way) grams)) - +>.$ :: no change + =/ ole (snag (dec way) grams) + =. q.q.gam + ::REVIEW let old %received override different "new" states, in an + :: attempt to stem a stale-update loop + :: + %- ~(urn by q.q.gam) + |= {a/partner b/{envelope dev/delivery}} ^- {envelope delivery} + ?: ?=({$~ ^ $received} (~(get by q.q.ole) a)) + b(dev %received) + b + :: + ?: =(gam ole) + +>.$ :: no change =. grams (welp (scag (dec way) grams) [gam (slag way grams)]) (pa-refresh num gam) -- From 2542a3ee8098b1f42ebb2b9c862bddaf327e8675 Mon Sep 17 00:00:00 2001 From: Joseph Bryan Date: Tue, 20 Jun 2017 11:59:50 -0400 Subject: [PATCH 10/18] adds error message to +ticket --- gen/ticket.hoon | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gen/ticket.hoon b/gen/ticket.hoon index da86fc6c4..cba4ceab8 100644 --- a/gen/ticket.hoon +++ b/gen/ticket.hoon @@ -5,10 +5,12 @@ /? 310 :: :::: - !: + !. :- %say |= $: {now/@da eny/@uvJ bec/beak} {{her/@p $~} $~} == :- %noun +~_ leaf+"can't ticket {} (not a child of {})" +?> =(p.bec (sein her)) .^(@p /a/(scot %p p.bec)/tick/(scot %da now)/(scot %p her)) From 54dc463a95105e902331ff7f632f46e0086811dd Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Wed, 28 Jun 2017 23:24:47 -0700 Subject: [PATCH 11/18] Revert sentimental family nicknames; assign ~teb. --- arvo/ames.hoon | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/arvo/ames.hoon b/arvo/ames.hoon index 163f0aa97..79c72a729 100644 --- a/arvo/ames.hoon +++ b/arvo/ames.hoon @@ -172,47 +172,47 @@ 0w0 :: 27, ~hec, Tlon Investor 8 0w0 :: 28, ~ryt, Tlon Investor 8 0w0 :: 29, ~tyv, Tlon Investor 8 - 0w0 :: 30, ~syd, Jennifer Kollmer + 0w0 :: 30, ~syd, Curtis Yarvin 0wp.BgRGJ.kslnv.PLAqb.TRKbr :: 31, ~nex, Prakhar Goel (oldkey) 0w0 :: 32, ~lun, Tlon Investor 9 0w0 :: 33, ~mep, Tlon Investor 9 0w0 :: 34, ~lut, Tlon Investor 9 0w0 :: 35, ~sep, Tlon Investor 9 - 0w0 :: 36, ~pes, Jennifer Kollmer + 0w0 :: 36, ~pes, Curtis Yarvin 0w10.5s1K0.dv9NT.02fPe.PyDYa :: 37, ~del, Kingdon Barrett 0w1w.KF-J1.5I63F.khFyv.h0n4J :: 38, ~sul, John Burnham (oldkey) 0w1A.OcPXS.oQi8K.g-E0d.zTRph :: 39, ~ped, Jeremy Wall 0w2.Mr2Id.SX8xI.MAs-j.5Y-1W :: 40, ~tem, Tlon Investor 10 (oldkey) 0w0 :: 41, ~led, Nick Caruso - 0w0 :: 42, ~tul, Susan Yarvin - 0w0 :: 43, ~met, Susan Yarvin - 0w0 :: 44, ~wen, Susan Yarvin - 0w0 :: 45, ~byn, Susan Yarvin + 0w0 :: 42, ~tul, Curtis Yarvin + 0w0 :: 43, ~met, Curtis Yarvin + 0w0 :: 44, ~wen, Curtis Yarvin + 0w0 :: 45, ~byn, Curtis Yarvin 0w0 :: 46, ~hex, James Torre 0w0 :: 47, ~feb, urbit.org 0wK.GoKEY.rMjfn.ZcvFQ.n4BmX :: 48, ~pyl, Michael Hartl (oldkey) - 0w0 :: 49, ~dul, Jennifer Kollmer - 0w0 :: 50, ~het, Jennifer Kollmer - 0w0 :: 51, ~mev, Herbert Yarvin - 0w0 :: 52, ~rut, Herbert Yarvin + 0w0 :: 49, ~dul, Curtis Yarvin + 0w0 :: 50, ~het, Curtis Yarvin + 0w0 :: 51, ~mev, Curtis Yarvin + 0w0 :: 52, ~rut, Curtis Yarvin 0w2L.M6-o5.DDTFL.R4sFL.7Zuay :: 53, ~tyl, Tlon Investor 11 (oldkey) 0w0 :: 54, ~wyd, Curtis Yarvin - 0w0 :: 55, ~tep, Sibyl Kollmer - 0w0 :: 56, ~bes, Sibyl Kollmer + 0w0 :: 55, ~tep, Curtis Yarvin + 0w0 :: 56, ~bes, Curtis Yarvin 0w0 :: 57, ~dex, Jared Hance 0w0 :: 58, ~sef, Owen Rescher 0w0 :: 59, ~wyc, Galen Wolfe-Pauly 0w0 :: 60, ~bur, Galen Wolfe-Pauly 0w0 :: 61, ~der, Galen Wolfe-Pauly 0w0 :: 62, ~nep, Galen Wolfe-Pauly - 0w0 :: 63, ~pur, Herbert Yarvin + 0w0 :: 63, ~pur, Curtis Yarvin 0w30.VtXvV.S~xIV.iMCL~.j9zTC :: 64, ~rys, Charlie Cummings (oldkey) - 0w0 :: 65, ~reb, Herbert Yarvin + 0w0 :: 65, ~reb, Curtis Yarvin 0wp.LslIa.IFSM9.mIp-z.KBIBh :: 66, ~den, Michael Hartl (oldkey) - 0w0 :: 67, ~nut, Henry Yarvin - 0w0 :: 68, ~sub, Henry Yarvin - 0w0 :: 69, ~pet, Henry Yarvin - 0w0 :: 70, ~rul, Henry Yarvin + 0w0 :: 67, ~nut, Curtis Yarvin + 0w0 :: 68, ~sub, Curtis Yarvin + 0w0 :: 69, ~pet, Curtis Yarvin + 0w0 :: 70, ~rul, Curtis Yarvin 0w0 :: 71, ~syn, Henry Ault 0w0 :: 72, ~reg, Henry Ault 0w0 :: 73, ~tyd, Henry Ault @@ -225,13 +225,13 @@ 0w0 :: 80, ~sec, Curtis Yarvin 0w0 :: 81, ~mul, Curtis Yarvin 0w1F.Tqroo.wyq2m.cBaTM.9MbG- :: 82, ~nym, Max Greer (oldkey) - 0w0 :: 83, ~tev, Sibyl Kollmer + 0w0 :: 83, ~tev, Curtis Yarvin 0w2x.~ldho.Oo7kE.QqNSx.XteFh :: 84, ~web, Ar Vicco (oldkey) 0w0 :: 85, ~sum, Philip Monk 0w0 :: 86, ~mut, Philip Monk 0w0 :: 87, ~nyx, Philip Monk 0w30.UUr19.iBPlD.wfyJD.2CWPv :: 88, ~rex, Tlon Investor 12 (oldkey) - 0w0 :: 89, ~teb, Sibyl Kollmer + 0w0 :: 89, ~teb, Michael Vassar 0w0 :: 90, ~fus, Tlon Corporation 0w0 :: 91, ~hep, urbit.org 0w0 :: 92, ~ben, urbit.org From b3eeaff83b6bf7cbb66d0f019093c0973ec3bfe0 Mon Sep 17 00:00:00 2001 From: Fang Date: Mon, 7 Aug 2017 20:42:52 -0700 Subject: [PATCH 12/18] Started allowing capitals in web.plan usernames. --- mar/plan.hoon | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mar/plan.hoon b/mar/plan.hoon index 3fce277e1..b9949e635 100644 --- a/mar/plan.hoon +++ b/mar/plan.hoon @@ -40,7 +40,8 @@ (malt (turn t.t.a |=(b/cord (rash b account)))) :: ++ user ;~(pfix (jest 'User ') (cook crip (star prn))) - ++ knot (sear (flit |=(a/^knot !=('' a))) urs:ab) + ++ knot %+ cook crip + (plus ;~(pose nud low hig hep dot sig cab)) ++ location ;~(pfix (jest 'Location ') (cook crip (star prn))) ++ account ;~ plug From 660b17ba34a19b7e1f6754dd8d9bc927ce7f4f4d Mon Sep 17 00:00:00 2001 From: Fang Date: Sat, 12 Aug 2017 13:03:58 -0700 Subject: [PATCH 13/18] Fixed rendered of %app and %lin speeches in %fat. --- web/talk/main.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/talk/main.js b/web/talk/main.js index eaeca6d6c..5fa3275d3 100644 --- a/web/talk/main.js +++ b/web/talk/main.js @@ -778,7 +778,10 @@ module.exports = recl({ case speech.url == null: return speechArr = speech.url.txt.split(/(\s|-)/); case speech.fat == null: - return speech.fat.taf.exp.txt.split(/(\s|-)/); + if (typeof speech.fat.taf.exp !== 'undefined') { return speech.fat.taf.exp.txt.split(/(\s|-)/); } + if (typeof speech.fat.taf.app !== 'undefined') { return speech.fat.taf.app.txt; } + if (typeof speech.fat.taf.lin !== 'undefined') { return speech.fat.taf.lin.txt; } + return "unsupported fat speech"; default: return []; } From 8a0fa6e279c7b7ad973e24ee0fc285c77e564ad6 Mon Sep 17 00:00:00 2001 From: Keaton Dunsford Date: Sat, 16 Sep 2017 09:22:07 -0700 Subject: [PATCH 14/18] Update LICENSE copyright year --- LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.txt b/LICENSE.txt index 6404c00fb..eed28e653 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015 Urbit +Copyright (c) 2017 Urbit Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 23f2bb6a65e9ddb2b1322dc71f2c42c304a1593c Mon Sep 17 00:00:00 2001 From: Keaton Dunsford Date: Wed, 27 Sep 2017 15:57:11 -0700 Subject: [PATCH 15/18] tree@f7e376e finally fix that return and new twitter --- web/tree/main.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/web/tree/main.js b/web/tree/main.js index 3aa9584ad..c486548b4 100644 --- a/web/tree/main.js +++ b/web/tree/main.js @@ -470,8 +470,8 @@ extras = { "This page was made by Urbit. Feedback: ", a({ href: "mailto:urbit@urbit.org" }, "urbit@urbit.org"), " ", a({ - href: "https://twitter.com/urbit_" - }, "@urbit_") + href: "https://twitter.com/urbit" + }, "@urbit") ]) ]); }) @@ -2053,7 +2053,7 @@ Virtual = name("Virtual", function(arg) { }, function(str) { return str; }, function(arg1, key) { - var c, e, error, ga, gn, props, ref1; + var c, e, ga, gn, props, ref1; gn = arg1.gn, ga = arg1.ga, c = arg1.c; props = { key: key @@ -2478,7 +2478,7 @@ module.exports = query({ if (this.props.match) { comp = gn === this.props.match; } else { - comp = gn && gn[0] === 'h' && parseInt(gn[1]) !== NaN; + comp = gn && gn[0] === 'h' && parseInt(gn[1]) !== (0/0); } if (comp) { ga = _.clone(ga); @@ -3166,8 +3166,9 @@ module.exports = { if (hor != null) { d.setHours(hor); d.setMinutes(min); - return d.setSeconds(sec); + d.setSeconds(sec); } + return d; }, getKeys: function(kids, sortBy) { return _.map(this.sortKids(kids, sortBy), 'name'); From a3758828732f51a5929abb02ecdc77438be0ad21 Mon Sep 17 00:00:00 2001 From: Eric Fode Date: Wed, 27 Sep 2017 20:15:13 -0700 Subject: [PATCH 16/18] Trim any trailing spaces from lines in dojo Trim any trailing spaces on the line. fixes #430 --- app/dojo.hoon | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/dojo.hoon b/app/dojo.hoon index 7f1eca49a..0ebf19ae4 100644 --- a/app/dojo.hoon +++ b/app/dojo.hoon @@ -789,7 +789,9 @@ ++ he-duke :: ++he-dope variant |= txt/tape ^- (each (unit (each dojo-command tape)) @ud) - =+ foy=(he-dope txt) + =+ trim-space=;~(pfix spac:poja (star next)) + =+ trimed-text=(flop (scan (flop txt) trim-space)) + =+ foy=(he-dope trimed-text) ?- -.foy $| [%| q.p.foy] $& [%& p.foy] From 08b1c7797637614adc3bfd41972cbb882219718a Mon Sep 17 00:00:00 2001 From: Eric Fode Date: Fri, 29 Sep 2017 15:33:42 +0000 Subject: [PATCH 17/18] added much better suggestion mess --- app/dojo.hoon | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/dojo.hoon b/app/dojo.hoon index 0ebf19ae4..76b4950a4 100644 --- a/app/dojo.hoon +++ b/app/dojo.hoon @@ -113,7 +113,7 @@ |= {gol/goal mod/dojo-model} ^- dojo-command [[%poke gol] [0 [%ge mod(q.p [q.gol q.p.mod])]]] :: - ++ dp-command-line ;~(sfix dp-command (just '\0a')) + ++ dp-command-line ;~(sfix dp-command (star ace) (just '\0a')) ++ dp-variable :: %verb or %brev |* {sym/rule src/rule} %+ cook @@ -789,9 +789,7 @@ ++ he-duke :: ++he-dope variant |= txt/tape ^- (each (unit (each dojo-command tape)) @ud) - =+ trim-space=;~(pfix spac:poja (star next)) - =+ trimed-text=(flop (scan (flop txt) trim-space)) - =+ foy=(he-dope trimed-text) + =+ foy=(he-dope txt) ?- -.foy $| [%| q.p.foy] $& [%& p.foy] From 94d6b3ccfacc82eea2167e8033df3f3e8511b51e Mon Sep 17 00:00:00 2001 From: Joseph Bryan Date: Fri, 6 Oct 2017 19:48:59 -0400 Subject: [PATCH 18/18] writes web/plan to whichever desk has been |served --- arvo/eyre.hoon | 2 ++ lib/write.hoon | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon index dc5028c9f..67fd3dff2 100644 --- a/arvo/eyre.hoon +++ b/arvo/eyre.hoon @@ -1984,6 +1984,8 @@ ?. ?=($$ ren) [~ ~] ?. ?=($$ -.lot) [~ ~] ?+ syd [~ ~] + $serv + ``[%path !>((tope top))] $host %- (lift (lift |=(a/hart [%hart !>(a)]))) ^- (unit (unit hart)) diff --git a/lib/write.hoon b/lib/write.hoon index 18dc50d9b..544326c83 100644 --- a/lib/write.hoon +++ b/lib/write.hoon @@ -50,8 +50,11 @@ |= dif/plan-diff ^+ abet ?. =(our src) ~|(foreign-write+[our=our src=src] !!) + =/ sev + =+ .^(path %e /(scot %p our)/serv/(scot %da now)) + ?>(?=({@tas @tas *} -) -) =; sob/soba - ?~(sob abet abet:(emit %info write+~ our `toro`[q.byk %& sob])) + ?~(sob abet abet:(emit %info write+~ our `toro`[i.t.sev %& sob])) =+ pax=`path`/web/plan =+ paf=(tope beak-now (flop pax)) ?~ [fil:.^(arch %cy paf)]