From 89adf353cb7877b0fb70abc63336ead536186146 Mon Sep 17 00:00:00 2001
From: Akshay <nerdy@peppe.rs>
Date: Thu, 20 Feb 2025 22:36:59 +0000
Subject: [PATCH] impl async resolver for multiple idents

---
 appview/pages/pages.go                   |  2 +-
 appview/pages/templates/repo/blob.html   |  2 +-
 appview/pages/templates/repo/commit.html |  2 +-
 appview/resolver.go                      | 32 ++++++++++++++++++++++++
 appview/state/repo.go                    | 23 ++++++++++-------
 knotserver/git/diff.go                   |  4 +--
 types/diff.go                            |  4 +--
 7 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index 322895a9..d89add7a 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -366,7 +366,7 @@ type RepoBlobParams struct {
 func (p *Pages) RepoBlob(w io.Writer, params RepoBlobParams) error {
 	if params.Lines < 5000 {
 		c := params.Contents
-		style := styles.Get("xcode")
+		style := styles.Get("bw")
 		formatter := chromahtml.New(
 			chromahtml.InlineCode(true),
 			chromahtml.WithLineNumbers(true),
diff --git a/appview/pages/templates/repo/blob.html b/appview/pages/templates/repo/blob.html
index 8967635a..e6c5095b 100644
--- a/appview/pages/templates/repo/blob.html
+++ b/appview/pages/templates/repo/blob.html
@@ -22,7 +22,7 @@
                     {{ end }}
                 {{ end }}
             </div>
-            <div id="file-info">
+            <div id="file-info" class="text-gray-500 text-xs">
                 {{ .Lines }} lines
                 <span class="select-none px-2 [&:before]:content-['·']"></span>
                 {{ byteFmt .SizeHint }}
diff --git a/appview/pages/templates/repo/commit.html b/appview/pages/templates/repo/commit.html
index b257340e..e81f73a1 100644
--- a/appview/pages/templates/repo/commit.html
+++ b/appview/pages/templates/repo/commit.html
@@ -108,7 +108,7 @@
           {{ else }}
             <pre class="overflow-auto">
             {{- range .TextFragments -}}
-              <div class="bg-gray-100 text-gray-500 select-none">{{ .Comment }}</div>
+              <div class="bg-gray-100 text-gray-500 select-none">{{ .Header }}</div>
 
               {{- range .Lines -}}
                   {{- if eq .Op.String "+" -}}
diff --git a/appview/resolver.go b/appview/resolver.go
index 409d68bb..a8119aad 100644
--- a/appview/resolver.go
+++ b/appview/resolver.go
@@ -2,6 +2,7 @@ package appview
 
 import (
 	"context"
+	"sync"
 
 	"github.com/bluesky-social/indigo/atproto/identity"
 	"github.com/bluesky-social/indigo/atproto/syntax"
@@ -25,3 +26,34 @@ func (r *Resolver) ResolveIdent(ctx context.Context, arg string) (*identity.Iden
 
 	return r.directory.Lookup(ctx, *id)
 }
+
+func (r *Resolver) ResolveIdents(ctx context.Context, idents []string) []*identity.Identity {
+	results := make([]*identity.Identity, len(idents))
+	var wg sync.WaitGroup
+
+	// Create a channel to handle context cancellation
+	done := make(chan struct{})
+	defer close(done)
+
+	// Start a goroutine for each identifier
+	for idx, ident := range idents {
+		wg.Add(1)
+		go func(index int, id string) {
+			defer wg.Done()
+
+			select {
+			case <-ctx.Done():
+				results[index] = nil
+			case <-done:
+				results[index] = nil
+			default:
+				// Resolve the identifier - if error, identity will be nil
+				identity, _ := r.ResolveIdent(ctx, id)
+				results[index] = identity
+			}
+		}(idx, ident)
+	}
+
+	wg.Wait()
+	return results
+}
diff --git a/appview/state/repo.go b/appview/state/repo.go
index a798ed3f..ad03dbed 100644
--- a/appview/state/repo.go
+++ b/appview/state/repo.go
@@ -480,22 +480,27 @@ func (f *FullyResolvedRepo) Collaborators(ctx context.Context, s *State) ([]page
 
 		did := item[0]
 
-		var handle string
-		id, err := s.resolver.ResolveIdent(ctx, did)
-		if err != nil {
-			handle = ""
-		} else {
-			handle = string(id.Handle)
-		}
-
 		c := pages.Collaborator{
 			Did:    did,
-			Handle: handle,
+			Handle: "",
 			Role:   role,
 		}
 		collaborators = append(collaborators, c)
 	}
 
+	// populate all collborators with handles
+	identsToResolve := make([]string, len(collaborators))
+	for i, collab := range collaborators {
+		identsToResolve[i] = collab.Did
+	}
+
+	resolvedIdents := s.resolver.ResolveIdents(ctx, identsToResolve)
+	for i, resolved := range resolvedIdents {
+		if resolved != nil {
+			collaborators[i].Handle = resolved.Handle.String()
+		}
+	}
+
 	return collaborators, nil
 }
 
diff --git a/knotserver/git/diff.go b/knotserver/git/diff.go
index aebb7e04..415c771f 100644
--- a/knotserver/git/diff.go
+++ b/knotserver/git/diff.go
@@ -66,8 +66,8 @@ func (g *GitRepo) Diff() (*types.NiceDiff, error) {
 
 		for _, tf := range d.TextFragments {
 			ndiff.TextFragments = append(ndiff.TextFragments, types.TextFragment{
-				Comment: tf.Comment,
-				Lines:   tf.Lines,
+				Header: tf.Header(),
+				Lines:  tf.Lines,
 			})
 			for _, l := range tf.Lines {
 				switch l.Op {
diff --git a/types/diff.go b/types/diff.go
index 75592fa7..a17e569b 100644
--- a/types/diff.go
+++ b/types/diff.go
@@ -6,8 +6,8 @@ import (
 )
 
 type TextFragment struct {
-	Comment string         `json:"comment"`
-	Lines   []gitdiff.Line `json:"lines"`
+	Header string         `json:"comment"`
+	Lines  []gitdiff.Line `json:"lines"`
 }
 
 type Diff struct {
-- 
2.54.0