diff --git a/templates/partials/activity_create_note.html b/templates/partials/activity_create_note.html
index 06b9dcc..254f80f 100644
--- a/templates/partials/activity_create_note.html
+++ b/templates/partials/activity_create_note.html
@@ -7,21 +7,22 @@
+ 
{{ if $note.in_reply_to }}
- {{- lookupStr $actors $note.author -}}
+ {{- $actors.Lookup "name" $note.author -}}
replied to
{{ if $note.in_reply_to_author }}
- {{- lookupStr $actors $note.in_reply_to_author -}}
+ {{- $actors.Lookup "name" $note.in_reply_to_author -}}
{{ else }}
a note
{{ end }}
{{ else }}
- {{- lookupStr $actors $note.author -}}
+ {{- $actors.Lookup "name" $note.author -}}
wrote
{{ end }}
on {{ datetime $note.published_at }}
diff --git a/web/command.go b/web/command.go
index 8dab19a..236d05e 100644
--- a/web/command.go
+++ b/web/command.go
@@ -210,9 +210,9 @@ func serverCommandAction(cliCtx *cli.Context) error {
root.GET("/object/:object", h.getObject)
root.GET("/tags/:tag", h.getTaggedObjects)
- root.GET("/avatar/svg/:name", h.avatarSVG)
+ root.GET("/avatar/svg/:domain/:name", h.avatarSVG)
if svgerConfig.Enabled {
- root.GET("/avatar/png/:name", h.avatarPNG)
+ root.GET("/avatar/png/:domain/:name", h.avatarPNG)
}
authenticated := r.Group("/")
diff --git a/web/handle_avatar.go b/web/handler_avatar.go
similarity index 76%
rename from web/handle_avatar.go
rename to web/handler_avatar.go
index 69fb331..d2588f6 100644
--- a/web/handle_avatar.go
+++ b/web/handler_avatar.go
@@ -47,10 +47,20 @@ func (h handler) avatarPNG(c *gin.Context) {
func (h handler) avatar(c *gin.Context) ([]byte, error) {
name := c.Param("name")
-
+ domain := c.Param("domain")
size := intParam(c, "size", 120)
- exists, err := h.storage.RowCount(c.Request.Context(), `SELECT COUNT(*) FROM users WHERE name = $1`, name)
+ if len(name) == 0 {
+ name = domain
+ domain = h.domain
+ }
+
+ if name == domain && name == "unknown" {
+ svg := avatar.AvatarSVG("unknown", size, false)
+ return []byte(svg), nil
+ }
+
+ exists, err := h.storage.RowCount(c.Request.Context(), `SELECT COUNT(*) FROM actors WHERE name = $1 AND domain = $2`, name, domain)
if err != nil {
return nil, err
}
@@ -58,7 +68,7 @@ func (h handler) avatar(c *gin.Context) ([]byte, error) {
return nil, errors.NewNotFoundError(nil)
}
- id := fmt.Sprintf("@%s@%s", name, h.domain)
- svg := avatar.AvatarSVG(id, size)
+ id := fmt.Sprintf("@%s@%s", name, domain)
+ svg := avatar.AvatarSVG(id, size, domain == h.domain)
return []byte(svg), nil
}
diff --git a/web/handler_feed.go b/web/handler_feed.go
index ddafb6e..9842e4b 100644
--- a/web/handler_feed.go
+++ b/web/handler_feed.go
@@ -123,7 +123,7 @@ func (h handler) viewFeed(c *gin.Context) {
h.hardFail(c, err)
return
}
- allActors := gatherActors(actors)
+ allActors := h.gatherActors(actors)
var pages []int
for i := page - 3; i <= page+3; i++ {
@@ -132,9 +132,8 @@ func (h handler) viewFeed(c *gin.Context) {
}
}
data["pages"] = pages
- actorNames := actorNames(allActors)
- actorNames[string(userActorID)] = "You"
- data["actors"] = actorNames
+
+ data["actors"] = actorLookup{h.domain, allActors}
if cont = h.saveSession(c, session); !cont {
return
@@ -215,7 +214,7 @@ func (h handler) viewMyFeed(c *gin.Context) {
h.hardFail(c, err)
return
}
- allActors := gatherActors(actors)
+ allActors := h.gatherActors(actors)
var pages []int
for i := page - 3; i <= page+3; i++ {
@@ -224,9 +223,7 @@ func (h handler) viewMyFeed(c *gin.Context) {
}
}
data["pages"] = pages
- actorNames := actorNames(allActors)
- actorNames[string(userActorID)] = "You"
- data["actors"] = actorNames
+ data["actors"] = actorLookup{h.domain, allActors}
if cont = h.saveSession(c, session); !cont {
return
@@ -234,7 +231,7 @@ func (h handler) viewMyFeed(c *gin.Context) {
c.HTML(http.StatusOK, "feed", data)
}
-func gatherActors(actors []storage.Payload) map[string]map[string]string {
+func (h handler) gatherActors(actors []storage.Payload) map[string]map[string]string {
results := make(map[string]map[string]string)
for _, actor := range actors {
@@ -261,26 +258,50 @@ func gatherActors(actors []storage.Payload) map[string]map[string]string {
summary["domain"] = domain
summary["at"] = fmt.Sprintf("%s@%s", preferredUsername, domain)
+ summary["icon"] = fmt.Sprintf("https://%s/avatar/png/%s/%s", h.domain, domain, preferredUsername)
+
results[actorID] = summary
}
return results
}
-func actorNames(actors map[string]map[string]string) map[string]string {
- names := make(map[string]string)
- for actorID, actor := range actors {
- names[actorID] = actorID
-
- if preferredUsername, ok := actor["preferred_username"]; ok {
- names[actorID] = preferredUsername
- }
- if at, ok := actor["at"]; ok {
- names[actorID] = at
- }
- if displayName, ok := actor["name"]; ok {
- names[actorID] = displayName
- }
- }
- return names
+type actorLookup struct {
+ domain string
+ actors map[string]map[string]string
+}
+
+func (al actorLookup) Lookup(focus string, actorID string) string {
+ switch focus {
+ case "icon":
+ actor, found := al.actors[actorID]
+ if found {
+ icon, found := actor["icon"]
+ if found {
+ return icon
+ }
+ username, foundA := actor["name"]
+ actorDomain, foundB := actor["domain"]
+ if foundA && foundB {
+ return fmt.Sprintf("https://%s/avatar/png/%s/%s", al.domain, actorDomain, username)
+ }
+ }
+ return fmt.Sprintf("https://%s/avatar/png/unknown/unknown", al.domain)
+ case "name":
+ actor, found := al.actors[actorID]
+ if found {
+ if displayName, ok := actor["name"]; ok {
+ return displayName
+ }
+ if at, ok := actor["at"]; ok {
+ return at
+ }
+ if preferredUsername, ok := actor["preferred_username"]; ok {
+ return preferredUsername
+ }
+ }
+ return actorID
+ default:
+ return fmt.Sprintf("unknown key: %s", focus)
+ }
}