Optional fields

EmissarySocial · Aug 29, 2024 · db84e68 · db84e68
1 parent 0c83e49
commit db84e68
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/model/user.go b/model/user.go
@@ -237,7 +237,6 @@ func (user User) GetJSONLD() mapof.Any {
 		vocab.PropertyURL:               user.ProfileURL,
 		vocab.PropertyName:              user.DisplayName,
 		vocab.PropertyPreferredUsername: user.Username,
-		vocab.PropertySummary:           user.StatusMessage,
 		vocab.PropertyTootDiscoverable:  user.IsDiscoverable,
 		vocab.PropertyTootIndexable:     user.IsIndexable,
 		vocab.PropertyInbox:             user.ActivityPubInboxURL(),
@@ -246,25 +245,25 @@ func (user User) GetJSONLD() mapof.Any {
 		vocab.PropertyFollowers:         user.ActivityPubFollowersURL(),
 		vocab.PropertyLiked:             user.ActivityPubLikedURL(),
 		vocab.PropertyBlocked:           user.ActivityPubBlockedURL(),
+	}
+
+	if user.StatusMessage != "" {
+		result[vocab.PropertySummary] = user.StatusMessage
+	}
 
-		vocab.PropertyIcon: mapof.Any{
+	if iconURL := user.ActivityPubIconURL(); iconURL != "" {
+		result[vocab.PropertyIcon] = mapof.Any{
 			vocab.PropertyType:      vocab.ObjectTypeImage,
 			vocab.PropertyMediaType: "image/webp",
 			vocab.PropertyURL:       user.ActivityPubIconURL(),
-		},
+		}
+	}
 
-		vocab.PropertyImage: mapof.Any{
+	if imageURL := user.ActivityPubImageURL(); imageURL != "" {
+		result[vocab.PropertyImage] = mapof.Any{
 			vocab.PropertyType:      vocab.ObjectTypeImage,
 			vocab.PropertyMediaType: "image/webp",
 			vocab.PropertyURL:       user.ActivityPubImageURL(),
-		},
-	}
-
-	// Conditionally add the Avatar URL
-	if avatarURL := user.ActivityPubIconURL(); avatarURL != "" {
-		result["icon"] = mapof.Any{
-			vocab.PropertyType: vocab.ObjectTypeImage,
-			vocab.PropertyURL:  avatarURL,
 		}
 	}