adamf/web_server
1
1
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

rename context

Browse Source
This commit is contained in:
Adam French
2025-11-25 13:58:54 +00:00
parent e6773a5971
commit 7b43b97650
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
backend/handlers/handle_spotify.go
View File

@@ -9,24 +9,24 @@ import (
"github.com/zmb3/spotify/v2" "github.com/zmb3/spotify/v2"
) )
func (store *Store) CompleteAuth(c *gin.Context) { func (store *Store) CompleteSpotifyAuth(ctx *gin.Context) {
state := c.Query("state") state := ctx.Query("state")
ctx := context.Background() c := context.Background()
// code := c.Query("code") // code := c.Query("code")
token, err := store.SpotifyAuth.Token(ctx, state, c.Request) token, err := store.SpotifyAuth.Token(c, state, ctx.Request)
if err != nil { if err != nil {
c.String(http.StatusInternalServerError, "Couldn't get token: %v", err) ctx.String(http.StatusInternalServerError, "Couldn't get token: %v", err)
return return
} }
services.SaveSpotifyToken(services.SPOTIFY_TOKEN_JSON_PATH, token) services.SaveSpotifyToken(services.SPOTIFY_TOKEN_JSON_PATH, token)
client := spotify.New(store.SpotifyAuth.Client(ctx, token)) client := spotify.New(store.SpotifyAuth.Client(c, token))
store.SpotifyClient = client store.SpotifyClient = client
c.JSON(http.StatusOK, gin.H{ ctx.JSON(http.StatusOK, gin.H{
"message": "Authentication successful", "message": "Authentication successful",
"token": token.AccessToken, "token": token.AccessToken,
"type": token.TokenType, "type": token.TokenType,
@@ -34,23 +34,23 @@ func (store *Store) CompleteAuth(c *gin.Context) {
}) })
} }
func (store *Store) ListeningTo(c *gin.Context) { func (store *Store) ListeningTo(ctx *gin.Context) {
ctx := c.Request.Context() c := ctx.Request.Context()
if store.SpotifyClient == nil { if store.SpotifyClient == nil {
c.JSON(500, gin.H{"error": "Spotify not authenticated"}) ctx.JSON(500, gin.H{"error": "Spotify not authenticated"})
return return
} }
playing, err := store.SpotifyClient.PlayerCurrentlyPlaying(ctx) playing, err := store.SpotifyClient.PlayerCurrentlyPlaying(c)
if err != nil { if err != nil {
c.JSON(500, gin.H{"error": err.Error()}) ctx.JSON(500, gin.H{"error": err.Error()})
return return
} }
// If Spotify says "nothing is currently playing" // If Spotify says "nothing is currently playing"
if playing == nil || !playing.Playing || playing.Item == nil { if playing == nil || !playing.Playing || playing.Item == nil {
c.JSON(200, gin.H{ ctx.JSON(200, gin.H{
"playing": false, "playing": false,
"message": "User is not currently listening to anything", "message": "User is not currently listening to anything",
}) })
@@ -69,7 +69,7 @@ func (store *Store) ListeningTo(c *gin.Context) {
imgURL = item.Album.Images[0].URL imgURL = item.Album.Images[0].URL
} }
c.JSON(200, gin.H{ ctx.JSON(200, gin.H{
"playing": true, "playing": true,
"song_name": item.Name, "song_name": item.Name,
"song_url": item.PreviewURL, "song_url": item.PreviewURL,