Fix friends display name fallback

2026-09-04 13:45:18 +08:00
parent 0f1c1f9255
commit 47649d33e2
4 changed files with 72 additions and 19 deletions
@@ -84,22 +84,16 @@ func profilePublicFromFields(base any, nickname, avatarFileID sql.NullString) an
 	public := publicMap(base)
 	if nickname.Valid {
 		value := strings.TrimSpace(nickname.String)
-		for _, key := range []string{"display_name", "nickname", "fn", "name"} {
-			if value == "" {
-				delete(public, key)
-			} else {
+		if value != "" {
+			for _, key := range []string{"display_name", "nickname", "fn", "name"} {
 				public[key] = value
 			}
 		}
 	}
 	if avatarFileID.Valid {
 		value := strings.TrimSpace(avatarFileID.String)
-		for _, key := range []string{"avatar_file_id", "photo", "avatar"} {
-			if value == "" {
-				delete(public, key)
-			} else if key == "avatar_file_id" {
-				public[key] = value
-			}
+		if value != "" {
+			public["avatar_file_id"] = value
 		}
 	}
 	return public