CI: test builds' publish step works under plain sh

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_011Y2iUsKEWDuRGjK5FPmcUP

.gitea/workflows/android.yml

@@ -117,7 +117,7 @@ jobs:
             echo "Release: $SERVER/$REPO/releases/tag/$REF_NAME"
           else
             owner=${REPO%%/*}
-            version="$(echo "$REF_NAME" | tr -c 'A-Za-z0-9._-\n' '-')-${SHA::8}"
+            version="$(printf '%s' "$REF_NAME" | tr -c 'A-Za-z0-9._-' '-')-$(printf '%s' "$SHA" | cut -c1-8)"
             for f in *.apk SHA256SUMS; do
               curl -fsS -X PUT -H "$auth" --upload-file "$f" "$SERVER/api/packages/$owner/generic/musicshare-android/$version/$f"
               echo "Uploaded $f"

.gitignore

@@ -10,5 +10,3 @@ next-env.d.ts
 # Production secrets and database backups
 deploy/production.env
 backups/
-.aider*
-deploy/gitea-runner/data/

apps/api/src/services/notifications.ts

@@ -103,27 +103,15 @@ export async function toNotificationDTOs(rows: Row[]): Promise<NotificationDTO[]
 }
 
 /** Newest first, 30 at a time; the cursor is the last one's time. */
-export async function listNotifications(
+export async function listNotifications(userId: string, cursor: string | null) {
-  userId: string,
-  cursor: string | null,
-  actorId?: string // Added optional actorId filter
-): Promise<{
-  notifications: NotificationDTO[];
-  unread: number;
-  nextCursor: string | null;
-}> {
   const n = schema.notifications;
   const before = cursor ? new Date(cursor) : null;
-  const query = db
+  const rows = await db
     .select()
     .from(n)
-    .where(and(
+    .where(and(eq(n.userId, userId), before && !isNaN(before.getTime()) ? lt(n.createdAt, before) : undefined))
-      eq(n.userId, userId),
+    .orderBy(desc(n.createdAt))
-      before && !isNaN(before.getTime()) ? lt(n.createdAt, before) : undefined,
+    .limit(31);
-      actorId ? eq(n.actorId, actorId) : undefined // Apply actor filter if provided
-    ));
-
-  const rows = await query.orderBy(desc(n.createdAt)).limit(31);
   const page = rows.slice(0, 30);
   return {
     notifications: await toNotificationDTOs(page),

apps/mobile/app.json

@@ -2,7 +2,7 @@
   "expo": {
     "name": "musicshare",
     "slug": "musicshare",
-    "version": "1.5.0",
+    "version": "1.4.0",
     "orientation": "portrait",
     "icon": "./assets/images/icon.png",
     "scheme": "musicshare",
@@ -23,7 +23,7 @@
       },
       "predictiveBackGestureEnabled": false,
       "package": "tech.chrisedwards.musicshare",
-      "versionCode": 6
+      "versionCode": 5
     },
     "plugins": [
       "expo-router",

apps/mobile/modules/now-playing-reader/android/src/main/java/tech/chrisedwards/musicshare/nowplaying/MediaListenerService.kt

@@ -121,11 +121,9 @@ class MediaListenerService : NotificationListenerService() {
   private fun snapshot(controller: MediaController): Playback? {
     val metadata = controller.metadata
     val title = metadata?.text(MediaMetadata.METADATA_KEY_TITLE) ?: metadata?.text(MediaMetadata.METADATA_KEY_DISPLAY_TITLE)
-    val realArtist = metadata?.text(MediaMetadata.METADATA_KEY_ARTIST)
+    val artist = metadata?.text(MediaMetadata.METADATA_KEY_ARTIST)
       ?: metadata?.text(MediaMetadata.METADATA_KEY_ALBUM_ARTIST)
-    val artist = realArtist ?: metadata?.text(MediaMetadata.METADATA_KEY_DISPLAY_SUBTITLE)
+      ?: metadata?.text(MediaMetadata.METADATA_KEY_DISPLAY_SUBTITLE)
-    // A phone video or other non-song: treat the session as if it weren't there.
-    if (NonMusicFilter.isNonMusic(controller.packageName, title, realArtist)) return null
     val playbackState = controller.playbackState
     val state = when (playbackState?.state) {
       PlaybackState.STATE_PLAYING, PlaybackState.STATE_BUFFERING,

apps/mobile/modules/now-playing-reader/android/src/main/java/tech/chrisedwards/musicshare/nowplaying/NonMusicFilter.kt

@@ -1,46 +0,0 @@
-package tech.chrisedwards.musicshare.nowplaying
-
-/**
- * Keeps things that aren't songs (phone videos, screen recordings) out of what we share.
- * General-purpose players report a local file's name as its title, so a video played
- * in VLC would otherwise show up as "VID_20261025_181502.mp4".
- */
-internal object NonMusicFilter {
-  /** Players that also open videos and arbitrary files: only share from them when there's a real artist. */
-  private val GENERAL_PLAYERS = setOf(
-    "org.videolan.vlc",
-    "org.videolan.vlc.debug",
-    "com.mxtech.videoplayer.ad",
-    "com.mxtech.videoplayer.pro",
-    "is.xyz.mpv",
-    "com.brouken.player", // Just Player
-    "com.google.android.apps.photos",
-    "com.sec.android.gallery3d",
-    "com.android.gallery3d",
-    "com.miui.gallery",
-    "com.google.android.apps.nbu.files",
-    "com.sec.android.app.myfiles",
-  )
-
-  private val FILE_NAME = Regex(
-    """.*\.(mp4|m4v|mkv|mov|webm|avi|3gp|3g2|wmv|flv|ts|mts|m2ts|mpg|mpeg)$""",
-    RegexOption.IGNORE_CASE,
-  )
-
-  /** Camera, screen-recorder and messaging-app naming schemes. */
-  private val RECORDING_NAME = Regex(
-    """^(VID|PXL|IMG|MVIMG|MOV|DSC|GOPR|GX\d{2}|Screen[_ ]?Recording|Screenrecorder|Record|signal|WhatsApp Video)[-_ ]?\d.*""",
-    RegexOption.IGNORE_CASE,
-  )
-
-  /**
-   * [realArtist] is the artist/album-artist tag only, not the display-subtitle fallback,
-   * which players fill with folder names and the like.
-   */
-  fun isNonMusic(packageName: String, title: String?, realArtist: String?): Boolean {
-    val name = title?.trim().orEmpty()
-    if (name.isEmpty()) return false
-    if (FILE_NAME.matches(name) || RECORDING_NAME.matches(name)) return true
-    return packageName in GENERAL_PLAYERS && realArtist.isNullOrBlank()
-  }
-}

apps/mobile/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@musicshare/mobile",
   "main": "expo-router/entry",
-  "version": "1.5.0",
+  "version": "1.4.0",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.4.1",

apps/web/src/app/notifications/page.tsx

@@ -8,68 +8,32 @@ import { notificationPath, notificationText, timeAgo, type NotificationListDTO }
 import { Avatar } from '@/components/Avatar';
 import { client, useMe } from '@/lib/api';
 
-const ADMIN_ACTOR_USERNAME = 'seriouscritter';
-
 /** Reactions, comments, new followers and songs sent to you, newest first. Opening it marks them read. */
 export default function NotificationsPage() {
   const { me, loggedOut } = useMe();
   const { mutate } = useSWRConfig();
-  
-  // Fetch all notifications for the user
   const { data, size, setSize, isLoading } = useSWRInfinite<NotificationListDTO>(
     (i, prev: NotificationListDTO | null) => (!me || (i > 0 && !prev?.nextCursor) ? null : ['notifications', prev?.nextCursor ?? null]),
     ([, cursor]: [string, string | null]) => client.notifications(cursor),
     { revalidateOnFocus: false },
   );
-  
+  const items = data?.flatMap((p) => p.notifications) ?? [];
-  const allItems = data?.flatMap((p) => p.notifications) ?? [];
   const unread = data?.[0]?.unread ?? 0;
 
-  // Filter messages specifically from seriouscritter
-  const seriousCritterMessages = allItems.filter(n => n.actor?.username === ADMIN_ACTOR_USERNAME);
-
   // Seen once you've looked: clear the bell (rows stay highlighted until you come back).
   useEffect(() => {
     if (unread) client.markNotificationsRead().then(() => mutate('/notifications'), () => {});
   }, [unread, mutate]);
 
   if (loggedOut) return <p className="muted"><Link href="/login">Log in</Link> to see your notifications.</p>;
-  
   return (
     <div className="stack">
       <h1>Notifications</h1>
-      
+      {items.length === 0 && !isLoading && (
-      {/* Dedicated section for seriouscritter's messages */}
-      {seriousCritterMessages.length > 0 && (
-        <div className="admin-section">
-          <h2 className="muted">From {ADMIN_ACTOR_USERNAME}</h2>
-          <ul className="notifications">
-            {seriousCritterMessages.map((n) => {
-              const { title, body } = notificationText(n);
-              return (
-                <li key={n.id} className={n.read ? '' : 'unread'}>
-                  <Link href={notificationPath(n)} className="notification">
-                    <Avatar user={n.actor} size={40} />
-                    <span className="notification-text">
-                      <strong>{title}</strong>
-                      <span>{body</span >
-                      <span className="muted">{timeAgo(n.createdAt)}</span>
-                    </span>
-                    {n.track?.artworkUrl && <img className="artwork-sm" src={n.track.artworkUrl} alt="" />}
-                  </Link>
-                </li>
-              );
-            })}
-          </ul>
-        </div>
-      )}
-
-      {/* General notifications list */}
-      {allItems.length === 0 && !isLoading && (
         <p className="muted">Nothing yet. Reactions, new followers and songs sent to you show up here.</p>
       )}
       <ul className="notifications">
-        {allItems.map((n) => {
+        {items.map((n) => {
           const { title, body } = notificationText(n);
           return (
             <li key={n.id} className={n.read ? '' : 'unread'}>
@@ -77,7 +41,7 @@ export default function NotificationsPage() {
                 <Avatar user={n.actor} size={40} />
                 <span className="notification-text">
                   <strong>{title}</strong>
-                  <span>{body</span >
+                  <span>{body}</span>
                   <span className="muted">{timeAgo(n.createdAt)}</span>
                 </span>
                 {n.track?.artworkUrl && <img className="artwork-sm" src={n.track.artworkUrl} alt="" />}
@@ -86,7 +50,6 @@ export default function NotificationsPage() {
           );
         })}
       </ul>
-      
       {data?.at(-1)?.nextCursor && (
         <button className="btn" onClick={() => setSize(size + 1)}>
           Show more

fastlane/metadata/android/en-US/changelogs/6.txt

@@ -1 +0,0 @@
-Videos and screen recordings played on your phone no longer show up as your song, and notifications now have their own section.

package-lock.json

@@ -809,7 +809,7 @@
     },
     "apps/mobile": {
       "name": "@musicshare/mobile",
-      "version": "1.5.0",
+      "version": "1.4.0",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.4.1",