track: Adapt URL func to new URI param

n10v · Mar 14, 2019 · 7a450e5 · 7a450e5
1 parent 8c37898
commit 7a450e5
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/track/track.go b/track/track.go
@@ -25,6 +25,7 @@ type Track struct {
 	JID         int    `json:"id"`
 	JTitle      string `json:"title"`
 	JURL        string `json:"stream_url"`
+	JURI        string `json:"uri"`
 	JAuthor     struct {
 		AvatarURL string `json:"avatar_url"`
 		Username  string `json:"username"`
@@ -108,8 +109,18 @@ func (t *Track) Title() string {
 }
 
 func (t Track) URL() string {
-	u, err := url.Parse(t.JURL)
-	if err != nil {
+	var streamURL string
+
+	if t.JURL != "" {
+		streamURL = t.JURL
+	} else if t.JURI != "" {
+		streamURL = t.JURI + "/stream"
+	} else {
+		return ""
+	}
+
+	u, err := url.Parse(streamURL)
+	if err != nil || u.String() == "" {
 		return ""
 	}