From 779f895ef8cc6b24f18a710f4984b44276bce62d Mon Sep 17 00:00:00 2001
From: Nathan Woodburn <github@nathan.woodburn.au>
Date: Wed, 28 Jan 2026 21:50:15 +0700
Subject: [PATCH] fix: Add last played spotify song when none currently playing

---
 NathanWoodburn.bsdesign | Bin 9424891 -> 9424891 bytes
 blueprints/api.py       |   4 ++--
 blueprints/spotify.py   |  38 +++++++++++++++++++++++++++++++++-----
 curl.py                 |   4 ++--
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/NathanWoodburn.bsdesign b/NathanWoodburn.bsdesign
index fcc1299c68b8a73994891f693948fb082b421644..092fc08c4a039cf3f4ee077cfabd6548b35f5cb7 100644
GIT binary patch
delta 460
zcmWO2*)kOX0D$4tv1SWVSwgmhw9ta0B9bkXt%Xtw{o092ocbw|9>9zl@6feJFug`I
zp5WX#7vBqf;jNuOIO5NEY-l@wvnUu^LZalL9Fl-UON_)yoWx6l9F{~$l4MDdR5>DP
zk}er?R5B$?j>&O3A=#26xsoR*C0`1pP)<pa6ibPeN|^+uTq>kePD_=Xk+X76&P%n_
z$OXA5m*le4N}bfp6}c)6(kR#Dy4;W^X_lMPBCT>u+T^yhONVqymvqY=>5*RPle=<H
z`ei@{Wk`nQzC4hJ@<>KxR36I{8Iz~-OvdH8ypRc*lqq>Bk;Z9xC9ma;yp?zIUOvc-
z%*scZlX>|hpXG}z$X8jEB?-wl`7X+`tjG`fDXa2J)?{6N|7Bx&H?H$v*VJD3{{#DY
C1HMH7

delta 460
zcmWO2$ubZC0Dxg3l(Hrg+K?rMR47YH%AT!6kv;mAB@_wyB}5Nk#shTj+>C>(_h`lw
zxN!Jh;5*#;7kqf^_dw|OZgkA<*y<v3LINd7g5{)yNT`I#DLF0Saz@TdghWb|L`#gs
z$~lRX^Aax!azPU1q9jSOq{t<?ELY^JT$5BulXST*8Imbkk}WqRM{de3$(20Gm)lYx
zcjT_zlR_zyV!1C5q(n-kOv>e<Jdz4|ES2&^s^qCWlWM7vTB(zIX^=*FE=|%bEz&A&
z@<LupyS$PP>6F*<M!KY1-b#=3N}u%0fDFozypv%Wk@s@kI4U3Hqm0S8Ovt2sk|~*%
z8Tl+<WLD<ntIW$cS&&6plJBxC%8LAuRrx7vvMw9)OE&+qwXz@9@@KF9py7YO5pHC^
A4gdfE

diff --git a/blueprints/api.py b/blueprints/api.py
index e3bf440..c5f94e4 100644
--- a/blueprints/api.py
+++ b/blueprints/api.py
@@ -7,7 +7,7 @@ from mail import sendEmail
 from tools import getClientIP, getGitCommit, json_response, parse_date, get_tools_data
 from blueprints import sol
 from dateutil import parser as date_parser
-from blueprints.spotify import get_spotify_track
+from blueprints.spotify import get_playing_spotify_track
 from cache_helper import get_nc_config, get_git_latest_activity
 
 # Constants
@@ -176,7 +176,7 @@ def tools():
 @app.route("/playing")
 def playing():
     """Get the currently playing Spotify track."""
-    track_info = get_spotify_track()
+    track_info = get_playing_spotify_track()
     if "error" in track_info:
         return json_response(request, track_info, HTTP_OK)
     return json_response(request, {"spotify": track_info}, HTTP_OK)
diff --git a/blueprints/spotify.py b/blueprints/spotify.py
index 0076c8f..8236891 100644
--- a/blueprints/spotify.py
+++ b/blueprints/spotify.py
@@ -15,7 +15,8 @@ SPOTIFY_AUTH_URL = "https://accounts.spotify.com/authorize"
 SPOTIFY_TOKEN_URL = "https://accounts.spotify.com/api/token"
 SPOTIFY_CURRENTLY_PLAYING_URL = "https://api.spotify.com/v1/me/player/currently-playing"
 
-SCOPE = "user-read-currently-playing user-read-playback-state"
+
+SCOPE = "user-read-currently-playing user-read-playback-state user-read-recently-played"
 
 ACCESS_TOKEN = None
 REFRESH_TOKEN = os.getenv("SPOTIFY_REFRESH_TOKEN")
@@ -103,11 +104,11 @@ def callback():
 @app.route("/playing")
 def currently_playing():
     """Public endpoint showing your current track."""
-    track = get_spotify_track()
+    track = get_playing_spotify_track()
     return json_response(request, {"spotify": track}, 200)
 
 
-def get_spotify_track():
+def get_playing_spotify_track():
     """Internal function to get current playing track without HTTP context."""
     token = refresh_access_token()
     if not token:
@@ -115,9 +116,9 @@ def get_spotify_track():
 
     headers = {"Authorization": f"Bearer {token}"}
     response = requests.get(SPOTIFY_CURRENTLY_PLAYING_URL, headers=headers)
-
     if response.status_code == 204:
-        return {"error": "Nothing is currently playing."}
+        # return {"error": "Nothing is currently playing."}
+        return get_last_spotify_track()
     elif response.status_code != 200:
         return {"error": "Spotify API error", "status": response.status_code}
 
@@ -135,3 +136,30 @@ def get_spotify_track():
         "duration_ms": data["item"].get("duration_ms", 1),
     }
     return track
+
+
+def get_last_spotify_track():
+    """Internal function to get last played track without HTTP context."""
+    token = refresh_access_token()
+    if not token:
+        return {"error": "Failed to refresh access token"}
+
+    headers = {"Authorization": f"Bearer {token}"}
+    response = requests.get(
+        "https://api.spotify.com/v1/me/player/recently-played", headers=headers
+    )
+    if response.status_code != 200:
+        print("Spotify API error:", response.text)
+        return {"error": "Spotify API error", "status": response.status_code}
+    data = response.json()
+    if not data.get("items"):
+        return {"error": "No recently played tracks found."}
+    last_track_info = data["items"][0]["track"]
+    track = {
+        "song_name": last_track_info["name"],
+        "artist": ", ".join([artist["name"] for artist in last_track_info["artists"]]),
+        "album_name": last_track_info["album"]["name"],
+        "album_art": last_track_info["album"]["images"][0]["url"],
+        "played_at": data["items"][0]["played_at"],
+    }
+    return track
diff --git a/curl.py b/curl.py
index 046ccf2..932cb63 100644
--- a/curl.py
+++ b/curl.py
@@ -2,7 +2,7 @@ from flask import render_template
 from tools import getAddress, get_tools_data, getClientIP
 import os
 from functools import lru_cache
-from blueprints.spotify import get_spotify_track
+from blueprints.spotify import get_playing_spotify_track
 from cache_helper import get_git_latest_activity, get_projects as get_projects_cached
 
 
@@ -61,7 +61,7 @@ def curl_response(request):
                 "index.ascii",
                 repo=get_current_project(),
                 ip=getClientIP(request),
-                spotify=get_spotify_track(),
+                spotify=get_playing_spotify_track(),
             ),
             200,
             {"Content-Type": "text/plain; charset=utf-8"},