{{ range $items }}
- {{ $repoOwner := index $handleMap .Metadata.Repo.Did }}
+ {{ $repoOwner := resolve .Metadata.Repo.Did }}
{{ $repoName := .Metadata.Repo.Name }}
{{ $repoUrl := printf "%s/%s" $repoOwner $repoName }}
@@ -163,10 +158,8 @@
{{ end }}
{{ define "pullEvents" }}
- {{ $i := index . 0 }}
- {{ $items := $i.Items }}
- {{ $stats := $i.Stats }}
- {{ $handleMap := index . 1 }}
+ {{ $items := .Items }}
+ {{ $stats := .Stats }}
{{ if gt (len $items) 0 }}
@@ -200,7 +193,7 @@
{{ range $items }}
- {{ $repoOwner := index $handleMap .Repo.Did }}
+ {{ $repoOwner := resolve .Repo.Did }}
{{ $repoName := .Repo.Name }}
{{ $repoUrl := printf "%s/%s" $repoOwner $repoName }}
diff --git a/appview/pulls/pulls.go b/appview/pulls/pulls.go
index 170d3105..ddff2e6a 100644
--- a/appview/pulls/pulls.go
+++ b/appview/pulls/pulls.go
@@ -151,16 +151,6 @@ func (s *Pulls) RepoSinglePull(w http.ResponseWriter, r *http.Request) {
}
}
- resolvedIds := s.idResolver.ResolveIdents(r.Context(), identsToResolve)
- didHandleMap := make(map[string]string)
- for _, identity := range resolvedIds {
- if !identity.Handle.IsInvalidHandle() {
- didHandleMap[identity.DID.String()] = fmt.Sprintf("@%s", identity.Handle.String())
- } else {
- didHandleMap[identity.DID.String()] = identity.DID.String()
- }
- }
-
mergeCheckResponse := s.mergeCheck(f, pull, stack)
resubmitResult := pages.Unknown
if user != nil && user.Did == pull.OwnerDid {
@@ -212,7 +202,6 @@ func (s *Pulls) RepoSinglePull(w http.ResponseWriter, r *http.Request) {
s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{
LoggedInUser: user,
RepoInfo: repoInfo,
- DidHandleMap: didHandleMap,
Pull: pull,
Stack: stack,
AbandonedPulls: abandonedPulls,
@@ -377,23 +366,11 @@ func (s *Pulls) RepoPullPatch(w http.ResponseWriter, r *http.Request) {
return
}
- identsToResolve := []string{pull.OwnerDid}
- resolvedIds := s.idResolver.ResolveIdents(r.Context(), identsToResolve)
- didHandleMap := make(map[string]string)
- for _, identity := range resolvedIds {
- if !identity.Handle.IsInvalidHandle() {
- didHandleMap[identity.DID.String()] = fmt.Sprintf("@%s", identity.Handle.String())
- } else {
- didHandleMap[identity.DID.String()] = identity.DID.String()
- }
- }
-
patch := pull.Submissions[roundIdInt].Patch
diff := patchutil.AsNiceDiff(patch, pull.TargetBranch)
s.pages.RepoPullPatchPage(w, pages.RepoPullPatchParams{
LoggedInUser: user,
- DidHandleMap: didHandleMap,
RepoInfo: f.RepoInfo(user),
Pull: pull,
Stack: stack,
@@ -440,17 +417,6 @@ func (s *Pulls) RepoPullInterdiff(w http.ResponseWriter, r *http.Request) {
return
}
- identsToResolve := []string{pull.OwnerDid}
- resolvedIds := s.idResolver.ResolveIdents(r.Context(), identsToResolve)
- didHandleMap := make(map[string]string)
- for _, identity := range resolvedIds {
- if !identity.Handle.IsInvalidHandle() {
- didHandleMap[identity.DID.String()] = fmt.Sprintf("@%s", identity.Handle.String())
- } else {
- didHandleMap[identity.DID.String()] = identity.DID.String()
- }
- }
-
currentPatch, err := patchutil.AsDiff(pull.Submissions[roundIdInt].Patch)
if err != nil {
log.Println("failed to interdiff; current patch malformed")
@@ -472,7 +438,6 @@ func (s *Pulls) RepoPullInterdiff(w http.ResponseWriter, r *http.Request) {
RepoInfo: f.RepoInfo(user),
Pull: pull,
Round: roundIdInt,
- DidHandleMap: didHandleMap,
Interdiff: interdiff,
DiffOpts: diffOpts,
})
@@ -494,17 +459,6 @@ func (s *Pulls) RepoPullPatchRaw(w http.ResponseWriter, r *http.Request) {
return
}
- identsToResolve := []string{pull.OwnerDid}
- resolvedIds := s.idResolver.ResolveIdents(r.Context(), identsToResolve)
- didHandleMap := make(map[string]string)
- for _, identity := range resolvedIds {
- if !identity.Handle.IsInvalidHandle() {
- didHandleMap[identity.DID.String()] = fmt.Sprintf("@%s", identity.Handle.String())
- } else {
- didHandleMap[identity.DID.String()] = identity.DID.String()
- }
- }
-
w.Header().Set("Content-Type", "text/plain; charset=utf-8")
w.Write([]byte(pull.Submissions[roundIdInt].Patch))
}
@@ -595,25 +549,10 @@ func (s *Pulls) RepoPulls(w http.ResponseWriter, r *http.Request) {
m[p.Sha] = p
}
- identsToResolve := make([]string, len(pulls))
- for i, pull := range pulls {
- identsToResolve[i] = pull.OwnerDid
- }
- resolvedIds := s.idResolver.ResolveIdents(r.Context(), identsToResolve)
- didHandleMap := make(map[string]string)
- for _, identity := range resolvedIds {
- if !identity.Handle.IsInvalidHandle() {
- didHandleMap[identity.DID.String()] = fmt.Sprintf("@%s", identity.Handle.String())
- } else {
- didHandleMap[identity.DID.String()] = identity.DID.String()
- }
- }
-
s.pages.RepoPulls(w, pages.RepoPullsParams{
LoggedInUser: s.oauth.GetUser(r),
RepoInfo: f.RepoInfo(user),
Pulls: pulls,
- DidHandleMap: didHandleMap,
FilteringBy: state,
Stacks: stacks,
Pipelines: m,
diff --git a/appview/spindles/spindles.go b/appview/spindles/spindles.go
index f6978651..6c7a5eb5 100644
--- a/appview/spindles/spindles.go
+++ b/appview/spindles/spindles.go
@@ -113,18 +113,6 @@ func (s *Spindles) dashboard(w http.ResponseWriter, r *http.Request) {
return
}
- identsToResolve := make([]string, len(members))
- copy(identsToResolve, members)
- resolvedIds := s.IdResolver.ResolveIdents(r.Context(), identsToResolve)
- didHandleMap := make(map[string]string)
- for _, identity := range resolvedIds {
- if !identity.Handle.IsInvalidHandle() {
- didHandleMap[identity.DID.String()] = fmt.Sprintf("@%s", identity.Handle.String())
- } else {
- didHandleMap[identity.DID.String()] = identity.DID.String()
- }
- }
-
// organize repos by did
repoMap := make(map[string][]db.Repo)
for _, r := range repos {
@@ -136,7 +124,6 @@ func (s *Spindles) dashboard(w http.ResponseWriter, r *http.Request) {
Spindle: spindle,
Members: members,
Repos: repoMap,
- DidHandleMap: didHandleMap,
})
}
diff --git a/appview/state/profile.go b/appview/state/profile.go
index 621d83a1..4acca956 100644
--- a/appview/state/profile.go
+++ b/appview/state/profile.go
@@ -108,16 +108,6 @@ func (s *State) profilePage(w http.ResponseWriter, r *http.Request) {
}
}
- resolvedIds := s.idResolver.ResolveIdents(r.Context(), didsToResolve)
- didHandleMap := make(map[string]string)
- for _, identity := range resolvedIds {
- if !identity.Handle.IsInvalidHandle() {
- didHandleMap[identity.DID.String()] = fmt.Sprintf("@%s", identity.Handle.String())
- } else {
- didHandleMap[identity.DID.String()] = identity.DID.String()
- }
- }
-
followers, following, err := db.GetFollowerFollowingCount(s.db, ident.DID.String())
if err != nil {
log.Printf("getting follow stats repos for %s: %s", ident.DID.String(), err)
@@ -145,7 +135,6 @@ func (s *State) profilePage(w http.ResponseWriter, r *http.Request) {
LoggedInUser: loggedInUser,
Repos: pinnedRepos,
CollaboratingRepos: pinnedCollaboratingRepos,
- DidHandleMap: didHandleMap,
Card: pages.ProfileCard{
UserDid: ident.DID.String(),
UserHandle: ident.Handle.String(),
@@ -194,7 +183,6 @@ func (s *State) reposPage(w http.ResponseWriter, r *http.Request) {
s.pages.ReposPage(w, pages.ReposPageParams{
LoggedInUser: loggedInUser,
Repos: repos,
- DidHandleMap: map[string]string{ident.DID.String(): ident.Handle.String()},
Card: pages.ProfileCard{
UserDid: ident.DID.String(),
UserHandle: ident.Handle.String(),
@@ -518,24 +506,9 @@ func (s *State) EditPinsFragment(w http.ResponseWriter, r *http.Request) {
})
}
- var didsToResolve []string
- for _, r := range allRepos {
- didsToResolve = append(didsToResolve, r.Did)
- }
- resolvedIds := s.idResolver.ResolveIdents(r.Context(), didsToResolve)
- didHandleMap := make(map[string]string)
- for _, identity := range resolvedIds {
- if !identity.Handle.IsInvalidHandle() {
- didHandleMap[identity.DID.String()] = fmt.Sprintf("@%s", identity.Handle.String())
- } else {
- didHandleMap[identity.DID.String()] = identity.DID.String()
- }
- }
-
s.pages.EditPinsFragment(w, pages.EditPinsParams{
LoggedInUser: user,
Profile: profile,
AllRepos: allRepos,
- DidHandleMap: didHandleMap,
})
}
diff --git a/appview/state/state.go b/appview/state/state.go
index 484fcfa3..e2df9ee6 100644
--- a/appview/state/state.go
+++ b/appview/state/state.go
@@ -61,14 +61,14 @@ func Make(ctx context.Context, config *config.Config) (*State, error) {
return nil, fmt.Errorf("failed to create enforcer: %w", err)
}
- pgs := pages.NewPages(config)
-
res, err := idresolver.RedisResolver(config.Redis.ToURL())
if err != nil {
log.Printf("failed to create redis resolver: %v", err)
res = idresolver.DefaultResolver()
}
+ pgs := pages.NewPages(config, res)
+
cache := cache.New(config.Redis.Addr)
sess := session.New(cache)
@@ -180,39 +180,10 @@ func (s *State) Timeline(w http.ResponseWriter, r *http.Request) {
s.pages.Notice(w, "timeline", "Uh oh! Failed to load timeline.")
}
- var didsToResolve []string
- for _, ev := range timeline {
- if ev.Repo != nil {
- didsToResolve = append(didsToResolve, ev.Repo.Did)
- if ev.Source != nil {
- didsToResolve = append(didsToResolve, ev.Source.Did)
- }
- }
- if ev.Follow != nil {
- didsToResolve = append(didsToResolve, ev.Follow.UserDid, ev.Follow.SubjectDid)
- }
- if ev.Star != nil {
- didsToResolve = append(didsToResolve, ev.Star.StarredByDid, ev.Star.Repo.Did)
- }
- }
-
- resolvedIds := s.idResolver.ResolveIdents(r.Context(), didsToResolve)
- didHandleMap := make(map[string]string)
- for _, identity := range resolvedIds {
- if !identity.Handle.IsInvalidHandle() {
- didHandleMap[identity.DID.String()] = fmt.Sprintf("@%s", identity.Handle.String())
- } else {
- didHandleMap[identity.DID.String()] = identity.DID.String()
- }
- }
-
s.pages.Timeline(w, pages.TimelineParams{
LoggedInUser: user,
Timeline: timeline,
- DidHandleMap: didHandleMap,
})
-
- return
}
func (s *State) Keys(w http.ResponseWriter, r *http.Request) {