+11

appview/config/config.go

··· 25 25 TmpAltAppPassword string `env:"ALT_APP_PASSWORD"` 26 26 } 27 27 28 28 + func (c *CoreConfig) UseTLS() bool { 29 29 + return !c.Dev 30 30 + } 31 31 + 32 32 + func (c *CoreConfig) BaseUrl() string { 33 33 + if c.UseTLS() { 34 34 + return "https://" + c.AppviewHost 35 35 + } 36 36 + return "http://" + c.AppviewHost 37 37 + } 38 38 + 28 39 type OAuthConfig struct { 29 40 ClientSecret string `env:"CLIENT_SECRET"` 30 41 ClientKid string `env:"CLIENT_KID"`

+1 -1

appview/pages/markup/extension/tangledlink.go

··· 78 78 79 79 func (t *tangledLinkTransformer) parseLinkCommitSha(raw string) string { 80 80 u, err := url.Parse(raw) 81 81 - if err != nil || u.Host != "tangled.org" { 81 81 + if err != nil || u.Host != t.host { 82 82 return "" 83 83 } 84 84

+1 -1

appview/pages/markup/extension/tangledlink_test.go

··· 36 36 } 37 37 for _, tt := range tests { 38 38 t.Run(tt.name, func(t *testing.T) { 39 39 - md := markup.NewMarkdown() 39 39 + md := markup.NewMarkdown("tangled.org") 40 40 41 41 var buf bytes.Buffer 42 42 if err := md.Convert([]byte(tt.markdown), &buf); err != nil {

+4 -3

appview/pages/markup/markdown.go

··· 46 46 CamoSecret string 47 47 repoinfo.RepoInfo 48 48 IsDev bool 49 49 + Hostname string 49 50 RendererType RendererType 50 51 Sanitizer Sanitizer 51 52 Files fs.FS 52 53 } 53 54 54 54 - func NewMarkdown() goldmark.Markdown { 55 55 + func NewMarkdown(hostname string) goldmark.Markdown { 55 56 md := goldmark.New( 56 57 goldmark.WithExtensions( 57 58 extension.GFM, ··· 67 68 ), 68 69 callout.CalloutExtention, 69 70 textension.AtExt, 70 70 - textension.NewTangledLinkExt("tangled.org"), 71 71 + textension.NewTangledLinkExt(hostname), 71 72 emoji.Emoji, 72 73 ), 73 74 goldmark.WithParserOptions( ··· 79 80 } 80 81 81 82 func (rctx *RenderContext) RenderMarkdown(source string) string { 82 82 - return rctx.RenderMarkdownWith(source, NewMarkdown()) 83 83 + return rctx.RenderMarkdownWith(source, NewMarkdown(rctx.Hostname)) 83 84 } 84 85 85 86 func (rctx *RenderContext) RenderMarkdownWith(source string, md goldmark.Markdown) string {

+2 -2

appview/pages/markup/markdown_test.go

··· 50 50 51 51 for _, tt := range tests { 52 52 t.Run(tt.name, func(t *testing.T) { 53 53 - md := NewMarkdown() 53 53 + md := NewMarkdown("tangled.org") 54 54 55 55 var buf bytes.Buffer 56 56 if err := md.Convert([]byte(tt.markdown), &buf); err != nil { ··· 105 105 106 106 for _, tt := range tests { 107 107 t.Run(tt.name, func(t *testing.T) { 108 108 - md := NewMarkdown() 108 108 + md := NewMarkdown("tangled.org") 109 109 110 110 var buf bytes.Buffer 111 111 if err := md.Convert([]byte(tt.markdown), &buf); err != nil {

+4 -7

appview/pages/markup/reference_link.go

··· 18 18 // like issues, PRs, comments or even @-mentions 19 19 // This funciton doesn't actually check for the existence of records in the DB 20 20 // or the PDS; it merely returns a list of what are presumed to be references. 21 21 - func FindReferences(baseUrl string, source string) ([]string, []models.ReferenceLink) { 21 21 + func FindReferences(host string, source string) ([]string, []models.ReferenceLink) { 22 22 var ( 23 23 refLinkSet = make(map[models.ReferenceLink]struct{}) 24 24 mentionsSet = make(map[string]struct{}) 25 25 - md = NewMarkdown() 25 25 + md = NewMarkdown(host) 26 26 sourceBytes = []byte(source) 27 27 root = md.Parser().Parse(text.NewReader(sourceBytes)) 28 28 ) 29 29 - // trim url scheme. the SSL shouldn't matter 30 30 - baseUrl = strings.TrimPrefix(baseUrl, "https://") 31 31 - baseUrl = strings.TrimPrefix(baseUrl, "http://") 32 29 33 30 ast.Walk(root, func(n ast.Node, entering bool) (ast.WalkStatus, error) { 34 31 if !entering { ··· 41 38 return ast.WalkSkipChildren, nil 42 39 case ast.KindLink: 43 40 dest := string(n.(*ast.Link).Destination) 44 44 - ref := parseTangledLink(baseUrl, dest) 41 41 + ref := parseTangledLink(host, dest) 45 42 if ref != nil { 46 43 refLinkSet[*ref] = struct{}{} 47 44 } ··· 50 47 an := n.(*ast.AutoLink) 51 48 if an.AutoLinkType == ast.AutoLinkURL { 52 49 dest := string(an.URL(sourceBytes)) 53 53 - ref := parseTangledLink(baseUrl, dest) 50 50 + ref := parseTangledLink(host, dest) 54 51 if ref != nil { 55 52 refLinkSet[*ref] = struct{}{} 56 53 }

+1 -1

appview/pages/markup/reference_link_test.go

··· 34 34 } 35 35 for _, tt := range tests { 36 36 t.Run(tt.name, func(t *testing.T) { 37 37 - handles, refLinks := markup.FindReferences("http://127.0.0.1:3000", tt.source) 37 37 + handles, refLinks := markup.FindReferences("127.0.0.1:3000", tt.source) 38 38 assert.ElementsMatch(t, tt.wantHandles, handles) 39 39 assert.ElementsMatch(t, tt.wantRefLinks, refLinks) 40 40 })

+1

appview/pages/pages.go

··· 53 53 // initialized with safe defaults, can be overriden per use 54 54 rctx := &markup.RenderContext{ 55 55 IsDev: config.Core.Dev, 56 56 + Hostname: config.Core.AppviewHost, 56 57 CamoUrl: config.Camo.Host, 57 58 CamoSecret: config.Camo.SharedSecret, 58 59 Sanitizer: markup.NewSanitizer(),

+1 -1

appview/repo/archive.go

··· 66 66 if link := resp.Header.Get("Link"); link != "" { 67 67 if resolvedRef, err := extractImmutableLink(link); err == nil { 68 68 newLink := fmt.Sprintf("<%s/%s/archive/%s.tar.gz>; rel=\"immutable\"", 69 69 - rp.config.Core.AppviewHost, f.DidSlashRepo(), resolvedRef) 69 69 + rp.config.Core.BaseUrl(), f.DidSlashRepo(), resolvedRef) 70 70 w.Header().Set("Link", newLink) 71 71 } 72 72 }

+4 -4

appview/repo/feed.go

··· 37 37 38 38 feed := &feeds.Feed{ 39 39 Title: fmt.Sprintf("activity feed for @%s", ownerSlashRepo), 40 40 - Link: &feeds.Link{Href: fmt.Sprintf("%s/%s", rp.config.Core.AppviewHost, ownerSlashRepo), Type: "text/html", Rel: "alternate"}, 40 40 + Link: &feeds.Link{Href: fmt.Sprintf("%s/%s", rp.config.Core.BaseUrl(), ownerSlashRepo), Type: "text/html", Rel: "alternate"}, 41 41 Items: make([]*feeds.Item, 0), 42 42 Updated: time.UnixMilli(0), 43 43 } ··· 86 86 mainItem := &feeds.Item{ 87 87 Title: fmt.Sprintf("[PR #%d] %s", pull.PullId, pull.Title), 88 88 Description: description, 89 89 - Link: &feeds.Link{Href: fmt.Sprintf("%s/%s/pulls/%d", rp.config.Core.AppviewHost, ownerSlashRepo, pull.PullId)}, 89 89 + Link: &feeds.Link{Href: fmt.Sprintf("%s/%s/pulls/%d", rp.config.Core.BaseUrl(), ownerSlashRepo, pull.PullId)}, 90 90 Created: pull.Created, 91 91 Author: &feeds.Author{Name: fmt.Sprintf("@%s", owner.Handle)}, 92 92 } ··· 100 100 roundItem := &feeds.Item{ 101 101 Title: fmt.Sprintf("[PR #%d] %s (round #%d)", pull.PullId, pull.Title, round.RoundNumber), 102 102 Description: fmt.Sprintf("@%s submitted changes (at round #%d) on PR #%d in @%s", owner.Handle, round.RoundNumber, pull.PullId, ownerSlashRepo), 103 103 - Link: &feeds.Link{Href: fmt.Sprintf("%s/%s/pulls/%d/round/%d/", rp.config.Core.AppviewHost, ownerSlashRepo, pull.PullId, round.RoundNumber)}, 103 103 + Link: &feeds.Link{Href: fmt.Sprintf("%s/%s/pulls/%d/round/%d/", rp.config.Core.BaseUrl(), ownerSlashRepo, pull.PullId, round.RoundNumber)}, 104 104 Created: round.Created, 105 105 Author: &feeds.Author{Name: fmt.Sprintf("@%s", owner.Handle)}, 106 106 } ··· 124 124 return &feeds.Item{ 125 125 Title: fmt.Sprintf("[Issue #%d] %s", issue.IssueId, issue.Title), 126 126 Description: fmt.Sprintf("@%s %s issue #%d in @%s", owner.Handle, state, issue.IssueId, ownerSlashRepo), 127 127 - Link: &feeds.Link{Href: fmt.Sprintf("%s/%s/issues/%d", rp.config.Core.AppviewHost, ownerSlashRepo, issue.IssueId)}, 127 127 + Link: &feeds.Link{Href: fmt.Sprintf("%s/%s/issues/%d", rp.config.Core.BaseUrl(), ownerSlashRepo, issue.IssueId)}, 128 128 Created: issue.Created, 129 129 Author: &feeds.Author{Name: fmt.Sprintf("@%s", owner.Handle)}, 130 130 }, nil

+7 -8

appview/settings/settings.go

··· 298 298 } 299 299 300 300 func (s *Settings) verifyUrl(did string, email string, code string) string { 301 301 - var appUrl string 302 302 - if s.Config.Core.Dev { 303 303 - appUrl = "http://" + s.Config.Core.ListenAddr 304 304 - } else { 305 305 - appUrl = s.Config.Core.AppviewHost 306 306 - } 307 307 - 308 308 - return fmt.Sprintf("%s/settings/emails/verify?did=%s&email=%s&code=%s", appUrl, url.QueryEscape(did), url.QueryEscape(email), url.QueryEscape(code)) 301 301 + return fmt.Sprintf( 302 302 + "%s/settings/emails/verify?did=%s&email=%s&code=%s", 303 303 + s.Config.Core.BaseUrl(), 304 304 + url.QueryEscape(did), 305 305 + url.QueryEscape(email), 306 306 + url.QueryEscape(code), 307 307 + ) 309 308 } 310 309 311 310 func (s *Settings) emailsVerify(w http.ResponseWriter, r *http.Request) {

+4 -4

appview/state/profile.go

··· 415 415 416 416 feed := feeds.Feed{ 417 417 Title: fmt.Sprintf("%s's timeline", author.Name), 418 418 - Link: &feeds.Link{Href: fmt.Sprintf("%s/@%s", s.config.Core.AppviewHost, id.Handle), Type: "text/html", Rel: "alternate"}, 418 418 + Link: &feeds.Link{Href: fmt.Sprintf("%s/@%s", s.config.Core.BaseUrl(), id.Handle), Type: "text/html", Rel: "alternate"}, 419 419 Items: make([]*feeds.Item, 0), 420 420 Updated: time.UnixMilli(0), 421 421 Author: author, ··· 483 483 func (s *State) createPullRequestItem(pull *models.Pull, owner *identity.Identity, author *feeds.Author) *feeds.Item { 484 484 return &feeds.Item{ 485 485 Title: fmt.Sprintf("%s created pull request '%s' in @%s/%s", author.Name, pull.Title, owner.Handle, pull.Repo.Name), 486 486 - Link: &feeds.Link{Href: fmt.Sprintf("%s/@%s/%s/pulls/%d", s.config.Core.AppviewHost, owner.Handle, pull.Repo.Name, pull.PullId), Type: "text/html", Rel: "alternate"}, 486 486 + Link: &feeds.Link{Href: fmt.Sprintf("%s/@%s/%s/pulls/%d", s.config.Core.BaseUrl(), owner.Handle, pull.Repo.Name, pull.PullId), Type: "text/html", Rel: "alternate"}, 487 487 Created: pull.Created, 488 488 Author: author, 489 489 } ··· 492 492 func (s *State) createIssueItem(issue *models.Issue, owner *identity.Identity, author *feeds.Author) *feeds.Item { 493 493 return &feeds.Item{ 494 494 Title: fmt.Sprintf("%s created issue '%s' in @%s/%s", author.Name, issue.Title, owner.Handle, issue.Repo.Name), 495 495 - Link: &feeds.Link{Href: fmt.Sprintf("%s/@%s/%s/issues/%d", s.config.Core.AppviewHost, owner.Handle, issue.Repo.Name, issue.IssueId), Type: "text/html", Rel: "alternate"}, 495 495 + Link: &feeds.Link{Href: fmt.Sprintf("%s/@%s/%s/issues/%d", s.config.Core.BaseUrl(), owner.Handle, issue.Repo.Name, issue.IssueId), Type: "text/html", Rel: "alternate"}, 496 496 Created: issue.Created, 497 497 Author: author, 498 498 } ··· 512 512 513 513 return &feeds.Item{ 514 514 Title: title, 515 515 - Link: &feeds.Link{Href: fmt.Sprintf("%s/@%s/%s", s.config.Core.AppviewHost, author.Name[1:], repo.Repo.Name), Type: "text/html", Rel: "alternate"}, // Remove @ prefix 515 515 + Link: &feeds.Link{Href: fmt.Sprintf("%s/@%s/%s", s.config.Core.BaseUrl(), author.Name[1:], repo.Repo.Name), Type: "text/html", Rel: "alternate"}, // Remove @ prefix 516 516 Created: repo.Repo.Created, 517 517 Author: author, 518 518 }, nil

+2 -2

nix/modules/appview.nix

··· 41 41 42 42 appviewHost = mkOption { 43 43 type = types.str; 44 44 - default = "https://tangled.org"; 45 45 - example = "https://example.com"; 44 44 + default = "tangled.org"; 45 45 + example = "example.com"; 46 46 description = "Public host URL for the appview instance"; 47 47 }; 48 48