From 02e161be0c1b9adabc6717fecc8194190790122d Mon Sep 17 00:00:00 2001 From: "oppili.bsky.social" Date: Thu, 27 Mar 2025 13:46:32 +0000 Subject: [PATCH] restore knot page seems to have been unlinked accidentally. this restores it + resolves DIDs in that page. --- appview/pages/pages.go | 1 + appview/pages/templates/knot.html | 12 ++++++++---- appview/pages/templates/knots.html | 6 ++++-- appview/state/state.go | 16 ++++++++++++++++ 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/appview/pages/pages.go b/appview/pages/pages.go index 17b95322..4edfd203 100644 --- a/appview/pages/pages.go +++ b/appview/pages/pages.go @@ -139,6 +139,7 @@ func (p *Pages) Knots(w io.Writer, params KnotsParams) error { type KnotParams struct { LoggedInUser *auth.User + DidHandleMap map[string]string Registration *db.Registration Members []string IsOwner bool diff --git a/appview/pages/templates/knot.html b/appview/pages/templates/knot.html index 9fe78fb3..4f199a10 100644 --- a/appview/pages/templates/knot.html +++ b/appview/pages/templates/knot.html @@ -17,7 +17,9 @@
opened by
- @{{ .Registration.ByDid }} + + {{ index $.DidHandleMap .Registration.ByDid }} {{ .Registration.ByDid }} + {{ if eq $.LoggedInUser.Did $.Registration.ByDid }} you {{ end }} @@ -57,8 +59,10 @@
{{ range $.Members }}
- {{ i "user" "w-3 h-3 dark:text-gray-300" }} - {{.}} + {{ i "user" "w-4 h-4 dark:text-gray-300" }} + {{index $.DidHandleMap .}} + {{.}} +
{{ else }}

No members have been added yet.

@@ -91,4 +95,4 @@ {{ end }} -{{ end }} \ No newline at end of file +{{ end }} diff --git a/appview/pages/templates/knots.html b/appview/pages/templates/knots.html index be4c80ba..63c28dc4 100644 --- a/appview/pages/templates/knots.html +++ b/appview/pages/templates/knots.html @@ -36,7 +36,9 @@
{{ i "git-branch" "w-3 h-3 dark:text-gray-300" }} -

{{ .Domain }}

+ +

{{ .Domain }}

+

owned by {{ .ByDid }}

registered {{ .Registered | timeFmt }}

@@ -83,4 +85,4 @@
-{{ end }} \ No newline at end of file +{{ end }} diff --git a/appview/state/state.go b/appview/state/state.go index 4281820a..f12110f2 100644 --- a/appview/state/state.go +++ b/appview/state/state.go @@ -420,11 +420,27 @@ func (s *State) KnotServerInfo(w http.ResponseWriter, r *http.Request) { } } + var didsToResolve []string + for _, m := range members { + didsToResolve = append(didsToResolve, m) + } + didsToResolve = append(didsToResolve, reg.ByDid) + resolvedIds := s.resolver.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() + } + } + ok, err := s.enforcer.IsServerOwner(user.Did, domain) isOwner := err == nil && ok p := pages.KnotParams{ LoggedInUser: user, + DidHandleMap: didHandleMap, Registration: reg, Members: members, IsOwner: isOwner, -- 2.51.2