Version 1.5.0

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

.gitea/workflows/android.yml

@@ -117,7 +117,7 @@ jobs:
             echo "Release: $SERVER/$REPO/releases/tag/$REF_NAME"
           else
             owner=${REPO%%/*}
-            version="$(printf '%s' "$REF_NAME" | tr -c 'A-Za-z0-9._-' '-')-$(printf '%s' "$SHA" | cut -c1-8)"
+            version="$(echo "$REF_NAME" | tr -c 'A-Za-z0-9._-\n' '-')-${SHA::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"

apps/api/src/services/notifications.ts

@@ -103,15 +103,27 @@ 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(userId: string, cursor: string | null) {
+export async function listNotifications(
+  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 rows = await db
+  const query = db
     .select()
     .from(n)
-    .where(and(eq(n.userId, userId), before && !isNaN(before.getTime()) ? lt(n.createdAt, before) : undefined))
-    .orderBy(desc(n.createdAt))
-    .limit(31);
+    .where(and(
+      eq(n.userId, userId),
+      before && !isNaN(before.getTime()) ? lt(n.createdAt, before) : undefined,
+      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/web/src/app/notifications/page.tsx

@@ -8,32 +8,43 @@ 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 && (
-        <p className="muted">Nothing yet. Reactions, new followers and songs sent to you show up here.</p>
-      )}
+      
+      {/* Dedicated section for seriouscritter's messages */}
+      {seriousCritterMessages.length > 0 && (
+        <div className="admin-section">
+          <h2 className="muted">From {ADMIN_ACTOR_USERNAME}</h2>
           <ul className="notifications">
-        {items.map((n) => {
+            {seriousCritterMessages.map((n) => {
               const { title, body } = notificationText(n);
               return (
                 <li key={n.id} className={n.read ? '' : 'unread'}>
@@ -41,7 +52,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="" />}
@@ -50,11 +61,37 @@ export default function NotificationsPage() {
               );
             })}
           </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) => {
+          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>
+      
       {data?.at(-1)?.nextCursor && (
         <button className="btn" onClick={() => setSize(size + 1)}>
           Show more
         </button>
       )}
-    </div>
+    </div >
   );
 }