Fix removing query args from tracks

bot.go

@@ -247,7 +247,7 @@ func findPlaylist(wikiText string) (spotify.ID, []spotify.ID) {
 					j += i
 				}
 				trackId := line[i+len(SPOTIFY_MARK) : j]
-				tracks = append(tracks, spotify.ID(trackId))
+				tracks = append(tracks, spotify.ID(chopArgs(trackId)))
 			}
 		} else if strings.Index(line, SPOTIFY_PLAYLIST_MARK) != -1 && strings.Index(line, PLAYLIST_MARK) != -1 {
 			i := strings.Index(line, SPOTIFY_PLAYLIST_MARK)
@@ -258,7 +258,7 @@ func findPlaylist(wikiText string) (spotify.ID, []spotify.ID) {
 			if q != -1 {
 				playlist = playlist[:q]
 			}
-			playlistId = spotify.ID(playlist)
+			playlistId = spotify.ID(chopArgs(playlist))
 		}
 	}
 	log.Printf("Found playlist %s and tracks %s\n", playlistId, tracks)
@@ -266,6 +266,14 @@ func findPlaylist(wikiText string) (spotify.ID, []spotify.ID) {
 	return spotify.ID(playlistId), tracks
 }
 
+func chopArgs(value string) string {
+	q := strings.Index(value, "?")
+	if q != -1 {
+		value = value[:q]
+	}
+	return value
+}
+
 func appendPlaylist(wikiText string, playlist *spotify.FullPlaylist) string {
 	changedText := wikiText + `
 	[` + playlist.ExternalURLs["spotify"] + ` Spotify-soittolista]

web.go

@@ -20,10 +20,12 @@ func (s *WebService) IndexHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	data := struct {
-		Username string
-		Spotify  string
-		Songs    []*Song
+		Username      string
+		Spotify       string
+		SpotifyExpiry string
+		Songs         []*Song
 	}{
+		"",
 		"",
 		"",
 		make([]*Song, 0),
@@ -42,6 +44,13 @@ func (s *WebService) IndexHandler(w http.ResponseWriter, r *http.Request) {
 		data.Spotify = session.spotify
 	}
 
+	if s.spotify.client != nil {
+		token, err := s.spotify.client.Token()
+		if err == nil {
+			data.SpotifyExpiry = token.Expiry.Format(time.RFC822Z)
+		}
+	}
+
 	var templates = cachedTemplates
 	if s.noCache {
 		templates = template.Must(template.ParseFiles("web/index.html"))

web/index.html

@@ -34,7 +34,7 @@
     <div class="container">
         {{if .Username }}
         {{if .Spotify}}
-        <p>You are logged to Spotify as <strong>{{ .Spotify }}</strong></p>
+        <p>You are logged to Spotify as <strong>{{ .Spotify }}</strong> (Login expires {{ .SpotifyExpiry }})</p>
         {{else}}
         <a href="/spotify"><button style="margin-bottom: 1em">Login with Spotify</button></a>
         {{end}}