From 29d8950e5bc26458ab140d5c1ad2cce5390ca9b3 Mon Sep 17 00:00:00 2001
From: Deluan <deluan@navidrome.org>
Date: Tue, 20 Oct 2020 11:33:55 -0400
Subject: [PATCH] Better ArtistInfo field names

---
 core/external_info.go       | 10 +++++-----
 model/artist_info.go        |  4 ++--
 server/subsonic/browsing.go |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/external_info.go b/core/external_info.go
index 38b6e46b..b8249928 100644
--- a/core/external_info.go
+++ b/core/external_info.go
@@ -121,10 +121,10 @@ func (e *externalInfo) callArtistImages(ctx context.Context, artist *model.Artis
 
 func (e *externalInfo) setBio(info *model.ArtistInfo, bio string) {
 	policy := bluemonday.UGCPolicy()
-	if info.Bio == "" {
+	if info.Biography == "" {
 		bio = policy.Sanitize(bio)
 		bio = strings.ReplaceAll(bio, "\n", " ")
-		info.Bio = strings.ReplaceAll(bio, "<a ", "<a target='_blank' ")
+		info.Biography = strings.ReplaceAll(bio, "<a ", "<a target='_blank' ")
 	}
 }
 
@@ -134,9 +134,9 @@ func (e *externalInfo) setLastFMUrl(info *model.ArtistInfo, url string) {
 	}
 }
 
-func (e *externalInfo) setMbzID(info *model.ArtistInfo, mbzID string) {
-	if info.MbzID == "" {
-		info.MbzID = mbzID
+func (e *externalInfo) setMbzID(info *model.ArtistInfo, mbID string) {
+	if info.MBID == "" {
+		info.MBID = mbID
 	}
 }
 
diff --git a/model/artist_info.go b/model/artist_info.go
index fff2c2c3..f8eac3cd 100644
--- a/model/artist_info.go
+++ b/model/artist_info.go
@@ -3,8 +3,8 @@ package model
 type ArtistInfo struct {
 	ID             string
 	Name           string
-	MbzID          string
-	Bio            string
+	MBID           string
+	Biography      string
 	Similar        []Artist
 	SmallImageUrl  string
 	MediumImageUrl string
diff --git a/server/subsonic/browsing.go b/server/subsonic/browsing.go
index a0a5957b..be5db10a 100644
--- a/server/subsonic/browsing.go
+++ b/server/subsonic/browsing.go
@@ -267,12 +267,12 @@ func (c *BrowsingController) GetArtistInfo(w http.ResponseWriter, r *http.Reques
 
 	response := newResponse()
 	response.ArtistInfo = &responses.ArtistInfo{}
-	response.ArtistInfo.Biography = info.Bio
+	response.ArtistInfo.Biography = info.Biography
 	response.ArtistInfo.SmallImageUrl = info.SmallImageUrl
 	response.ArtistInfo.MediumImageUrl = info.MediumImageUrl
 	response.ArtistInfo.LargeImageUrl = info.LargeImageUrl
 	response.ArtistInfo.LastFmUrl = info.LastFMUrl
-	response.ArtistInfo.MusicBrainzID = info.MbzID
+	response.ArtistInfo.MusicBrainzID = info.MBID
 	for _, s := range info.Similar {
 		similar := responses.Artist{}
 		similar.Id = s.ID