Commit `b1edcc8d0d`

b1edcc8d0db15075ef8b5da5e6e3e8315ba2f6e9

parent: 76b847b463

Unsigned

cmc <hello@cleberg.net> · 2026-08-28 19:01 UTC

Resolve repo-relative README links and images to gitbay URLs

Pass the instance host and owner/repo into OrgSwift's render options so relative
references resolve: images against /{owner}/{repo}/raw/HEAD/ (raw bytes) and links
against /blob/HEAD/ (the file page), matching gitbay's routes. Absolute and
in-page (#anchor) references are unchanged.

Layout: unified · split

gitbay/Views/Repos/OrgReadmeWebView.swift +2 −1

 /// highlighted through Highlightr; links open in the system browser.
 struct OrgReadmeWebView: View {
     let source: String
+    var options: OrgRenderOptions = .init()
     @Environment(\.colorScheme) private var colorScheme
     @State private var html = ""
         // READMEs are small, and Highlightr (JavaScriptCore) is thread-confined; rendering
         // on the main actor keeps it simple and matches how the app highlights elsewhere.
         let highlighter = OrgCodeHighlighter(colorScheme: scheme)
-        let body = OrgRenderer.renderToHTML(source, highlighter: highlighter)
+        let body = OrgRenderer.renderToHTML(source, options: options, highlighter: highlighter)
         html = OrgReadmeDocument.wrap(body, colorScheme: scheme)
     }
 }

gitbay/Views/Repos/ReadmeView.swift +24 −1

	@@ -1,4 +1,5 @@
1	import Foundation	1	import Foundation
		2	import OrgSwift
2	import SwiftUI	3	import SwiftUI
3		4
4	/// README rendering follows the file's format. Org is rendered by the shared `OrgSwift`	5	/// README rendering follows the file's format. Org is rendered by the shared `OrgSwift`
	@@ -6,15 +7,37 @@ import SwiftUI
6	struct ReadmeView: View {	7	struct ReadmeView: View {
7	let name: String	8	let name: String
8	let content: String	9	let content: String
		10	/// Instance host and `owner/repo`, used to resolve repository-relative links and images.
		11	/// Empty leaves relative references unresolved.
		12	var host: String = ""
		13	var repoPath: String = ""
9		14
10	/// Format follows the file name, never a guess at the content.	15	/// Format follows the file name, never a guess at the content.
11	var isOrg: Bool { name.lowercased().hasSuffix(".org") }	16	var isOrg: Bool { name.lowercased().hasSuffix(".org") }
12		17
13	var body: some View {	18	var body: some View {
14	if isOrg {	19	if isOrg {
15	OrgReadmeWebView(source: content)	20	OrgReadmeWebView(source: content, options: orgOptions)
16	} else {	21	} else {
17	MarkdownView(markdown: content)	22	MarkdownView(markdown: content)
18	}	23	}
19	}	24	}
		25
		26	/// gitbay serves raw bytes at `/{owner}/{repo}/raw/{ref}/…` and the file page at
		27	/// `/blob/…`, so relative images resolve against `raw` and links against `blob`.
		28	private var orgOptions: OrgRenderOptions {
		29	let parts = repoPath.split(separator: "/", maxSplits: 1).map(String.init)
		30	guard parts.count == 2, !host.isEmpty else {
		31	return OrgRenderOptions()
		32	}
		33	return OrgRenderOptions(
		34	host: host,
		35	owner: parts[0],
		36	repositoryName: parts[1],
		37	ref: "HEAD",
		38	readmePath: name,
		39	imagePathSegment: "raw",
		40	linkPathSegment: "blob"
		41	)
		42	}
20	}	43	}

gitbay/Views/Repos/RepoView.swift +9 −2

     @State private var model: RepoDetailViewModel
     private let path: String
+    private let host: String
     init(client: GitbayClient, path: String) {
         self.path = path
+        self.host = client.instance.baseURL.host() ?? ""
         _model = State(initialValue: RepoDetailViewModel(client: client, path: path))
     }
                 if let readme = model.readme {
                     Section("README") {
-                        ReadmeView(name: model.readmeName ?? "README.md", content: readme)
+                        ReadmeView(
-                            .padding(.vertical, 4)
+                            name: model.readmeName ?? "README.md",
+                            content: readme,
+                            host: host,
+                            repoPath: path
+                        )
+                        .padding(.vertical, 4)
                     }
                 }
             }

Commit b1edcc8d0d

Commit `b1edcc8d0d`