From 4f34095be505c1bc142f0b2dc4931644dc7422eb Mon Sep 17 00:00:00 2001
From: Samuel Shuert <me@thecoded.prof>
Date: Tue, 12 Aug 2025 07:58:42 +0000
Subject: [PATCH] appview: db: Update GetForksByDid
Change-Id: zkmkprovpuursmppkoukvtooyykpkotk

Signed-off-by: Samuel Shuert <me@thecoded.prof>
---
 appview/db/repos.go | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/appview/db/repos.go b/appview/db/repos.go
index 61e5029..a55a94d 100644
--- a/appview/db/repos.go
+++ b/appview/db/repos.go
@@ -467,11 +467,14 @@ func GetForksByDid(e Execer, did string) ([]Repo, error) {
 	var repos []Repo
 
 	rows, err := e.Query(
-		`select did, name, knot, rkey, description, created, at_uri, source
-		from repos
-		where did = ? and source is not null and source != ''
-		order by created desc`,
-		did,
+		`select distinct r.did, r.name, r.knot, r.rkey, r.description, r.created, r.at_uri, r.source
+		from repos r
+		left join collaborators c on r.at_uri = c.repo_at
+		where (r.did = ? or c.subject_did = ?)
+			and r.source is not null
+			and r.source != ''
+		order by r.created desc`,
+		did, did,
 	)
 	if err != nil {
 		return nil, err
-- 
2.43.0


From 5cc75de17b114027b77b83b03cc438a7d75928f0 Mon Sep 17 00:00:00 2001
From: Samuel Shuert <me@thecoded.prof>
Date: Tue, 12 Aug 2025 07:58:42 +0000
Subject: [PATCH] appview: pages: Update PRCompare fork titles
Change-Id: nvwonuuosssxmnwvnuvnkolkmlwytmon

Show fork titles in owner/repo format, otherwise if you have collaborator
access to multiple forks of the same repo (in which the forks have the
same title) it may be hard to differentiate

Signed-off-by: Samuel Shuert <me@thecoded.prof>
---
 .../pages/templates/repo/pulls/fragments/pullCompareForks.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appview/pages/templates/repo/pulls/fragments/pullCompareForks.html b/appview/pages/templates/repo/pulls/fragments/pullCompareForks.html
index 3dd7903..9784a17 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullCompareForks.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullCompareForks.html
@@ -20,7 +20,7 @@
                     <option disabled selected>select a fork</option>
                     {{ range .Forks }}
                         <option value="{{ .Name }}" {{ if eq .Name $.Selected }}selected{{ end }} class="py-1">
-                            {{ .Name }}
+                            {{ .Did | resolve }}/{{ .Name }}
                         </option>
                     {{ end }}
                 </select>
-- 
2.43.0