From c203e3baa3c83aac689ca10c58476764f639cd7d Mon Sep 17 00:00:00 2001
From: Chris Fulljames <christianfulljames@gmail.com>
Date: Fri, 29 Aug 2025 19:32:38 -0400
Subject: [PATCH] Launch push notifications feature

---
 src/littlesongplace/push_notifications.py   | 11 ++++++-----
 src/littlesongplace/templates/base.html     |  1 +
 src/littlesongplace/templates/news.html     |  7 +++++++
 src/littlesongplace/templates/settings.html |  8 +++++++-
 test/test_push_notifications.py             |  2 +-
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/littlesongplace/push_notifications.py b/src/littlesongplace/push_notifications.py
index 602758c..55b8cb6 100644
--- a/src/littlesongplace/push_notifications.py
+++ b/src/littlesongplace/push_notifications.py
@@ -209,18 +209,19 @@ def notify_new_songs_cmd():
         new_songs = [s for s in new_songs if not s.hidden]  # Filter out hidden songs
         unique_users = sorted(set(s.username for s in new_songs))
 
-        title = None
+        title = f"New music!"
+        body = None
         _except = None
         if len(new_songs) == 1:
-            title = f"New song from {unique_users[0]}"
+            body = f"New song from {unique_users[0]}"
             _except = new_songs[0].userid
         elif len(new_songs) > 1:
-            title = f"New songs from {', '.join(unique_users)}"
+            body = f"New songs from {', '.join(unique_users)}"
 
-        if title:
+        if body:
             notify_all(
                     title,
-                    body=None,
+                    body,
                     url="/",
                     setting=SubscriptionSetting.SONGS,
                     _except=_except)
diff --git a/src/littlesongplace/templates/base.html b/src/littlesongplace/templates/base.html
index ef16269..4ab6b56 100644
--- a/src/littlesongplace/templates/base.html
+++ b/src/littlesongplace/templates/base.html
@@ -57,6 +57,7 @@
                     <div class="navbar">
                         <a href="/users/{{ session["username"] }}" class="nav-logged-in" id="my-profile" hidden>My Profile</a>
                         <a href="/activity" class="nav-logged-in" hidden><span id="activity-indicator" hidden></span>Activity</a>
+                        <a href="/settings" class="nav-logged-in" hidden>Settings</a>
                         <a href="/logout" class="nav-logged-in" hidden>Sign Out</a>
 
                         <a href="/signup" class="nav-logged-out">Create Account</a>
diff --git a/src/littlesongplace/templates/news.html b/src/littlesongplace/templates/news.html
index 7f4c8ea..73039ce 100644
--- a/src/littlesongplace/templates/news.html
+++ b/src/littlesongplace/templates/news.html
@@ -5,6 +5,13 @@
 {% block body %}
 
 <h1>site news</h1>
+<h2>2025-08-29 - Finally, Push Notifications!</h2>
+<p>
+Mobile push notifications have landed.  Add a bookmark to your phone's home
+screen, and then open the new <a href="/settings">Settings</a> page and select
+which things you'd like to be notified about.
+</p>
+
 <h2>2025-08-17 - Leaving GitHub</h2>
 <p>
 I have felt for a while like GitHub was not really the right home for the
diff --git a/src/littlesongplace/templates/settings.html b/src/littlesongplace/templates/settings.html
index 5c957b4..2911b61 100644
--- a/src/littlesongplace/templates/settings.html
+++ b/src/littlesongplace/templates/settings.html
@@ -6,15 +6,21 @@
 <h1>settings</h1>
 
 <h2>push notifications</h2>
+<p>
+<b>Note:</b> For the best notification experience, you can add a bookmark to
+the site to your mobile device's home screen.  This will allow the the site to
+run in "progressive web app" mode, which enables background notifications.
+</p>
 <div id="activity-settings" style="line-height: 1.5;">
     <!--<span>Push notifications are currently disabled on this device.</span>-->
     <!--<button onclick="enablePushNotifications()" class="button" style="float: right;">Enable</button>-->
-    Send me a push notification on this device when:
+    <b>Send me a push notification on this device when:</b>
     <br/>
     <label><input type="checkbox" onclick="updateSettings()" id="comment-push">I get a new comment</label>
     <br/>
     <label><input type="checkbox" onclick="updateSettings()" id="song-push">Anyone uploads a new song (at most once per day)</label>
 </div>
+<br/>
 
 <button class="button" onclick="fetch('/push-notifications/test')">Test Notifications</button>
 
diff --git a/test/test_push_notifications.py b/test/test_push_notifications.py
index 75c0dad..b62b7a3 100644
--- a/test/test_push_notifications.py
+++ b/test/test_push_notifications.py
@@ -202,7 +202,7 @@ def test_notification_for_new_songs_enabled(pushmock, app, client, user, subid,
 
     pushmock.assert_called_once_with(
         json.loads(SUBDATA),
-        '{"title": "New song from user2", "body": null, "url": "/"}',
+        '{"title": "New music!", "body": "New song from user2", "url": "/"}',
         vapid_private_key="vapid-private-key",
         vapid_claims={"sub": "mailto:littlesongplace@gmail.com"})
 
-- 
2.39.5