From b8b069eca685eadfed8d1f0e223a707041893a7e Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Mon, 21 Sep 2026 17:02:34 -0500
Subject: [PATCH] Fix server crash when collapse sub series and sort by author
 name #4993 & add whitelist for collapse subseries sort

---
 server/utils/libraryHelpers.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/server/utils/libraryHelpers.js b/server/utils/libraryHelpers.js
index 5702071e5..937d72b90 100644
--- a/server/utils/libraryHelpers.js
+++ b/server/utils/libraryHelpers.js
@@ -1,10 +1,13 @@
 const { createNewSortInstance } = require('../libs/fastSort')
 const Database = require('../Database')
+const Logger = require('../Logger')
 const { getTitlePrefixAtEnd, isNullOrNaN, getTitleIgnorePrefix } = require('../utils/index')
 const naturalSort = createNewSortInstance({
   comparer: new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' }).compare
 })
 
+const VALID_COLLAPSE_SUBSERIES_SORTS = new Set(['addedAt', 'size', 'birthtimeMs', 'mtimeMs', 'media.duration', 'media.metadata.publishedYear', 'media.metadata.authorName', 'media.metadata.authorNameLF', 'media.metadata.title', 'sequence', 'progress', 'progress.createdAt', 'progress.finishedAt', 'random'])
+
 module.exports = {
   /**
    *
@@ -100,6 +103,11 @@ module.exports = {
    * @returns {Object[]}
    */
   async handleCollapseSubseries(payload, seriesId, user, library) {
+    if (payload.sortBy && !VALID_COLLAPSE_SUBSERIES_SORTS.has(payload.sortBy)) {
+      Logger.warn(`[libraryHelpers] Invalid "sort" query string "${payload.sortBy}"`)
+      payload.sortBy = undefined
+    }
+
     const seriesWithBooks = await Database.seriesModel.findByPk(seriesId, {
       include: {
         model: Database.bookModel,
@@ -196,7 +204,9 @@ module.exports = {
               return li.collapsedSeries?.name || li.media.title
             }
           } else {
-            return payload.sortBy.split('.').reduce((a, b) => a[b], li)
+            if (payload.sortBy === 'media.metadata.authorName') return li.authorNamesFirstLast ?? ''
+            if (payload.sortBy === 'media.metadata.authorNameLF') return li.authorNamesLastFirst ?? ''
+            return payload.sortBy.split('.').reduce((a, b) => a?.[b], li) ?? ''
           }
         }
       })