appview/pages/markup: smart commit autolink renderer #1003

+59 -23

3 changed files

Interdiff #0 → #1

expand all

unified split

appview

pages

markup

extension

tangledlink.go

tangledlink_test.go

markdown.go

+53 -22

appview/pages/markup/extension/tangledlink.go

··· 12 "github.com/yuin/goldmark/util" 13 ) 14 15 - const ( 16 - tangledCommitLinkAttr = "tangled-commit-link" 17 - ) 18 19 type tangledLinkTransformer struct { 20 host string ··· 29 return ast.WalkContinue, nil 30 } 31 32 - link, ok := n.(*ast.AutoLink) 33 - if !ok { 34 return ast.WalkContinue, nil 35 } 36 37 - dest := string(link.URL(reader.Source())) 38 if sha := t.parseLinkCommitSha(dest); sha != "" { 39 - link.SetAttributeString(tangledCommitLinkAttr, []byte(sha)) 40 } 41 42 return ast.WalkContinue, nil ··· 76 77 // RegisterFuncs implements [renderer.NodeRenderer]. 78 func (r *tangledLinkRenderer) RegisterFuncs(reg renderer.NodeRendererFuncRegisterer) { 79 - reg.Register(ast.KindAutoLink, r.renderAutoLink) 80 } 81 82 - func (r *tangledLinkRenderer) renderAutoLink(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) { 83 - link := node.(*ast.AutoLink) 84 - sha, ok := link.AttributeString(tangledCommitLinkAttr) 85 - if !ok { 86 - return ast.WalkContinue, nil 87 - } 88 89 - if entering { 90 - w.WriteString(`<a href="`) 91 - w.Write(link.URL(source)) 92 - w.WriteString(`"><code>`) 93 - w.Write(sha.([]byte)) 94 - return ast.WalkSkipChildren, nil 95 - } else { 96 - w.WriteString("</code></a>") 97 } 98 return ast.WalkContinue, nil 99 } 100

··· 12 "github.com/yuin/goldmark/util" 13 ) 14 15 + // KindTangledLink is a NodeKind of the TangledLink node. 16 + var KindTangledLink = ast.NewNodeKind("TangledLink") 17 + 18 + type TangledLinkNode struct { 19 + ast.BaseInline 20 + Destination string 21 + Commit *TangledCommitLink 22 + // TODO: add more Tangled-link types 23 + } 24 + 25 + type TangledCommitLink struct { 26 + Sha string 27 + } 28 + 29 + var _ ast.Node = new(TangledLinkNode) 30 + 31 + // Dump implements [ast.Node]. 32 + func (n *TangledLinkNode) Dump(source []byte, level int) { 33 + ast.DumpHelper(n, source, level, nil, nil) 34 + } 35 + 36 + // Kind implements [ast.Node]. 37 + func (n *TangledLinkNode) Kind() ast.NodeKind { 38 + return KindTangledLink 39 + } 40 41 type tangledLinkTransformer struct { 42 host string ··· 51 return ast.WalkContinue, nil 52 } 53 54 + var dest string 55 + 56 + switch n := n.(type) { 57 + case *ast.AutoLink: 58 + dest = string(n.URL(reader.Source())) 59 + case *ast.Link: 60 + // maybe..? not sure 61 + default: 62 return ast.WalkContinue, nil 63 } 64 65 if sha := t.parseLinkCommitSha(dest); sha != "" { 66 + newLink := &TangledLinkNode{ 67 + Destination: dest, 68 + Commit: &TangledCommitLink{ 69 + Sha: sha, 70 + }, 71 + } 72 + n.Parent().ReplaceChild(n.Parent(), n, newLink) 73 } 74 75 return ast.WalkContinue, nil ··· 109 110 // RegisterFuncs implements [renderer.NodeRenderer]. 111 func (r *tangledLinkRenderer) RegisterFuncs(reg renderer.NodeRendererFuncRegisterer) { 112 + reg.Register(KindTangledLink, r.renderTangledLink) 113 } 114 115 + func (r *tangledLinkRenderer) renderTangledLink(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) { 116 + link := node.(*TangledLinkNode) 117 118 + if link.Commit != nil { 119 + if entering { 120 + w.WriteString(`<a href="`) 121 + w.WriteString(link.Destination) 122 + w.WriteString(`"><code>`) 123 + w.WriteString(link.Commit.Sha) 124 + } else { 125 + w.WriteString(`</code></a>`) 126 + } 127 } 128 + 129 return ast.WalkContinue, nil 130 } 131

+6 -1

appview/pages/markup/extension/tangledlink_test.go

··· 24 expected: `This is a commit: <a href="https://tangled.org/alice.tngl.sh/cool-repo/commit/cde4705021a07e3cb11322fb9ef78a6c786b41c0"><code>cde47050</code></a>`, 25 }, 26 { 27 + name: "skip non-autolink links", 28 markdown: "This is a commit: [a commit](https://tangled.org/alice.tngl.sh/cool-repo/commit/cde4705021a07e3cb11322fb9ef78a6c786b41c0)", 29 expected: `This is a commit: <a href="https://tangled.org/alice.tngl.sh/cool-repo/commit/cde4705021a07e3cb11322fb9ef78a6c786b41c0">a commit</a>`, 30 }, 31 + { 32 + name: "skip non-autolink links with content same as dest", 33 + markdown: "This is a commit: [https://tangled.org/alice.tngl.sh/cool-repo/commit/cde4705021a07e3cb11322fb9ef78a6c786b41c0](https://tangled.org/alice.tngl.sh/cool-repo/commit/cde4705021a07e3cb11322fb9ef78a6c786b41c0)", 34 + expected: `This is a commit: <a href="https://tangled.org/alice.tngl.sh/cool-repo/commit/cde4705021a07e3cb11322fb9ef78a6c786b41c0">https://tangled.org/alice.tngl.sh/cool-repo/commit/cde4705021a07e3cb11322fb9ef78a6c786b41c0</a>`, 35 + }, 36 } 37 for _, tt := range tests { 38 t.Run(tt.name, func(t *testing.T) {

appview/pages/markup/markdown.go

This file has not been changed.

History

5 rounds 11 comments

boltless.me submitted #4 3d

diff interdiff

2 commits

expand

d11a5d86

appview/pages/markup: smart commit autolink renderer

7a8efd77

appview: strip scheme from CoreConfig.AppviewHost

3/3 success

expand

expand 2 comments

boltless.me 3d

@oppi.li makes sense. I completely forgot the indigo oauth behavior. I reverted the change.

oppi.li 1d

lgtm, this bug is still present:

next, in appview/config/config.go, the default value for AppivewHost should be set to tangled.org

but should be a quick fix, i can apply that on master!

pull request successfully merged

boltless.me submitted #3 7d

diff interdiff

2 commits

expand

d11a5d86

appview/pages/markup: smart commit autolink renderer

da0e3532

appview: strip scheme from CoreConfig.AppviewHost

expand 3 comments

oppi.li 5d

when using dev, the callback URL should always be http://127.0.0.1/oauth/callback (or http://localhost), regardless of what the AppviewHost is set to. the port is ignored iirc.

next, in appview/config/config.go, the default value for AppivewHost should be set to tangled.org (without the scheme).

i think BaseUrl is good naming choice. happy with that!

boltless.me 5d

when using dev, the callback URL should always be http://127.0.0.1/oauth/callback (or http://localhost), regardless of what the AppviewHost is set to. the port is ignored iirc.

If someone set AppviewHost, I suspect they are testing on that host. I used to test on my own domain long ago. http://127.0.0.1:3000/oauth/callback is what was used in original code.

next, in appview/config/config.go, the default value for AppivewHost should be set to tangled.org

will do!

oppi.li 5d

if you are using oauth.NewLocalhostConfig (as we do in dev), the redirect URL's host cannot be anything other than localhost or 127.0.0.1, if it is something else, you will get an error when performing the PAR request:

URL must use \"localhost\", \"127.0.0.1\" or \"[::1]\" as hostname at body.redirect_uri]"

when in dev, we should just ignore AppviewHost and use one of the predefined hosts. in the original code, the host is 127.0.0.1 which is one of the predefined hosts. the port is ignored anyway.

boltless.me submitted #2 7d

diff interdiff

2 commits

expand

d11a5d86

appview/pages/markup: smart commit autolink renderer

43f2e30e

appview: strip scheme from CoreConfig.AppviewHost

3/3 success

expand

expand 5 comments

oppi.li 7d

here, i think Url is a bit ambiguous to have on config, could use a better name here

rest of the changeset lgtm, will give this a test, thanks!

oppi.li 7d

after some local testing, this seems to oauth, i am unable to login!

2026/01/21 06:25:06 WARN auth server request failed request=PAR statusCode=400 body="map[error:invalid_request error_description:Invalid authorization request: URL must use \"localhost\", \"127.0.0.1\" or \"[::1]\" as hostname at body.redirect_uri]"
2026/01/21 06:25:06 ERRO appview: failed to start auth handler=Login err="auth request failed: PAR request failed (HTTP 400): invalid_request"

boltless.me 7d

@oppi.li I can't reproduce the oauth issue. Have you tried after setting TANGLED_APPVIEWHOST=127.0.0.1? you should remove the scheme now.

for Url() naming, would BaseUrl() be fine enough?

anirudh.fi 7d

Also naming/consistency nit: tangledlink.go → tangled_link.go? Keeping in line with reference_link.go. Rest looks OK!

boltless.me 7d

@anirudh.fi I'm matching with extension/atlink.go. Doesn't reference_link.go violates the golang conventions? yes, I'm the one who wrote both... inconsistencies all over the place 🙈