From 3219e488e4c60a89b675a5d9d38f3159a9132bed Mon Sep 17 00:00:00 2001
From: oppiliappan <me@oppi.li>
Date: Tue, 28 Apr 2026 11:24:29 +0100
Subject: [PATCH] appview/pages: add DID <-> string casts where necessary

Signed-off-by: oppiliappan <me@oppi.li>
---
 appview/pages/funcmap.go                               |  5 +++++
 .../templates/repo/issues/fragments/commentList.html   |  4 ++--
 .../templates/repo/issues/fragments/issueListing.html  |  2 +-
 appview/pages/templates/repo/issues/issue.html         |  2 +-
 .../templates/repo/pulls/fragments/pullHeader.html     |  2 +-
 appview/pages/templates/repo/pulls/pull.html           |  4 ++--
 appview/pages/templates/repo/pulls/pulls.html          |  2 +-
 appview/pages/templates/user/fragments/picLink.html    |  2 +-
 .../pages/templates/user/fragments/vouchTooltip.html   |  4 ++--
 appview/pulls/pulls.go                                 | 10 ++++++++--
 10 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/appview/pages/funcmap.go b/appview/pages/funcmap.go
index 9bce3fa6..5340ca5a 100644
--- a/appview/pages/funcmap.go
+++ b/appview/pages/funcmap.go
@@ -23,6 +23,7 @@ import (
 	chromahtml "github.com/alecthomas/chroma/v2/formatters/html"
 	"github.com/alecthomas/chroma/v2/lexers"
 	"github.com/alecthomas/chroma/v2/styles"
+	"github.com/bluesky-social/indigo/atproto/syntax"
 	"github.com/dustin/go-humanize"
 	"github.com/dustin/go-humanize/english"
 	"github.com/go-enry/go-enry/v2"
@@ -504,6 +505,10 @@ func (p *Pages) funcMap() template.FuncMap {
 				"PdsUserDomain": p.pdsCfg.UserDomain,
 			}
 		},
+		"did": func(s string) syntax.DID {
+			// cast to DID
+			return syntax.DID(s)
+		},
 	}
 }
 
diff --git a/appview/pages/templates/repo/issues/fragments/commentList.html b/appview/pages/templates/repo/issues/fragments/commentList.html
index 39492331..6a09db8a 100644
--- a/appview/pages/templates/repo/issues/fragments/commentList.html
+++ b/appview/pages/templates/repo/issues/fragments/commentList.html
@@ -15,7 +15,7 @@
           "LoggedInUser" $root.LoggedInUser
           "Issue" $root.Issue
           "Comment" $comment.Self
-          "VouchRelationship" (index $root.VouchRelationships $comment.Self.Did)
+          "VouchRelationship" (index $root.VouchRelationships (did $comment.Self.Did))
           ) }}
 
   <div class="rounded border border-gray-200 dark:border-gray-700 w-full overflow-hidden shadow-sm bg-gray-50 dark:bg-gray-800/50">
@@ -31,7 +31,7 @@
               "LoggedInUser" $root.LoggedInUser
               "Issue" $root.Issue
               "Comment" $reply
-              "VouchRelationship" (index $root.VouchRelationships $reply.Did)
+              "VouchRelationship" (index $root.VouchRelationships (did $reply.Did))
           ) }}
         </div>
       {{ end }}
diff --git a/appview/pages/templates/repo/issues/fragments/issueListing.html b/appview/pages/templates/repo/issues/fragments/issueListing.html
index 39fafb07..c3f4b489 100644
--- a/appview/pages/templates/repo/issues/fragments/issueListing.html
+++ b/appview/pages/templates/repo/issues/fragments/issueListing.html
@@ -27,7 +27,7 @@
         </span>
 
         <span class="ml-1 flex items-center gap-1">
-          {{ template "user/fragments/picLink" (list .Did "size-6" (index $.VouchRelationships .Did)) }}
+          {{ template "user/fragments/picLink" (list .Did "size-6" (index $.VouchRelationships (did .Did))) }}
           <a href="/{{ resolve .Did }}">{{ resolve .Did }}</a>
         </span>
 
diff --git a/appview/pages/templates/repo/issues/issue.html b/appview/pages/templates/repo/issues/issue.html
index 9b317552..21e13fb1 100644
--- a/appview/pages/templates/repo/issues/issue.html
+++ b/appview/pages/templates/repo/issues/issue.html
@@ -68,7 +68,7 @@
 
     <span class="text-gray-500 dark:text-gray-400 text-sm flex flex-wrap items-center gap-1">
       opened by
-      {{ template "user/fragments/picLink" (list .Issue.Did "size-6" (index .VouchRelationships .Issue.Did)) }}
+      {{ template "user/fragments/picLink" (list .Issue.Did "size-6" (index .VouchRelationships (did .Issue.Did))) }}
       <a href="/{{ resolve .Issue.Did }}">{{ resolve .Issue.Did }}</a>
       <span class="select-none before:content-['\00B7']"></span>
       {{ if .Issue.Edited }}
diff --git a/appview/pages/templates/repo/pulls/fragments/pullHeader.html b/appview/pages/templates/repo/pulls/fragments/pullHeader.html
index 36b6aae6..0fac3d06 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullHeader.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullHeader.html
@@ -11,7 +11,7 @@
         {{ template "repo/pulls/fragments/pullState" .Pull.State }}
         <span class="text-gray-500 dark:text-gray-400 text-sm flex flex-wrap items-center gap-1">
             opened by
-            {{ template "user/fragments/picLink" (list .Pull.OwnerDid "size-6" (index .VouchRelationships .Pull.OwnerDid)) }}
+            {{ template "user/fragments/picLink" (list .Pull.OwnerDid "size-6" (index .VouchRelationships (did .Pull.OwnerDid))) }}
             <a href="/{{ resolve .Pull.OwnerDid }}">{{ resolve .Pull.OwnerDid }}</a>
             <span class="select-none before:content-['\00B7']"></span>
             {{ template "repo/fragments/time" .Pull.Created }}
diff --git a/appview/pages/templates/repo/pulls/pull.html b/appview/pages/templates/repo/pulls/pull.html
index 177d7148..72ec5278 100644
--- a/appview/pages/templates/repo/pulls/pull.html
+++ b/appview/pages/templates/repo/pulls/pull.html
@@ -300,7 +300,7 @@
     flex gap-2 sticky top-0 z-20">
     <!-- left column: just profile picture -->
     <div class="flex-shrink-0 pt-2">
-      {{ template "user/fragments/picLink" (list $root.Pull.OwnerDid "size-8" (index $root.VouchRelationships $root.Pull.OwnerDid)) }}
+      {{ template "user/fragments/picLink" (list $root.Pull.OwnerDid "size-8" (index $root.VouchRelationships (did $root.Pull.OwnerDid))) }}
     </div>
     <!-- right column -->
     <div class="flex-1 min-w-0 flex flex-col gap-1">
@@ -630,7 +630,7 @@
   <div id="comment-{{$comment.ID}}" class="flex gap-2 -ml-4 py-4 w-full mx-auto group/comment">
     <!-- left column: profile picture -->
     <div class="flex-shrink-0 h-fit relative">
-      {{ template "user/fragments/picLink" (list $comment.OwnerDid "size-8" (index $root.VouchRelationships $comment.OwnerDid)) }}
+      {{ template "user/fragments/picLink" (list $comment.OwnerDid "size-8" (index $root.VouchRelationships (did $comment.OwnerDid))) }}
     </div>
     <!-- right column: name and body in two rows -->
     <div class="flex-1 min-w-0">
diff --git a/appview/pages/templates/repo/pulls/pulls.html b/appview/pages/templates/repo/pulls/pulls.html
index 58b99b5b..b8bdc2af 100644
--- a/appview/pages/templates/repo/pulls/pulls.html
+++ b/appview/pages/templates/repo/pulls/pulls.html
@@ -82,7 +82,7 @@
                 <div class="text-sm text-gray-500 dark:text-gray-400 flex flex-wrap items-center gap-1">
                     {{ template "repo/pulls/fragments/pullState" $topPR.State }}
                     <span class="ml-1 flex items-center gap-1">
-                        {{ template "user/fragments/picLink" (list $topPR.OwnerDid "size-6" (index $.VouchRelationships $topPR.OwnerDid)) }}
+                        {{ template "user/fragments/picLink" (list $topPR.OwnerDid "size-6" (index $.VouchRelationships (did $topPR.OwnerDid))) }}
                     <a href="/{{ resolve $topPR.OwnerDid }}">{{ resolve $topPR.OwnerDid }}</a>
                     </span>
 
diff --git a/appview/pages/templates/user/fragments/picLink.html b/appview/pages/templates/user/fragments/picLink.html
index 073af802..33d5629a 100644
--- a/appview/pages/templates/user/fragments/picLink.html
+++ b/appview/pages/templates/user/fragments/picLink.html
@@ -18,7 +18,7 @@
       {{ if ne $did $vr.ViewerDid }}
         <button
           type="button"
-          popovertarget="vouch-modal-{{ normalizeForHtmlId $vr.SubjectDid }}"
+          popovertarget="vouch-modal-{{ normalizeForHtmlId $vr.SubjectDid.String }}"
           popovertargetaction="toggle"
           class="absolute -bottom-0.5 -right-0.5 w-1/2 h-1/2 cursor-pointer"
           title="{{ template "user/fragments/vouchTooltip" $vr }}">
diff --git a/appview/pages/templates/user/fragments/vouchTooltip.html b/appview/pages/templates/user/fragments/vouchTooltip.html
index 914da99b..f043751f 100644
--- a/appview/pages/templates/user/fragments/vouchTooltip.html
+++ b/appview/pages/templates/user/fragments/vouchTooltip.html
@@ -14,9 +14,9 @@
     {{- $direct := $vr.GetDirectVouch -}}
     {{- if $direct -}}
       {{- if $direct.IsVouch -}}
-        You vouched for {{ resolve $vr.SubjectDid }} {{ relTimeFmt $direct.CreatedAt }}. {{ $networkPart }}
+        You vouched for {{ resolve $vr.SubjectDid.String }} {{ relTimeFmt $direct.CreatedAt }}. {{ $networkPart }}
       {{- else -}}
-        You denounced {{ resolve $vr.SubjectDid }} {{ relTimeFmt $direct.CreatedAt }}. {{ $networkPart }}
+        You denounced {{ resolve $vr.SubjectDid.String }} {{ relTimeFmt $direct.CreatedAt }}. {{ $networkPart }}
       {{- end -}}
     {{- else -}}
       {{- $networkPart -}}.
diff --git a/appview/pulls/pulls.go b/appview/pulls/pulls.go
index d6bb8d01..21a04d36 100644
--- a/appview/pulls/pulls.go
+++ b/appview/pulls/pulls.go
@@ -297,7 +297,7 @@ func (s *Pulls) repoPullHelper(w http.ResponseWriter, r *http.Request, interdiff
 		diff = patchutil.Interdiff(previousPatch, currentPatch)
 	}
 
-	s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{
+	err = s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{
 		LoggedInUser:       user,
 		RepoInfo:           s.repoResolver.GetRepoInfo(r, user),
 		Pull:               pull,
@@ -318,6 +318,9 @@ func (s *Pulls) repoPullHelper(w http.ResponseWriter, r *http.Request, interdiff
 		LabelDefs:          defs,
 		VouchRelationships: vouchRelationships,
 	})
+	if err != nil {
+		l.Error("failed to render page", "err", err)
+	}
 }
 
 func (s *Pulls) RepoSinglePull(w http.ResponseWriter, r *http.Request) {
@@ -804,7 +807,7 @@ func (s *Pulls) RepoPulls(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	s.pages.RepoPulls(w, pages.RepoPullsParams{
+	err = s.pages.RepoPulls(w, pages.RepoPullsParams{
 		LoggedInUser:       s.oauth.GetMultiAccountUser(r),
 		RepoInfo:           repoInfo,
 		Pulls:              pulls,
@@ -817,6 +820,9 @@ func (s *Pulls) RepoPulls(w http.ResponseWriter, r *http.Request) {
 		PullCount:          totalPulls,
 		VouchRelationships: vouchRelationships,
 	})
+	if err != nil {
+		l.Error("failed to render page", "err", err)
+	}
 }
 
 func (s *Pulls) PullComment(w http.ResponseWriter, r *http.Request) {
-- 
2.51.2