From dc007e2faab5a0df53cd574c4e59768789e2cd46 Mon Sep 17 00:00:00 2001
From: Mike Jones <mike@netsplit.org.uk>
Date: Tue, 1 Jan 2019 19:14:02 +0000
Subject: [PATCH] Prettify error, fix tags and similar artists if empty

---
 internal/app/modlastfm/command/artist.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/internal/app/modlastfm/command/artist.go b/internal/app/modlastfm/command/artist.go
index 32e2d81..9fb5bf5 100644
--- a/internal/app/modlastfm/command/artist.go
+++ b/internal/app/modlastfm/command/artist.go
@@ -12,6 +12,10 @@ func (f *Fn) ArtistInfo(artist string, nickname string) string {
 	artistInfo, err := f.getArtistInfo(artist)
 
 	if err != nil {
+		if strings.HasPrefix(err.Error(), "LastfmError[6]") {
+			return "The artist you supplied could not be found"
+		}
+
 		return fmtError(err)
 	}
 
@@ -25,7 +29,7 @@ func (f *Fn) GetArtistTags(artist string, nickname string) string {
 
 	res, err := f.getArtistInfo(artist)
 
-	if err == nil {
+	if err == nil && len(res.Tags) > 0 {
 		tags = fmtArtistTags(res)
 	}
 
@@ -87,5 +91,9 @@ func fmtArtistSimilar(artist lastfm.ArtistGetInfo) string {
 		s = append(s, artist.Similars[i].Name)
 	}
 
-	return strings.Join(s, ", ")
+	if len(s) > 0 {
+		return strings.Join(s, ", ")
+	}
+
+	return "none"
 }
-- 
GitLab