diff --git a/web/src/fixtures/pull.ts b/web/src/fixtures/pull.ts index a36383834..31f96a77c 100644 --- a/web/src/fixtures/pull.ts +++ b/web/src/fixtures/pull.ts @@ -368,7 +368,7 @@ export const mockPullFetch = (options: PullFetchOptions = {}): typeof fetch => }); } - case "sh.tangled.git.temp.getBlob": { + case "org.tangled.temp.git.getBlob": { const file = files.find( (entry) => entry.path === param("path") || entry.oldPath === param("path") ); diff --git a/web/src/lib/api/gitclient.test.ts b/web/src/lib/api/gitclient.test.ts index 63076a6ce..e4a9126d9 100644 --- a/web/src/lib/api/gitclient.test.ts +++ b/web/src/lib/api/gitclient.test.ts @@ -175,7 +175,7 @@ describe("endpoint routing", () => { blobRawUrl(mirrorTarget(globalThis.fetch), { ref: "main", path: "README.md" }) ); expect(url.origin).toBe("https://bobbin.example"); - expect(url.pathname).toBe("/xrpc/sh.tangled.git.temp.getBlob"); + expect(url.pathname).toBe("/xrpc/org.tangled.temp.git.getBlob"); expect(url.searchParams.get("repo")).toBe(repo.repoDid); expect(url.searchParams.has("raw")).toBe(false); }); diff --git a/web/src/lib/api/knotmirror.test.ts b/web/src/lib/api/knotmirror.test.ts index 906e7d55e..94ff85fcd 100644 --- a/web/src/lib/api/knotmirror.test.ts +++ b/web/src/lib/api/knotmirror.test.ts @@ -61,7 +61,7 @@ describe("knotmirror.tree", () => { expect(treeUrl.pathname).toBe("/xrpc/org.tangled.temp.git.getTree"); const blobUrl = new URL(String(fetchMock.mock.calls[1][0])); expect(blobUrl.origin).toBe("https://bobbin.test"); - expect(blobUrl.pathname).toBe("/xrpc/sh.tangled.git.temp.getBlob"); + expect(blobUrl.pathname).toBe("/xrpc/org.tangled.temp.git.getBlob"); expect(blobUrl.searchParams.get("path")).toBe("docs/README.md"); }); }); @@ -125,7 +125,7 @@ describe("knotmirror.blob", () => { expect(entryUrl.pathname).toBe("/xrpc/org.tangled.temp.git.getEntry"); const blobUrl = new URL(String(fetchMock.mock.calls[1][0])); expect(blobUrl.origin).toBe("https://bobbin.test"); - expect(blobUrl.pathname).toBe("/xrpc/sh.tangled.git.temp.getBlob"); + expect(blobUrl.pathname).toBe("/xrpc/org.tangled.temp.git.getBlob"); }); it("skips the content fetch when the entry is over the inline cap", async () => { diff --git a/web/src/lib/api/knotmirror.ts b/web/src/lib/api/knotmirror.ts index 9f6d916c4..15dd502cc 100644 --- a/web/src/lib/api/knotmirror.ts +++ b/web/src/lib/api/knotmirror.ts @@ -19,7 +19,7 @@ const ENTRY_NSID = "org.tangled.temp.git.getEntry"; const MERGE_BASE_NSID = "org.tangled.temp.git.getMergeBase"; const GET_BRANCH_NSID = "org.tangled.temp.git.getBranch"; -const BLOB_NSID = "sh.tangled.git.temp.getBlob"; +const BLOB_NSID = "org.tangled.temp.git.getBlob"; const FORMAT_PATCH_NSID = "sh.tangled.git.temp.formatPatch"; const LOG_NSID = "sh.tangled.git.temp.listCommits"; const BRANCHES_NSID = "sh.tangled.git.temp.listBranches"; diff --git a/web/src/lib/components/repo/CloneDropdown.svelte b/web/src/lib/components/repo/CloneDropdown.svelte index 04708bdb9..174db9ccd 100644 --- a/web/src/lib/components/repo/CloneDropdown.svelte +++ b/web/src/lib/components/repo/CloneDropdown.svelte @@ -40,10 +40,11 @@ ]); const archiveUrl = (format: "tar.gz" | "zip") => { - const url = new URL("/xrpc/sh.tangled.repo.archive", `${bobbinUrl}/`); - url.searchParams.set("repo", repo.uri); + const url = new URL("/xrpc/org.tangled.temp.git.getArchive", `${bobbinUrl}/`); + url.searchParams.set("repo", repo.repoDid ?? ""); url.searchParams.set("ref", ref); url.searchParams.set("format", format); + url.searchParams.set("prefix", `${repo.name}-${ref.replaceAll("/", "-")}`); return url.toString(); };