Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ops: promote 1.26.1 #285

Merged
merged 4 commits into from
Sep 16, 2024
Merged

ops: promote 1.26.1 #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6d77e8
reel: migrate old tokens and update link flow to match
arthyn Sep 16, 2024
6c6adca
Merge pull request #284 from tloncorp/hm/migrate-old-tokens
arthyn Sep 16, 2024
10fc2bb
Merge branch 'staging' into promote-9-16
arthyn Sep 16, 2024
b64c287
ops: bump version
arthyn Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions desk/app/reel.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion desk/desk.docket-0
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
==
Loading