Merge remote-tracking branch 'oHaitch/zuseflat' into plastic-boot

app/curl.hoon

@@ -6,7 +6,7 @@
 |_  {{^ ^ ost/@ ^} $~}
 ++  poke  |*(a/{mark *} :_(+> [ost %hiss / `~ %wain a]~))
 ::++  poke-purl  |=(a/purl :_(+> [ost %hiss / %wain %purl a]~))
-++  poke-tape  |=(a/tape (poke %purl (scan a auri:epur)))
+++  poke-tape  |=(a/tape (poke %purl (scan a auri:urlp)))
 ++  poke-hiss  |=(a/hiss (poke %hiss a))
 ++  poke-noun  poke-hiss
 ++  sigh-wain  |=({* a/wain} ~&(a `+>))

app/dojo.hoon

@@ -233,7 +233,7 @@
     ++  dp-iden-url
       %+  cook
         |=({a/(unit knot) b/purl:^eyre} [`(fall a *knot) b])
-      auru:epur:url:eyre
+      auru:urlp:url:eyre
     ::
     ++  dp-model   ;~(plug dp-server dp-config)         ::  ++dojo-model
     ++  dp-path    (tope he-beam)                       ::  ++path

app/gh.hoon

@@ -276,7 +276,7 @@
     :*  %+  scan
           =+  [(trip i.pax) (trip i.t.pax)]
           "https://api.github.com/repos/{-<}/{->}/hooks"
-        auri:epur
+        auri:urlp
         %post  ~  ~
         %-  taco  %-  crip  %-  pojo  %-  jobe  :~
           name+s+%web

app/gmail.hoon

@@ -252,7 +252,7 @@
     ^-  purl
     %+  scan 
       "https://www.googleapis.com/gmail/v1/users/me{<`path`endpoint>}"
-    auri:epur
+    auri:urlp
     ::  Send an HTTP req
   ++  send-http
     |=  hiz/hiss

arvo/clay.hoon

@@ -12,8 +12,6 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 |=  pit/vase
 =,  ^clay
-=,  differ:clay
-=,  lines:clay
 =>  |%
 ++  aeon  @ud                                           ::  version number
 ::
@@ -2190,6 +2188,8 @@
       =+  mar=(lobe-to-mark u.lob)
       ?.  ?=($hoon mar)
         [~ ~ %| u.lob]
+      =*  differ  differ:clay
+      =*  lines  lines:clay
       :^  ~  ~  %&
       :+  mar  [%atom %t ~]
       |-  ^-  @t                      ::  (urge cord) would be faster
@@ -2200,7 +2200,7 @@
       =+  txt=$(u.lob q.q.bol)
       ?>  ?=($txt-diff p.r.bol)
       =+  dif=((hard (urge cord)) q.r.bol)
-      =+  pac=(role (lurk (lore (cat 3 txt '\0a')) dif))
+      =+  pac=(role:lines (lurk:differ (lore:lines (cat 3 txt '\0a')) dif))
       (end 3 (dec (met 3 pac)) pac)
     ::
     ::  Gets an arch (directory listing) at a node.

arvo/eyre.hoon

@@ -223,7 +223,7 @@
 ++  from-cookies
   |=  {maf/math fil/$-({@t @t} ?)}
   =+  `cot/(list @t)`(~(get ju maf) 'cookie')
-  =+  `cok/quay`(zing `(list quay)`(murn cot (curr rush cock:epur)))
+  =+  `cok/quay`(zing `(list quay)`(murn cot (curr rush cock:urlp)))
   |-  ^-  (unit cord)
   ?~  cok  ~
   ?:((fil i.cok) [~ q.i.cok] $(cok t.cok))
@@ -803,14 +803,14 @@
       %-  emule  |.  ^+  ..apex
       =*  sec  p.kyz    ::  ?                           ::  https bit
       =*  heq  r.kyz    ::  httq                        ::  request content
-      =+  ryp=`quri`(rash q.heq zest:epur)
+      =+  ryp=`quri`(rash q.heq zest:urlp)
       =+  maf=(eat-headers r.heq)
       =+  ^=  pul  ^-  purl
           ?-  -.ryp
             $&  ?>(=(sec p.p.p.ryp) p.ryp)
             $|  =+  hot=(~(get ja maf) %host)
                 ?>  ?=({@ $~} hot)
-                [[sec (rash i.hot thor:epur)] p.ryp q.ryp]
+                [[sec (rash i.hot thor:urlp)] p.ryp q.ryp]
           ==
       =.  p.p.pul  |(p.p.pul ?=(hoke r.p.pul))
       ?:  ?=($chis -.kyz)                               :: IPC escape hatch

gen/curl.hoon

@@ -7,6 +7,6 @@
 =,  sole
 :-  %get  |=  {^ {a/tape $~} $~}
 ^-  (sole-request (cask httr))
-%+  sole-at  (scan a auri:epur)
+%+  sole-at  (scan a auri:urlp)
 |=  hit/httr
 (sole-so %httr hit)

gen/curl/url.hoon

@@ -8,4 +8,4 @@
   ::
 :-  %say
 |=  {^ {arg/tape $~} $~}
-purl+(scan arg auri:epur)
+purl+(scan arg auri:urlp)

lib/connector.hoon

@@ -87,7 +87,7 @@
   ::
   ++  endpoint-to-purl
     |=  endpoint/path
-    (scan (weld api-url <`path`endpoint>) auri:epur)
+    (scan (weld api-url <`path`endpoint>) auri:urlp)
   ::
   ::  Return error.  Used when no http response is expected.
   ::

lib/down-jet.hoon

@@ -6,7 +6,7 @@
 ::
 ::::
   ::
-=,(markdown .)
+=,(^?(markdown) .)
 //    /%/parse                       ::  inli donp parse    
 //    /%/rend                        ::  sing sung sang flat into-inner
 ~%  %down  ..is  ~

lib/interpolate.hoon

@@ -13,7 +13,7 @@
   |=  a/$@(cord:purl purl)  ^-  purl
   ?^  a  a
   ~|  bad-url+a
-  (rash a auri:epur)
+  (rash a auri:urlp)
 ::
 ++  add-query
   |=  {a/$@(@t purl) b/quay}  ^-  purl

lib/twitter.hoon

@@ -11,6 +11,7 @@
 =,  js:eyre
 =,  url:eyre
 =,  xml:eyre
+=,  chrono:behn
 ::
 ::::  functions
   ::
@@ -24,7 +25,7 @@
 ++  valve                                               ::  produce request
   |=  {med/?($get $post) pax/path quy/quay}
   ^-  hiss
-  =+  url=(scan "https://api.twitter.com/1.1/.json" auri:epur)  :: base path
+  =+  url=(scan "https://api.twitter.com/1.1/.json" auri:urlp)  :: base path
   =.  q.q.url  (welp q.q.url pax)
   =.  r.url  quy
   ^-  hiss
@@ -80,7 +81,7 @@
     %-  ot
     :~  id+ni
         user+(ot (fasp screen-name+(su usor)) ~)
-        (fasp created-at+da)
+        (fasp created-at+(cu year (ci stud so)))
         text+(cu crip (su (star escp:^parse)))  :: parse html escapes
     ==
   ++  usel 

mar/gh/issue-comment.hoon

@@ -16,10 +16,10 @@
         ==
     :*  %api  %github
         login.sender.issue-comment
-        (rash html-url.sender.issue-comment aurf:epur)
+        (rash html-url.sender.issue-comment aurf:urlp)
         txt
         txt
-        (rash html-url.comment.issue-comment aurf:epur)
+        (rash html-url.comment.issue-comment aurf:urlp)
         %-  jobe  :~
           repository+s+name.repository.issue-comment
           number+(jone number.issue.issue-comment)

mar/gh/issues.hoon

@@ -80,9 +80,9 @@
     ^-  speech:talk
     :*  %api  %github
         login.sender.issues
-        (rash html-url.sender.issues aurf:epur)
+        (rash html-url.sender.issues aurf:urlp)
         txt  txt
-        (rash html-url.issue.issues aurf:epur)
+        (rash html-url.issue.issues aurf:urlp)
         %-  jobe
         %+  welp
           :~  repository+s+name.repository.issues