Skip to content

Commit ae52a05

Browse files
authored
Merge pull request #285 from tloncorp/promote-9-16
ops: promote 1.26.1
2 parents 87d832f + b64c287 commit ae52a05

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

Diff for: desk/app/reel.hoon

+22-6
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
open-describes=(set token:reel)
5555
stable-id=(map cord token:reel)
5656
==
57+
++ flag ;~((glue fas) ;~(pfix sig fed:ag) sym)
5758
:: url with old style token
5859
++ url-for-token
5960
|= [vic=cord token=cord]
@@ -79,7 +80,20 @@
7980
=/ old !<(versioned-state old-state)
8081
?- -.old
8182
%4
82-
`this(state old)
83+
=. state old
84+
=^ new-md stable-id
85+
%+ roll
86+
~(tap by our-metadata)
87+
|= [[=token:reel =metadata:reel] [md=_our-metadata id=_stable-id]]
88+
?^ (slaw %uv token) [md id]
89+
?^ (rush token flag)
90+
:- md
91+
?: (~(has by id) token) id
92+
(~(put by id) token token)
93+
=/ new (rap 3 (scot %p our.bowl) '/' token ~)
94+
:- (~(put by md) new metadata)
95+
(~(put by id) new new)
96+
`this(our-metadata new-md)
8397
%3
8498
`this(state [%4 vic.old civ.old our-metadata.old outstanding-pokes.old ~ ~])
8599
%2
@@ -174,18 +188,20 @@
174188
%reel-want-token-link
175189
=+ !<(=token:reel vase)
176190
:_ this
191+
=/ full-token
192+
?^ (rush token flag) token
193+
(rap 3 (scot %p our.bowl) '/' token ~)
177194
=/ result=(unit [cord cord])
178-
?. (~(has by our-metadata) token) `[token '']
179-
`[token (url-for-token vic token)]
195+
?. (~(has by our-metadata) full-token) `[full-token '']
196+
`[full-token (url-for-token vic full-token)]
180197
~[[%pass [%token-link-want token ~] %agent [src dap]:bowl %poke %reel-give-token-link !>(result)]]
181198
%reel-give-token-link
182199
=+ !<(result=(unit [cord cord]) vase)
183200
?~ result `this
184201
:_ this
185202
=/ [token=cord url=cord] u.result
186-
?: =('' url)
187-
~[[%give %fact ~[[%token-link (scot %p src.bowl) token ~]] %json !>(~)]]
188-
~[[%give %fact ~[[%token-link (scot %p src.bowl) token ~]] %json !>(s+url)]]
203+
=/ path (stab (cat 3 '/token-link/' token))
204+
~[[%give %fact ~[path] %json !>(?:(=('' url) ~ s+url))]]
189205
==
190206
::
191207
++ on-agent

Diff for: desk/desk.docket-0

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
glob-http+['https://bootstrap.urbit.org/glob-0v7.the2a.smdhg.89k09.6ar0t.gb5te.glob' 0v7.the2a.smdhg.89k09.6ar0t.gb5te]
55
::glob-ames+~zod^0v0
66
base+'landscape'
7-
version+[1 26 0]
7+
version+[1 26 1]
88
website+'https://tlon.io'
99
license+'MIT'
1010
==

0 commit comments

Comments
 (0)