From 001f6b1a34615b9729ceca639179fe38b1c1b9bc Mon Sep 17 00:00:00 2001
From: 0xsysr3ll <31414959+0xSysR3ll@users.noreply.github.com>
Date: Sun, 1 Mar 2026 18:51:51 +0100
Subject: [PATCH] fix(media): exclude null mediaAddedAt entries (#2607)

---
 server/routes/media.ts | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/server/routes/media.ts b/server/routes/media.ts
index d7962825..8bc1b8ba 100644
--- a/server/routes/media.ts
+++ b/server/routes/media.ts
@@ -17,7 +17,7 @@ import logger from '@server/logger';
 import { isAuthenticated } from '@server/middleware/auth';
 import { Router } from 'express';
 import type { FindOneOptions } from 'typeorm';
-import { In } from 'typeorm';
+import { In, IsNull, Not } from 'typeorm';
 
 const mediaRoutes = Router();
 
@@ -68,12 +68,18 @@ mediaRoutes.get('/', async (req, res, next) => {
       };
   }
 
+  let whereClause: FindOneOptions<Media>['where'];
+  if (statusFilter || req.query.sort === 'mediaAdded') {
+    whereClause = {};
+    if (statusFilter) whereClause.status = statusFilter;
+    if (req.query.sort === 'mediaAdded')
+      whereClause.mediaAddedAt = Not(IsNull());
+  }
+
   try {
     const [media, mediaCount] = await mediaRepository.findAndCount({
       order: sortFilter,
-      where: statusFilter && {
-        status: statusFilter,
-      },
+      where: whereClause,
       take: pageSize,
       skip,
     });