Merge pull request #285 from tloncorp/promote-9-16

ops: promote 1.26.1
tloncorp · Sep 16, 2024 · ae52a05 · ae52a05
2 parents 87d832f + b64c287
commit ae52a05
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/desk/app/reel.hoon b/desk/app/reel.hoon
@@ -54,6 +54,7 @@
       open-describes=(set token:reel)
       stable-id=(map cord token:reel)
   ==
+++  flag  ;~((glue fas) ;~(pfix sig fed:ag) sym)
 ::  url with old style token
 ++  url-for-token
   |=  [vic=cord token=cord]
@@ -79,7 +80,20 @@
   =/  old  !<(versioned-state old-state)
   ?-  -.old
       %4
-    `this(state old)
+    =.  state  old
+    =^  new-md  stable-id
+      %+  roll
+        ~(tap by our-metadata)
+      |=  [[=token:reel =metadata:reel] [md=_our-metadata id=_stable-id]]
+      ?^  (slaw %uv token)  [md id]
+      ?^  (rush token flag)
+        :-  md
+        ?:  (~(has by id) token)  id
+        (~(put by id) token token)
+      =/  new  (rap 3 (scot %p our.bowl) '/' token ~)
+      :-  (~(put by md) new metadata)
+      (~(put by id) new new)
+    `this(our-metadata new-md)
       %3
     `this(state [%4 vic.old civ.old our-metadata.old outstanding-pokes.old ~ ~])
       %2
@@ -174,18 +188,20 @@
       %reel-want-token-link
     =+  !<(=token:reel vase)
     :_  this
+    =/  full-token
+      ?^  (rush token flag)  token
+      (rap 3 (scot %p our.bowl) '/' token ~)
     =/  result=(unit [cord cord])
-      ?.  (~(has by our-metadata) token)  `[token '']
-      `[token (url-for-token vic token)]
+      ?.  (~(has by our-metadata) full-token)  `[full-token '']
+      `[full-token (url-for-token vic full-token)]
     ~[[%pass [%token-link-want token ~] %agent [src dap]:bowl %poke %reel-give-token-link !>(result)]]
       %reel-give-token-link
     =+  !<(result=(unit [cord cord]) vase)
     ?~  result  `this
     :_  this
     =/  [token=cord url=cord]  u.result
-    ?:  =('' url)
-      ~[[%give %fact ~[[%token-link (scot %p src.bowl) token ~]] %json !>(~)]]
-    ~[[%give %fact ~[[%token-link (scot %p src.bowl) token ~]] %json !>(s+url)]]
+    =/  path  (stab (cat 3 '/token-link/' token))
+    ~[[%give %fact ~[path] %json !>(?:(=('' url) ~ s+url))]]
   ==
 ::
 ++  on-agent

diff --git a/desk/desk.docket-0 b/desk/desk.docket-0
@@ -4,7 +4,7 @@
     glob-http+['https://bootstrap.urbit.org/glob-0v7.the2a.smdhg.89k09.6ar0t.gb5te.glob' 0v7.the2a.smdhg.89k09.6ar0t.gb5te]
     ::glob-ames+~zod^0v0
     base+'landscape'
-    version+[1 26 0]
+    version+[1 26 1]
     website+'https://tlon.io'
     license+'MIT'
 ==