From ff8da03d869d18eb62167de8d47cef765a13c85e Mon Sep 17 00:00:00 2001
From: Anirudh Oppiliappan <x@icyphox.sh>
Date: Sat, 8 Mar 2025 15:52:17 +0200
Subject: [PATCH] appview/pages: display correct knot in clone url

---
 appview/pages/pages.go                  |  1 +
 appview/pages/templates/repo/empty.html | 32 +++++++++++++++----------
 appview/pages/templates/repo/index.html | 23 +++++++++++-------
 appview/state/repo.go                   |  7 ++++++
 4 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index 3362de3b..35a2584c 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -164,6 +164,7 @@ type RepoInfo struct {
 	OwnerDid        string
 	OwnerHandle     string
 	Description     string
+	Knot            string
 	SettingsAllowed bool
 }
 
diff --git a/appview/pages/templates/repo/empty.html b/appview/pages/templates/repo/empty.html
index b2003830..4d6364b1 100644
--- a/appview/pages/templates/repo/empty.html
+++ b/appview/pages/templates/repo/empty.html
@@ -9,16 +9,24 @@
 {{ end }}
 
 {{ define "repoAfter" }}
-    <section class="mt-4 p-6 rounded bg-white w-full mx-auto overflow-auto">
-        <strong>push</strong>
-        <pre>
- git remote add origin git@tangled.sh:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }} </pre
-        >
-        <strong>clone</strong>
-        <pre>
- git clone https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}
- git clone git@tangled.sh:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}
- </pre
-        >
-    </section>
+<section class="mt-4 p-6 rounded bg-white w-full mx-auto overflow-auto">
+    <strong>push</strong>
+    <div class="py-2">
+        <code>git remote add origin git@{{.RepoInfo.Knot}}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code>
+    </div>
+    <strong>clone</strong>
+    
+
+    <div class="flex flex-col gap-2">
+        <div class="pt-2 flex flex-row gap-2">
+            <span class="bg-gray-100 p-1 mr-1 font-mono text-sm rounded select-none">HTTP</span>
+            <code>git clone https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}</code>
+        </div>
+        <div class="pt-2 flex flex-row gap-2">
+            <span class="bg-gray-100 p-1 mr-1 font-mono text-sm rounded select-none">SSH</span><code>git clone git@{{.RepoInfo.Knot}}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code>
+        </div>
+    </div>
+    <p class="py-2 text-gray-500">Note that for self-hosted knots, clone URLs may be different based on your setup.</p>
+</section>
+
 {{ end }}
diff --git a/appview/pages/templates/repo/index.html b/appview/pages/templates/repo/index.html
index 1ba8eb36..a7755a28 100644
--- a/appview/pages/templates/repo/index.html
+++ b/appview/pages/templates/repo/index.html
@@ -206,14 +206,21 @@
 
     <section class="mt-4 p-6 rounded bg-white w-full mx-auto overflow-auto">
         <strong>push</strong>
-        <pre>
- git remote add origin git@tangled.sh:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }} </pre
-        >
+        <div class="py-2">
+            <code>git remote add origin git@{{.RepoInfo.Knot}}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code>
+        </div>
         <strong>clone</strong>
-        <pre>
- git clone https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}
- git clone git@tangled.sh:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}
- </pre
-        >
+        
+
+        <div class="flex flex-col gap-2">
+            <div class="pt-2 flex flex-row gap-2">
+                <span class="bg-gray-100 p-1 mr-1 font-mono text-sm rounded select-none">HTTP</span>
+                <code>git clone https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}</code>
+            </div>
+            <div class="pt-2 flex flex-row gap-2">
+                <span class="bg-gray-100 p-1 mr-1 font-mono text-sm rounded select-none">SSH</span><code>git clone git@{{.RepoInfo.Knot}}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code>
+            </div>
+        </div>
+        <p class="py-2 text-gray-500">Note that for self-hosted knots, clone URLs may be different based on your setup.</p>
     </section>
 {{ end }}
diff --git a/appview/state/repo.go b/appview/state/repo.go
index c0a79800..fef35b7e 100644
--- a/appview/state/repo.go
+++ b/appview/state/repo.go
@@ -74,12 +74,19 @@ func (s *State) RepoIndex(w http.ResponseWriter, r *http.Request) {
 	}
 
 	user := s.auth.GetUser(r)
+
+	knot := f.Knot
+	if knot == "knot1.tangled.sh" {
+		knot = "tangled.sh"
+	}
+
 	s.pages.RepoIndexPage(w, pages.RepoIndexParams{
 		LoggedInUser: user,
 		RepoInfo: pages.RepoInfo{
 			OwnerDid:        f.OwnerDid(),
 			OwnerHandle:     f.OwnerHandle(),
 			Name:            f.RepoName,
+			Knot:            knot,
 			SettingsAllowed: settingsAllowed(s, user, f),
 		},
 		TagMap:            tagMap,
-- 
2.51.2