From 80458e24bd94357ccc6178ac4ce0ecde8c6d47c1 Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Thu, 30 Nov 2023 21:15:25 +0200
Subject: [PATCH 01/47] "[un]abridged" in title candidate generation

---
 server/finders/BookFinder.js           | 1 +
 test/server/finders/BookFinder.test.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/server/finders/BookFinder.js b/server/finders/BookFinder.js
index 7d26b6bf..0c5f32d2 100644
--- a/server/finders/BookFinder.js
+++ b/server/finders/BookFinder.js
@@ -167,6 +167,7 @@ class BookFinder {
         [/ (2nd|3rd|\d+th)\s+ed(\.|ition)?/g, ''], // Remove edition
         [/(^| |\.)(m4b|m4a|mp3)( |$)/g, ''],       // Remove file-type
         [/ a novel.*$/g, ''],                      // Remove "a novel"
+        [/(^| )(un)?abridged( |$)/g, ' '],         // Remove "unabridged/abridged"
         [/^\d+ | \d+$/g, ''],                      // Remove preceding/trailing numbers
       ]
 
diff --git a/test/server/finders/BookFinder.test.js b/test/server/finders/BookFinder.test.js
index 2728f174..ed2442c6 100644
--- a/test/server/finders/BookFinder.test.js
+++ b/test/server/finders/BookFinder.test.js
@@ -35,6 +35,8 @@ describe('TitleCandidates', () => {
         ['adds candidate + variant, removing edition 2', 'anna karenina 4th ed.', ['anna karenina', 'anna karenina 4th ed.']],
         ['adds candidate + variant, removing fie type', 'anna karenina.mp3', ['anna karenina', 'anna karenina.mp3']],
         ['adds candidate + variant, removing "a novel"', 'anna karenina a novel', ['anna karenina', 'anna karenina a novel']],
+        ['adds candidate + variant, removing "abridged"', 'abridged anna karenina', ['anna karenina', 'abridged anna karenina']],
+        ['adds candidate + variant, removing "unabridged"', 'anna karenina unabridged', ['anna karenina', 'anna karenina unabridged']],
         ['adds candidate + variant, removing preceding/trailing numbers', '1 anna karenina 2', ['anna karenina', '1 anna karenina 2']],
         ['does not add empty candidate', '', []],
         ['does not add spaces-only candidate', '   ', []],

From 8ac0ce399f8dbe5082fb933c2510423b1251ab8a Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Thu, 30 Nov 2023 21:17:13 +0200
Subject: [PATCH 02/47] Remove "et al[.]" in author cleanup

---
 server/finders/BookFinder.js           | 2 ++
 test/server/finders/BookFinder.test.js | 1 +
 2 files changed, 3 insertions(+)

diff --git a/server/finders/BookFinder.js b/server/finders/BookFinder.js
index 0c5f32d2..4422fa98 100644
--- a/server/finders/BookFinder.js
+++ b/server/finders/BookFinder.js
@@ -462,6 +462,8 @@ function cleanAuthorForCompares(author) {
   cleanAuthor = cleanAuthor.replace(/([a-z])\.([a-z])/g, '$1. $2')
   // remove middle initials
   cleanAuthor = cleanAuthor.replace(/(?<=\w\w)(\s+[a-z]\.?)+(?=\s+\w\w)/g, '')
+  // remove et al.
+  cleanAuthor = cleanAuthor.replace(/et al\.?/g, '')
   return cleanAuthor
 }
 
diff --git a/test/server/finders/BookFinder.test.js b/test/server/finders/BookFinder.test.js
index ed2442c6..5d28bbea 100644
--- a/test/server/finders/BookFinder.test.js
+++ b/test/server/finders/BookFinder.test.js
@@ -111,6 +111,7 @@ describe('AuthorCandidates', () => {
         ['adds recognized author if edit distance from candidate is small', 'nicolai gogol', ['nikolai gogol']],
         ['does not add candidate if edit distance from any recognized author is large', 'nikolai google', []],
         ['adds normalized recognized candidate (contains redundant spaces)', 'nikolai    gogol', ['nikolai gogol']],
+        ['adds normalized recognized candidate (et al removed)', 'nikolai gogol et al.', ['nikolai gogol']],
         ['adds normalized recognized candidate (normalized initials)', 'j.k. rowling', ['j. k. rowling']],
       ].forEach(([name, author, expected]) => it(name, async () => {
         authorCandidates.add(author)

From 281de48ed4b0bc67d48e7a8ec1f85e4dbdeaa247 Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Thu, 30 Nov 2023 21:49:24 +0200
Subject: [PATCH 03/47] Fix "et al" cleanup

---
 server/finders/BookFinder.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/finders/BookFinder.js b/server/finders/BookFinder.js
index 4422fa98..b76b8b1d 100644
--- a/server/finders/BookFinder.js
+++ b/server/finders/BookFinder.js
@@ -463,7 +463,7 @@ function cleanAuthorForCompares(author) {
   // remove middle initials
   cleanAuthor = cleanAuthor.replace(/(?<=\w\w)(\s+[a-z]\.?)+(?=\s+\w\w)/g, '')
   // remove et al.
-  cleanAuthor = cleanAuthor.replace(/et al\.?/g, '')
+  cleanAuthor = cleanAuthor.replace(/ et al\.?(?= |$)/g, '')
   return cleanAuthor
 }
 

From 80fd2a1a1831b415546194fc2e7809a002f85030 Mon Sep 17 00:00:00 2001
From: Denis Arnst <git@sapd.eu>
Date: Mon, 4 Dec 2023 22:36:34 +0100
Subject: [PATCH 04/47] SSO/OpenID: Use a mobile-redirect route (Fixes #2379
 and #2381)

- Implement /auth/openid/mobile-redirect this will redirect to an app-link like audiobookshelf://oauth
- An app must provide an `redirect_uri` parameter with the app-link in the authorization request to /auth/openid
- The user will have to whitelist possible URLs, or explicitly allow all
- Also modified MultiSelect to allow to hide the menu/popup
---
 client/components/ui/MultiSelect.vue      |  8 ++-
 client/pages/config/authentication.vue    | 22 +++++++++
 client/strings/de.json                    |  2 +
 client/strings/en-us.json                 |  2 +
 server/Auth.js                            | 59 ++++++++++++++++++++++-
 server/controllers/MiscController.js      | 17 +++++++
 server/objects/settings/ServerSettings.js |  9 +++-
 7 files changed, 114 insertions(+), 5 deletions(-)

diff --git a/client/components/ui/MultiSelect.vue b/client/components/ui/MultiSelect.vue
index 4fa8e394..2009b28d 100644
--- a/client/components/ui/MultiSelect.vue
+++ b/client/components/ui/MultiSelect.vue
@@ -50,7 +50,11 @@ export default {
     label: String,
     disabled: Boolean,
     readonly: Boolean,
-    showEdit: Boolean
+    showEdit: Boolean,
+    menuDisabled: {
+      type: Boolean,
+      default: false
+    },
   },
   data() {
     return {
@@ -77,7 +81,7 @@ export default {
       }
     },
     showMenu() {
-      return this.isFocused
+      return this.isFocused && !this.menuDisabled
     },
     wrapperClass() {
       var classes = []
diff --git a/client/pages/config/authentication.vue b/client/pages/config/authentication.vue
index e645569e..ffb1feb7 100644
--- a/client/pages/config/authentication.vue
+++ b/client/pages/config/authentication.vue
@@ -46,6 +46,9 @@
 
             <ui-text-input-with-label ref="openidClientSecret" v-model="newAuthSettings.authOpenIDClientSecret" :disabled="savingSettings" :label="'Client Secret'" class="mb-2" />
 
+            <ui-multi-select ref="redirectUris" v-model="newAuthSettings.authOpenIDMobileRedirectURIs" :items="newAuthSettings.authOpenIDMobileRedirectURIs" :label="$strings.LabelMobileRedirectURIs" class="mb-2" :menuDisabled="true" :disabled="savingSettings" />
+            <p class="pl-4 text-sm text-gray-300 mb-2" v-html="$strings.LabelMobileRedirectURIsDescription" />
+
             <ui-text-input-with-label ref="buttonTextInput" v-model="newAuthSettings.authOpenIDButtonText" :disabled="savingSettings" :label="$strings.LabelButtonText" class="mb-2" />
 
             <div class="flex items-center pt-1 mb-2">
@@ -187,6 +190,25 @@ export default {
         this.$toast.error('Client Secret required')
         isValid = false
       }
+
+      function isValidRedirectURI(uri) {
+        // Check for somestring://someother/string
+        const pattern = new RegExp('^\\w+://[\\w\\.-]+$', 'i')
+        return pattern.test(uri)
+      }
+
+      const uris = this.newAuthSettings.authOpenIDMobileRedirectURIs
+      if (uris.includes('*') && uris.length > 1) {
+        this.$toast.error('Mobile Redirect URIs: Asterisk (*) must be the only entry if used')
+        isValid = false
+      } else {
+        uris.forEach(uri => {
+          if (uri !== '*' && !isValidRedirectURI(uri)) {
+            this.$toast.error(`Mobile Redirect URIs: Invalid URI ${uri}`)
+            isValid = false
+          }
+        })
+      }
       return isValid
     },
     async saveSettings() {
diff --git a/client/strings/de.json b/client/strings/de.json
index 78e64804..eb3d59f4 100644
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -337,6 +337,8 @@
   "LabelMinute": "Minute",
   "LabelMissing": "Fehlend",
   "LabelMissingParts": "Fehlende Teile",
+  "LabelMobileRedirectURIs": "Erlaubte Weiterleitungs-URIs für die mobile App",
+  "LabelMobileRedirectURIsDescription": "Dies ist eine Whitelist gültiger Umleitungs-URIs für mobile Apps. Der Standardwert ist <code>audiobookshelf://oauth</code>, den Sie entfernen oder durch zusätzliche URIs für die Integration von Drittanbieter-Apps ergänzen können. Die Verwendung eines Sternchens (<code>*</code>) als alleiniger Eintrag erlaubt jede URI.",
   "LabelMore": "Mehr",
   "LabelMoreInfo": "Mehr Info",
   "LabelName": "Name",
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index 857627e9..02f9df05 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -343,6 +343,8 @@
   "LabelMinute": "Minute",
   "LabelMissing": "Missing",
   "LabelMissingParts": "Missing Parts",
+  "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
+  "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "More",
   "LabelMoreInfo": "More Info",
   "LabelName": "Name",
diff --git a/server/Auth.js b/server/Auth.js
index 267bbb45..c20d532a 100644
--- a/server/Auth.js
+++ b/server/Auth.js
@@ -8,6 +8,7 @@ const ExtractJwt = require('passport-jwt').ExtractJwt
 const OpenIDClient = require('openid-client')
 const Database = require('./Database')
 const Logger = require('./Logger')
+const e = require('express')
 
 /**
  * @class Class for handling all the authentication related functionality.
@@ -15,6 +16,8 @@ const Logger = require('./Logger')
 class Auth {
 
   constructor() {
+    // Map of openId sessions indexed by oauth2 state-variable
+    this.openIdAuthSession = new Map()
   }
 
   /**
@@ -283,7 +286,26 @@ class Auth {
         //    for API or mobile clients
         const oidcStrategy = passport._strategy('openid-client')
         const protocol = (req.secure || req.get('x-forwarded-proto') === 'https') ? 'https' : 'http'
-        oidcStrategy._params.redirect_uri = new URL(`${protocol}://${req.get('host')}/auth/openid/callback`).toString()
+
+        let redirect_uri = null
+
+        // The client wishes a different redirect_uri
+        // We will allow if it is in the whitelist, by saving it into this.openIdAuthSession and setting the redirect uri to /auth/openid/mobile-redirect
+        //    where we will handle the redirect to it
+        if (req.query.redirect_uri) {
+          // Check if the redirect_uri is in the whitelist
+          if (Database.serverSettings.authOpenIDMobileRedirectURIs.includes(req.query.redirect_uri) ||
+           (Database.serverSettings.authOpenIDMobileRedirectURIs.length === 1 && Database.serverSettings.authOpenIDMobileRedirectURIs[0] === '*')) {
+            oidcStrategy._params.redirect_uri = new URL(`${protocol}://${req.get('host')}/auth/openid/mobile-redirect`).toString()
+            redirect_uri = req.query.redirect_uri
+          } else {
+            Logger.debug(`[Auth] Invalid redirect_uri=${req.query.redirect_uri} - not in whitelist`)
+            return res.status(400).send('Invalid redirect_uri')
+          }
+        } else {
+          oidcStrategy._params.redirect_uri = new URL(`${protocol}://${req.get('host')}/auth/openid/callback`).toString()
+        }
+
         Logger.debug(`[Auth] Set oidc redirect_uri=${oidcStrategy._params.redirect_uri}`)
         const client = oidcStrategy._client
         const sessionKey = oidcStrategy._key
@@ -327,6 +349,10 @@ class Auth {
           mobile: req.query.isRest?.toLowerCase() === 'true' // Used in the abs callback later
         }
 
+        // We cannot save redirect_uri in the session, because it the mobile client uses browser instead of the API
+        //   for the request to mobile-redirect and as such the session is not shared
+        this.openIdAuthSession.set(params.state, { redirect_uri: redirect_uri })
+
         // Now get the URL to direct to
         const authorizationUrl = client.authorizationUrl({
           ...params,
@@ -347,6 +373,37 @@ class Auth {
       }
     })
 
+    // This will be the oauth2 callback route for mobile clients
+    // It will redirect to an app-link like audiobookshelf://oauth
+    router.get('/auth/openid/mobile-redirect', (req, res) => {
+      try {
+        // Extract the state parameter from the request
+        const { state, code } = req.query
+    
+        // Check if the state provided is in our list
+        if (!state || !this.openIdAuthSession.has(state)) {
+          Logger.error('[Auth] /auth/openid/mobile-redirect route: State parameter mismatch')
+          return res.status(400).send('State parameter mismatch')
+        }
+
+        let redirect_uri = this.openIdAuthSession.get(state).redirect_uri
+
+        if (!redirect_uri) {
+          Logger.error('[Auth] No redirect URI')
+          return res.status(400).send('No redirect URI')
+        }
+
+        this.openIdAuthSession.delete(state)
+
+        const redirectUri = `${redirect_uri}?code=${encodeURIComponent(code)}&state=${encodeURIComponent(state)}`
+        // Redirect to the overwrite URI saved in the map
+        res.redirect(redirectUri)
+      } catch (error) {
+        Logger.error(`[Auth] Error in /auth/openid/mobile-redirect route: ${error}`)
+        res.status(500).send('Internal Server Error')
+      }
+    })
+
     // openid strategy callback route (this receives the token from the configured openid login provider)
     router.get('/auth/openid/callback', (req, res, next) => {
       const oidcStrategy = passport._strategy('openid-client')
diff --git a/server/controllers/MiscController.js b/server/controllers/MiscController.js
index 26a9d77b..e209fac9 100644
--- a/server/controllers/MiscController.js
+++ b/server/controllers/MiscController.js
@@ -629,6 +629,23 @@ class MiscController {
         } else {
           Logger.warn(`[MiscController] Invalid value for authActiveAuthMethods`)
         }
+      } else if (key === 'authOpenIDMobileRedirectURIs') {
+        function isValidRedirectURI(uri) {
+          const pattern = new RegExp('^\\w+://[\\w.-]+$', 'i');
+          return pattern.test(uri);
+        }
+
+        const uris = settingsUpdate[key]
+        if (!Array.isArray(uris) || 
+            (uris.includes('*') && uris.length > 1) || 
+            uris.some(uri => uri !== '*' && !isValidRedirectURI(uri))) {
+          Logger.warn(`[MiscController] Invalid value for authOpenIDMobileRedirectURIs`)
+          continue
+        }
+
+        // Update the URIs
+        Database.serverSettings[key] = uris
+        hasUpdates = true
       } else {
         const updatedValueType = typeof settingsUpdate[key]
         if (['authOpenIDAutoLaunch', 'authOpenIDAutoRegister'].includes(key)) {
diff --git a/server/objects/settings/ServerSettings.js b/server/objects/settings/ServerSettings.js
index bf3db557..6e9d8456 100644
--- a/server/objects/settings/ServerSettings.js
+++ b/server/objects/settings/ServerSettings.js
@@ -71,6 +71,7 @@ class ServerSettings {
     this.authOpenIDAutoLaunch = false
     this.authOpenIDAutoRegister = false
     this.authOpenIDMatchExistingBy = null
+    this.authOpenIDMobileRedirectURIs = ['audiobookshelf://oauth']
 
     if (settings) {
       this.construct(settings)
@@ -126,6 +127,7 @@ class ServerSettings {
     this.authOpenIDAutoLaunch = !!settings.authOpenIDAutoLaunch
     this.authOpenIDAutoRegister = !!settings.authOpenIDAutoRegister
     this.authOpenIDMatchExistingBy = settings.authOpenIDMatchExistingBy || null
+    this.authOpenIDMobileRedirectURIs = settings.authOpenIDMobileRedirectURIs || ['audiobookshelf://oauth']
 
     if (!Array.isArray(this.authActiveAuthMethods)) {
       this.authActiveAuthMethods = ['local']
@@ -211,7 +213,8 @@ class ServerSettings {
       authOpenIDButtonText: this.authOpenIDButtonText,
       authOpenIDAutoLaunch: this.authOpenIDAutoLaunch,
       authOpenIDAutoRegister: this.authOpenIDAutoRegister,
-      authOpenIDMatchExistingBy: this.authOpenIDMatchExistingBy
+      authOpenIDMatchExistingBy: this.authOpenIDMatchExistingBy, 
+      authOpenIDMobileRedirectURIs: this.authOpenIDMobileRedirectURIs // Do not return to client
     }
   }
 
@@ -220,6 +223,7 @@ class ServerSettings {
     delete json.tokenSecret
     delete json.authOpenIDClientID
     delete json.authOpenIDClientSecret
+    delete json.authOpenIDMobileRedirectURIs
     return json
   }
 
@@ -254,7 +258,8 @@ class ServerSettings {
       authOpenIDButtonText: this.authOpenIDButtonText,
       authOpenIDAutoLaunch: this.authOpenIDAutoLaunch,
       authOpenIDAutoRegister: this.authOpenIDAutoRegister,
-      authOpenIDMatchExistingBy: this.authOpenIDMatchExistingBy
+      authOpenIDMatchExistingBy: this.authOpenIDMatchExistingBy,
+      authOpenIDMobileRedirectURIs: this.authOpenIDMobileRedirectURIs // Do not return to client
     }
   }
 

From e6ab28365fa740b72295668b924ee5b1d6640f09 Mon Sep 17 00:00:00 2001
From: Denis Arnst <git@sapd.eu>
Date: Tue, 5 Dec 2023 00:18:58 +0100
Subject: [PATCH 05/47] SSO/OpenID: Remove modifying redirect_uri in the
 callback

The redirect URI will be now correctly set to either /callback or /mobile-redirect in the /auth/openid route
---
 server/Auth.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/server/Auth.js b/server/Auth.js
index c20d532a..b5bc7d40 100644
--- a/server/Auth.js
+++ b/server/Auth.js
@@ -359,7 +359,7 @@ class Auth {
           scope: 'openid profile email',
           response_type: 'code',
           code_challenge,
-          code_challenge_method,
+          code_challenge_method
         })
 
         // params (isRest, callback) to a cookie that will be send to the client
@@ -460,11 +460,8 @@ class Auth {
 
       // While not required by the standard, the passport plugin re-sends the original redirect_uri in the token request
       // We need to set it correctly, as some SSO providers (e.g. keycloak) check that parameter when it is provided
-      if (req.session[sessionKey].mobile) {
-        return passport.authenticate('openid-client', { redirect_uri: 'audiobookshelf://oauth' }, passportCallback(req, res, next))(req, res, next)
-      } else {
-        return passport.authenticate('openid-client', passportCallback(req, res, next))(req, res, next)
-      }
+      // This is already done in the strategy in the route to /auth/openid using oidcStrategy._params.redirect_uri 
+      return passport.authenticate('openid-client', passportCallback(req, res, next))(req, res, next)
     },
       // on a successfull login: read the cookies and react like the client requested (callback or json)
       this.handleLoginSuccessBasedOnCookie.bind(this))

From cf00650c6d3bd74ddb9fae92138c00f808511150 Mon Sep 17 00:00:00 2001
From: Denis Arnst <git@sapd.eu>
Date: Tue, 5 Dec 2023 09:43:06 +0100
Subject: [PATCH 06/47] SSO/OpenID: Also fix possible race condition

- We need to define redirect_uri in the callback again, because the global params of passport can change between calls to the first route (ie. if multiple users log in at same time)
- Removed is_rest parameter as requirement for mobile flow (to maximise compatibility with possible oauth libraries)
- Also renamed some variables for clarity
---
 server/Auth.js | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/server/Auth.js b/server/Auth.js
index b5bc7d40..0a282c9c 100644
--- a/server/Auth.js
+++ b/server/Auth.js
@@ -190,9 +190,10 @@ class Auth {
    * @param {import('express').Response} res
    */
   paramsToCookies(req, res) {
-    if (req.query.isRest?.toLowerCase() == 'true') {
+    // Set if isRest flag is set or if mobile oauth flow is used
+    if (req.query.isRest?.toLowerCase() == 'true' || req.query.redirect_uri) {
       // store the isRest flag to the is_rest cookie 
-      res.cookie('is_rest', req.query.isRest.toLowerCase(), {
+      res.cookie('is_rest', 'true', {
         maxAge: 120000, // 2 min
         httpOnly: true
       })
@@ -287,7 +288,7 @@ class Auth {
         const oidcStrategy = passport._strategy('openid-client')
         const protocol = (req.secure || req.get('x-forwarded-proto') === 'https') ? 'https' : 'http'
 
-        let redirect_uri = null
+        let mobile_redirect_uri = null
 
         // The client wishes a different redirect_uri
         // We will allow if it is in the whitelist, by saving it into this.openIdAuthSession and setting the redirect uri to /auth/openid/mobile-redirect
@@ -297,7 +298,7 @@ class Auth {
           if (Database.serverSettings.authOpenIDMobileRedirectURIs.includes(req.query.redirect_uri) ||
            (Database.serverSettings.authOpenIDMobileRedirectURIs.length === 1 && Database.serverSettings.authOpenIDMobileRedirectURIs[0] === '*')) {
             oidcStrategy._params.redirect_uri = new URL(`${protocol}://${req.get('host')}/auth/openid/mobile-redirect`).toString()
-            redirect_uri = req.query.redirect_uri
+            mobile_redirect_uri = req.query.redirect_uri
           } else {
             Logger.debug(`[Auth] Invalid redirect_uri=${req.query.redirect_uri} - not in whitelist`)
             return res.status(400).send('Invalid redirect_uri')
@@ -306,7 +307,7 @@ class Auth {
           oidcStrategy._params.redirect_uri = new URL(`${protocol}://${req.get('host')}/auth/openid/callback`).toString()
         }
 
-        Logger.debug(`[Auth] Set oidc redirect_uri=${oidcStrategy._params.redirect_uri}`)
+        Logger.debug(`[Auth] Oidc redirect_uri=${oidcStrategy._params.redirect_uri}`)
         const client = oidcStrategy._client
         const sessionKey = oidcStrategy._key
 
@@ -346,12 +347,13 @@ class Auth {
         req.session[sessionKey] = {
           ...req.session[sessionKey],
           ...pick(params, 'nonce', 'state', 'max_age', 'response_type'),
-          mobile: req.query.isRest?.toLowerCase() === 'true' // Used in the abs callback later
+          mobile: req.query.redirect_uri, // Used in the abs callback later, set mobile if redirect_uri is filled out
+          sso_redirect_uri: oidcStrategy._params.redirect_uri // Save the redirect_uri (for the SSO Provider) for the callback
         }
 
         // We cannot save redirect_uri in the session, because it the mobile client uses browser instead of the API
         //   for the request to mobile-redirect and as such the session is not shared
-        this.openIdAuthSession.set(params.state, { redirect_uri: redirect_uri })
+        this.openIdAuthSession.set(params.state, { mobile_redirect_uri: mobile_redirect_uri })
 
         // Now get the URL to direct to
         const authorizationUrl = client.authorizationUrl({
@@ -386,16 +388,16 @@ class Auth {
           return res.status(400).send('State parameter mismatch')
         }
 
-        let redirect_uri = this.openIdAuthSession.get(state).redirect_uri
+        let mobile_redirect_uri = this.openIdAuthSession.get(state).mobile_redirect_uri
 
-        if (!redirect_uri) {
+        if (!mobile_redirect_uri) {
           Logger.error('[Auth] No redirect URI')
           return res.status(400).send('No redirect URI')
         }
 
         this.openIdAuthSession.delete(state)
 
-        const redirectUri = `${redirect_uri}?code=${encodeURIComponent(code)}&state=${encodeURIComponent(state)}`
+        const redirectUri = `${mobile_redirect_uri}?code=${encodeURIComponent(code)}&state=${encodeURIComponent(state)}`
         // Redirect to the overwrite URI saved in the map
         res.redirect(redirectUri)
       } catch (error) {
@@ -460,8 +462,8 @@ class Auth {
 
       // While not required by the standard, the passport plugin re-sends the original redirect_uri in the token request
       // We need to set it correctly, as some SSO providers (e.g. keycloak) check that parameter when it is provided
-      // This is already done in the strategy in the route to /auth/openid using oidcStrategy._params.redirect_uri 
-      return passport.authenticate('openid-client', passportCallback(req, res, next))(req, res, next)
+      // We set it here again because the passport param can change between requests
+      return passport.authenticate('openid-client', { redirect_uri: req.session[sessionKey].sso_redirect_uri }, passportCallback(req, res, next))(req, res, next)
     },
       // on a successfull login: read the cookies and react like the client requested (callback or json)
       this.handleLoginSuccessBasedOnCookie.bind(this))

From b5e255a3848637c636f92dd1110010fbdcb69e6c Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 6 Dec 2023 17:31:36 -0600
Subject: [PATCH 07/47] Update:Clean series sequence response from audible
 provider #2380 - Removes Book prefix - Splits on spaces and takes first,
 removes trailing comma

---
 server/providers/Audible.js | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/server/providers/Audible.js b/server/providers/Audible.js
index 31719eef..e46ed323 100644
--- a/server/providers/Audible.js
+++ b/server/providers/Audible.js
@@ -18,6 +18,27 @@ class Audible {
         }
     }
 
+    /**
+     * Audible will sometimes send sequences with "Book 1" or "2, Dramatized Adaptation"
+     * @see https://github.com/advplyr/audiobookshelf/issues/2380
+     * @see https://github.com/advplyr/audiobookshelf/issues/1339
+     * 
+     * @param {string} seriesName
+     * @param {string} sequence 
+     * @returns {string}
+     */
+    cleanSeriesSequence(seriesName, sequence) {
+        if (!sequence) return ''
+        let updatedSequence = sequence.replace(/Book /, '').trim()
+        if (updatedSequence.includes(' ')) {
+            updatedSequence = updatedSequence.split(' ').shift().replace(/,$/, '')
+        }
+        if (sequence !== updatedSequence) {
+            Logger.debug(`[Audible] Series "${seriesName}" sequence was cleaned from "${sequence}" to "${updatedSequence}"`)
+        }
+        return updatedSequence
+    }
+
     cleanResult(item) {
         const { title, subtitle, asin, authors, narrators, publisherName, summary, releaseDate, image, genres, seriesPrimary, seriesSecondary, language, runtimeLengthMin, formatType } = item
 
@@ -25,13 +46,13 @@ class Audible {
         if (seriesPrimary) {
             series.push({
                 series: seriesPrimary.name,
-                sequence: (seriesPrimary.position || '').replace(/Book /, '') // Can be badly formatted see #1339
+                sequence: this.cleanSeriesSequence(seriesPrimary.name, seriesPrimary.position || '')
             })
         }
         if (seriesSecondary) {
             series.push({
                 series: seriesSecondary.name,
-                sequence: (seriesSecondary.position || '').replace(/Book /, '')
+                sequence: this.cleanSeriesSequence(seriesSecondary.name, seriesSecondary.position || '')
             })
         }
 
@@ -64,7 +85,7 @@ class Audible {
     }
 
     asinSearch(asin, region) {
-        asin = encodeURIComponent(asin);
+        asin = encodeURIComponent(asin)
         var regionQuery = region ? `?region=${region}` : ''
         var url = `https://api.audnex.us/books/${asin}${regionQuery}`
         Logger.debug(`[Audible] ASIN url: ${url}`)

From 341a0452da4044fe8bec7745d8c54b28a5c5eb6b Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 7 Dec 2023 17:01:33 -0600
Subject: [PATCH 08/47] Update auth settings endpoint to return updated flag
 and show whether updates were made in client toast

---
 client/pages/config/authentication.vue |  8 ++++++--
 server/controllers/MiscController.js   | 19 ++++++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/client/pages/config/authentication.vue b/client/pages/config/authentication.vue
index ffb1feb7..9e028307 100644
--- a/client/pages/config/authentication.vue
+++ b/client/pages/config/authentication.vue
@@ -202,7 +202,7 @@ export default {
         this.$toast.error('Mobile Redirect URIs: Asterisk (*) must be the only entry if used')
         isValid = false
       } else {
-        uris.forEach(uri => {
+        uris.forEach((uri) => {
           if (uri !== '*' && !isValidRedirectURI(uri)) {
             this.$toast.error(`Mobile Redirect URIs: Invalid URI ${uri}`)
             isValid = false
@@ -230,7 +230,11 @@ export default {
         .$patch('/api/auth-settings', this.newAuthSettings)
         .then((data) => {
           this.$store.commit('setServerSettings', data.serverSettings)
-          this.$toast.success('Server settings updated')
+          if (data.updated) {
+            this.$toast.success('Server settings updated')
+          } else {
+            this.$toast.info(this.$strings.MessageNoUpdatesWereNecessary)
+          }
         })
         .catch((error) => {
           console.error('Failed to update server settings', error)
diff --git a/server/controllers/MiscController.js b/server/controllers/MiscController.js
index e209fac9..db4110e0 100644
--- a/server/controllers/MiscController.js
+++ b/server/controllers/MiscController.js
@@ -631,21 +631,25 @@ class MiscController {
         }
       } else if (key === 'authOpenIDMobileRedirectURIs') {
         function isValidRedirectURI(uri) {
-          const pattern = new RegExp('^\\w+://[\\w.-]+$', 'i');
-          return pattern.test(uri);
+          if (typeof uri !== 'string') return false
+          const pattern = new RegExp('^\\w+://[\\w.-]+$', 'i')
+          return pattern.test(uri)
         }
 
         const uris = settingsUpdate[key]
-        if (!Array.isArray(uris) || 
-            (uris.includes('*') && uris.length > 1) || 
-            uris.some(uri => uri !== '*' && !isValidRedirectURI(uri))) {
+        if (!Array.isArray(uris) ||
+          (uris.includes('*') && uris.length > 1) ||
+          uris.some(uri => uri !== '*' && !isValidRedirectURI(uri))) {
           Logger.warn(`[MiscController] Invalid value for authOpenIDMobileRedirectURIs`)
           continue
         }
 
         // Update the URIs
-        Database.serverSettings[key] = uris
-        hasUpdates = true
+        if (Database.serverSettings[key].some(uri => !uris.includes(uri)) || uris.some(uri => !Database.serverSettings[key].includes(uri))) {
+          Logger.debug(`[MiscController] Updating auth settings key "${key}" from "${Database.serverSettings[key]}" to "${uris}"`)
+          Database.serverSettings[key] = uris
+          hasUpdates = true
+        }
       } else {
         const updatedValueType = typeof settingsUpdate[key]
         if (['authOpenIDAutoLaunch', 'authOpenIDAutoRegister'].includes(key)) {
@@ -688,6 +692,7 @@ class MiscController {
     }
 
     res.json({
+      updated: hasUpdates,
       serverSettings: Database.serverSettings.toJSONForBrowser()
     })
   }

From 98104a3c03591af2c8b8885631ce5bf87c556682 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 7 Dec 2023 17:05:52 -0600
Subject: [PATCH 09/47] Map new translations to other files

---
 client/strings/cs.json    | 2 ++
 client/strings/da.json    | 2 ++
 client/strings/es.json    | 2 ++
 client/strings/fr.json    | 2 ++
 client/strings/gu.json    | 2 ++
 client/strings/hi.json    | 2 ++
 client/strings/hr.json    | 2 ++
 client/strings/it.json    | 2 ++
 client/strings/lt.json    | 2 ++
 client/strings/nl.json    | 2 ++
 client/strings/no.json    | 2 ++
 client/strings/pl.json    | 2 ++
 client/strings/ru.json    | 2 ++
 client/strings/sv.json    | 2 ++
 client/strings/zh-cn.json | 2 ++
 15 files changed, 30 insertions(+)

diff --git a/client/strings/cs.json b/client/strings/cs.json
index b8936024..6d39569e 100644
--- a/client/strings/cs.json
+++ b/client/strings/cs.json
@@ -343,6 +343,8 @@
   "LabelMinute": "Minuta",
   "LabelMissing": "Chybějící",
   "LabelMissingParts": "Chybějící díly",
+  "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
+  "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "Více",
   "LabelMoreInfo": "Více informací",
   "LabelName": "Jméno",
diff --git a/client/strings/da.json b/client/strings/da.json
index a93507c0..fa28dd24 100644
--- a/client/strings/da.json
+++ b/client/strings/da.json
@@ -343,6 +343,8 @@
   "LabelMinute": "Minut",
   "LabelMissing": "Mangler",
   "LabelMissingParts": "Manglende dele",
+  "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
+  "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "Mere",
   "LabelMoreInfo": "Mere info",
   "LabelName": "Navn",
diff --git a/client/strings/es.json b/client/strings/es.json
index fc2f0316..47315301 100644
--- a/client/strings/es.json
+++ b/client/strings/es.json
@@ -343,6 +343,8 @@
   "LabelMinute": "Minuto",
   "LabelMissing": "Ausente",
   "LabelMissingParts": "Partes Ausentes",
+  "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
+  "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "Más",
   "LabelMoreInfo": "Más Información",
   "LabelName": "Nombre",
diff --git a/client/strings/fr.json b/client/strings/fr.json
index f10a51f4..f6efa428 100644
--- a/client/strings/fr.json
+++ b/client/strings/fr.json
@@ -343,6 +343,8 @@
   "LabelMinute": "Minute",
   "LabelMissing": "Manquant",
   "LabelMissingParts": "Parties manquantes",
+  "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
+  "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "Plus",
   "LabelMoreInfo": "Plus d’info",
   "LabelName": "Nom",
diff --git a/client/strings/gu.json b/client/strings/gu.json
index d65bb13e..0317e2f9 100644
--- a/client/strings/gu.json
+++ b/client/strings/gu.json
@@ -343,6 +343,8 @@
   "LabelMinute": "Minute",
   "LabelMissing": "Missing",
   "LabelMissingParts": "Missing Parts",
+  "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
+  "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "More",
   "LabelMoreInfo": "More Info",
   "LabelName": "Name",
diff --git a/client/strings/hi.json b/client/strings/hi.json
index b172c2e5..eb4f074f 100644
--- a/client/strings/hi.json
+++ b/client/strings/hi.json
@@ -343,6 +343,8 @@
   "LabelMinute": "Minute",
   "LabelMissing": "Missing",
   "LabelMissingParts": "Missing Parts",
+  "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
+  "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "More",
   "LabelMoreInfo": "More Info",
   "LabelName": "Name",
diff --git a/client/strings/hr.json b/client/strings/hr.json
index 50f384e7..eb7d27d8 100644
--- a/client/strings/hr.json
+++ b/client/strings/hr.json
@@ -343,6 +343,8 @@
   "LabelMinute": "Minuta",
   "LabelMissing": "Nedostaje",
   "LabelMissingParts": "Nedostajali dijelovi",
+  "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
+  "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "Više",
   "LabelMoreInfo": "More Info",
   "LabelName": "Ime",
diff --git a/client/strings/it.json b/client/strings/it.json
index 638e3468..7e526721 100644
--- a/client/strings/it.json
+++ b/client/strings/it.json
@@ -343,6 +343,8 @@
   "LabelMinute": "Minuto",
   "LabelMissing": "Altro",
   "LabelMissingParts": "Parti rimantenti",
+  "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
+  "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "Molto",
   "LabelMoreInfo": "Più Info",
   "LabelName": "Nome",
diff --git a/client/strings/lt.json b/client/strings/lt.json
index 3e3fda41..9c4b9a63 100644
--- a/client/strings/lt.json
+++ b/client/strings/lt.json
@@ -343,6 +343,8 @@
   "LabelMinute": "Minutė",
   "LabelMissing": "Trūksta",
   "LabelMissingParts": "Trūkstamos dalys",
+  "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
+  "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "Daugiau",
   "LabelMoreInfo": "Daugiau informacijos",
   "LabelName": "Pavadinimas",
diff --git a/client/strings/nl.json b/client/strings/nl.json
index 08845488..d4779abd 100644
--- a/client/strings/nl.json
+++ b/client/strings/nl.json
@@ -343,6 +343,8 @@
   "LabelMinute": "Minuut",
   "LabelMissing": "Ontbrekend",
   "LabelMissingParts": "Ontbrekende delen",
+  "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
+  "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "Meer",
   "LabelMoreInfo": "Meer info",
   "LabelName": "Naam",
diff --git a/client/strings/no.json b/client/strings/no.json
index 8cbfd919..511c8b86 100644
--- a/client/strings/no.json
+++ b/client/strings/no.json
@@ -343,6 +343,8 @@
   "LabelMinute": "Minutt",
   "LabelMissing": "Mangler",
   "LabelMissingParts": "Manglende deler",
+  "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
+  "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "Mer",
   "LabelMoreInfo": "Mer info",
   "LabelName": "Navn",
diff --git a/client/strings/pl.json b/client/strings/pl.json
index bf34cbac..b51084e9 100644
--- a/client/strings/pl.json
+++ b/client/strings/pl.json
@@ -343,6 +343,8 @@
   "LabelMinute": "Minuta",
   "LabelMissing": "Brakujący",
   "LabelMissingParts": "Brakujące cześci",
+  "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
+  "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "Więcej",
   "LabelMoreInfo": "More Info",
   "LabelName": "Nazwa",
diff --git a/client/strings/ru.json b/client/strings/ru.json
index b0ba0f6a..b48e0dbd 100644
--- a/client/strings/ru.json
+++ b/client/strings/ru.json
@@ -343,6 +343,8 @@
   "LabelMinute": "Минуты",
   "LabelMissing": "Потеряно",
   "LabelMissingParts": "Потерянные части",
+  "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
+  "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "Еще",
   "LabelMoreInfo": "Больше информации",
   "LabelName": "Имя",
diff --git a/client/strings/sv.json b/client/strings/sv.json
index 6883af39..fde0cd87 100644
--- a/client/strings/sv.json
+++ b/client/strings/sv.json
@@ -343,6 +343,8 @@
   "LabelMinute": "Minut",
   "LabelMissing": "Saknad",
   "LabelMissingParts": "Saknade delar",
+  "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
+  "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "Mer",
   "LabelMoreInfo": "Mer information",
   "LabelName": "Namn",
diff --git a/client/strings/zh-cn.json b/client/strings/zh-cn.json
index 14bfcc0b..7c559489 100644
--- a/client/strings/zh-cn.json
+++ b/client/strings/zh-cn.json
@@ -343,6 +343,8 @@
   "LabelMinute": "分钟",
   "LabelMissing": "丢失",
   "LabelMissingParts": "丢失的部分",
+  "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
+  "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
   "LabelMore": "更多",
   "LabelMoreInfo": "更多..",
   "LabelName": "名称",

From 8d3d6363290aa820f7fd6e93c4d7bca91950d891 Mon Sep 17 00:00:00 2001
From: JBlond <leet31337@web.de>
Date: Fri, 8 Dec 2023 09:39:04 +0100
Subject: [PATCH 10/47] Follow up for sso-redirecturi and #2305 #2333

8f4c65ec8c8838e71d7810266f60a85664927c27 / 7c9c278cc40acb2887f4d2b7b3c40241096ae38e sso-redirecturi
2f6756eddf03f758bea0f5dc7a154ba57ab1e69d #2333
2e5822b7c88ad362d7174c55becf320c0c834675 #2305
---
 client/strings/de.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/strings/de.json b/client/strings/de.json
index da8af1d8..3fa18960 100644
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -87,9 +87,9 @@
   "ButtonUserEdit": "Benutzer {0} bearbeiten",
   "ButtonViewAll": "Alles anzeigen",
   "ButtonYes": "Ja",
-  "ErrorUploadFetchMetadataAPI": "Error fetching metadata",
-  "ErrorUploadFetchMetadataNoResults": "Could not fetch metadata - try updating title and/or author",
-  "ErrorUploadLacksTitle": "Must have a title",
+  "ErrorUploadFetchMetadataAPI": "Fehler beim Abrufen der Metadaten",
+  "ErrorUploadFetchMetadataNoResults": "Metadaten konnten nicht abgerufen werden. Versuchen Sie den Titel und oder den Autor zu updaten",
+  "ErrorUploadLacksTitle": "Es muss ein Titel eingegeben werden",
   "HeaderAccount": "Konto",
   "HeaderAdvanced": "Erweitert",
   "HeaderAppriseNotificationSettings": "Apprise Benachrichtigungseinstellungen",
@@ -199,8 +199,8 @@
   "LabelAuthorLastFirst": "Autor (Nachname, Vorname)",
   "LabelAuthors": "Autoren",
   "LabelAutoDownloadEpisodes": "Episoden automatisch herunterladen",
-  "LabelAutoFetchMetadata": "Auto Fetch Metadata",
-  "LabelAutoFetchMetadataHelp": "Fetches metadata for title, author, and series to streamline uploading. Additional metadata may have to be matched after upload.",
+  "LabelAutoFetchMetadata": "Automatisches Abholen der Metadaten",
+  "LabelAutoFetchMetadataHelp": "Abholen der Metadaten von Titel, Autor und Serien, um das Hochladen zu optimieren. Möglicherweise müssen zusätzliche Metadaten nach dem Hochladen abgeglichen werden.",
   "LabelAutoLaunch": "Automatischer Start",
   "LabelAutoLaunchDescription": "Automatische Weiterleitung zum Authentifizierungsanbieter beim Navigieren zur Anmeldeseite (manueller Überschreibungspfad <code>/login?autoLaunch=0</code>)",
   "LabelAutoRegister": "Automatische Registrierung",
@@ -271,7 +271,7 @@
   "LabelExample": "Beispiel",
   "LabelExplicit": "Explizit (Altersbeschränkung)",
   "LabelFeedURL": "Feed URL",
-  "LabelFetchingMetadata": "Fetching Metadata",
+  "LabelFetchingMetadata": "Abholen der Metadaten",
   "LabelFile": "Datei",
   "LabelFileBirthtime": "Datei erstellt",
   "LabelFileModified": "Datei geändert",
@@ -289,7 +289,7 @@
   "LabelHardDeleteFile": "Datei dauerhaft löschen",
   "LabelHasEbook": "mit E-Book",
   "LabelHasSupplementaryEbook": "mit zusätlichem E-Book",
-  "LabelHighestPriority": "Highest priority",
+  "LabelHighestPriority": "Höchste Priorität",
   "LabelHost": "Host",
   "LabelHour": "Stunde",
   "LabelIcon": "Symbol",
@@ -331,12 +331,12 @@
   "LabelLogLevelInfo": "Informationen",
   "LabelLogLevelWarn": "Warnungen",
   "LabelLookForNewEpisodesAfterDate": "Suchen nach neuen Episoden nach diesem Datum",
-  "LabelLowestPriority": "Lowest Priority",
+  "LabelLowestPriority": "Niedrigste Priorität",
   "LabelMatchExistingUsersBy": "Zuordnen existierender Benutzer mit",
   "LabelMatchExistingUsersByDescription": "Wird zum Verbinden vorhandener Benutzer verwendet. Sobald die Verbindung hergestellt ist, wird den Benutzern eine eindeutige ID von Ihrem SSO-Anbieter zugeordnet",
   "LabelMediaPlayer": "Mediaplayer",
   "LabelMediaType": "Medientyp",
-  "LabelMetadataOrderOfPrecedenceDescription": "Higher priority metadata sources will override lower priority metadata sources",
+  "LabelMetadataOrderOfPrecedenceDescription": "Eine Höhere Priorität Quelle für Metadaten wird die Metadaten aus eine Quelle mit niedrigerer Priorität überschreiben.",
   "LabelMetadataProvider": "Metadatenanbieter",
   "LabelMetaTag": "Meta Schlagwort",
   "LabelMetaTags": "Meta Tags",
@@ -523,7 +523,7 @@
   "LabelUpdateDetailsHelp": "Erlaube das Überschreiben bestehender Details für die ausgewählten Hörbücher wenn eine Übereinstimmung gefunden wird",
   "LabelUploaderDragAndDrop": "Ziehen und Ablegen von Dateien oder Ordnern",
   "LabelUploaderDropFiles": "Dateien löschen",
-  "LabelUploaderItemFetchMetadataHelp": "Automatically fetch title, author, and series",
+  "LabelUploaderItemFetchMetadataHelp": "Automatisches Abholden von Titel, Author und Serien",
   "LabelUseChapterTrack": "Kapiteldatei verwenden",
   "LabelUseFullTrack": "Gesamte Datei verwenden",
   "LabelUser": "Benutzer",

From 0282a0521b8466c0af521f017c5a16dd8fcdfa8a Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Sat, 9 Dec 2023 00:33:06 +0200
Subject: [PATCH 11/47] Sort audible match results by duration difference

---
 client/components/modals/item/tabs/Match.vue |  1 +
 server/controllers/SearchController.js       |  5 +-
 server/finders/BookFinder.js                 | 26 ++++++++--
 server/scanner/Scanner.js                    |  2 +-
 test/server/finders/BookFinder.test.js       | 54 ++++++++++++++++----
 5 files changed, 70 insertions(+), 18 deletions(-)

diff --git a/client/components/modals/item/tabs/Match.vue b/client/components/modals/item/tabs/Match.vue
index 1c682919..b57e9612 100644
--- a/client/components/modals/item/tabs/Match.vue
+++ b/client/components/modals/item/tabs/Match.vue
@@ -332,6 +332,7 @@ export default {
       if (this.isPodcast) return `term=${encodeURIComponent(this.searchTitle)}`
       var searchQuery = `provider=${this.provider}&fallbackTitleOnly=1&title=${encodeURIComponent(this.searchTitle)}`
       if (this.searchAuthor) searchQuery += `&author=${encodeURIComponent(this.searchAuthor)}`
+      if (this.libraryItemId) searchQuery += `&id=${this.libraryItemId}`
       return searchQuery
     },
     submitSearch() {
diff --git a/server/controllers/SearchController.js b/server/controllers/SearchController.js
index 93587bc4..e52e6973 100644
--- a/server/controllers/SearchController.js
+++ b/server/controllers/SearchController.js
@@ -3,15 +3,18 @@ const BookFinder = require('../finders/BookFinder')
 const PodcastFinder = require('../finders/PodcastFinder')
 const AuthorFinder = require('../finders/AuthorFinder')
 const MusicFinder = require('../finders/MusicFinder')
+const Database = require("../Database")
 
 class SearchController {
   constructor() { }
 
   async findBooks(req, res) {
+    const id = req.query.id
+    const libraryItem = await Database.libraryItemModel.getOldById(id)
     const provider = req.query.provider || 'google'
     const title = req.query.title || ''
     const author = req.query.author || ''
-    const results = await BookFinder.search(provider, title, author)
+    const results = await BookFinder.search(libraryItem, provider, title, author)
     res.json(results)
   }
 
diff --git a/server/finders/BookFinder.js b/server/finders/BookFinder.js
index b76b8b1d..8704a964 100644
--- a/server/finders/BookFinder.js
+++ b/server/finders/BookFinder.js
@@ -299,6 +299,7 @@ class BookFinder {
   /**
    * Search for books including fuzzy searches
    * 
+   * @param {Object} libraryItem
    * @param {string} provider 
    * @param {string} title 
    * @param {string} author 
@@ -307,7 +308,7 @@ class BookFinder {
    * @param {{titleDistance:number, authorDistance:number, maxFuzzySearches:number}} options 
    * @returns {Promise<Object[]>}
    */
-  async search(provider, title, author, isbn, asin, options = {}) {
+  async search(libraryItem, provider, title, author, isbn, asin, options = {}) {
     let books = []
     const maxTitleDistance = !isNaN(options.titleDistance) ? Number(options.titleDistance) : 4
     const maxAuthorDistance = !isNaN(options.authorDistance) ? Number(options.authorDistance) : 4
@@ -336,6 +337,7 @@ class BookFinder {
       for (const titlePart of titleParts)
         authorCandidates.add(titlePart)
       authorCandidates = await authorCandidates.getCandidates()
+      loop_author:
       for (const authorCandidate of authorCandidates) {
         let titleCandidates = new BookFinder.TitleCandidates(authorCandidate)
         for (const titlePart of titleParts)
@@ -343,13 +345,27 @@ class BookFinder {
         titleCandidates = titleCandidates.getCandidates()
         for (const titleCandidate of titleCandidates) {
           if (titleCandidate == title && authorCandidate == author) continue // We already tried this
-          if (++numFuzzySearches > maxFuzzySearches) return books
+          if (++numFuzzySearches > maxFuzzySearches) break loop_author
           books = await this.runSearch(titleCandidate, authorCandidate, provider, asin, maxTitleDistance, maxAuthorDistance)
-          if (books.length) return books
+          if (books.length) break loop_author
         }
       }
     }
 
+    if (books.length) {
+      const resultsHaveDuration = provider.startsWith('audible')
+      if (resultsHaveDuration && libraryItem && libraryItem.media?.duration) {
+        const libraryItemDurationMinutes = libraryItem.media.duration/60      
+        // If provider results have duration, sort by ascendinge duration difference from libraryItem
+        books.sort((a, b) => {
+          const aDuration = a.duration || Number.POSITIVE_INFINITY
+          const bDuration = b.duration || Number.POSITIVE_INFINITY
+          const aDurationDiff = Math.abs(aDuration - libraryItemDurationMinutes)
+          const bDurationDiff = Math.abs(bDuration - libraryItemDurationMinutes)
+          return aDurationDiff - bDurationDiff
+        })
+      }
+    }
     return books
   }
 
@@ -393,12 +409,12 @@ class BookFinder {
 
     if (provider === 'all') {
       for (const providerString of this.providers) {
-        const providerResults = await this.search(providerString, title, author, options)
+        const providerResults = await this.search(null, providerString, title, author, options)
         Logger.debug(`[BookFinder] Found ${providerResults.length} covers from ${providerString}`)
         searchResults.push(...providerResults)
       }
     } else {
-      searchResults = await this.search(provider, title, author, options)
+      searchResults = await this.search(null, provider, title, author, options)
     }
     Logger.debug(`[BookFinder] FindCovers search results: ${searchResults.length}`)
 
diff --git a/server/scanner/Scanner.js b/server/scanner/Scanner.js
index 616baf29..040053e4 100644
--- a/server/scanner/Scanner.js
+++ b/server/scanner/Scanner.js
@@ -37,7 +37,7 @@ class Scanner {
       var searchISBN = options.isbn || libraryItem.media.metadata.isbn
       var searchASIN = options.asin || libraryItem.media.metadata.asin
 
-      var results = await BookFinder.search(provider, searchTitle, searchAuthor, searchISBN, searchASIN, { maxFuzzySearches: 2 })
+      var results = await BookFinder.search(libraryItem, provider, searchTitle, searchAuthor, searchISBN, searchASIN, { maxFuzzySearches: 2 })
       if (!results.length) {
         return {
           warning: `No ${provider} match found`
diff --git a/test/server/finders/BookFinder.test.js b/test/server/finders/BookFinder.test.js
index 5d28bbea..03f81f12 100644
--- a/test/server/finders/BookFinder.test.js
+++ b/test/server/finders/BookFinder.test.js
@@ -225,14 +225,14 @@ describe('search', () => {
 
   describe('search title is empty', () => {
     it('returns empty result', async () => {
-      expect(await bookFinder.search('', '', a)).to.deep.equal([])
+      expect(await bookFinder.search(null, '', '', a)).to.deep.equal([])
       sinon.assert.callCount(bookFinder.runSearch, 0)
     })
   })
 
   describe('search title is a recognized title and search author is a recognized author', () => {
     it('returns non-empty result (no fuzzy searches)', async () => {
-      expect(await bookFinder.search('', t, a)).to.deep.equal(r)
+      expect(await bookFinder.search(null, '', t, a)).to.deep.equal(r)
       sinon.assert.callCount(bookFinder.runSearch, 1)
     })
   })
@@ -254,7 +254,7 @@ describe('search', () => {
       [`2022_${t}_HQ`],
     ].forEach(([searchTitle]) => {
       it(`search('${searchTitle}', '${a}') returns non-empty result (with 1 fuzzy search)`, async () => {
-        expect(await bookFinder.search('', searchTitle, a)).to.deep.equal(r)
+        expect(await bookFinder.search(null, '', searchTitle, a)).to.deep.equal(r)
         sinon.assert.callCount(bookFinder.runSearch, 2)
       })
     });
@@ -264,7 +264,7 @@ describe('search', () => {
       [`${a} - series 01 - ${t}`],
     ].forEach(([searchTitle]) => {
       it(`search('${searchTitle}', '${a}') returns non-empty result (with 2 fuzzy searches)`, async () => {
-        expect(await bookFinder.search('', searchTitle, a)).to.deep.equal(r)
+        expect(await bookFinder.search(null, '', searchTitle, a)).to.deep.equal(r)
         sinon.assert.callCount(bookFinder.runSearch, 3)
       })
     });
@@ -274,7 +274,7 @@ describe('search', () => {
       [`${t} junk`],
     ].forEach(([searchTitle]) => {
       it(`search('${searchTitle}', '${a}') returns an empty result`, async () => {
-        expect(await bookFinder.search('', searchTitle, a)).to.deep.equal([])
+        expect(await bookFinder.search(null, '', searchTitle, a)).to.deep.equal([])
       })
     })
 
@@ -283,7 +283,7 @@ describe('search', () => {
         [`${t} - ${a}`],
       ].forEach(([searchTitle]) => {
         it(`search('${searchTitle}', '${a}') returns an empty result (with no fuzzy searches)`, async () => {
-          expect(await bookFinder.search('', searchTitle, a, null, null, { maxFuzzySearches: 0 })).to.deep.equal([])
+          expect(await bookFinder.search(null, '', searchTitle, a, null, null, { maxFuzzySearches: 0 })).to.deep.equal([])
           sinon.assert.callCount(bookFinder.runSearch, 1)
         })
       })
@@ -295,7 +295,7 @@ describe('search', () => {
         [`${a} - series 01 - ${t}`],
       ].forEach(([searchTitle]) => {
         it(`search('${searchTitle}', '${a}') returns an empty result (1 fuzzy search)`, async () => {
-          expect(await bookFinder.search('', searchTitle, a, null, null, { maxFuzzySearches: 1 })).to.deep.equal([])
+          expect(await bookFinder.search(null, '', searchTitle, a, null, null, { maxFuzzySearches: 1 })).to.deep.equal([])
           sinon.assert.callCount(bookFinder.runSearch, 2)
         })
       })
@@ -308,7 +308,7 @@ describe('search', () => {
       [`${a} - ${t}`],
     ].forEach(([searchTitle]) => {
       it(`search('${searchTitle}', '') returns a non-empty result (1 fuzzy search)`, async () => {
-        expect(await bookFinder.search('', searchTitle, '')).to.deep.equal(r)
+        expect(await bookFinder.search(null, '', searchTitle, '')).to.deep.equal(r)
         sinon.assert.callCount(bookFinder.runSearch, 2)
       })
     });
@@ -319,7 +319,7 @@ describe('search', () => {
       [`${u} - ${t}`]
     ].forEach(([searchTitle]) => {
       it(`search('${searchTitle}', '') returns an empty result`, async () => {
-        expect(await bookFinder.search('', searchTitle, '')).to.deep.equal([])
+        expect(await bookFinder.search(null, '', searchTitle, '')).to.deep.equal([])
       })
     })
   })
@@ -330,7 +330,7 @@ describe('search', () => {
       [`${u} - ${t}`]
     ].forEach(([searchTitle]) => {
       it(`search('${searchTitle}', '${u}') returns a non-empty result (1 fuzzy search)`, async () => {
-        expect(await bookFinder.search('', searchTitle, u)).to.deep.equal(r)
+        expect(await bookFinder.search(null, '', searchTitle, u)).to.deep.equal(r)
         sinon.assert.callCount(bookFinder.runSearch, 2)
       })
     });
@@ -339,9 +339,41 @@ describe('search', () => {
       [`${t}`]
     ].forEach(([searchTitle]) => {
       it(`search('${searchTitle}', '${u}') returns a non-empty result (no fuzzy search)`, async () => {
-        expect(await bookFinder.search('', searchTitle, u)).to.deep.equal(r)
+        expect(await bookFinder.search(null, '', searchTitle, u)).to.deep.equal(r)
         sinon.assert.callCount(bookFinder.runSearch, 1)
       })
     })
   })
+
+  describe('search provider results have duration', () => {
+    const  libraryItem = { media: { duration: 60 * 1000 } }
+    const provider = 'audible'
+    const unsorted = [{ duration: 3000 }, { duration: 2000 }, { duration: 1000 }, { duration: 500 }]
+    const sorted = [{ duration: 1000 }, { duration: 500 }, { duration: 2000 }, { duration: 3000 }]
+    runSearchStub.withArgs(t, a, provider).resolves(unsorted)
+
+    it('returns results sorted by library item duration diff', async () => {
+      expect(await bookFinder.search(libraryItem, provider, t, a)).to.deep.equal(sorted)
+    })
+    
+    it('returns unsorted results if library item is null', async () => {
+      expect(await bookFinder.search(null, provider, t, a)).to.deep.equal(unsorted)
+    })
+
+    it('returns unsorted results if library item duration is undefined', async () => {
+      expect(await bookFinder.search({ media: {} }, provider, t, a)).to.deep.equal(unsorted)
+    })
+
+    it('returns unsorted results if library item media is undefined', async () => {
+      expect(await bookFinder.search({ }, provider, t, a)).to.deep.equal(unsorted)
+    })
+
+    it ('should return a result last if it has no duration', async () => {
+      const unsorted = [{}, { duration: 3000 }, { duration: 2000 }, { duration: 1000 }, { duration: 500 }]
+      const sorted = [{ duration: 1000 }, { duration: 500 }, { duration: 2000 }, { duration: 3000 }, {}]
+      runSearchStub.withArgs(t, a, provider).resolves(unsorted)
+
+      expect(await bookFinder.search(libraryItem, provider, t, a)).to.deep.equal(sorted)
+    })
+  })
 })

From f659c3f11c2afbafd5769807111b1422effd1215 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 9 Dec 2023 13:51:28 -0600
Subject: [PATCH 12/47] Fix:Podcast RSS feed request header to include
 application/rss+xml #2401

---
 server/utils/podcastUtils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/utils/podcastUtils.js b/server/utils/podcastUtils.js
index cf1567f9..87b080d7 100644
--- a/server/utils/podcastUtils.js
+++ b/server/utils/podcastUtils.js
@@ -218,7 +218,7 @@ module.exports.parsePodcastRssFeedXml = async (xml, excludeEpisodeMetadata = fal
 
 module.exports.getPodcastFeed = (feedUrl, excludeEpisodeMetadata = false) => {
   Logger.debug(`[podcastUtils] getPodcastFeed for "${feedUrl}"`)
-  return axios.get(feedUrl, { timeout: 12000, responseType: 'arraybuffer' }).then(async (data) => {
+  return axios.get(feedUrl, { timeout: 12000, responseType: 'arraybuffer', headers: { Accept: 'application/rss+xml' } }).then(async (data) => {
 
     // Adding support for ios-8859-1 encoded RSS feeds.
     //  See: https://github.com/advplyr/audiobookshelf/issues/1489

From b580a23e7e05818a3d7ba38abf40f3450852eece Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 10 Dec 2023 10:35:21 -0600
Subject: [PATCH 13/47] BookFinder formatting update

---
 server/finders/BookFinder.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/finders/BookFinder.js b/server/finders/BookFinder.js
index 8704a964..466c8701 100644
--- a/server/finders/BookFinder.js
+++ b/server/finders/BookFinder.js
@@ -354,8 +354,8 @@ class BookFinder {
 
     if (books.length) {
       const resultsHaveDuration = provider.startsWith('audible')
-      if (resultsHaveDuration && libraryItem && libraryItem.media?.duration) {
-        const libraryItemDurationMinutes = libraryItem.media.duration/60      
+      if (resultsHaveDuration && libraryItem?.media?.duration) {
+        const libraryItemDurationMinutes = libraryItem.media.duration / 60
         // If provider results have duration, sort by ascendinge duration difference from libraryItem
         books.sort((a, b) => {
           const aDuration = a.duration || Number.POSITIVE_INFINITY
@@ -472,7 +472,7 @@ function cleanTitleForCompares(title) {
 function cleanAuthorForCompares(author) {
   if (!author) return ''
   author = stripRedundantSpaces(author)
-  
+
   let cleanAuthor = replaceAccentedChars(author).toLowerCase()
   // separate initials
   cleanAuthor = cleanAuthor.replace(/([a-z])\.([a-z])/g, '$1. $2')

From 6f26fd72380e524125306691df0fda1366074040 Mon Sep 17 00:00:00 2001
From: Dmitry Naboychenko <dmitry@naboychenko.ru>
Date: Tue, 12 Dec 2023 22:56:05 +0300
Subject: [PATCH 14/47] Update Russian localization

---
 client/strings/ru.json | 82 +++++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/client/strings/ru.json b/client/strings/ru.json
index b48e0dbd..03e7385f 100644
--- a/client/strings/ru.json
+++ b/client/strings/ru.json
@@ -1,10 +1,10 @@
 {
   "ButtonAdd": "Добавить",
   "ButtonAddChapters": "Добавить главы",
-  "ButtonAddDevice": "Add Device",
-  "ButtonAddLibrary": "Add Library",
+  "ButtonAddDevice": "Добавить устройство",
+  "ButtonAddLibrary": "Добавить библиотеку",
   "ButtonAddPodcasts": "Добавить подкасты",
-  "ButtonAddUser": "Add User",
+  "ButtonAddUser": "Добавить пользователя",
   "ButtonAddYourFirstLibrary": "Добавьте Вашу первую библиотеку",
   "ButtonApply": "Применить",
   "ButtonApplyChapters": "Применить главы",
@@ -62,7 +62,7 @@
   "ButtonRemoveSeriesFromContinueSeries": "Удалить серию из Продолжить серию",
   "ButtonReScan": "Пересканировать",
   "ButtonReset": "Сбросить",
-  "ButtonResetToDefault": "Reset to default",
+  "ButtonResetToDefault": "Сборосить по умолчанию",
   "ButtonRestore": "Восстановить",
   "ButtonSave": "Сохранить",
   "ButtonSaveAndClose": "Сохранить и закрыть",
@@ -78,7 +78,7 @@
   "ButtonStartM4BEncode": "Начать кодирование M4B",
   "ButtonStartMetadataEmbed": "Начать встраивание метаданных",
   "ButtonSubmit": "Применить",
-  "ButtonTest": "Test",
+  "ButtonTest": "Тест",
   "ButtonUpload": "Загрузить",
   "ButtonUploadBackup": "Загрузить бэкап",
   "ButtonUploadCover": "Загрузить обложку",
@@ -87,15 +87,15 @@
   "ButtonUserEdit": "Редактировать пользователя {0}",
   "ButtonViewAll": "Посмотреть все",
   "ButtonYes": "Да",
-  "ErrorUploadFetchMetadataAPI": "Error fetching metadata",
-  "ErrorUploadFetchMetadataNoResults": "Could not fetch metadata - try updating title and/or author",
-  "ErrorUploadLacksTitle": "Must have a title",
+  "ErrorUploadFetchMetadataAPI": "Ошибка при получении метаданных",
+  "ErrorUploadFetchMetadataNoResults": "Не удалось получить метаданные - попробуйте обновить название и/или автора",
+  "ErrorUploadLacksTitle": "Название должно быть заполнено",
   "HeaderAccount": "Учетная запись",
   "HeaderAdvanced": "Дополнительно",
   "HeaderAppriseNotificationSettings": "Настройки оповещений",
   "HeaderAudiobookTools": "Инструменты файлов аудиокниг",
   "HeaderAudioTracks": "Аудио треки",
-  "HeaderAuthentication": "Authentication",
+  "HeaderAuthentication": "Аутентификация",
   "HeaderBackups": "Бэкапы",
   "HeaderChangePassword": "Изменить пароль",
   "HeaderChapters": "Главы",
@@ -130,15 +130,15 @@
   "HeaderManageTags": "Редактировать теги",
   "HeaderMapDetails": "Найти подробности",
   "HeaderMatch": "Поиск",
-  "HeaderMetadataOrderOfPrecedence": "Metadata order of precedence",
+  "HeaderMetadataOrderOfPrecedence": "Порядок приоритета метаданных",
   "HeaderMetadataToEmbed": "Метаинформация для встраивания",
   "HeaderNewAccount": "Новая учетная запись",
   "HeaderNewLibrary": "Новая библиотека",
   "HeaderNotifications": "Уведомления",
-  "HeaderOpenIDConnectAuthentication": "OpenID Connect Authentication",
+  "HeaderOpenIDConnectAuthentication": "Аутентификация OpenID Connect",
   "HeaderOpenRSSFeed": "Открыть RSS-канал",
   "HeaderOtherFiles": "Другие файлы",
-  "HeaderPasswordAuthentication": "Password Authentication",
+  "HeaderPasswordAuthentication": "Аутентификация по паролю",
   "HeaderPermissions": "Разрешения",
   "HeaderPlayerQueue": "Очередь воспроизведения",
   "HeaderPlaylist": "Плейлист",
@@ -187,11 +187,11 @@
   "LabelAddToCollectionBatch": "Добавить {0} книг в коллекцию",
   "LabelAddToPlaylist": "Добавить в плейлист",
   "LabelAddToPlaylistBatch": "Добавить {0} элементов в плейлист",
-  "LabelAdminUsersOnly": "Admin users only",
+  "LabelAdminUsersOnly": "Только для пользователей с правами администратора",
   "LabelAll": "Все",
   "LabelAllUsers": "Все пользователи",
-  "LabelAllUsersExcludingGuests": "All users excluding guests",
-  "LabelAllUsersIncludingGuests": "All users including guests",
+  "LabelAllUsersExcludingGuests": "Все пользователи, кроме гостей",
+  "LabelAllUsersIncludingGuests": "Все пользователи, включая гостей",
   "LabelAlreadyInYourLibrary": "Уже в Вашей библиотеке",
   "LabelAppend": "Добавить",
   "LabelAuthor": "Автор",
@@ -199,14 +199,14 @@
   "LabelAuthorLastFirst": "Автор (Фамилия, Имя)",
   "LabelAuthors": "Авторы",
   "LabelAutoDownloadEpisodes": "Скачивать эпизоды автоматически",
-  "LabelAutoFetchMetadata": "Auto Fetch Metadata",
-  "LabelAutoFetchMetadataHelp": "Fetches metadata for title, author, and series to streamline uploading. Additional metadata may have to be matched after upload.",
-  "LabelAutoLaunch": "Auto Launch",
-  "LabelAutoLaunchDescription": "Redirect to the auth provider automatically when navigating to the login page (manual override path <code>/login?autoLaunch=0</code>)",
-  "LabelAutoRegister": "Auto Register",
-  "LabelAutoRegisterDescription": "Automatically create new users after logging in",
+  "LabelAutoFetchMetadata": "Автоматическое извлечение метаданных",
+  "LabelAutoFetchMetadataHelp": "Извлекает метаданные для названия, автора и серии для упрощения загрузки. После загрузки может потребоваться сопоставление дополнительных метаданных.",
+  "LabelAutoLaunch": "Автозапуск",
+  "LabelAutoLaunchDescription": "Редирект на провайдера аутентификации автоматически при переходе на страницу входа (путь ручного переопределения <code>/login?autoLaunch=0</code>)",
+  "LabelAutoRegister": "Автоматическая регистрация",
+  "LabelAutoRegisterDescription": "Автоматическое создание новых пользователей после входа в систему",
   "LabelBackToUser": "Назад к пользователю",
-  "LabelBackupLocation": "Backup Location",
+  "LabelBackupLocation": "Путь для бэкапов",
   "LabelBackupsEnableAutomaticBackups": "Включить автоматическое бэкапирование",
   "LabelBackupsEnableAutomaticBackupsHelp": "Бэкапы сохраняются в /metadata/backups",
   "LabelBackupsMaxBackupSize": "Максимальный размер бэкапа (в GB)",
@@ -215,13 +215,13 @@
   "LabelBackupsNumberToKeepHelp": "За один раз только 1 бэкап будет удален, так что если у вас будет больше бэкапов, то их нужно удалить вручную.",
   "LabelBitrate": "Битрейт",
   "LabelBooks": "Книги",
-  "LabelButtonText": "Button Text",
+  "LabelButtonText": "Текст кнопки",
   "LabelChangePassword": "Изменить пароль",
   "LabelChannels": "Каналы",
   "LabelChapters": "Главы",
   "LabelChaptersFound": "глав найдено",
   "LabelChapterTitle": "Название главы",
-  "LabelClickForMoreInfo": "Click for more info",
+  "LabelClickForMoreInfo": "Нажмите, чтобы узнать больше",
   "LabelClosePlayer": "Закрыть проигрыватель",
   "LabelCodec": "Кодек",
   "LabelCollapseSeries": "Свернуть серии",
@@ -240,12 +240,12 @@
   "LabelCurrently": "Текущее:",
   "LabelCustomCronExpression": "Пользовательское выражение Cron:",
   "LabelDatetime": "Дата и время",
-  "LabelDeleteFromFileSystemCheckbox": "Delete from file system (uncheck to only remove from database)",
+  "LabelDeleteFromFileSystemCheckbox": "Удалить из файловой системы (снимите флажок, чтобы удалить только из базы данных)",
   "LabelDescription": "Описание",
   "LabelDeselectAll": "Снять выделение",
   "LabelDevice": "Устройство",
   "LabelDeviceInfo": "Информация об устройстве",
-  "LabelDeviceIsAvailableTo": "Device is available to...",
+  "LabelDeviceIsAvailableTo": "Устройство доступно для...",
   "LabelDirectory": "Каталог",
   "LabelDiscFromFilename": "Диск из Имени файла",
   "LabelDiscFromMetadata": "Диск из Метаданных",
@@ -271,7 +271,7 @@
   "LabelExample": "Пример",
   "LabelExplicit": "Явный",
   "LabelFeedURL": "URL канала",
-  "LabelFetchingMetadata": "Fetching Metadata",
+  "LabelFetchingMetadata": "Извлечение метаданных",
   "LabelFile": "Файл",
   "LabelFileBirthtime": "Дата создания",
   "LabelFileModified": "Дата модификации",
@@ -289,11 +289,11 @@
   "LabelHardDeleteFile": "Жесткое удаление файла",
   "LabelHasEbook": "Есть e-книга",
   "LabelHasSupplementaryEbook": "Есть дополнительная e-книга",
-  "LabelHighestPriority": "Highest priority",
+  "LabelHighestPriority": "Наивысший приоритет",
   "LabelHost": "Хост",
   "LabelHour": "Часы",
   "LabelIcon": "Иконка",
-  "LabelImageURLFromTheWeb": "Image URL from the web",
+  "LabelImageURLFromTheWeb": "URL-адрес изображения из Интернета",
   "LabelIncludeInTracklist": "Включать в список воспроизведения",
   "LabelIncomplete": "Не завершен",
   "LabelInProgress": "В процессе",
@@ -331,20 +331,20 @@
   "LabelLogLevelInfo": "Info",
   "LabelLogLevelWarn": "Warn",
   "LabelLookForNewEpisodesAfterDate": "Искать новые эпизоды после этой даты",
-  "LabelLowestPriority": "Lowest Priority",
-  "LabelMatchExistingUsersBy": "Match existing users by",
-  "LabelMatchExistingUsersByDescription": "Used for connecting existing users. Once connected, users will be matched by a unique id from your SSO provider",
+  "LabelLowestPriority": "Самый низкий приоритет",
+  "LabelMatchExistingUsersBy": "Сопоставление существующих пользователей по",
+  "LabelMatchExistingUsersByDescription": "Используется для подключения существующих пользователей. После подключения пользователям будет присвоен уникальный идентификатор от поставщика единого входа",
   "LabelMediaPlayer": "Медиа проигрыватель",
   "LabelMediaType": "Тип медиа",
-  "LabelMetadataOrderOfPrecedenceDescription": "Higher priority metadata sources will override lower priority metadata sources",
+  "LabelMetadataOrderOfPrecedenceDescription": "Источники метаданных с более высоким приоритетом будут переопределять источники метаданных с более низким приоритетом",
   "LabelMetadataProvider": "Провайдер",
   "LabelMetaTag": "Мета тег",
   "LabelMetaTags": "Мета теги",
   "LabelMinute": "Минуты",
   "LabelMissing": "Потеряно",
   "LabelMissingParts": "Потерянные части",
-  "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
-  "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
+  "LabelMobileRedirectURIs": "Разрешенные URI перенаправления с мобильных устройств",
+  "LabelMobileRedirectURIsDescription": "Это белый список допустимых URI перенаправления для мобильных приложений. По умолчанию используется <code>audiobookshelf://oauth</code>, который можно удалить или дополнить дополнительными URI для интеграции со сторонними приложениями. Использование звездочки (<code>*</code>) в качестве единственной записи разрешает любой URI.",
   "LabelMore": "Еще",
   "LabelMoreInfo": "Больше информации",
   "LabelName": "Имя",
@@ -523,7 +523,7 @@
   "LabelUpdateDetailsHelp": "Позволяет перезаписывать текущие подробности для выбранных книг если будут найдены",
   "LabelUploaderDragAndDrop": "Перетащите файлы или каталоги",
   "LabelUploaderDropFiles": "Перетащите файлы",
-  "LabelUploaderItemFetchMetadataHelp": "Automatically fetch title, author, and series",
+  "LabelUploaderItemFetchMetadataHelp": "Автоматическое извлечение названия, автора и серии",
   "LabelUseChapterTrack": "Показывать время главы",
   "LabelUseFullTrack": "Показывать время книги",
   "LabelUser": "Пользователь",
@@ -557,17 +557,17 @@
   "MessageConfirmDeleteBackup": "Вы уверены, что хотите удалить бэкап для {0}?",
   "MessageConfirmDeleteFile": "Это удалит файл из Вашей файловой системы. Вы уверены?",
   "MessageConfirmDeleteLibrary": "Вы уверены, что хотите навсегда удалить библиотеку \"{0}\"?",
-  "MessageConfirmDeleteLibraryItem": "This will delete the library item from the database and your file system. Are you sure?",
-  "MessageConfirmDeleteLibraryItems": "This will delete {0} library items from the database and your file system. Are you sure?",
+  "MessageConfirmDeleteLibraryItem": "Это приведет к удалению элемента библиотеки из базы данных и файловой системы. Вы уверены?",
+  "MessageConfirmDeleteLibraryItems": "Это приведет к удалению {0} элементов библиотеки из базы данных и файловой системы. Вы уверены?",
   "MessageConfirmDeleteSession": "Вы уверены, что хотите удалить этот сеанс?",
   "MessageConfirmForceReScan": "Вы уверены, что хотите принудительно выполнить повторное сканирование?",
   "MessageConfirmMarkAllEpisodesFinished": "Вы уверены, что хотите отметить все эпизоды как завершенные?",
   "MessageConfirmMarkAllEpisodesNotFinished": "Вы уверены, что хотите отметить все эпизоды как не завершенные?",
   "MessageConfirmMarkSeriesFinished": "Вы уверены, что хотите отметить все книги этой серии как завершенные?",
   "MessageConfirmMarkSeriesNotFinished": "Вы уверены, что хотите отметить все книги этой серии как не завершенные?",
-  "MessageConfirmQuickEmbed": "Warning! Quick embed will not backup your audio files. Make sure that you have a backup of your audio files. <br><br>Would you like to continue?",
+  "MessageConfirmQuickEmbed": "Предупреждение! Быстрое встраивание не позволяет создавать резервные копии аудиофайлов. Убедитесь, что у вас есть резервная копия аудиофайлов. <br><br>Хотите продолжить?",
   "MessageConfirmRemoveAllChapters": "Вы уверены, что хотите удалить все главы?",
-  "MessageConfirmRemoveAuthor": "Are you sure you want to remove author \"{0}\"?",
+  "MessageConfirmRemoveAuthor": "Вы уверены, что хотите удалить автора \"{0}\"?",
   "MessageConfirmRemoveCollection": "Вы уверены, что хотите удалить коллекцию \"{0}\"?",
   "MessageConfirmRemoveEpisode": "Вы уверены, что хотите удалить эпизод \"{0}\"?",
   "MessageConfirmRemoveEpisodes": "Вы уверены, что хотите удалить {0} эпизодов?",
@@ -579,7 +579,7 @@
   "MessageConfirmRenameTag": "Вы уверены, что хотите переименовать тег \"{0}\" в \"{1}\" для всех элементов?",
   "MessageConfirmRenameTagMergeNote": "Примечание: Этот тег уже существует, поэтому они будут объединены.",
   "MessageConfirmRenameTagWarning": "Предупреждение! Похожий тег с другими начальными буквами уже существует \"{0}\".",
-  "MessageConfirmReScanLibraryItems": "Are you sure you want to re-scan {0} items?",
+  "MessageConfirmReScanLibraryItems": "Вы уверены, что хотите пересканировать {0} элементов?",
   "MessageConfirmSendEbookToDevice": "Вы уверены, что хотите отправить {0} e-книгу \"{1}\" на устройство \"{2}\"?",
   "MessageDownloadingEpisode": "Эпизод скачивается",
   "MessageDragFilesIntoTrackOrder": "Перетащите файлы для исправления порядка треков",

From d3256d59d56da99f2acb42ba228696e60c779a5a Mon Sep 17 00:00:00 2001
From: JBlond <leet31337@web.de>
Date: Wed, 13 Dec 2023 20:12:25 +0100
Subject: [PATCH 15/47] - Translate more strings - Add missing least empty line

---
 client/strings/de.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/strings/de.json b/client/strings/de.json
index 3fa18960..6975b794 100644
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -1,10 +1,10 @@
 {
   "ButtonAdd": "Hinzufügen",
   "ButtonAddChapters": "Kapitel hinzufügen",
-  "ButtonAddDevice": "Add Device",
-  "ButtonAddLibrary": "Add Library",
+  "ButtonAddDevice": "Gerät hinzufügen",
+  "ButtonAddLibrary": "Bibliothek hinzufügen",
   "ButtonAddPodcasts": "Podcasts hinzufügen",
-  "ButtonAddUser": "Add User",
+  "ButtonAddUser": "Benutzer hinzufügen",
   "ButtonAddYourFirstLibrary": "Erstelle deine erste Bibliothek",
   "ButtonApply": "Übernehmen",
   "ButtonApplyChapters": "Kapitel anwenden",
@@ -58,11 +58,11 @@
   "ButtonRemoveAll": "Alles löschen",
   "ButtonRemoveAllLibraryItems": "Lösche alle Bibliothekseinträge",
   "ButtonRemoveFromContinueListening": "Lösche den Eintrag aus der Fortsetzungsliste",
-  "ButtonRemoveFromContinueReading": "Remove from Continue Reading",
+  "ButtonRemoveFromContinueReading": "Lösche die Serie aus der Lesefortsetzungsliste",
   "ButtonRemoveSeriesFromContinueSeries": "Lösche die Serie aus der Serienfortsetzungsliste",
   "ButtonReScan": "Neu scannen",
   "ButtonReset": "Zurücksetzen",
-  "ButtonResetToDefault": "Reset to default",
+  "ButtonResetToDefault": "Zurücksetzen auf Standard",
   "ButtonRestore": "Wiederherstellen",
   "ButtonSave": "Speichern",
   "ButtonSaveAndClose": "Speichern & Schließen",
@@ -221,7 +221,7 @@
   "LabelChapters": "Kapitel",
   "LabelChaptersFound": "gefundene Kapitel",
   "LabelChapterTitle": "Kapitelüberschrift",
-  "LabelClickForMoreInfo": "Click for more info",
+  "LabelClickForMoreInfo": "Klicken für mehr Informationen",
   "LabelClosePlayer": "Player schließen",
   "LabelCodec": "Codec",
   "LabelCollapseSeries": "Serien zusammenfassen",
@@ -251,7 +251,7 @@
   "LabelDiscFromMetadata": "CD aus den Metadaten",
   "LabelDiscover": "Entdecken",
   "LabelDownload": "Herunterladen",
-  "LabelDownloadNEpisodes": "Download {0} episodes",
+  "LabelDownloadNEpisodes": "Download {0} Episoden",
   "LabelDuration": "Laufzeit",
   "LabelDurationFound": "Gefundene Laufzeit:",
   "LabelEbook": "E-Book",
@@ -747,4 +747,4 @@
   "ToastSocketFailedToConnect": "Verbindung zum WebSocket fehlgeschlagen",
   "ToastUserDeleteFailed": "Benutzer konnte nicht gelöscht werden",
   "ToastUserDeleteSuccess": "Benutzer gelöscht"
-}
\ No newline at end of file
+}

From fae383a04520f36928b9f77ee2269cec7de26b90 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 14 Dec 2023 15:45:34 -0600
Subject: [PATCH 16/47] Fix:RSS feeds for collections not updating #2414

---
 server/managers/RssFeedManager.js | 14 ++++++++++++--
 server/models/Feed.js             |  8 ++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/server/managers/RssFeedManager.js b/server/managers/RssFeedManager.js
index 7eb1cce7..3149689d 100644
--- a/server/managers/RssFeedManager.js
+++ b/server/managers/RssFeedManager.js
@@ -103,19 +103,29 @@ class RssFeedManager {
         await Database.updateFeed(feed)
       }
     } else if (feed.entityType === 'collection') {
-      const collection = await Database.collectionModel.findByPk(feed.entityId)
+      const collection = await Database.collectionModel.findByPk(feed.entityId, {
+        include: Database.collectionBookModel
+      })
       if (collection) {
         const collectionExpanded = await collection.getOldJsonExpanded()
 
         // Find most recently updated item in collection
         let mostRecentlyUpdatedAt = collectionExpanded.lastUpdate
+        // Check for most recently updated book
         collectionExpanded.books.forEach((libraryItem) => {
           if (libraryItem.media.tracks.length && libraryItem.updatedAt > mostRecentlyUpdatedAt) {
             mostRecentlyUpdatedAt = libraryItem.updatedAt
           }
         })
+        // Check for most recently added collection book
+        collection.collectionBooks.forEach((collectionBook) => {
+          if (collectionBook.createdAt.valueOf() > mostRecentlyUpdatedAt) {
+            mostRecentlyUpdatedAt = collectionBook.createdAt.valueOf()
+          }
+        })
+        const hasBooksRemoved = collection.collectionBooks.length < feed.episodes.length
 
-        if (!feed.entityUpdatedAt || mostRecentlyUpdatedAt > feed.entityUpdatedAt) {
+        if (!feed.entityUpdatedAt || hasBooksRemoved || mostRecentlyUpdatedAt > feed.entityUpdatedAt) {
           Logger.debug(`[RssFeedManager] Updating RSS feed for collection "${collection.name}"`)
 
           feed.updateFromCollection(collectionExpanded)
diff --git a/server/models/Feed.js b/server/models/Feed.js
index 72ea146c..d8c5a2a7 100644
--- a/server/models/Feed.js
+++ b/server/models/Feed.js
@@ -108,7 +108,7 @@ class Feed extends Model {
 
   /**
    * Find all library item ids that have an open feed (used in library filter)
-   * @returns {Promise<Array<String>>} array of library item ids
+   * @returns {Promise<string[]>} array of library item ids
    */
   static async findAllLibraryItemIds() {
     const feeds = await this.findAll({
@@ -122,8 +122,8 @@ class Feed extends Model {
 
   /**
    * Find feed where and return oldFeed
-   * @param {object} where sequelize where object
-   * @returns {Promise<objects.Feed>} oldFeed
+   * @param {Object} where sequelize where object
+   * @returns {Promise<oldFeed>} oldFeed
    */
   static async findOneOld(where) {
     if (!where) return null
@@ -140,7 +140,7 @@ class Feed extends Model {
   /**
    * Find feed and return oldFeed
    * @param {string} id
-   * @returns {Promise<objects.Feed>} oldFeed
+   * @returns {Promise<oldFeed>} oldFeed
    */
   static async findByPkOld(id) {
     if (!id) return null

From 1d41904fc3400e268a8ed0f3fd26986245d8cf6e Mon Sep 17 00:00:00 2001
From: nichwall <nicholaslwallace@gmail.com>
Date: Thu, 14 Dec 2023 21:04:37 -0700
Subject: [PATCH 17/47] Added comments to the Docker Compose file

---
 docker-compose.yml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index da3fa1f2..68e012fb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,12 +3,28 @@ version: "3.7"
 
 services:
   audiobookshelf:
-    image: ghcr.io/advplyr/audiobookshelf
+    image: ghcr.io/advplyr/audiobookshelf:latest
+    # ABS runs on port 13378 by default. If you want to change
+    # the port, only change the external port, not the internal port
     ports:
       - 13378:80
     volumes:
+      # These volumes are needed to keep your library persistent
+      # and allow media to be accessed by the ABS server.
+      # The path to the left of the colon is the path on your computer,
+      # and the path to the right of the colon is where the data is
+      # available to ABS in Docker.
+      # You can change these media directories or add as many as you want
       - ./audiobooks:/audiobooks
       - ./podcasts:/podcasts
+      # The metadata directory can be stored anywhere on your computer
       - ./metadata:/metadata
+      # The config directory needs to be on the same physical machine
+      # you are running ABS on
       - ./config:/config
     restart: unless-stopped
+    # You can use the following environment variable to run the ABS
+    # docker container as a specific user. You will need to change
+    # the UID and GID to the correct values for your user.
+    #environment:
+    #  - user=1000:1000

From 39ceb025004b302bb4650cc382267bacfa0af36f Mon Sep 17 00:00:00 2001
From: SunX <yearnsun@gmail.com>
Date: Fri, 15 Dec 2023 19:04:56 +0800
Subject: [PATCH 18/47] Update zh-cn.json

---
 client/strings/zh-cn.json | 76 +++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/client/strings/zh-cn.json b/client/strings/zh-cn.json
index 7c559489..edf09040 100644
--- a/client/strings/zh-cn.json
+++ b/client/strings/zh-cn.json
@@ -1,10 +1,10 @@
 {
   "ButtonAdd": "增加",
   "ButtonAddChapters": "添加章节",
-  "ButtonAddDevice": "Add Device",
-  "ButtonAddLibrary": "Add Library",
+  "ButtonAddDevice": "添加设备",
+  "ButtonAddLibrary": "添加库",
   "ButtonAddPodcasts": "添加播客",
-  "ButtonAddUser": "Add User",
+  "ButtonAddUser": "添加用户",
   "ButtonAddYourFirstLibrary": "添加第一个媒体库",
   "ButtonApply": "应用",
   "ButtonApplyChapters": "应用到章节",
@@ -62,7 +62,7 @@
   "ButtonRemoveSeriesFromContinueSeries": "从继续收听系列中删除",
   "ButtonReScan": "重新扫描",
   "ButtonReset": "重置",
-  "ButtonResetToDefault": "Reset to default",
+  "ButtonResetToDefault": "重置为默认",
   "ButtonRestore": "恢复",
   "ButtonSave": "保存",
   "ButtonSaveAndClose": "保存并关闭",
@@ -87,15 +87,15 @@
   "ButtonUserEdit": "编辑用户 {0}",
   "ButtonViewAll": "查看全部",
   "ButtonYes": "确定",
-  "ErrorUploadFetchMetadataAPI": "Error fetching metadata",
-  "ErrorUploadFetchMetadataNoResults": "Could not fetch metadata - try updating title and/or author",
-  "ErrorUploadLacksTitle": "Must have a title",
+  "ErrorUploadFetchMetadataAPI": "获取元数据时出错",
+  "ErrorUploadFetchMetadataNoResults": "无法获取元数据 - 尝试更新标题和/或作者",
+  "ErrorUploadLacksTitle": "必须有标题",
   "HeaderAccount": "帐户",
   "HeaderAdvanced": "高级",
   "HeaderAppriseNotificationSettings": "测试通知设置",
   "HeaderAudiobookTools": "有声读物文件管理工具",
   "HeaderAudioTracks": "音轨",
-  "HeaderAuthentication": "Authentication",
+  "HeaderAuthentication": "身份验证",
   "HeaderBackups": "备份",
   "HeaderChangePassword": "更改密码",
   "HeaderChapters": "章节",
@@ -130,15 +130,15 @@
   "HeaderManageTags": "管理标签",
   "HeaderMapDetails": "编辑详情",
   "HeaderMatch": "匹配",
-  "HeaderMetadataOrderOfPrecedence": "Metadata order of precedence",
+  "HeaderMetadataOrderOfPrecedence": "元数据优先级",
   "HeaderMetadataToEmbed": "嵌入元数据",
   "HeaderNewAccount": "新建帐户",
   "HeaderNewLibrary": "新建媒体库",
   "HeaderNotifications": "通知",
-  "HeaderOpenIDConnectAuthentication": "OpenID Connect Authentication",
+  "HeaderOpenIDConnectAuthentication": "OpenID 连接身份验证",
   "HeaderOpenRSSFeed": "打开 RSS 源",
   "HeaderOtherFiles": "其他文件",
-  "HeaderPasswordAuthentication": "Password Authentication",
+  "HeaderPasswordAuthentication": "密码认证",
   "HeaderPermissions": "权限",
   "HeaderPlayerQueue": "播放队列",
   "HeaderPlaylist": "播放列表",
@@ -187,11 +187,11 @@
   "LabelAddToCollectionBatch": "批量添加 {0} 个媒体到收藏",
   "LabelAddToPlaylist": "添加到播放列表",
   "LabelAddToPlaylistBatch": "添加 {0} 个项目到播放列表",
-  "LabelAdminUsersOnly": "Admin users only",
+  "LabelAdminUsersOnly": "仅限管理员用户",
   "LabelAll": "全部",
   "LabelAllUsers": "所有用户",
-  "LabelAllUsersExcludingGuests": "All users excluding guests",
-  "LabelAllUsersIncludingGuests": "All users including guests",
+  "LabelAllUsersExcludingGuests": "除访客外的所有用户",
+  "LabelAllUsersIncludingGuests": "包括访客的所有用户",
   "LabelAlreadyInYourLibrary": "已存在你的库中",
   "LabelAppend": "附加",
   "LabelAuthor": "作者",
@@ -199,12 +199,12 @@
   "LabelAuthorLastFirst": "作者 (名, 姓)",
   "LabelAuthors": "作者",
   "LabelAutoDownloadEpisodes": "自动下载剧集",
-  "LabelAutoFetchMetadata": "Auto Fetch Metadata",
-  "LabelAutoFetchMetadataHelp": "Fetches metadata for title, author, and series to streamline uploading. Additional metadata may have to be matched after upload.",
-  "LabelAutoLaunch": "Auto Launch",
-  "LabelAutoLaunchDescription": "Redirect to the auth provider automatically when navigating to the login page (manual override path <code>/login?autoLaunch=0</code>)",
-  "LabelAutoRegister": "Auto Register",
-  "LabelAutoRegisterDescription": "Automatically create new users after logging in",
+  "LabelAutoFetchMetadata": "自动获取元数据",
+  "LabelAutoFetchMetadataHelp": "获取标题, 作者和系列的元数据以简化上传. 上传后可能需要匹配其他元数据.",
+  "LabelAutoLaunch": "自动启动",
+  "LabelAutoLaunchDescription": "导航到登录页面时自动重定向到身份验证提供程序 (手动覆盖路径 <code>/login?autoLaunch=0</code>)",
+  "LabelAutoRegister": "自动注册",
+  "LabelAutoRegisterDescription": "登录后自动创建新用户",
   "LabelBackToUser": "返回到用户",
   "LabelBackupLocation": "备份位置",
   "LabelBackupsEnableAutomaticBackups": "启用自动备份",
@@ -215,13 +215,13 @@
   "LabelBackupsNumberToKeepHelp": "一次只能删除一个备份, 因此如果你已经有超过此数量的备份, 则应手动删除它们.",
   "LabelBitrate": "比特率",
   "LabelBooks": "图书",
-  "LabelButtonText": "Button Text",
+  "LabelButtonText": "按钮文本",
   "LabelChangePassword": "修改密码",
   "LabelChannels": "声道",
   "LabelChapters": "章节",
   "LabelChaptersFound": "找到的章节",
   "LabelChapterTitle": "章节标题",
-  "LabelClickForMoreInfo": "Click for more info",
+  "LabelClickForMoreInfo": "点击了解更多信息",
   "LabelClosePlayer": "关闭播放器",
   "LabelCodec": "编解码",
   "LabelCollapseSeries": "折叠系列",
@@ -240,12 +240,12 @@
   "LabelCurrently": "当前:",
   "LabelCustomCronExpression": "自定义计划任务表达式:",
   "LabelDatetime": "日期时间",
-  "LabelDeleteFromFileSystemCheckbox": "Delete from file system (uncheck to only remove from database)",
+  "LabelDeleteFromFileSystemCheckbox": "从文件系统删除 (取消选中仅从数据库中删除)",
   "LabelDescription": "描述",
   "LabelDeselectAll": "全部取消选择",
   "LabelDevice": "设备",
   "LabelDeviceInfo": "设备信息",
-  "LabelDeviceIsAvailableTo": "Device is available to...",
+  "LabelDeviceIsAvailableTo": "设备可用于...",
   "LabelDirectory": "目录",
   "LabelDiscFromFilename": "从文件名获取光盘",
   "LabelDiscFromMetadata": "从元数据获取光盘",
@@ -271,7 +271,7 @@
   "LabelExample": "示例",
   "LabelExplicit": "信息准确",
   "LabelFeedURL": "源 URL",
-  "LabelFetchingMetadata": "Fetching Metadata",
+  "LabelFetchingMetadata": "正在获取元数据",
   "LabelFile": "文件",
   "LabelFileBirthtime": "文件创建时间",
   "LabelFileModified": "文件修改时间",
@@ -289,7 +289,7 @@
   "LabelHardDeleteFile": "完全删除文件",
   "LabelHasEbook": "有电子书",
   "LabelHasSupplementaryEbook": "有补充电子书",
-  "LabelHighestPriority": "Highest priority",
+  "LabelHighestPriority": "最高优先级",
   "LabelHost": "主机",
   "LabelHour": "小时",
   "LabelIcon": "图标",
@@ -331,20 +331,20 @@
   "LabelLogLevelInfo": "信息",
   "LabelLogLevelWarn": "警告",
   "LabelLookForNewEpisodesAfterDate": "在此日期后查找新剧集",
-  "LabelLowestPriority": "Lowest Priority",
-  "LabelMatchExistingUsersBy": "Match existing users by",
-  "LabelMatchExistingUsersByDescription": "Used for connecting existing users. Once connected, users will be matched by a unique id from your SSO provider",
+  "LabelLowestPriority": "最低优先级",
+  "LabelMatchExistingUsersBy": "匹配现有用户",
+  "LabelMatchExistingUsersByDescription": "用于连接现有用户. 连接后, 用户将通过SSO提供商提供的唯一 id 进行匹配",
   "LabelMediaPlayer": "媒体播放器",
   "LabelMediaType": "媒体类型",
-  "LabelMetadataOrderOfPrecedenceDescription": "Higher priority metadata sources will override lower priority metadata sources",
+  "LabelMetadataOrderOfPrecedenceDescription": "较高优先级的元数据源将覆盖较低优先级的元数据源",
   "LabelMetadataProvider": "元数据提供者",
   "LabelMetaTag": "元数据标签",
   "LabelMetaTags": "元标签",
   "LabelMinute": "分钟",
   "LabelMissing": "丢失",
   "LabelMissingParts": "丢失的部分",
-  "LabelMobileRedirectURIs": "Allowed Mobile Redirect URIs",
-  "LabelMobileRedirectURIsDescription": "This is a whitelist of valid redirect URIs for mobile apps. The default one is <code>audiobookshelf://oauth</code>, which you can remove or supplement with additional URIs for third-party app integration. Using an asterisk (<code>*</code>) as the sole entry permits any URI.",
+  "LabelMobileRedirectURIs": "允许移动应用重定向 URI",
+  "LabelMobileRedirectURIsDescription": "这是移动应用程序的有效重定向 URI 白名单. 默认值为 <code>audiobookshelf://oauth</code>，您可以删除它或添加其他 URI 以进行第三方应用集成. 使用星号 (<code>*</code>) 作为唯一条目允许任何 URI.",
   "LabelMore": "更多",
   "LabelMoreInfo": "更多..",
   "LabelName": "名称",
@@ -523,7 +523,7 @@
   "LabelUpdateDetailsHelp": "找到匹配项时允许覆盖所选书籍存在的详细信息",
   "LabelUploaderDragAndDrop": "拖放文件或文件夹",
   "LabelUploaderDropFiles": "删除文件",
-  "LabelUploaderItemFetchMetadataHelp": "Automatically fetch title, author, and series",
+  "LabelUploaderItemFetchMetadataHelp": "自动获取标题, 作者和系列",
   "LabelUseChapterTrack": "使用章节音轨",
   "LabelUseFullTrack": "使用完整音轨",
   "LabelUser": "用户",
@@ -557,15 +557,15 @@
   "MessageConfirmDeleteBackup": "你确定要删除备份 {0}?",
   "MessageConfirmDeleteFile": "这将从文件系统中删除该文件. 你确定吗?",
   "MessageConfirmDeleteLibrary": "你确定要永久删除媒体库 \"{0}\"?",
-  "MessageConfirmDeleteLibraryItem": "This will delete the library item from the database and your file system. Are you sure?",
-  "MessageConfirmDeleteLibraryItems": "This will delete {0} library items from the database and your file system. Are you sure?",
+  "MessageConfirmDeleteLibraryItem": "这将从数据库和文件系统中删除库项目. 你确定吗?",
+  "MessageConfirmDeleteLibraryItems": "这将从数据库和文件系统中删除 {0} 个库项目. 你确定吗?",
   "MessageConfirmDeleteSession": "你确定要删除此会话吗?",
   "MessageConfirmForceReScan": "你确定要强制重新扫描吗?",
   "MessageConfirmMarkAllEpisodesFinished": "你确定要将所有剧集都标记为已完成吗?",
   "MessageConfirmMarkAllEpisodesNotFinished": "你确定要将所有剧集都标记为未完成吗?",
   "MessageConfirmMarkSeriesFinished": "你确定要将此系列中的所有书籍都标记为已听完吗?",
   "MessageConfirmMarkSeriesNotFinished": "你确定要将此系列中的所有书籍都标记为未听完吗?",
-  "MessageConfirmQuickEmbed": "Warning! Quick embed will not backup your audio files. Make sure that you have a backup of your audio files. <br><br>Would you like to continue?",
+  "MessageConfirmQuickEmbed": "警告! 快速嵌入不会备份你的音频文件. 确保你有音频文件的备份. <br><br>你是否想继续吗?",
   "MessageConfirmRemoveAllChapters": "你确定要移除所有章节吗?",
   "MessageConfirmRemoveAuthor": "你确定要删除作者 \"{0}\"?",
   "MessageConfirmRemoveCollection": "你确定要移除收藏 \"{0}\"?",
@@ -579,7 +579,7 @@
   "MessageConfirmRenameTag": "你确定要将所有项目标签 \"{0}\" 重命名到 \"{1}\"?",
   "MessageConfirmRenameTagMergeNote": "注意: 该标签已经存在, 因此它们将被合并.",
   "MessageConfirmRenameTagWarning": "警告! 已经存在有大小写不同的类似标签 \"{0}\".",
-  "MessageConfirmReScanLibraryItems": "Are you sure you want to re-scan {0} items?",
+  "MessageConfirmReScanLibraryItems": "你确定要重新扫描 {0} 个项目吗?",
   "MessageConfirmSendEbookToDevice": "你确定要发送 {0} 电子书 \"{1}\" 到设备 \"{2}\"?",
   "MessageDownloadingEpisode": "正在下载剧集",
   "MessageDragFilesIntoTrackOrder": "将文件拖动到正确的音轨顺序",
@@ -747,4 +747,4 @@
   "ToastSocketFailedToConnect": "网络连接失败",
   "ToastUserDeleteFailed": "删除用户失败",
   "ToastUserDeleteSuccess": "用户已删除"
-}
\ No newline at end of file
+}

From 728496010cbfcee5b7b54001c9f79e02ede30d82 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 17 Dec 2023 10:41:39 -0600
Subject: [PATCH 19/47] Update:/auth/openid/config API endpoint to require
 admin user and validate issuer URL

---
 server/Auth.js | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/server/Auth.js b/server/Auth.js
index 0a282c9c..d2334de2 100644
--- a/server/Auth.js
+++ b/server/Auth.js
@@ -296,7 +296,7 @@ class Auth {
         if (req.query.redirect_uri) {
           // Check if the redirect_uri is in the whitelist
           if (Database.serverSettings.authOpenIDMobileRedirectURIs.includes(req.query.redirect_uri) ||
-           (Database.serverSettings.authOpenIDMobileRedirectURIs.length === 1 && Database.serverSettings.authOpenIDMobileRedirectURIs[0] === '*')) {
+            (Database.serverSettings.authOpenIDMobileRedirectURIs.length === 1 && Database.serverSettings.authOpenIDMobileRedirectURIs[0] === '*')) {
             oidcStrategy._params.redirect_uri = new URL(`${protocol}://${req.get('host')}/auth/openid/mobile-redirect`).toString()
             mobile_redirect_uri = req.query.redirect_uri
           } else {
@@ -381,7 +381,7 @@ class Auth {
       try {
         // Extract the state parameter from the request
         const { state, code } = req.query
-    
+
         // Check if the state provided is in our list
         if (!state || !this.openIdAuthSession.has(state)) {
           Logger.error('[Auth] /auth/openid/mobile-redirect route: State parameter mismatch')
@@ -469,17 +469,38 @@ class Auth {
       this.handleLoginSuccessBasedOnCookie.bind(this))
 
     /**
-     * Used to auto-populate the openid URLs in config/authentication
+     * Helper route used to auto-populate the openid URLs in config/authentication
+     * Takes an issuer URL as a query param and requests the config data at "/.well-known/openid-configuration"
+     * 
+     * @example /auth/openid/config?issuer=http://192.168.1.66:9000/application/o/audiobookshelf/
      */
-    router.get('/auth/openid/config', async (req, res) => {
+    router.get('/auth/openid/config', this.isAuthenticated, async (req, res) => {
+      if (!req.user.isAdminOrUp) {
+        Logger.error(`[Auth] Non-admin user "${req.user.username}" attempted to get issuer config`)
+        return res.sendStatus(403)
+      }
+
       if (!req.query.issuer) {
         return res.status(400).send('Invalid request. Query param \'issuer\' is required')
       }
+
+      // Strip trailing slash
       let issuerUrl = req.query.issuer
       if (issuerUrl.endsWith('/')) issuerUrl = issuerUrl.slice(0, -1)
 
-      const configUrl = `${issuerUrl}/.well-known/openid-configuration`
-      axios.get(configUrl).then(({ data }) => {
+      // Append config pathname and validate URL
+      let configUrl = null
+      try {
+        configUrl = new URL(`${issuerUrl}/.well-known/openid-configuration`)
+        if (!configUrl.pathname.endsWith('/.well-known/openid-configuration')) {
+          throw new Error('Invalid pathname')
+        }
+      } catch (error) {
+        Logger.error(`[Auth] Failed to get openid configuration. Invalid URL "${configUrl}"`, error)
+        return res.status(400).send('Invalid request. Query param \'issuer\' is invalid')
+      }
+
+      axios.get(configUrl.toString()).then(({ data }) => {
         res.json({
           issuer: data.issuer,
           authorization_endpoint: data.authorization_endpoint,

From 8966dbbcd1fa24825e03695a1d3fb87f01a6066e Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 17 Dec 2023 11:06:03 -0600
Subject: [PATCH 20/47] Fix:Restrict podcast search page to admins

---
 client/pages/library/_library/podcast/search.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/pages/library/_library/podcast/search.vue b/client/pages/library/_library/podcast/search.vue
index cde84468..3be851ce 100644
--- a/client/pages/library/_library/podcast/search.vue
+++ b/client/pages/library/_library/podcast/search.vue
@@ -45,6 +45,11 @@
 <script>
 export default {
   async asyncData({ params, query, store, app, redirect }) {
+    // Podcast search/add page is restricted to admins
+    if (!store.getters['user/getIsAdminOrUp']) {
+      return redirect(`/library/${params.library}`)
+    }
+
     var libraryId = params.library
     var libraryData = await store.dispatch('libraries/fetch', libraryId)
     if (!libraryData) {

From 05820aa820b5ac0b9d8ce71efedae19fc8614269 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 17 Dec 2023 11:17:35 -0600
Subject: [PATCH 21/47] Update:API endpoints /podcasts/feed and /podcasts/opml
 restricted to admin users

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

diff --git a/server/controllers/PodcastController.js b/server/controllers/PodcastController.js
index 22c3cafa..035f9152 100644
--- a/server/controllers/PodcastController.js
+++ b/server/controllers/PodcastController.js
@@ -16,7 +16,7 @@ class PodcastController {
 
   async create(req, res) {
     if (!req.user.isAdminOrUp) {
-      Logger.error(`[PodcastController] Non-admin user attempted to create podcast`, req.user)
+      Logger.error(`[PodcastController] Non-admin user "${req.user.username}" attempted to create podcast`)
       return res.sendStatus(403)
     }
     const payload = req.body
@@ -103,6 +103,11 @@ class PodcastController {
   }
 
   async getPodcastFeed(req, res) {
+    if (!req.user.isAdminOrUp) {
+      Logger.error(`[PodcastController] Non-admin user "${req.user.username}" attempted to get podcast feed`)
+      return res.sendStatus(403)
+    }
+
     var url = req.body.rssFeed
     if (!url) {
       return res.status(400).send('Bad request')
@@ -116,6 +121,11 @@ class PodcastController {
   }
 
   async getFeedsFromOPMLText(req, res) {
+    if (!req.user.isAdminOrUp) {
+      Logger.error(`[PodcastController] Non-admin user "${req.user.username}" attempted to get feeds from opml`)
+      return res.sendStatus(403)
+    }
+
     if (!req.body.opmlText) {
       return res.sendStatus(400)
     }

From dc67a5200030c31794fa5f529e647b2ea0669407 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 17 Dec 2023 11:18:21 -0600
Subject: [PATCH 22/47] Update:API endpoint /search/podcast throw 400 error if
 term query param is not supplied

---
 server/controllers/SearchController.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/server/controllers/SearchController.js b/server/controllers/SearchController.js
index e52e6973..34d65e3c 100644
--- a/server/controllers/SearchController.js
+++ b/server/controllers/SearchController.js
@@ -35,8 +35,19 @@ class SearchController {
     })
   }
 
+  /**
+   * Find podcast RSS feeds given a term
+   * 
+   * @param {import('express').Request} req 
+   * @param {import('express').Response} res 
+   */
   async findPodcasts(req, res) {
     const term = req.query.term
+    if (!term) {
+      Logger.error('[SearchController] Invalid request query param "term" is required')
+      return res.status(400).send('Invalid request query param "term" is required')
+    }
+
     const results = await PodcastFinder.search(term)
     res.json(results)
   }

From f2f2ea161ca0701e1405e737b0df0f96296e4f64 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 17 Dec 2023 12:00:11 -0600
Subject: [PATCH 23/47] Update:API endpoint /podcasts/feed validates rssFeed
 URL and uses SSRF req filter

---
 server/controllers/PodcastController.js | 14 +++++++++++--
 server/utils/index.js                   | 28 +++++++++++++++++++------
 server/utils/podcastUtils.js            | 28 ++++++++++++++++++++-----
 3 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/server/controllers/PodcastController.js b/server/controllers/PodcastController.js
index 035f9152..e476efd5 100644
--- a/server/controllers/PodcastController.js
+++ b/server/controllers/PodcastController.js
@@ -6,6 +6,7 @@ const fs = require('../libs/fsExtra')
 
 const { getPodcastFeed, findMatchingEpisodes } = require('../utils/podcastUtils')
 const { getFileTimestampsWithIno, filePathToPOSIX } = require('../utils/fileUtils')
+const { validateUrl } = require('../utils/index')
 
 const Scanner = require('../scanner/Scanner')
 const CoverManager = require('../managers/CoverManager')
@@ -102,15 +103,24 @@ class PodcastController {
     }
   }
 
+  /**
+   * POST: /api/podcasts/feed
+   * 
+   * @typedef getPodcastFeedReqBody
+   * @property {string} rssFeed
+   * 
+   * @param {import('express').Request<{}, {}, getPodcastFeedReqBody, {}} req 
+   * @param {import('express').Response} res 
+   */
   async getPodcastFeed(req, res) {
     if (!req.user.isAdminOrUp) {
       Logger.error(`[PodcastController] Non-admin user "${req.user.username}" attempted to get podcast feed`)
       return res.sendStatus(403)
     }
 
-    var url = req.body.rssFeed
+    const url = validateUrl(req.body.rssFeed)
     if (!url) {
-      return res.status(400).send('Bad request')
+      return res.status(400).send('Invalid request body. "rssFeed" must be a valid URL')
     }
 
     const podcast = await getPodcastFeed(url)
diff --git a/server/utils/index.js b/server/utils/index.js
index 0377b173..29a65885 100644
--- a/server/utils/index.js
+++ b/server/utils/index.js
@@ -11,24 +11,24 @@ const levenshteinDistance = (str1, str2, caseSensitive = false) => {
     str2 = str2.toLowerCase()
   }
   const track = Array(str2.length + 1).fill(null).map(() =>
-    Array(str1.length + 1).fill(null));
+    Array(str1.length + 1).fill(null))
   for (let i = 0; i <= str1.length; i += 1) {
-    track[0][i] = i;
+    track[0][i] = i
   }
   for (let j = 0; j <= str2.length; j += 1) {
-    track[j][0] = j;
+    track[j][0] = j
   }
   for (let j = 1; j <= str2.length; j += 1) {
     for (let i = 1; i <= str1.length; i += 1) {
-      const indicator = str1[i - 1] === str2[j - 1] ? 0 : 1;
+      const indicator = str1[i - 1] === str2[j - 1] ? 0 : 1
       track[j][i] = Math.min(
         track[j][i - 1] + 1, // deletion
         track[j - 1][i] + 1, // insertion
         track[j - 1][i - 1] + indicator, // substitution
-      );
+      )
     }
   }
-  return track[str2.length][str1.length];
+  return track[str2.length][str1.length]
 }
 module.exports.levenshteinDistance = levenshteinDistance
 
@@ -204,4 +204,20 @@ module.exports.asciiOnlyToLowerCase = (str) => {
 module.exports.escapeRegExp = (str) => {
   if (typeof str !== 'string') return ''
   return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+}
+
+/**
+ * Validate url string with URL class
+ * 
+ * @param {string} rawUrl 
+ * @returns {string} null if invalid
+ */
+module.exports.validateUrl = (rawUrl) => {
+  if (!rawUrl || typeof rawUrl !== 'string') return null
+  try {
+    return new URL(rawUrl).toString()
+  } catch (error) {
+    Logger.error(`Invalid URL "${rawUrl}"`, error)
+    return null
+  }
 }
\ No newline at end of file
diff --git a/server/utils/podcastUtils.js b/server/utils/podcastUtils.js
index 87b080d7..819ec914 100644
--- a/server/utils/podcastUtils.js
+++ b/server/utils/podcastUtils.js
@@ -1,5 +1,6 @@
-const Logger = require('../Logger')
 const axios = require('axios')
+const ssrfFilter = require('ssrf-req-filter')
+const Logger = require('../Logger')
 const { xmlToJSON, levenshteinDistance } = require('./index')
 const htmlSanitizer = require('../utils/htmlSanitizer')
 
@@ -216,9 +217,26 @@ module.exports.parsePodcastRssFeedXml = async (xml, excludeEpisodeMetadata = fal
   }
 }
 
+/**
+ * Get podcast RSS feed as JSON
+ * Uses SSRF filter to prevent internal URLs
+ * 
+ * @param {string} feedUrl 
+ * @param {boolean} [excludeEpisodeMetadata=false]
+ * @returns {Promise}
+ */
 module.exports.getPodcastFeed = (feedUrl, excludeEpisodeMetadata = false) => {
   Logger.debug(`[podcastUtils] getPodcastFeed for "${feedUrl}"`)
-  return axios.get(feedUrl, { timeout: 12000, responseType: 'arraybuffer', headers: { Accept: 'application/rss+xml' } }).then(async (data) => {
+
+  return axios({
+    url: feedUrl,
+    method: 'GET',
+    timeout: 12000,
+    responseType: 'arraybuffer',
+    headers: { Accept: 'application/rss+xml' },
+    httpAgent: ssrfFilter(feedUrl),
+    httpsAgent: ssrfFilter(feedUrl)
+  }).then(async (data) => {
 
     // Adding support for ios-8859-1 encoded RSS feeds.
     //  See: https://github.com/advplyr/audiobookshelf/issues/1489
@@ -231,12 +249,12 @@ module.exports.getPodcastFeed = (feedUrl, excludeEpisodeMetadata = false) => {
 
     if (!data?.data) {
       Logger.error(`[podcastUtils] getPodcastFeed: Invalid podcast feed request response (${feedUrl})`)
-      return false
+      return null
     }
     Logger.debug(`[podcastUtils] getPodcastFeed for "${feedUrl}" success - parsing xml`)
     const payload = await this.parsePodcastRssFeedXml(data.data, excludeEpisodeMetadata)
     if (!payload) {
-      return false
+      return null
     }
 
     // RSS feed may be a private RSS feed
@@ -245,7 +263,7 @@ module.exports.getPodcastFeed = (feedUrl, excludeEpisodeMetadata = false) => {
     return payload.podcast
   }).catch((error) => {
     Logger.error('[podcastUtils] getPodcastFeed Error', error)
-    return false
+    return null
   })
 }
 

From 10b1784f6dc3175525900d3af689b5edb6dacc50 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 17 Dec 2023 12:23:55 -0600
Subject: [PATCH 24/47] Fix:Library search API endpoint /libraries/:id/search
 to check that query param q is a valid string

---
 server/controllers/LibraryController.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/controllers/LibraryController.js b/server/controllers/LibraryController.js
index d2090270..70baff85 100644
--- a/server/controllers/LibraryController.js
+++ b/server/controllers/LibraryController.js
@@ -552,8 +552,8 @@ class LibraryController {
    * @param {import('express').Response} res 
    */
   async search(req, res) {
-    if (!req.query.q) {
-      return res.status(400).send('No query string')
+    if (!req.query.q || typeof req.query.q !== 'string') {
+      return res.status(400).send('Invalid request. Query param "q" must be a string')
     }
     const limit = req.query.limit && !isNaN(req.query.limit) ? Number(req.query.limit) : 12
     const query = asciiOnlyToLowerCase(req.query.q.trim())

From 2d8d11d4da561b4e97cc685dc211efa00ed56a48 Mon Sep 17 00:00:00 2001
From: Trey Gordon <41927921+treyg@users.noreply.github.com>
Date: Sun, 17 Dec 2023 15:56:14 -0500
Subject: [PATCH 25/47] docs: update synology reverse proxy to use the latest
 DSM settings

---
 readme.md | 49 +++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/readme.md b/readme.md
index ad00dd66..3ebe097d 100644
--- a/readme.md
+++ b/readme.md
@@ -174,16 +174,49 @@ serve that directly:
 
 [See LinuxServer.io config sample](https://github.com/linuxserver/reverse-proxy-confs/blob/master/audiobookshelf.subdomain.conf.sample)
 
-### Synology Reverse Proxy
+### Synology NAS Reverse Proxy Setup (DSM 7+/Quickconnect)
 
-1. Open Control Panel > Application Portal
-2. Change to the Reverse Proxy tab
-3. Select the proxy rule for which you want to enable Websockets and click on Edit
-4. Change to the "Custom Header" tab
-5. Click Create > WebSocket
-6. Click Save
+1. **Open Control Panel**
+   - Navigate to `Login Portal > Advanced`.
+
+2. **General Tab**
+   - Click `Reverse Proxy` > `Create`.
+   
+   | Setting | Value          |
+   |---------|----------------|
+   | Reverse Proxy Name    | audiobookshelf |
+
+3. **Source Configuration**
+
+   | Setting                 | Value                               |
+   |-------------------------|-------------------------------------|
+   | Protocol                | HTTPS                               |
+   | Hostname                | `<sub>.<quickconnectdomain>.synology.me` |
+   | Port                    | 443                                 |
+   | Access Control Profile  | Leave as is                         |
+
+   - Example Hostname: `audiobookshelf.mydomain.synology.me`
+
+4. **Destination Configuration**
+
+   | Setting   | Value            |
+   |-----------|------------------|
+   | Protocol  | HTTP             |
+   | Hostname  | Your NAS IP      |
+   | Port      | 13378            |
+
+5. **Custom Header Tab**
+   - Go to `Create > Websocket`.
+   - Configure Headers (leave as is):
+
+    | Header Name | Value            |
+    |-------------|------------------|
+    | Upgrade     | `$http_upgrade`  |
+    | Connection  | `$connection_upgrade` |
+
+6. **Advanced Settings Tab**
+   - Leave as is.
 
-[from @silentArtifact](https://github.com/advplyr/audiobookshelf/issues/241#issuecomment-1036732329)
 
 ### [Traefik Reverse Proxy](https://doc.traefik.io/traefik/)
 

From bef0f3709f7f9b4417f93d393049ed42327e0647 Mon Sep 17 00:00:00 2001
From: Pablo <pablo.jimenez@exheus.com>
Date: Tue, 19 Dec 2023 18:39:02 +0100
Subject: [PATCH 26/47] feat: add basic zoom functionality to comic reader

---
 client/components/readers/ComicReader.vue | 34 +++++++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/client/components/readers/ComicReader.vue b/client/components/readers/ComicReader.vue
index 40b28a74..c0a3f957 100644
--- a/client/components/readers/ComicReader.vue
+++ b/client/components/readers/ComicReader.vue
@@ -26,8 +26,12 @@
     <div v-if="numPages" class="absolute top-0 right-16 bg-bg text-gray-100 border-b border-l border-r border-gray-400 rounded-b-md px-2 h-9 flex items-center text-center z-20">
       <p class="font-mono">{{ page }} / {{ numPages }}</p>
     </div>
+    <div class="absolute top-0 right-40 bg-bg text-gray-100 border-b border-l border-r border-gray-400 z-20 rounded-b-md px-2 h-9 hidden md:flex items-center text-center">
+      <ui-icon-btn icon="zoom_out" :size="8" :disabled="!canScaleDown" borderless class="mr-px" @click="zoomOut" />
+      <ui-icon-btn icon="zoom_in" :size="8" :disabled="!canScaleUp" borderless class="ml-px" @click="zoomIn" />
+    </div>
 
-    <div class="overflow-hidden w-full h-full relative">
+    <div class="w-full h-full relative">
       <div v-show="canGoPrev" class="absolute top-0 left-0 h-full w-1/2 lg:w-1/3 hover:opacity-100 opacity-0 z-10 cursor-pointer" @click.stop.prevent="prev" @mousedown.prevent>
         <div class="flex items-center justify-center h-full w-1/2">
           <span v-show="loadedFirstPage" class="material-icons text-5xl text-white cursor-pointer text-opacity-30 hover:text-opacity-90">arrow_back_ios</span>
@@ -38,10 +42,11 @@
           <span v-show="loadedFirstPage" class="material-icons text-5xl text-white cursor-pointer text-opacity-30 hover:text-opacity-90">arrow_forward_ios</span>
         </div>
       </div>
-      <div class="h-full flex justify-center">
-        <img v-if="mainImg" :src="mainImg" class="object-contain h-full m-auto" />
+      <div class="w-full h-full relative overflow-auto">
+        <div class="h-full flex" :class="scale > 100 ? '' : 'justify-center'">
+          <img v-if="mainImg" :style="{ minWidth: scale + '%', width: scale + '%' }" :src="mainImg" class="object-contain m-auto" />
+        </div>
       </div>
-
       <div v-show="loading" class="w-full h-full absolute top-0 left-0 flex items-center justify-center z-10">
         <ui-loading-indicator />
       </div>
@@ -54,6 +59,10 @@ import Path from 'path'
 import { Archive } from 'libarchive.js/main.js'
 import { CompressedFile } from 'libarchive.js/src/compressed-file'
 
+// This is % with respect to the screen width
+const MAX_SCALE = 400
+const MIN_SCALE = 10
+
 Archive.init({
   workerUrl: '/libarchive/worker-bundle.js'
 })
@@ -81,7 +90,8 @@ export default {
       showInfoMenu: false,
       loadTimeout: null,
       loadedFirstPage: false,
-      comicMetadata: null
+      comicMetadata: null,
+      scale: 80,
     }
   },
   watch: {
@@ -136,6 +146,12 @@ export default {
           return p
         }) || []
       )
+    },
+    canScaleUp() {
+      return this.scale < MAX_SCALE
+    },
+    canScaleDown() {
+      return this.scale > MIN_SCALE
     }
   },
   methods: {
@@ -331,7 +347,13 @@ export default {
       orderedImages = orderedImages.concat(noNumImages.map((i) => i.filename))
 
       this.pages = orderedImages
-    }
+    },
+    zoomIn() {
+      this.scale += 10
+    },
+    zoomOut() {
+      this.scale -= 10
+    },
   },
   mounted() {},
   beforeDestroy() {}

From aa7ee3e8ff3333cd9f99afc734b56e93346a6697 Mon Sep 17 00:00:00 2001
From: Pablo <pablo.jimenez@exheus.com>
Date: Tue, 19 Dec 2023 18:45:11 +0100
Subject: [PATCH 27/47] fix: zoom buttons were showing when loading the image

---
 client/components/readers/ComicReader.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/readers/ComicReader.vue b/client/components/readers/ComicReader.vue
index c0a3f957..57068e34 100644
--- a/client/components/readers/ComicReader.vue
+++ b/client/components/readers/ComicReader.vue
@@ -26,7 +26,7 @@
     <div v-if="numPages" class="absolute top-0 right-16 bg-bg text-gray-100 border-b border-l border-r border-gray-400 rounded-b-md px-2 h-9 flex items-center text-center z-20">
       <p class="font-mono">{{ page }} / {{ numPages }}</p>
     </div>
-    <div class="absolute top-0 right-40 bg-bg text-gray-100 border-b border-l border-r border-gray-400 z-20 rounded-b-md px-2 h-9 hidden md:flex items-center text-center">
+    <div v-if="mainImg" class="absolute top-0 right-40 bg-bg text-gray-100 border-b border-l border-r border-gray-400 z-20 rounded-b-md px-2 h-9 hidden md:flex items-center text-center">
       <ui-icon-btn icon="zoom_out" :size="8" :disabled="!canScaleDown" borderless class="mr-px" @click="zoomOut" />
       <ui-icon-btn icon="zoom_in" :size="8" :disabled="!canScaleUp" borderless class="ml-px" @click="zoomIn" />
     </div>

From 7391b4d0ece9830d6d8bd0e91a2d5a56fac72af7 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Tue, 19 Dec 2023 17:19:33 -0600
Subject: [PATCH 28/47] Add:User stats API for year stats

---
 server/Database.js                 |   7 +-
 server/controllers/MeController.js |  16 +++
 server/routers/ApiRouter.js        |   1 +
 server/utils/queries/userStats.js  | 178 +++++++++++++++++++++++++++++
 4 files changed, 201 insertions(+), 1 deletion(-)
 create mode 100644 server/utils/queries/userStats.js

diff --git a/server/Database.js b/server/Database.js
index 5721ac27..8a357481 100644
--- a/server/Database.js
+++ b/server/Database.js
@@ -122,11 +122,16 @@ class Database {
     return this.models.feed
   }
 
-  /** @type {typeof import('./models/Feed')} */
+  /** @type {typeof import('./models/FeedEpisode')} */
   get feedEpisodeModel() {
     return this.models.feedEpisode
   }
 
+  /** @type {typeof import('./models/PlaybackSession')} */
+  get playbackSessionModel() {
+    return this.models.playbackSession
+  }
+
   /**
    * Check if db file exists
    * @returns {boolean}
diff --git a/server/controllers/MeController.js b/server/controllers/MeController.js
index d38c1c4a..42387b59 100644
--- a/server/controllers/MeController.js
+++ b/server/controllers/MeController.js
@@ -3,6 +3,7 @@ const SocketAuthority = require('../SocketAuthority')
 const Database = require('../Database')
 const { sort } = require('../libs/fastSort')
 const { toNumber } = require('../utils/index')
+const userStats = require('../utils/queries/userStats')
 
 class MeController {
   constructor() { }
@@ -333,5 +334,20 @@ class MeController {
     }
     res.json(req.user.toJSONForBrowser())
   }
+
+  /**
+   * 
+   * @param {import('express').Request} req 
+   * @param {import('express').Response} res 
+   */
+  async getStatsForYear(req, res) {
+    const year = Number(req.params.year)
+    if (isNaN(year) || year < 2000 || year > 9999) {
+      Logger.error(`[MeController] Invalid year "${year}"`)
+      return res.status(400).send('Invalid year')
+    }
+    const data = await userStats.getStatsForYear(req.user.id, year)
+    res.json(data)
+  }
 }
 module.exports = new MeController()
\ No newline at end of file
diff --git a/server/routers/ApiRouter.js b/server/routers/ApiRouter.js
index d7714568..f2418180 100644
--- a/server/routers/ApiRouter.js
+++ b/server/routers/ApiRouter.js
@@ -180,6 +180,7 @@ class ApiRouter {
     this.router.get('/me/items-in-progress', MeController.getAllLibraryItemsInProgress.bind(this))
     this.router.get('/me/series/:id/remove-from-continue-listening', MeController.removeSeriesFromContinueListening.bind(this))
     this.router.get('/me/series/:id/readd-to-continue-listening', MeController.readdSeriesFromContinueListening.bind(this))
+    this.router.get('/me/year/:year/stats', MeController.getStatsForYear.bind(this))
 
     //
     // Backup Routes
diff --git a/server/utils/queries/userStats.js b/server/utils/queries/userStats.js
new file mode 100644
index 00000000..b6895008
--- /dev/null
+++ b/server/utils/queries/userStats.js
@@ -0,0 +1,178 @@
+const Sequelize = require('sequelize')
+const Database = require('../../Database')
+const PlaybackSession = require('../../models/PlaybackSession')
+const MediaProgress = require('../../models/MediaProgress')
+const { elapsedPretty } = require('../index')
+
+module.exports = {
+  /**
+   * 
+   * @param {string} userId 
+   * @param {number} year YYYY
+   * @returns {Promise<PlaybackSession[]>}
+   */
+  async getUserListeningSessionsForYear(userId, year) {
+    const sessions = await Database.playbackSessionModel.findAll({
+      where: {
+        userId,
+        createdAt: {
+          [Sequelize.Op.gte]: `${year}-01-01`,
+          [Sequelize.Op.lt]: `${year + 1}-01-01`
+        }
+      }
+    })
+    return sessions
+  },
+
+  /**
+   * 
+   * @param {string} userId 
+   * @param {number} year YYYY
+   * @returns {Promise<MediaProgress[]>}
+   */
+  async getBookMediaProgressFinishedForYear(userId, year) {
+    const progresses = await Database.mediaProgressModel.findAll({
+      where: {
+        userId,
+        mediaItemType: 'book',
+        finishedAt: {
+          [Sequelize.Op.gte]: `${year}-01-01`,
+          [Sequelize.Op.lt]: `${year + 1}-01-01`
+        }
+      },
+      include: {
+        model: Database.bookModel,
+        required: true
+      }
+    })
+    return progresses
+  },
+
+  /**
+   * @param {string} userId
+   * @param {number} year YYYY
+   */
+  async getStatsForYear(userId, year) {
+    const listeningSessions = await this.getUserListeningSessionsForYear(userId, year)
+
+    let totalBookListeningTime = 0
+    let totalPodcastListeningTime = 0
+    let totalListeningTime = 0
+
+    let authorListeningMap = {}
+    let genreListeningMap = {}
+    let narratorListeningMap = {}
+    let monthListeningMap = {}
+
+    listeningSessions.forEach((ls) => {
+      const listeningSessionListeningTime = ls.timeListening || 0
+
+      const lsMonth = ls.createdAt.getMonth()
+      if (!monthListeningMap[lsMonth]) monthListeningMap[lsMonth] = 0
+      monthListeningMap[lsMonth] += listeningSessionListeningTime
+
+      totalListeningTime += listeningSessionListeningTime
+      if (ls.mediaItemType === 'book') {
+        totalBookListeningTime += listeningSessionListeningTime
+
+        const authors = ls.mediaMetadata.authors || []
+        authors.forEach((au) => {
+          if (!authorListeningMap[au.name]) authorListeningMap[au.name] = 0
+          authorListeningMap[au.name] += listeningSessionListeningTime
+        })
+
+        const narrators = ls.mediaMetadata.narrators || []
+        narrators.forEach((narrator) => {
+          if (!narratorListeningMap[narrator]) narratorListeningMap[narrator] = 0
+          narratorListeningMap[narrator] += listeningSessionListeningTime
+        })
+
+        // Filter out bad genres like "audiobook" and "audio book"
+        const genres = (ls.mediaMetadata.genres || []).filter(g => !g.toLowerCase().includes('audiobook') && !g.toLowerCase().includes('audio book'))
+        genres.forEach((genre) => {
+          if (!genreListeningMap[genre]) genreListeningMap[genre] = 0
+          genreListeningMap[genre] += listeningSessionListeningTime
+        })
+      } else {
+        totalPodcastListeningTime += listeningSessionListeningTime
+      }
+    })
+
+    totalListeningTime = Math.round(totalListeningTime)
+    totalBookListeningTime = Math.round(totalBookListeningTime)
+    totalPodcastListeningTime = Math.round(totalPodcastListeningTime)
+
+    let mostListenedAuthor = null
+    for (const authorName in authorListeningMap) {
+      if (!mostListenedAuthor?.time || authorListeningMap[authorName] > mostListenedAuthor.time) {
+        mostListenedAuthor = {
+          time: Math.round(authorListeningMap[authorName]),
+          pretty: elapsedPretty(Math.round(authorListeningMap[authorName])),
+          name: authorName
+        }
+      }
+    }
+    let mostListenedNarrator = null
+    for (const narrator in narratorListeningMap) {
+      if (!mostListenedNarrator?.time || narratorListeningMap[narrator] > mostListenedNarrator.time) {
+        mostListenedNarrator = {
+          time: Math.round(narratorListeningMap[narrator]),
+          pretty: elapsedPretty(Math.round(narratorListeningMap[narrator])),
+          name: narrator
+        }
+      }
+    }
+    let mostListenedGenre = null
+    for (const genre in genreListeningMap) {
+      if (!mostListenedGenre?.time || genreListeningMap[genre] > mostListenedGenre.time) {
+        mostListenedGenre = {
+          time: Math.round(genreListeningMap[genre]),
+          pretty: elapsedPretty(Math.round(genreListeningMap[genre])),
+          name: genre
+        }
+      }
+    }
+    let mostListenedMonth = null
+    for (const month in monthListeningMap) {
+      if (!mostListenedMonth?.time || monthListeningMap[month] > mostListenedMonth.time) {
+        mostListenedMonth = {
+          month: Number(month),
+          time: Math.round(monthListeningMap[month]),
+          pretty: elapsedPretty(Math.round(monthListeningMap[month]))
+        }
+      }
+    }
+
+    const bookProgresses = await this.getBookMediaProgressFinishedForYear(userId, year)
+
+    const numBooksFinished = bookProgresses.length
+    let longestAudiobookFinished = null
+    bookProgresses.forEach((mediaProgress) => {
+      if (mediaProgress.duration && (!longestAudiobookFinished?.duration || mediaProgress.duration > longestAudiobookFinished.duration)) {
+        longestAudiobookFinished = {
+          id: mediaProgress.mediaItem.id,
+          title: mediaProgress.mediaItem.title,
+          duration: Math.round(mediaProgress.duration),
+          durationPretty: elapsedPretty(Math.round(mediaProgress.duration)),
+          finishedAt: mediaProgress.finishedAt
+        }
+      }
+    })
+
+    return {
+      totalListeningSessions: listeningSessions.length,
+      totalListeningTime,
+      totalListeningTimePretty: elapsedPretty(totalListeningTime),
+      totalBookListeningTime,
+      totalBookListeningTimePretty: elapsedPretty(totalBookListeningTime),
+      totalPodcastListeningTime,
+      totalPodcastListeningTimePretty: elapsedPretty(totalPodcastListeningTime),
+      mostListenedAuthor,
+      mostListenedNarrator,
+      mostListenedGenre,
+      mostListenedMonth,
+      numBooksFinished,
+      longestAudiobookFinished
+    }
+  }
+}

From 52f0a5432b6138c705da4580ce7a4203c0cad8b0 Mon Sep 17 00:00:00 2001
From: Pablo <pablo.jimenez@exheus.com>
Date: Wed, 20 Dec 2023 11:45:21 +0100
Subject: [PATCH 29/47] feat: enable zoom through the arrow buttons

---
 client/components/readers/ComicReader.vue | 34 +++++++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/client/components/readers/ComicReader.vue b/client/components/readers/ComicReader.vue
index 57068e34..9b09f5b6 100644
--- a/client/components/readers/ComicReader.vue
+++ b/client/components/readers/ComicReader.vue
@@ -26,23 +26,23 @@
     <div v-if="numPages" class="absolute top-0 right-16 bg-bg text-gray-100 border-b border-l border-r border-gray-400 rounded-b-md px-2 h-9 flex items-center text-center z-20">
       <p class="font-mono">{{ page }} / {{ numPages }}</p>
     </div>
-    <div v-if="mainImg" class="absolute top-0 right-40 bg-bg text-gray-100 border-b border-l border-r border-gray-400 z-20 rounded-b-md px-2 h-9 hidden md:flex items-center text-center">
+    <div v-if="mainImg" class="absolute top-0 right-40 bg-bg text-gray-100 border-b border-l border-r border-gray-400 rounded-b-md px-2 h-9 flex items-center text-center z-20">
       <ui-icon-btn icon="zoom_out" :size="8" :disabled="!canScaleDown" borderless class="mr-px" @click="zoomOut" />
       <ui-icon-btn icon="zoom_in" :size="8" :disabled="!canScaleUp" borderless class="ml-px" @click="zoomIn" />
     </div>
 
     <div class="w-full h-full relative">
-      <div v-show="canGoPrev" class="absolute top-0 left-0 h-full w-1/2 lg:w-1/3 hover:opacity-100 opacity-0 z-10 cursor-pointer" @click.stop.prevent="prev" @mousedown.prevent>
+      <div v-show="canGoPrev" ref="prevButton" class="absolute top-0 left-0 h-full w-1/2 lg:w-1/3 hover:opacity-100 opacity-0 z-10 cursor-pointer" @click.stop.prevent="prev" @mousedown.prevent>
         <div class="flex items-center justify-center h-full w-1/2">
           <span v-show="loadedFirstPage" class="material-icons text-5xl text-white cursor-pointer text-opacity-30 hover:text-opacity-90">arrow_back_ios</span>
         </div>
       </div>
-      <div v-show="canGoNext" class="absolute top-0 right-0 h-full w-1/2 lg:w-1/3 hover:opacity-100 opacity-0 z-10 cursor-pointer" @click.stop.prevent="next" @mousedown.prevent>
+      <div v-show="canGoNext" ref="nextButton" class="absolute top-0 right-0 h-full w-1/2 lg:w-1/3 hover:opacity-100 opacity-0 z-10 cursor-pointer" @click.stop.prevent="next" @mousedown.prevent>
         <div class="flex items-center justify-center h-full w-1/2 ml-auto">
           <span v-show="loadedFirstPage" class="material-icons text-5xl text-white cursor-pointer text-opacity-30 hover:text-opacity-90">arrow_forward_ios</span>
         </div>
       </div>
-      <div class="w-full h-full relative overflow-auto">
+      <div ref="imageContainer" class="w-full h-full relative overflow-auto">
         <div class="h-full flex" :class="scale > 100 ? '' : 'justify-center'">
           <img v-if="mainImg" :style="{ minWidth: scale + '%', width: scale + '%' }" :src="mainImg" class="object-contain m-auto" />
         </div>
@@ -354,9 +354,31 @@ export default {
     zoomOut() {
       this.scale -= 10
     },
+    scroll(event) {
+      const imageContainer = this.$refs.imageContainer
+
+      console.log("Scrolling by " + event.deltaY)
+      imageContainer.scrollBy({
+        top: event.deltaY,
+        behavior: "auto",
+      });
+    }
   },
-  mounted() {},
-  beforeDestroy() {}
+  mounted() {
+    const prevButton = this.$refs.prevButton
+    const nextButton = this.$refs.nextButton
+    
+    prevButton.addEventListener('wheel', this.scroll, { passive: false })
+    nextButton.addEventListener('wheel', this.scroll, { passive: false })
+
+  },
+  beforeDestroy() {
+    const prevButton = this.$refs.prevButton
+    const nextButton = this.$refs.nextButton
+
+    prevButton.removeEventListener('wheel', this.scroll, { passive: false })
+    nextButton.removeEventListener('wheel', this.scroll, { passive: false })
+  }
 }
 </script>
 

From 2b7122c7447943afe8d581a91bed916e1c044fdf Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 20 Dec 2023 17:18:21 -0600
Subject: [PATCH 30/47] Update:Year stats API endpoint & generate year in
 review image #2373

---
 client/components/stats/YearInReview.vue | 175 +++++++++++++++++++++++
 client/pages/config/stats.vue            |  18 ++-
 server/utils/queries/userStats.js        |  93 +++++++-----
 3 files changed, 248 insertions(+), 38 deletions(-)
 create mode 100644 client/components/stats/YearInReview.vue

diff --git a/client/components/stats/YearInReview.vue b/client/components/stats/YearInReview.vue
new file mode 100644
index 00000000..fa57020a
--- /dev/null
+++ b/client/components/stats/YearInReview.vue
@@ -0,0 +1,175 @@
+<template>
+  <div>
+    <div v-if="processing" class="w-[400px] h-[400px] flex items-center justify-center">
+      <widgets-loading-spinner />
+    </div>
+    <img v-else-if="dataUrl" :src="dataUrl" />
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    processing: Boolean
+  },
+  data() {
+    return {
+      dataUrl: null,
+      year: null,
+      yearStats: null
+    }
+  },
+  methods: {
+    async initCanvas() {
+      if (!this.yearStats) return
+
+      const canvas = document.createElement('canvas')
+      canvas.width = 400
+      canvas.height = 400
+      const ctx = canvas.getContext('2d')
+
+      const createRoundedRect = (x, y, w, h) => {
+        ctx.fillStyle = '#37383866'
+        ctx.strokeStyle = '#C0C0C0aa'
+        ctx.beginPath()
+        ctx.roundRect(x, y, w, h, [20])
+        ctx.fill()
+        ctx.stroke()
+      }
+
+      const addText = (text, fontSize, fontWeight, color, letterSpacing, x, y) => {
+        ctx.fillStyle = color
+        ctx.font = `${fontWeight} ${fontSize} Source Sans Pro`
+        ctx.letterSpacing = letterSpacing
+        ctx.fillText(text, x, y)
+      }
+
+      const addIcon = (icon, color, fontSize, x, y) => {
+        ctx.fillStyle = color
+        ctx.font = `${fontSize} Material Icons Outlined`
+        ctx.fillText(icon, x, y)
+      }
+
+      // Bg color
+      ctx.fillStyle = '#232323'
+      ctx.fillRect(0, 0, canvas.width, canvas.height)
+
+      // Cover image tiles
+      if (this.yearStats.booksWithCovers.length) {
+        let index = 0
+        ctx.globalAlpha = 0.25
+        for (let x = 0; x < 4; x++) {
+          for (let y = 0; y < 4; y++) {
+            const coverIndex = index % this.yearStats.booksWithCovers.length
+            let libraryItemId = this.yearStats.booksWithCovers[coverIndex]
+            index++
+
+            await new Promise((resolve) => {
+              const img = new Image()
+              img.crossOrigin = 'anonymous'
+              img.addEventListener('load', () => {
+                ctx.drawImage(img, 100 * x, 100 * y, 100, 100)
+                resolve()
+              })
+              img.addEventListener('error', () => {
+                resolve()
+              })
+              img.src = this.$store.getters['globals/getLibraryItemCoverSrcById'](libraryItemId)
+            })
+          }
+        }
+      }
+
+      ctx.globalAlpha = 1
+      ctx.textBaseline = 'middle'
+
+      // Create gradient
+      const grd1 = ctx.createLinearGradient(0, 0, 400, 400)
+      grd1.addColorStop(0, '#000000aa')
+      grd1.addColorStop(1, '#cd9d49aa')
+      ctx.fillStyle = grd1
+      ctx.fillRect(0, 0, canvas.width, canvas.height)
+
+      // Top Abs icon
+      let tanColor = '#ffdb70'
+      ctx.fillStyle = tanColor
+      ctx.font = '32px absicons'
+      ctx.fillText('\ue900', 15, 32)
+
+      // Top text
+      addText('audiobookshelf', '22px', 'normal', tanColor, '0px', 55, 22)
+      addText(`${this.year} YEAR IN REVIEW`, '14px', 'bold', 'white', '1px', 55, 44)
+
+      // Top left box
+      createRoundedRect(10, 65, 185, 80)
+      addText(this.yearStats.numBooksFinished, '32px', 'bold', 'white', '0px', 63, 98)
+      addText('books finished', '14px', 'normal', tanColor, '0px', 63, 120)
+      const readIconPath = new Path2D()
+      readIconPath.addPath(new Path2D('M19 1H5c-1.1 0-1.99.9-1.99 2L3 15.93c0 .69.35 1.3.88 1.66L12 23l8.11-5.41c.53-.36.88-.97.88-1.66L21 3c0-1.1-.9-2-2-2zm-9 15l-5-5 1.41-1.41L10 13.17l7.59-7.59L19 7l-9 9z'), { a: 1.2, d: 1.2, e: 26, f: 90 })
+      ctx.fillStyle = '#ffffff'
+      ctx.fill(readIconPath)
+
+      // Box top right
+      createRoundedRect(205, 65, 185, 80)
+      addText(this.$elapsedPrettyExtended(this.yearStats.totalListeningTime, true, false), '20px', 'bold', 'white', '0px', 257, 96)
+      addText('spent listening', '14px', 'normal', tanColor, '0px', 257, 117)
+      addIcon('watch_later', 'white', '32px', 218, 105)
+
+      // Box bottom left
+      createRoundedRect(10, 155, 185, 80)
+      addText(this.yearStats.totalListeningSessions, '32px', 'bold', 'white', '0px', 65, 188)
+      addText('sessions', '14px', 'normal', tanColor, '1px', 65, 210)
+      addIcon('headphones', 'white', '32px', 25, 195)
+
+      // Box bottom right
+      createRoundedRect(205, 155, 185, 80)
+      addText(this.yearStats.numBooksListened, '32px', 'bold', 'white', '0px', 258, 188)
+      addText('books listened to', '14px', 'normal', tanColor, '0.65px', 258, 210)
+      addIcon('local_library', 'white', '32px', 220, 195)
+
+      // Text stats
+      const topNarrator = this.yearStats.mostListenedNarrator
+      if (topNarrator) {
+        addText('TOP NARRATOR', '12px', 'normal', tanColor, '1px', 20, 260)
+        addText(topNarrator.name, '18px', 'bolder', 'white', '0px', 20, 282)
+        addText(this.$elapsedPrettyExtended(topNarrator.time, true, false), '14px', 'lighter', 'white', '1px', 20, 302)
+      }
+
+      const topGenre = this.yearStats.topGenres[0]
+      if (topGenre) {
+        addText('TOP GENRE', '12px', 'normal', tanColor, '1px', 215, 260)
+        addText(topGenre.genre, '18px', 'bolder', 'white', '0px', 215, 282)
+        addText(this.$elapsedPrettyExtended(topGenre.time, true, false), '14px', 'lighter', 'white', '1px', 215, 302)
+      }
+
+      const topAuthor = this.yearStats.topAuthors[0]
+      if (topAuthor) {
+        addText('TOP AUTHOR', '12px', 'normal', tanColor, '1px', 20, 335)
+        addText(topAuthor.name, '18px', 'bolder', 'white', '0px', 20, 357)
+        addText(this.$elapsedPrettyExtended(topAuthor.time, true, false), '14px', 'lighter', 'white', '1px', 20, 377)
+      }
+
+      this.dataUrl = canvas.toDataURL('png')
+    },
+    refresh() {
+      this.init()
+    },
+    async init() {
+      this.$emit('update:processing', true)
+      let year = new Date().getFullYear()
+      if (new Date().getMonth() < 11) year--
+      this.year = year
+      this.yearStats = await this.$axios.$get(`/api/me/year/${year}/stats`).catch((err) => {
+        console.error('Failed to load stats for year', err)
+        this.$toast.error('Failed to load year stats')
+        return null
+      })
+      await this.initCanvas()
+      this.$emit('update:processing', false)
+    }
+  },
+  mounted() {
+    this.init()
+  }
+}
+</script>
\ No newline at end of file
diff --git a/client/pages/config/stats.vue b/client/pages/config/stats.vue
index 9b8f7ea5..b527ea38 100644
--- a/client/pages/config/stats.vue
+++ b/client/pages/config/stats.vue
@@ -62,6 +62,13 @@
         </div>
       </div>
       <stats-heatmap v-if="listeningStats" :days-listening="listeningStats.days" class="my-2" />
+
+      <ui-btn small :loading="processingYearInReview" @click.stop="clickShowYearInReview">Year in Review</ui-btn>
+      <div v-if="showYearInReview">
+        <div class="w-full h-px bg-slate-200/10 my-4" />
+
+        <stats-year-in-review ref="yearInReview" :processing.sync="processingYearInReview" />
+      </div>
     </app-settings-content>
   </div>
 </template>
@@ -71,7 +78,9 @@ export default {
   data() {
     return {
       listeningStats: null,
-      windowWidth: 0
+      windowWidth: 0,
+      showYearInReview: false,
+      processingYearInReview: false
     }
   },
   watch: {
@@ -114,6 +123,13 @@ export default {
     }
   },
   methods: {
+    clickShowYearInReview() {
+      if (this.showYearInReview) {
+        this.$refs.yearInReview.refresh()
+      } else {
+        this.showYearInReview = true
+      }
+    },
     async init() {
       this.listeningStats = await this.$axios.$get(`/api/me/listening-stats`).catch((err) => {
         console.error('Failed to load listening sesions', err)
diff --git a/server/utils/queries/userStats.js b/server/utils/queries/userStats.js
index b6895008..f9b9684e 100644
--- a/server/utils/queries/userStats.js
+++ b/server/utils/queries/userStats.js
@@ -2,7 +2,7 @@ const Sequelize = require('sequelize')
 const Database = require('../../Database')
 const PlaybackSession = require('../../models/PlaybackSession')
 const MediaProgress = require('../../models/MediaProgress')
-const { elapsedPretty } = require('../index')
+const fsExtra = require('../../libs/fsExtra')
 
 module.exports = {
   /**
@@ -18,8 +18,21 @@ module.exports = {
         createdAt: {
           [Sequelize.Op.gte]: `${year}-01-01`,
           [Sequelize.Op.lt]: `${year + 1}-01-01`
+        },
+        timeListening: {
+          [Sequelize.Op.gt]: 5
         }
-      }
+      },
+      include: {
+        model: Database.bookModel,
+        attributes: ['id', 'coverPath'],
+        include: {
+          model: Database.libraryItemModel,
+          attributes: ['id', 'mediaId', 'mediaType']
+        },
+        required: false
+      },
+      order: Database.sequelize.random()
     })
     return sessions
   },
@@ -42,6 +55,10 @@ module.exports = {
       },
       include: {
         model: Database.bookModel,
+        include: {
+          model: Database.libraryItemModel,
+          attributes: ['id', 'mediaId', 'mediaType']
+        },
         required: true
       }
     })
@@ -63,8 +80,15 @@ module.exports = {
     let genreListeningMap = {}
     let narratorListeningMap = {}
     let monthListeningMap = {}
+    let bookListeningMap = {}
+    const booksWithCovers = []
+
+    for (const ls of listeningSessions) {
+      // Grab first 16 that have a cover
+      if (ls.mediaItem?.coverPath && !booksWithCovers.includes(ls.mediaItem.libraryItem.id) && booksWithCovers.length < 16 && await fsExtra.pathExists(ls.mediaItem.coverPath)) {
+        booksWithCovers.push(ls.mediaItem.libraryItem.id)
+      }
 
-    listeningSessions.forEach((ls) => {
       const listeningSessionListeningTime = ls.timeListening || 0
 
       const lsMonth = ls.createdAt.getMonth()
@@ -75,6 +99,12 @@ module.exports = {
       if (ls.mediaItemType === 'book') {
         totalBookListeningTime += listeningSessionListeningTime
 
+        if (ls.displayTitle && !bookListeningMap[ls.displayTitle]) {
+          bookListeningMap[ls.displayTitle] = listeningSessionListeningTime
+        } else if (ls.displayTitle) {
+          bookListeningMap[ls.displayTitle] += listeningSessionListeningTime
+        }
+
         const authors = ls.mediaMetadata.authors || []
         authors.forEach((au) => {
           if (!authorListeningMap[au.name]) authorListeningMap[au.name] = 0
@@ -96,64 +126,54 @@ module.exports = {
       } else {
         totalPodcastListeningTime += listeningSessionListeningTime
       }
-    })
+    }
 
     totalListeningTime = Math.round(totalListeningTime)
     totalBookListeningTime = Math.round(totalBookListeningTime)
     totalPodcastListeningTime = Math.round(totalPodcastListeningTime)
 
-    let mostListenedAuthor = null
-    for (const authorName in authorListeningMap) {
-      if (!mostListenedAuthor?.time || authorListeningMap[authorName] > mostListenedAuthor.time) {
-        mostListenedAuthor = {
-          time: Math.round(authorListeningMap[authorName]),
-          pretty: elapsedPretty(Math.round(authorListeningMap[authorName])),
-          name: authorName
-        }
-      }
-    }
+    let topAuthors = null
+    topAuthors = Object.keys(authorListeningMap).map(authorName => ({
+      name: authorName,
+      time: Math.round(authorListeningMap[authorName])
+    })).sort((a, b) => b.time - a.time).slice(0, 3)
+
     let mostListenedNarrator = null
     for (const narrator in narratorListeningMap) {
       if (!mostListenedNarrator?.time || narratorListeningMap[narrator] > mostListenedNarrator.time) {
         mostListenedNarrator = {
           time: Math.round(narratorListeningMap[narrator]),
-          pretty: elapsedPretty(Math.round(narratorListeningMap[narrator])),
           name: narrator
         }
       }
     }
-    let mostListenedGenre = null
-    for (const genre in genreListeningMap) {
-      if (!mostListenedGenre?.time || genreListeningMap[genre] > mostListenedGenre.time) {
-        mostListenedGenre = {
-          time: Math.round(genreListeningMap[genre]),
-          pretty: elapsedPretty(Math.round(genreListeningMap[genre])),
-          name: genre
-        }
-      }
-    }
+
+    let topGenres = null
+    topGenres = Object.keys(genreListeningMap).map(genre => ({
+      genre,
+      time: Math.round(genreListeningMap[genre])
+    })).sort((a, b) => b.time - a.time).slice(0, 3)
+
     let mostListenedMonth = null
     for (const month in monthListeningMap) {
       if (!mostListenedMonth?.time || monthListeningMap[month] > mostListenedMonth.time) {
         mostListenedMonth = {
           month: Number(month),
-          time: Math.round(monthListeningMap[month]),
-          pretty: elapsedPretty(Math.round(monthListeningMap[month]))
+          time: Math.round(monthListeningMap[month])
         }
       }
     }
 
-    const bookProgresses = await this.getBookMediaProgressFinishedForYear(userId, year)
+    const bookProgressesFinished = await this.getBookMediaProgressFinishedForYear(userId, year)
 
-    const numBooksFinished = bookProgresses.length
+    const numBooksFinished = bookProgressesFinished.length
     let longestAudiobookFinished = null
-    bookProgresses.forEach((mediaProgress) => {
+    bookProgressesFinished.forEach((mediaProgress) => {
       if (mediaProgress.duration && (!longestAudiobookFinished?.duration || mediaProgress.duration > longestAudiobookFinished.duration)) {
         longestAudiobookFinished = {
           id: mediaProgress.mediaItem.id,
           title: mediaProgress.mediaItem.title,
           duration: Math.round(mediaProgress.duration),
-          durationPretty: elapsedPretty(Math.round(mediaProgress.duration)),
           finishedAt: mediaProgress.finishedAt
         }
       }
@@ -162,17 +182,16 @@ module.exports = {
     return {
       totalListeningSessions: listeningSessions.length,
       totalListeningTime,
-      totalListeningTimePretty: elapsedPretty(totalListeningTime),
       totalBookListeningTime,
-      totalBookListeningTimePretty: elapsedPretty(totalBookListeningTime),
       totalPodcastListeningTime,
-      totalPodcastListeningTimePretty: elapsedPretty(totalPodcastListeningTime),
-      mostListenedAuthor,
+      topAuthors,
+      topGenres,
       mostListenedNarrator,
-      mostListenedGenre,
       mostListenedMonth,
       numBooksFinished,
-      longestAudiobookFinished
+      numBooksListened: Object.keys(bookListeningMap).length,
+      longestAudiobookFinished,
+      booksWithCovers
     }
   }
 }

From 46ec59c74e5c9622b4053420dcfdc97f1b51d710 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 21 Dec 2023 09:44:37 -0600
Subject: [PATCH 31/47] Update:Year in review card prevent text overflow for
 narrator, author and genre #2373

---
 client/components/stats/YearInReview.vue | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/client/components/stats/YearInReview.vue b/client/components/stats/YearInReview.vue
index fa57020a..74c57065 100644
--- a/client/components/stats/YearInReview.vue
+++ b/client/components/stats/YearInReview.vue
@@ -37,10 +37,24 @@ export default {
         ctx.stroke()
       }
 
-      const addText = (text, fontSize, fontWeight, color, letterSpacing, x, y) => {
+      const addText = (text, fontSize, fontWeight, color, letterSpacing, x, y, maxWidth = 0) => {
         ctx.fillStyle = color
         ctx.font = `${fontWeight} ${fontSize} Source Sans Pro`
         ctx.letterSpacing = letterSpacing
+
+        // If maxWidth is specified then continue to remove chars until under maxWidth and add ellipsis
+        if (maxWidth) {
+          let txtWidth = ctx.measureText(text).width
+          while (txtWidth > maxWidth) {
+            console.warn(`Text "${text}" is greater than max width ${maxWidth} (width:${txtWidth})`)
+            if (text.endsWith('...')) text = text.slice(0, -4) // Repeated checks remove 1 char at a time
+            else text = text.slice(0, -3) // First check remove last 3 chars
+            text += '...'
+            txtWidth = ctx.measureText(text).width
+            console.log(`Checking text "${text}" (width:${txtWidth})`)
+          }
+        }
+
         ctx.fillText(text, x, y)
       }
 
@@ -131,21 +145,21 @@ export default {
       const topNarrator = this.yearStats.mostListenedNarrator
       if (topNarrator) {
         addText('TOP NARRATOR', '12px', 'normal', tanColor, '1px', 20, 260)
-        addText(topNarrator.name, '18px', 'bolder', 'white', '0px', 20, 282)
+        addText(topNarrator.name, '18px', 'bolder', 'white', '0px', 20, 282, 180)
         addText(this.$elapsedPrettyExtended(topNarrator.time, true, false), '14px', 'lighter', 'white', '1px', 20, 302)
       }
 
       const topGenre = this.yearStats.topGenres[0]
       if (topGenre) {
         addText('TOP GENRE', '12px', 'normal', tanColor, '1px', 215, 260)
-        addText(topGenre.genre, '18px', 'bolder', 'white', '0px', 215, 282)
+        addText(topGenre.genre, '18px', 'bolder', 'white', '0px', 215, 282, 180)
         addText(this.$elapsedPrettyExtended(topGenre.time, true, false), '14px', 'lighter', 'white', '1px', 215, 302)
       }
 
       const topAuthor = this.yearStats.topAuthors[0]
       if (topAuthor) {
         addText('TOP AUTHOR', '12px', 'normal', tanColor, '1px', 20, 335)
-        addText(topAuthor.name, '18px', 'bolder', 'white', '0px', 20, 357)
+        addText(topAuthor.name, '18px', 'bolder', 'white', '0px', 20, 357, 180)
         addText(this.$elapsedPrettyExtended(topAuthor.time, true, false), '14px', 'lighter', 'white', '1px', 20, 377)
       }
 

From 76119445a302f0c1109bc4fdb44100f60be7107e Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 21 Dec 2023 13:52:42 -0600
Subject: [PATCH 32/47] Update:Listening sessions table for multi-select,
 sorting and rows per page - Updated get all sessions API endpoint to include
 sorting - Added sessions API endpoint for batch deleting

---
 client/components/ui/Checkbox.vue       |   6 +-
 client/components/ui/Dropdown.vue       |   4 +-
 client/components/ui/InputDropdown.vue  |   2 +-
 client/pages/config/sessions.vue        | 205 +++++++++++++++++++++---
 client/strings/cs.json                  |   3 +
 client/strings/da.json                  |   3 +
 client/strings/de.json                  |   5 +-
 client/strings/en-us.json               |   5 +-
 client/strings/es.json                  |   3 +
 client/strings/fr.json                  |   3 +
 client/strings/gu.json                  |   3 +
 client/strings/hi.json                  |   3 +
 client/strings/hr.json                  |   3 +
 client/strings/it.json                  |   3 +
 client/strings/lt.json                  |   3 +
 client/strings/nl.json                  |   3 +
 client/strings/no.json                  |   3 +
 client/strings/pl.json                  |   3 +
 client/strings/ru.json                  |   3 +
 client/strings/sv.json                  |   3 +
 client/strings/zh-cn.json               |   5 +-
 client/tailwind.config.js               |   1 +
 server/controllers/SessionController.js | 137 ++++++++++++++--
 server/routers/ApiRouter.js             |  13 +-
 server/utils/index.js                   |  12 ++
 25 files changed, 375 insertions(+), 62 deletions(-)

diff --git a/client/components/ui/Checkbox.vue b/client/components/ui/Checkbox.vue
index 439d6c7d..58770aa8 100644
--- a/client/components/ui/Checkbox.vue
+++ b/client/components/ui/Checkbox.vue
@@ -2,7 +2,8 @@
   <label class="flex justify-start items-center" :class="!disabled ? 'cursor-pointer' : ''">
     <div class="border-2 rounded flex flex-shrink-0 justify-center items-center" :class="wrapperClass">
       <input v-model="selected" :disabled="disabled" type="checkbox" class="opacity-0 absolute" :class="!disabled ? 'cursor-pointer' : ''" />
-      <svg v-if="selected" class="fill-current pointer-events-none" :class="svgClass" viewBox="0 0 20 20"><path d="M0 11l2-2 5 5L18 3l2 2L7 18z" /></svg>
+      <span v-if="partial" class="material-icons text-base leading-none text-gray-400">remove</span>
+      <svg v-else-if="selected" class="fill-current pointer-events-none" :class="svgClass" viewBox="0 0 20 20"><path d="M0 11l2-2 5 5L18 3l2 2L7 18z" /></svg>
     </div>
     <div v-if="label" class="select-none" :class="[labelClassname, disabled ? 'text-gray-400' : 'text-gray-100']">{{ label }}</div>
   </label>
@@ -31,7 +32,8 @@ export default {
       type: String,
       default: ''
     },
-    disabled: Boolean
+    disabled: Boolean,
+    partial: Boolean
   },
   data() {
     return {}
diff --git a/client/components/ui/Dropdown.vue b/client/components/ui/Dropdown.vue
index 58155499..632e38ec 100644
--- a/client/components/ui/Dropdown.vue
+++ b/client/components/ui/Dropdown.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="relative w-full" v-click-outside="clickOutsideObj">
-    <p class="text-sm font-semibold px-1" :class="disabled ? 'text-gray-300' : ''">{{ label }}</p>
+    <p v-if="label" class="text-sm font-semibold px-1" :class="disabled ? 'text-gray-300' : ''">{{ label }}</p>
     <button type="button" :aria-label="longLabel" :disabled="disabled" class="relative w-full border rounded shadow-sm pl-3 pr-8 py-2 text-left sm:text-sm" :class="buttonClass" aria-haspopup="listbox" aria-expanded="true" @click.stop.prevent="clickShowMenu">
       <span class="flex items-center">
         <span class="block truncate font-sans" :class="{ 'font-semibold': selectedSubtext, 'text-sm': small }">{{ selectedText }}</span>
@@ -64,7 +64,7 @@ export default {
     },
     itemsToShow() {
       return this.items.map((i) => {
-        if (typeof i === 'string') {
+        if (typeof i === 'string' || typeof i === 'number') {
           return {
             text: i,
             value: i
diff --git a/client/components/ui/InputDropdown.vue b/client/components/ui/InputDropdown.vue
index 852aa997..a9ae7467 100644
--- a/client/components/ui/InputDropdown.vue
+++ b/client/components/ui/InputDropdown.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="w-full">
-    <label class="px-1 text-sm font-semibold" :class="disabled ? 'text-gray-400' : ''">{{ label }}</label>
+    <label v-if="label" class="px-1 text-sm font-semibold" :class="disabled ? 'text-gray-400' : ''">{{ label }}</label>
     <div ref="wrapper" class="relative">
       <form @submit.prevent="submitForm">
         <div ref="inputWrapper" class="input-wrapper flex-wrap relative w-full shadow-sm flex items-center border border-gray-600 rounded px-2 py-2" :class="disabled ? 'pointer-events-none bg-black-300 text-gray-400' : 'bg-primary'">
diff --git a/client/pages/config/sessions.vue b/client/pages/config/sessions.vue
index 0b74955c..fb6e4c30 100644
--- a/client/pages/config/sessions.vue
+++ b/client/pages/config/sessions.vue
@@ -5,37 +5,72 @@
         <ui-dropdown v-model="selectedUser" :items="userItems" :label="$strings.LabelFilterByUser" small class="max-w-48" @input="updateUserFilter" />
       </div>
 
-      <div v-if="listeningSessions.length" class="block max-w-full">
+      <div v-if="listeningSessions.length" class="block max-w-full relative">
         <table class="userSessionsTable">
           <tr class="bg-primary bg-opacity-40">
-            <th class="w-48 min-w-48 text-left">{{ $strings.LabelItem }}</th>
-            <th class="w-20 min-w-20 text-left hidden md:table-cell">{{ $strings.LabelUser }}</th>
-            <th class="w-32 min-w-32 text-left hidden md:table-cell">{{ $strings.LabelPlayMethod }}</th>
-            <th class="w-32 min-w-32 text-left hidden sm:table-cell">{{ $strings.LabelDeviceInfo }}</th>
-            <th class="w-32 min-w-32">{{ $strings.LabelTimeListened }}</th>
-            <th class="w-16 min-w-16">{{ $strings.LabelLastTime }}</th>
-            <th class="flex-grow hidden sm:table-cell">{{ $strings.LabelLastUpdate }}</th>
+            <th class="w-6 min-w-6 text-left hidden md:table-cell h-11">
+              <ui-checkbox v-model="isAllSelected" :partial="numSelected > 0 && !isAllSelected" small checkbox-bg="bg" />
+            </th>
+            <th v-if="numSelected" class="flex-grow text-left" :colspan="7">
+              <div class="flex items-center">
+                <p>{{ $getString('MessageSelected', [numSelected]) }}</p>
+                <div class="flex-grow" />
+                <ui-btn small color="error" :loading="deletingSessions" @click.stop="removeSessionsClick">{{ $strings.ButtonRemove }}</ui-btn>
+              </div>
+            </th>
+            <th v-if="!numSelected" class="w-48 min-w-48 text-left group cursor-pointer" @click.stop="sortColumn('displayTitle')">
+              <div class="inline-flex items-center">
+                {{ $strings.LabelItem }} <span :class="{ 'opacity-0 group-hover:opacity-30': !isSortSelected('displayTitle') }" class="material-icons text-base pl-px">{{ sortDesc ? 'arrow_drop_down' : 'arrow_drop_up' }}</span>
+              </div>
+            </th>
+            <th v-if="!numSelected" class="w-20 min-w-20 text-left hidden md:table-cell">{{ $strings.LabelUser }}</th>
+            <th v-if="!numSelected" class="w-26 min-w-26 text-left hidden md:table-cell group cursor-pointer" @click.stop="sortColumn('playMethod')">
+              <div class="inline-flex items-center">
+                {{ $strings.LabelPlayMethod }} <span :class="{ 'opacity-0 group-hover:opacity-30': !isSortSelected('playMethod') }" class="material-icons text-base pl-px">{{ sortDesc ? 'arrow_drop_down' : 'arrow_drop_up' }}</span>
+              </div>
+            </th>
+            <th v-if="!numSelected" class="w-32 min-w-32 text-left hidden sm:table-cell">{{ $strings.LabelDeviceInfo }}</th>
+            <th v-if="!numSelected" class="w-32 min-w-32 group cursor-pointer" @click.stop="sortColumn('timeListening')">
+              <div class="inline-flex items-center">
+                {{ $strings.LabelTimeListened }} <span :class="{ 'opacity-0 group-hover:opacity-30': !isSortSelected('timeListening') }" class="material-icons text-base pl-px">{{ sortDesc ? 'arrow_drop_down' : 'arrow_drop_up' }}</span>
+              </div>
+            </th>
+            <th v-if="!numSelected" class="w-24 min-w-24 group cursor-pointer" @click.stop="sortColumn('currentTime')">
+              <div class="inline-flex items-center">
+                {{ $strings.LabelLastTime }} <span :class="{ 'opacity-0 group-hover:opacity-30': !isSortSelected('currentTime') }" class="material-icons text-base pl-px">{{ sortDesc ? 'arrow_drop_down' : 'arrow_drop_up' }}</span>
+              </div>
+            </th>
+            <th v-if="!numSelected" class="flex-grow hidden sm:table-cell cursor-pointer group" @click.stop="sortColumn('updatedAt')">
+              <div class="inline-flex items-center">
+                {{ $strings.LabelLastUpdate }} <span :class="{ 'opacity-0 group-hover:opacity-30': !isSortSelected('updatedAt') }" class="material-icons text-base pl-px">{{ sortDesc ? 'arrow_drop_down' : 'arrow_drop_up' }}</span>
+              </div>
+            </th>
           </tr>
 
-          <tr v-for="session in listeningSessions" :key="session.id" class="cursor-pointer" @click="showSession(session)">
-            <td class="py-1 max-w-48">
+          <tr v-for="session in listeningSessions" :key="session.id" :class="{ selected: session.selected }" class="cursor-pointer" @click="clickSessionRow(session)">
+            <td class="hidden md:table-cell py-1 max-w-6 relative">
+              <ui-checkbox v-model="session.selected" small checkbox-bg="bg" />
+              <!-- overlay of the checkbox so that the entire box is clickable -->
+              <div class="absolute inset-0 w-full h-full" @click.stop="session.selected = !session.selected" />
+            </td>
+            <td class="py-1 w-48 max-w-48">
               <p class="text-xs text-gray-200 truncate">{{ session.displayTitle }}</p>
               <p class="text-xs text-gray-400 truncate">{{ session.displayAuthor }}</p>
             </td>
-            <td class="hidden md:table-cell">
+            <td class="hidden md:table-cell w-20 min-w-20">
               <p v-if="filteredUserUsername" class="text-xs">{{ filteredUserUsername }}</p>
               <p v-else class="text-xs">{{ session.user ? session.user.username : 'N/A' }}</p>
             </td>
-            <td class="hidden md:table-cell">
+            <td class="hidden md:table-cell w-26 min-w-26">
               <p class="text-xs">{{ getPlayMethodName(session.playMethod) }}</p>
             </td>
-            <td class="hidden sm:table-cell">
+            <td class="hidden sm:table-cell w-32 min-w-32">
               <p class="text-xs" v-html="getDeviceInfoString(session.deviceInfo)" />
             </td>
-            <td class="text-center">
+            <td class="text-center w-32 min-w-32">
               <p class="text-xs font-mono">{{ $elapsedPretty(session.timeListening) }}</p>
             </td>
-            <td class="text-center hover:underline" @click.stop="clickCurrentTime(session)">
+            <td class="text-center hover:underline w-24 min-w-24" @click.stop="clickCurrentTime(session)">
               <p class="text-xs font-mono">{{ $secondsToTimestamp(session.currentTime) }}</p>
             </td>
             <td class="text-center hidden sm:table-cell">
@@ -45,10 +80,22 @@
             </td>
           </tr>
         </table>
-        <div class="flex items-center justify-end my-2">
-          <ui-icon-btn icon="arrow_back_ios_new" :size="7" icon-font-size="1rem" class="mx-1" :disabled="currentPage === 0" @click="prevPage" />
-          <p class="text-sm mx-1">Page {{ currentPage + 1 }} of {{ numPages }}</p>
-          <ui-icon-btn icon="arrow_forward_ios" :size="7" icon-font-size="1rem" class="mx-1" :disabled="currentPage >= numPages - 1" @click="nextPage" />
+        <!-- table bottom options -->
+        <div class="flex items-center my-2">
+          <div class="flex-grow" />
+          <div class="inline-flex items-center">
+            <p class="text-sm">{{ $strings.LabelRowsPerPage }}</p>
+            <ui-dropdown v-model="itemsPerPage" :items="itemsPerPageOptions" small class="w-24 mx-2" @input="updatedItemsPerPage" />
+          </div>
+          <div class="inline-flex items-center">
+            <p class="text-sm mx-2">Page {{ currentPage + 1 }} of {{ numPages }}</p>
+            <ui-icon-btn icon="arrow_back_ios_new" :size="9" icon-font-size="1rem" class="mx-1" :disabled="currentPage === 0" @click="prevPage" />
+            <ui-icon-btn icon="arrow_forward_ios" :size="9" icon-font-size="1rem" class="mx-1" :disabled="currentPage >= numPages - 1" @click="nextPage" />
+          </div>
+        </div>
+
+        <div v-if="deletingSessions || loading" class="absolute inset-0 w-full h-full flex items-center justify-center">
+          <ui-loading-indicator />
         </div>
       </div>
       <p v-else class="text-white text-opacity-50">{{ $strings.MessageNoListeningSessions }}</p>
@@ -128,6 +175,7 @@ export default {
   },
   data() {
     return {
+      loading: false,
       showSessionModal: false,
       selectedSession: null,
       listeningSessions: [],
@@ -138,7 +186,11 @@ export default {
       itemsPerPage: 10,
       userFilter: null,
       selectedUser: '',
-      processingGoToTimestamp: false
+      sortBy: 'updatedAt',
+      sortDesc: true,
+      processingGoToTimestamp: false,
+      deletingSessions: false,
+      itemsPerPageOptions: [10, 25, 50, 100]
     }
   },
   computed: {
@@ -162,9 +214,85 @@ export default {
     },
     timeFormat() {
       return this.$store.state.serverSettings.timeFormat
+    },
+    numSelected() {
+      return this.listeningSessions.filter((s) => s.selected).length
+    },
+    isAllSelected: {
+      get() {
+        return this.numSelected === this.listeningSessions.length
+      },
+      set(val) {
+        this.setSelectionForAll(val)
+      }
     }
   },
   methods: {
+    isSortSelected(column) {
+      return this.sortBy === column
+    },
+    sortColumn(column) {
+      if (this.sortBy === column) {
+        this.sortDesc = !this.sortDesc
+      } else {
+        this.sortBy = column
+      }
+      this.loadSessions(this.currentPage)
+    },
+    removeSelectedSessions() {
+      if (!this.numSelected) return
+      this.deletingSessions = true
+
+      let isAllSessions = this.isAllSelected
+      const payload = {
+        sessions: this.listeningSessions.filter((s) => s.selected).map((s) => s.id)
+      }
+      this.$axios
+        .$post(`/api/sessions/batch/delete`, payload)
+        .then(() => {
+          this.$toast.success('Sessions removed')
+          if (isAllSessions) {
+            // If all sessions were removed from the current page then go to the previous page
+            if (this.currentPage > 0) {
+              this.currentPage--
+            }
+            this.loadSessions(this.currentPage)
+          } else {
+            // Filter out the deleted sessions
+            this.listeningSessions = this.listeningSessions.filter((ls) => !payload.sessions.includes(ls.id))
+          }
+        })
+        .catch((error) => {
+          const errorMsg = error.response?.data || 'Failed to remove sessions'
+          this.$toast.error(errorMsg)
+        })
+        .finally(() => {
+          this.deletingSessions = false
+        })
+    },
+    removeSessionsClick() {
+      if (!this.numSelected) return
+      const payload = {
+        message: this.$getString('MessageConfirmRemoveListeningSessions', [this.numSelected]),
+        callback: (confirmed) => {
+          if (confirmed) {
+            this.removeSelectedSessions()
+          }
+        },
+        type: 'yesNo'
+      }
+      this.$store.commit('globals/setConfirmPrompt', payload)
+    },
+    setSelectionForAll(val) {
+      this.listeningSessions = this.listeningSessions.map((s) => {
+        s.selected = val
+        return s
+      })
+    },
+    updatedItemsPerPage() {
+      this.currentPage = 0
+      this.loadSessions(this.currentPage)
+    },
     closedSession() {
       this.loadOpenSessions()
     },
@@ -252,6 +380,13 @@ export default {
     nextPage() {
       this.loadSessions(this.currentPage + 1)
     },
+    clickSessionRow(session) {
+      if (this.numSelected > 0) {
+        session.selected = !session.selected
+      } else {
+        this.showSession(session)
+      }
+    },
     showSession(session) {
       this.selectedSession = session
       this.showSessionModal = true
@@ -274,11 +409,21 @@ export default {
       return 'Unknown'
     },
     async loadSessions(page) {
-      const userFilterQuery = this.selectedUser ? `&user=${this.selectedUser}` : ''
-      const data = await this.$axios.$get(`/api/sessions?page=${page}&itemsPerPage=${this.itemsPerPage}${userFilterQuery}`).catch((err) => {
+      this.loading = true
+      const urlSearchParams = new URLSearchParams()
+      urlSearchParams.set('page', page)
+      urlSearchParams.set('itemsPerPage', this.itemsPerPage)
+      urlSearchParams.set('sort', this.sortBy)
+      urlSearchParams.set('desc', this.sortDesc ? '1' : '0')
+      if (this.selectedUser) {
+        urlSearchParams.set('user', this.selectedUser)
+      }
+
+      const data = await this.$axios.$get(`/api/sessions?${urlSearchParams.toString()}`).catch((err) => {
         console.error('Failed to load listening sessions', err)
         return null
       })
+      this.loading = false
       if (!data) {
         this.$toast.error('Failed to load listening sessions')
         return
@@ -287,8 +432,13 @@ export default {
       this.numPages = data.numPages
       this.total = data.total
       this.currentPage = data.page
-      this.listeningSessions = data.sessions
-      this.userFilter = data.userFilter
+      this.listeningSessions = data.sessions.map((ls) => {
+        return {
+          ...ls,
+          selected: false
+        }
+      })
+      this.userFilter = data.userId
     },
     async loadOpenSessions() {
       const data = await this.$axios.$get('/api/sessions/open').catch((err) => {
@@ -326,15 +476,18 @@ export default {
 .userSessionsTable tr:first-child {
   background-color: #272727;
 }
-.userSessionsTable tr:not(:first-child) {
+.userSessionsTable tr:not(:first-child):not(.selected) {
   background-color: #373838;
 }
-.userSessionsTable tr:not(:first-child):nth-child(odd) {
+.userSessionsTable tr:not(:first-child):nth-child(odd):not(.selected):not(:hover) {
   background-color: #2f2f2f;
 }
 .userSessionsTable tr:hover:not(:first-child) {
   background-color: #474747;
 }
+.userSessionsTable tr.selected {
+  background-color: #474747;
+}
 .userSessionsTable td {
   padding: 4px 8px;
 }
diff --git a/client/strings/cs.json b/client/strings/cs.json
index 6d39569e..bac376d8 100644
--- a/client/strings/cs.json
+++ b/client/strings/cs.json
@@ -406,6 +406,7 @@
   "LabelRegion": "Region",
   "LabelReleaseDate": "Datum vydání",
   "LabelRemoveCover": "Odstranit obálku",
+  "LabelRowsPerPage": "Rows per page",
   "LabelRSSFeedCustomOwnerEmail": "Vlastní e-mail vlastníka",
   "LabelRSSFeedCustomOwnerName": "Vlastní jméno vlastníka",
   "LabelRSSFeedOpen": "Otevření RSS kanálu",
@@ -571,6 +572,7 @@
   "MessageConfirmRemoveCollection": "Opravdu chcete odstranit kolekci \"{0}\"?",
   "MessageConfirmRemoveEpisode": "Opravdu chcete odstranit epizodu \"{0}\"?",
   "MessageConfirmRemoveEpisodes": "Opravdu chcete odstranit {0} epizody?",
+  "MessageConfirmRemoveListeningSessions": "Are you sure you want to remove {0} listening sessions?",
   "MessageConfirmRemoveNarrator": "Opravdu chcete odebrat předčítání \"{0}\"?",
   "MessageConfirmRemovePlaylist": "Opravdu chcete odstranit svůj playlist \"{0}\"?",
   "MessageConfirmRenameGenre": "Opravdu chcete přejmenovat žánr \"{0}\" na \"{1}\" pro všechny položky?",
@@ -650,6 +652,7 @@
   "MessageRestoreBackupConfirm": "Opravdu chcete obnovit zálohu vytvořenou dne?",
   "MessageRestoreBackupWarning": "Obnovení zálohy přepíše celou databázi umístěnou v /config a obálku obrázků v /metadata/items & /metadata/authors.<br /><br />Backups nezmění žádné soubory ve složkách knihovny. Pokud jste povolili nastavení serveru pro ukládání obrázků obalu a metadat do složek knihovny, nebudou zálohovány ani přepsány.<br /><br />Všichni klienti používající váš server budou automaticky obnoveni.",
   "MessageSearchResultsFor": "Výsledky hledání pro",
+  "MessageSelected": "{0} selected",
   "MessageServerCouldNotBeReached": "Server je nedostupný",
   "MessageSetChaptersFromTracksDescription": "Nastavit kapitoly jako kapitolu a název kapitoly jako název zvukového souboru",
   "MessageStartPlaybackAtTime": "Spustit přehrávání pro \"{0}\" v {1}?",
diff --git a/client/strings/da.json b/client/strings/da.json
index fa28dd24..3dd611d9 100644
--- a/client/strings/da.json
+++ b/client/strings/da.json
@@ -406,6 +406,7 @@
   "LabelRegion": "Region",
   "LabelReleaseDate": "Udgivelsesdato",
   "LabelRemoveCover": "Fjern omslag",
+  "LabelRowsPerPage": "Rows per page",
   "LabelRSSFeedCustomOwnerEmail": "Brugerdefineret ejerens e-mail",
   "LabelRSSFeedCustomOwnerName": "Brugerdefineret ejerens navn",
   "LabelRSSFeedOpen": "Åben RSS-feed",
@@ -571,6 +572,7 @@
   "MessageConfirmRemoveCollection": "Er du sikker på, at du vil fjerne samlingen \"{0}\"?",
   "MessageConfirmRemoveEpisode": "Er du sikker på, at du vil fjerne episoden \"{0}\"?",
   "MessageConfirmRemoveEpisodes": "Er du sikker på, at du vil fjerne {0} episoder?",
+  "MessageConfirmRemoveListeningSessions": "Are you sure you want to remove {0} listening sessions?",
   "MessageConfirmRemoveNarrator": "Er du sikker på, at du vil fjerne fortælleren \"{0}\"?",
   "MessageConfirmRemovePlaylist": "Er du sikker på, at du vil fjerne din spilleliste \"{0}\"?",
   "MessageConfirmRenameGenre": "Er du sikker på, at du vil omdøbe genre \"{0}\" til \"{1}\" for alle elementer?",
@@ -650,6 +652,7 @@
   "MessageRestoreBackupConfirm": "Er du sikker på, at du vil gendanne sikkerhedskopien oprettet den",
   "MessageRestoreBackupWarning": "Gendannelse af en sikkerhedskopi vil overskrive hele databasen, som er placeret på /config, og omslagsbilleder i /metadata/items & /metadata/authors.<br /><br />Sikkerhedskopier ændrer ikke nogen filer i dine biblioteksmapper. Hvis du har aktiveret serverindstillinger for at gemme omslagskunst og metadata i dine biblioteksmapper, sikkerhedskopieres eller overskrives disse ikke.<br /><br />Alle klienter, der bruger din server, opdateres automatisk.",
   "MessageSearchResultsFor": "Søgeresultater for",
+  "MessageSelected": "{0} selected",
   "MessageServerCouldNotBeReached": "Serveren kunne ikke nås",
   "MessageSetChaptersFromTracksDescription": "Indstil kapitler ved at bruge hver lydfil som et kapitel og kapiteloverskrift som lydfilnavn",
   "MessageStartPlaybackAtTime": "Start afspilning for \"{0}\" kl. {1}?",
diff --git a/client/strings/de.json b/client/strings/de.json
index 6975b794..8cf54cbe 100644
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -406,6 +406,7 @@
   "LabelRegion": "Region",
   "LabelReleaseDate": "Veröffentlichungsdatum",
   "LabelRemoveCover": "Lösche Titelbild",
+  "LabelRowsPerPage": "Rows per page",
   "LabelRSSFeedCustomOwnerEmail": "Benutzerdefinierte Eigentümer-E-Mail",
   "LabelRSSFeedCustomOwnerName": "Benutzerdefinierter Name des Eigentümers",
   "LabelRSSFeedOpen": "RSS Feed Offen",
@@ -571,6 +572,7 @@
   "MessageConfirmRemoveCollection": "Sammlung \"{0}\" wird gelöscht! Sind Sie sicher?",
   "MessageConfirmRemoveEpisode": "Episode \"{0}\" wird geloscht! Sind Sie sicher?",
   "MessageConfirmRemoveEpisodes": "{0} Episoden werden gelöscht! Sind Sie sicher?",
+  "MessageConfirmRemoveListeningSessions": "Are you sure you want to remove {0} listening sessions?",
   "MessageConfirmRemoveNarrator": "Erzähler \"{0}\" wird gelöscht! Sind Sie sicher?",
   "MessageConfirmRemovePlaylist": "Wiedergabeliste \"{0}\" wird entfernt! Sind Sie sicher?",
   "MessageConfirmRenameGenre": "Kategorie \"{0}\" in \"{1}\" für alle Hörbücher/Podcasts werden umbenannt! Sind Sie sicher?",
@@ -650,6 +652,7 @@
   "MessageRestoreBackupConfirm": "Sind Sie sicher, dass Sie die Sicherung wiederherstellen wollen, welche am",
   "MessageRestoreBackupWarning": "Bei der Wiederherstellung einer Sicherung wird die gesamte Datenbank unter /config und die Titelbilder in /metadata/items und /metadata/authors überschrieben.<br /><br />Bei der Sicherung werden keine Dateien in Ihren Bibliotheksordnern verändert. Wenn Sie die Servereinstellungen aktiviert haben, um Cover und Metadaten in Ihren Bibliotheksordnern zu speichern, werden diese nicht gesichert oder überschrieben.<br /><br />Alle Clients, die Ihren Server nutzen, werden automatisch aktualisiert.",
   "MessageSearchResultsFor": "Suchergebnisse für",
+  "MessageSelected": "{0} selected",
   "MessageServerCouldNotBeReached": "Server kann nicht erreicht werden",
   "MessageSetChaptersFromTracksDescription": "Kaitelerstellung basiert auf den existierenden einzelnen Audiodateien. Pro existierende Audiodatei wird 1 Kapitel erstellt, wobei deren Kapitelname aus dem Audiodateinamen extrahiert wird",
   "MessageStartPlaybackAtTime": "Start der Wiedergabe für \"{0}\" bei {1}?",
@@ -747,4 +750,4 @@
   "ToastSocketFailedToConnect": "Verbindung zum WebSocket fehlgeschlagen",
   "ToastUserDeleteFailed": "Benutzer konnte nicht gelöscht werden",
   "ToastUserDeleteSuccess": "Benutzer gelöscht"
-}
+}
\ No newline at end of file
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index 02f9df05..f69175fd 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -406,6 +406,7 @@
   "LabelRegion": "Region",
   "LabelReleaseDate": "Release Date",
   "LabelRemoveCover": "Remove cover",
+  "LabelRowsPerPage": "Rows per page",
   "LabelRSSFeedCustomOwnerEmail": "Custom owner Email",
   "LabelRSSFeedCustomOwnerName": "Custom owner Name",
   "LabelRSSFeedOpen": "RSS Feed Open",
@@ -571,6 +572,7 @@
   "MessageConfirmRemoveCollection": "Are you sure you want to remove collection \"{0}\"?",
   "MessageConfirmRemoveEpisode": "Are you sure you want to remove episode \"{0}\"?",
   "MessageConfirmRemoveEpisodes": "Are you sure you want to remove {0} episodes?",
+  "MessageConfirmRemoveListeningSessions": "Are you sure you want to remove {0} listening sessions?",
   "MessageConfirmRemoveNarrator": "Are you sure you want to remove narrator \"{0}\"?",
   "MessageConfirmRemovePlaylist": "Are you sure you want to remove your playlist \"{0}\"?",
   "MessageConfirmRenameGenre": "Are you sure you want to rename genre \"{0}\" to \"{1}\" for all items?",
@@ -650,6 +652,7 @@
   "MessageRestoreBackupConfirm": "Are you sure you want to restore the backup created on",
   "MessageRestoreBackupWarning": "Restoring a backup will overwrite the entire database located at /config and cover images in /metadata/items & /metadata/authors.<br /><br />Backups do not modify any files in your library folders. If you have enabled server settings to store cover art and metadata in your library folders then those are not backed up or overwritten.<br /><br />All clients using your server will be automatically refreshed.",
   "MessageSearchResultsFor": "Search results for",
+  "MessageSelected": "{0} selected",
   "MessageServerCouldNotBeReached": "Server could not be reached",
   "MessageSetChaptersFromTracksDescription": "Set chapters using each audio file as a chapter and chapter title as the audio file name",
   "MessageStartPlaybackAtTime": "Start playback for \"{0}\" at {1}?",
@@ -747,4 +750,4 @@
   "ToastSocketFailedToConnect": "Socket failed to connect",
   "ToastUserDeleteFailed": "Failed to delete user",
   "ToastUserDeleteSuccess": "User deleted"
-}
+}
\ No newline at end of file
diff --git a/client/strings/es.json b/client/strings/es.json
index 47315301..cefeb8f8 100644
--- a/client/strings/es.json
+++ b/client/strings/es.json
@@ -406,6 +406,7 @@
   "LabelRegion": "Región",
   "LabelReleaseDate": "Fecha de Estreno",
   "LabelRemoveCover": "Remover Portada",
+  "LabelRowsPerPage": "Rows per page",
   "LabelRSSFeedCustomOwnerEmail": "Email de dueño personalizado",
   "LabelRSSFeedCustomOwnerName": "Nombre de dueño personalizado",
   "LabelRSSFeedOpen": "Fuente RSS Abierta",
@@ -571,6 +572,7 @@
   "MessageConfirmRemoveCollection": "¿Está seguro de que desea remover la colección \"{0}\"?",
   "MessageConfirmRemoveEpisode": "¿Está seguro de que desea remover el episodio \"{0}\"?",
   "MessageConfirmRemoveEpisodes": "¿Está seguro de que desea remover {0} episodios?",
+  "MessageConfirmRemoveListeningSessions": "Are you sure you want to remove {0} listening sessions?",
   "MessageConfirmRemoveNarrator": "¿Está seguro de que desea remover el narrador \"{0}\"?",
   "MessageConfirmRemovePlaylist": "¿Está seguro de que desea remover la lista de reproducción \"{0}\"?",
   "MessageConfirmRenameGenre": "¿Está seguro de que desea renombrar el genero \"{0}\" a \"{1}\" de todos los elementos?",
@@ -650,6 +652,7 @@
   "MessageRestoreBackupConfirm": "¿Está seguro de que desea para restaurar del respaldo creado en",
   "MessageRestoreBackupWarning": "Restaurar sobrescribirá toda la base de datos localizada en /config y las imágenes de portadas en /metadata/items y /metadata/authors.<br /><br />El respaldo no modifica ningún archivo en las carpetas de su biblioteca. Si ha habilitado la opción del servidor para almacenar portadas y metadata en las carpetas de su biblioteca, esos archivos no se respaldan o sobrescriben.<br /><br />Todos los clientes que usen su servidor se actualizarán automáticamente.",
   "MessageSearchResultsFor": "Resultados de la búsqueda de",
+  "MessageSelected": "{0} selected",
   "MessageServerCouldNotBeReached": "No se pudo establecer la conexión con el servidor",
   "MessageSetChaptersFromTracksDescription": "Establecer capítulos usando cada archivo de audio como un capítulo y el título del capítulo como el nombre del archivo de audio",
   "MessageStartPlaybackAtTime": "Iniciar reproducción para \"{0}\" en {1}?",
diff --git a/client/strings/fr.json b/client/strings/fr.json
index f6efa428..86a64602 100644
--- a/client/strings/fr.json
+++ b/client/strings/fr.json
@@ -406,6 +406,7 @@
   "LabelRegion": "Région",
   "LabelReleaseDate": "Date de parution",
   "LabelRemoveCover": "Supprimer la couverture",
+  "LabelRowsPerPage": "Rows per page",
   "LabelRSSFeedCustomOwnerEmail": "Courriel du propriétaire personnalisé",
   "LabelRSSFeedCustomOwnerName": "Nom propriétaire personnalisé",
   "LabelRSSFeedOpen": "Flux RSS ouvert",
@@ -571,6 +572,7 @@
   "MessageConfirmRemoveCollection": "Êtes-vous sûr de vouloir supprimer la collection « {0} » ?",
   "MessageConfirmRemoveEpisode": "Êtes-vous sûr de vouloir supprimer l’épisode « {0} » ?",
   "MessageConfirmRemoveEpisodes": "Êtes-vous sûr de vouloir supprimer {0} épisodes ?",
+  "MessageConfirmRemoveListeningSessions": "Are you sure you want to remove {0} listening sessions?",
   "MessageConfirmRemoveNarrator": "Êtes-vous sûr de vouloir supprimer le narrateur « {0} » ?",
   "MessageConfirmRemovePlaylist": "Êtes-vous sûr de vouloir supprimer la liste de lecture « {0} » ?",
   "MessageConfirmRenameGenre": "Êtes-vous sûr de vouloir renommer le genre « {0} » en « {1} » pour tous les articles ?",
@@ -650,6 +652,7 @@
   "MessageRestoreBackupConfirm": "Êtes-vous certain de vouloir restaurer la sauvegarde créée le",
   "MessageRestoreBackupWarning": "Restaurer la sauvegarde écrasera la base de donnée située dans le dossier /config ainsi que les images sur /metadata/items et /metadata/authors.<br /><br />Les sauvegardes ne touchent pas aux fichiers de la bibliothèque. Si vous avez activé le paramètre pour sauvegarder les métadonnées et les images de couverture dans le même dossier que les fichiers, ceux-ci ne ni sauvegardés, ni écrasés lors de la restauration.<br /><br />Tous les clients utilisant votre serveur seront automatiquement mis à jour.",
   "MessageSearchResultsFor": "Résultats de recherche pour",
+  "MessageSelected": "{0} selected",
   "MessageServerCouldNotBeReached": "Serveur inaccessible",
   "MessageSetChaptersFromTracksDescription": "Positionne un chapitre par fichier audio, avec le titre du fichier comme titre de chapitre",
   "MessageStartPlaybackAtTime": "Démarrer la lecture pour « {0} » à {1} ?",
diff --git a/client/strings/gu.json b/client/strings/gu.json
index 0317e2f9..24c874eb 100644
--- a/client/strings/gu.json
+++ b/client/strings/gu.json
@@ -406,6 +406,7 @@
   "LabelRegion": "Region",
   "LabelReleaseDate": "Release Date",
   "LabelRemoveCover": "Remove cover",
+  "LabelRowsPerPage": "Rows per page",
   "LabelRSSFeedCustomOwnerEmail": "Custom owner Email",
   "LabelRSSFeedCustomOwnerName": "Custom owner Name",
   "LabelRSSFeedOpen": "RSS Feed Open",
@@ -571,6 +572,7 @@
   "MessageConfirmRemoveCollection": "Are you sure you want to remove collection \"{0}\"?",
   "MessageConfirmRemoveEpisode": "Are you sure you want to remove episode \"{0}\"?",
   "MessageConfirmRemoveEpisodes": "Are you sure you want to remove {0} episodes?",
+  "MessageConfirmRemoveListeningSessions": "Are you sure you want to remove {0} listening sessions?",
   "MessageConfirmRemoveNarrator": "Are you sure you want to remove narrator \"{0}\"?",
   "MessageConfirmRemovePlaylist": "Are you sure you want to remove your playlist \"{0}\"?",
   "MessageConfirmRenameGenre": "Are you sure you want to rename genre \"{0}\" to \"{1}\" for all items?",
@@ -650,6 +652,7 @@
   "MessageRestoreBackupConfirm": "Are you sure you want to restore the backup created on",
   "MessageRestoreBackupWarning": "Restoring a backup will overwrite the entire database located at /config and cover images in /metadata/items & /metadata/authors.<br /><br />Backups do not modify any files in your library folders. If you have enabled server settings to store cover art and metadata in your library folders then those are not backed up or overwritten.<br /><br />All clients using your server will be automatically refreshed.",
   "MessageSearchResultsFor": "Search results for",
+  "MessageSelected": "{0} selected",
   "MessageServerCouldNotBeReached": "Server could not be reached",
   "MessageSetChaptersFromTracksDescription": "Set chapters using each audio file as a chapter and chapter title as the audio file name",
   "MessageStartPlaybackAtTime": "Start playback for \"{0}\" at {1}?",
diff --git a/client/strings/hi.json b/client/strings/hi.json
index eb4f074f..e7ec6155 100644
--- a/client/strings/hi.json
+++ b/client/strings/hi.json
@@ -406,6 +406,7 @@
   "LabelRegion": "Region",
   "LabelReleaseDate": "Release Date",
   "LabelRemoveCover": "Remove cover",
+  "LabelRowsPerPage": "Rows per page",
   "LabelRSSFeedCustomOwnerEmail": "Custom owner Email",
   "LabelRSSFeedCustomOwnerName": "Custom owner Name",
   "LabelRSSFeedOpen": "RSS Feed Open",
@@ -571,6 +572,7 @@
   "MessageConfirmRemoveCollection": "Are you sure you want to remove collection \"{0}\"?",
   "MessageConfirmRemoveEpisode": "Are you sure you want to remove episode \"{0}\"?",
   "MessageConfirmRemoveEpisodes": "Are you sure you want to remove {0} episodes?",
+  "MessageConfirmRemoveListeningSessions": "Are you sure you want to remove {0} listening sessions?",
   "MessageConfirmRemoveNarrator": "Are you sure you want to remove narrator \"{0}\"?",
   "MessageConfirmRemovePlaylist": "Are you sure you want to remove your playlist \"{0}\"?",
   "MessageConfirmRenameGenre": "Are you sure you want to rename genre \"{0}\" to \"{1}\" for all items?",
@@ -650,6 +652,7 @@
   "MessageRestoreBackupConfirm": "Are you sure you want to restore the backup created on",
   "MessageRestoreBackupWarning": "Restoring a backup will overwrite the entire database located at /config and cover images in /metadata/items & /metadata/authors.<br /><br />Backups do not modify any files in your library folders. If you have enabled server settings to store cover art and metadata in your library folders then those are not backed up or overwritten.<br /><br />All clients using your server will be automatically refreshed.",
   "MessageSearchResultsFor": "Search results for",
+  "MessageSelected": "{0} selected",
   "MessageServerCouldNotBeReached": "Server could not be reached",
   "MessageSetChaptersFromTracksDescription": "Set chapters using each audio file as a chapter and chapter title as the audio file name",
   "MessageStartPlaybackAtTime": "Start playback for \"{0}\" at {1}?",
diff --git a/client/strings/hr.json b/client/strings/hr.json
index eb7d27d8..edefcf53 100644
--- a/client/strings/hr.json
+++ b/client/strings/hr.json
@@ -406,6 +406,7 @@
   "LabelRegion": "Regija",
   "LabelReleaseDate": "Datum izlaska",
   "LabelRemoveCover": "Remove cover",
+  "LabelRowsPerPage": "Rows per page",
   "LabelRSSFeedCustomOwnerEmail": "Custom owner Email",
   "LabelRSSFeedCustomOwnerName": "Custom owner Name",
   "LabelRSSFeedOpen": "RSS Feed Open",
@@ -571,6 +572,7 @@
   "MessageConfirmRemoveCollection": "AJeste li sigurni da želite obrisati kolekciju \"{0}\"?",
   "MessageConfirmRemoveEpisode": "Jeste li sigurni da želite obrisati epizodu \"{0}\"?",
   "MessageConfirmRemoveEpisodes": "Jeste li sigurni da želite obrisati {0} epizoda/-u?",
+  "MessageConfirmRemoveListeningSessions": "Are you sure you want to remove {0} listening sessions?",
   "MessageConfirmRemoveNarrator": "Are you sure you want to remove narrator \"{0}\"?",
   "MessageConfirmRemovePlaylist": "Are you sure you want to remove your playlist \"{0}\"?",
   "MessageConfirmRenameGenre": "Are you sure you want to rename genre \"{0}\" to \"{1}\" for all items?",
@@ -650,6 +652,7 @@
   "MessageRestoreBackupConfirm": "Jeste li sigurni da želite povratiti backup kreiran",
   "MessageRestoreBackupWarning": "Povračanje backupa će zamijeniti postoječu bazu podataka u /config i slike covera u /metadata/items i /metadata/authors.<br /><br />Backups ne modificiraju nikakve datoteke u folderu od biblioteke. Ako imate uključene server postavke da spremate cover i metapodtake u folderu od biblioteke, onda oni neće biti backupani ili overwritten.<br /><br />Svi klijenti koji koriste tvoj server će biti automatski osvježeni.",
   "MessageSearchResultsFor": "Traži rezultate za",
+  "MessageSelected": "{0} selected",
   "MessageServerCouldNotBeReached": "Server ne može biti kontaktiran",
   "MessageSetChaptersFromTracksDescription": "Set chapters using each audio file as a chapter and chapter title as the audio file name",
   "MessageStartPlaybackAtTime": "Pokreni reprodukciju za \"{0}\" na {1}?",
diff --git a/client/strings/it.json b/client/strings/it.json
index 7e526721..0860e83f 100644
--- a/client/strings/it.json
+++ b/client/strings/it.json
@@ -406,6 +406,7 @@
   "LabelRegion": "Regione",
   "LabelReleaseDate": "Data Release",
   "LabelRemoveCover": "Rimuovi cover",
+  "LabelRowsPerPage": "Rows per page",
   "LabelRSSFeedCustomOwnerEmail": "Email del proprietario personalizzato",
   "LabelRSSFeedCustomOwnerName": "Nome del proprietario personalizzato",
   "LabelRSSFeedOpen": "RSS Feed Aperto",
@@ -571,6 +572,7 @@
   "MessageConfirmRemoveCollection": "Sei sicuro di voler rimuovere la Raccolta \"{0}\"?",
   "MessageConfirmRemoveEpisode": "Sei sicuro di voler rimuovere l'episodio \"{0}\"?",
   "MessageConfirmRemoveEpisodes": "Sei sicuro di voler rimuovere  {0} episodi?",
+  "MessageConfirmRemoveListeningSessions": "Are you sure you want to remove {0} listening sessions?",
   "MessageConfirmRemoveNarrator": "Sei sicuro di voler rimuovere il narratore \"{0}\"?",
   "MessageConfirmRemovePlaylist": "Sei sicuro di voler rimuovere la tua playlist \"{0}\"?",
   "MessageConfirmRenameGenre": "Sei sicuro di voler rinominare il genere \"{0}\" in \"{1}\" per tutti gli oggetti?",
@@ -650,6 +652,7 @@
   "MessageRestoreBackupConfirm": "Sei sicuro di voler ripristinare il backup creato su",
   "MessageRestoreBackupWarning": "Il ripristino di un backup sovrascriverà l'intero database situato in /config e sovrascrive le immagini in /metadata/items & /metadata/authors.<br /><br />I backup non modificano alcun file nelle cartelle della libreria. Se hai abilitato le impostazioni del server per archiviare copertine e metadati nelle cartelle della libreria, questi non vengono sottoposti a backup o sovrascritti.<br /><br />Tutti i client che utilizzano il tuo server verranno aggiornati automaticamente.",
   "MessageSearchResultsFor": "cerca risultati per",
+  "MessageSelected": "{0} selected",
   "MessageServerCouldNotBeReached": "Impossibile raggiungere il server",
   "MessageSetChaptersFromTracksDescription": "Impostare i capitoli utilizzando ciascun file audio come capitolo e il titolo del capitolo come nome del file audio",
   "MessageStartPlaybackAtTime": "Avvia la riproduzione per \"{0}\" a {1}?",
diff --git a/client/strings/lt.json b/client/strings/lt.json
index 9c4b9a63..94067198 100644
--- a/client/strings/lt.json
+++ b/client/strings/lt.json
@@ -406,6 +406,7 @@
   "LabelRegion": "Regionas",
   "LabelReleaseDate": "Išleidimo data",
   "LabelRemoveCover": "Pašalinti viršelį",
+  "LabelRowsPerPage": "Rows per page",
   "LabelRSSFeedCustomOwnerEmail": "Pasirinktinis savininko el. paštas",
   "LabelRSSFeedCustomOwnerName": "Pasirinktinis savininko vardas",
   "LabelRSSFeedOpen": "Atidarytas RSS srautas",
@@ -571,6 +572,7 @@
   "MessageConfirmRemoveCollection": "Ar tikrai norite pašalinti kolekciją \"{0}\"?",
   "MessageConfirmRemoveEpisode": "Ar tikrai norite pašalinti epizodą \"{0}\"?",
   "MessageConfirmRemoveEpisodes": "Ar tikrai norite pašalinti {0} epizodus?",
+  "MessageConfirmRemoveListeningSessions": "Are you sure you want to remove {0} listening sessions?",
   "MessageConfirmRemoveNarrator": "Ar tikrai norite pašalinti skaitytoją \"{0}\"?",
   "MessageConfirmRemovePlaylist": "Ar tikrai norite pašalinti savo grojaraštį \"{0}\"?",
   "MessageConfirmRenameGenre": "Ar tikrai norite pervadinti žanrą \"{0}\" į \"{1}\" visiems elementams?",
@@ -650,6 +652,7 @@
   "MessageRestoreBackupConfirm": "Ar tikrai norite atkurti atsarginę kopiją, sukurtą",
   "MessageRestoreBackupWarning": "Atkurdami atsarginę kopiją perrašysite visą duomenų bazę, esančią /config ir viršelių vaizdus /metadata/items ir /metadata/authors.<br /><br />Atsarginės kopijos nekeičia jokių failų jūsų bibliotekos aplankuose. Jei esate įgalinę serverio nustatymus, kad viršelio meną ir metaduomenis saugotumėte savo bibliotekos aplankuose, šie neperrašomi ar atkuriami.<br /><br />Visi klientai, naudojantys jūsų serverį, bus automatiškai atnaujinti.",
   "MessageSearchResultsFor": "Paieškos rezultatai „{0}“",
+  "MessageSelected": "{0} selected",
   "MessageServerCouldNotBeReached": "Nepavyko pasiekti serverio",
   "MessageSetChaptersFromTracksDescription": "Nustatyti skyrius, naudojant kiekvieną garso failą kaip skyrių ir skyriaus pavadinimą kaip garso failo pavadinimą",
   "MessageStartPlaybackAtTime": "Paleisti klausymą „{0}“ nuo {1}?",
diff --git a/client/strings/nl.json b/client/strings/nl.json
index d4779abd..19a5c35a 100644
--- a/client/strings/nl.json
+++ b/client/strings/nl.json
@@ -406,6 +406,7 @@
   "LabelRegion": "Regio",
   "LabelReleaseDate": "Verschijningsdatum",
   "LabelRemoveCover": "Verwijder cover",
+  "LabelRowsPerPage": "Rows per page",
   "LabelRSSFeedCustomOwnerEmail": "Aangepast e-mailadres eigenaar",
   "LabelRSSFeedCustomOwnerName": "Aangepaste naam eigenaar",
   "LabelRSSFeedOpen": "RSS-feed open",
@@ -571,6 +572,7 @@
   "MessageConfirmRemoveCollection": "Weet je zeker dat je de collectie \"{0}\" wil verwijderen?",
   "MessageConfirmRemoveEpisode": "Weet je zeker dat je de aflevering \"{0}\" wil verwijderen?",
   "MessageConfirmRemoveEpisodes": "Weet je zeker dat je {0} afleveringen wil verwijderen?",
+  "MessageConfirmRemoveListeningSessions": "Are you sure you want to remove {0} listening sessions?",
   "MessageConfirmRemoveNarrator": "Weet je zeker dat je verteller \"{0}\" wil verwijderen?",
   "MessageConfirmRemovePlaylist": "Weet je zeker dat je je afspeellijst \"{0}\" wil verwijderen?",
   "MessageConfirmRenameGenre": "Weet je zeker dat je genre \"{0}\" wil hernoemen naar \"{1}\" voor alle onderdelen?",
@@ -650,6 +652,7 @@
   "MessageRestoreBackupConfirm": "Weet je zeker dat je wil herstellen met behulp van de back-up gemaakt op",
   "MessageRestoreBackupWarning": "Herstellen met een back-up zal de volledige database in /config en de covers in /metadata/items & /metadata/authors overschrijven.<br /><br />Back-ups wijzigen geen bestanden in je bibliotheekmappen. Als je de serverinstelling gebruikt om covers en metadata in je bibliotheekmappen te bewaren dan worden deze niet geback-upt of overschreven.<br /><br />Alle clients die van je server gebruik maken zullen automatisch worden ververst.",
   "MessageSearchResultsFor": "Zoekresultaten voor",
+  "MessageSelected": "{0} selected",
   "MessageServerCouldNotBeReached": "Server niet bereikbaar",
   "MessageSetChaptersFromTracksDescription": "Stel hoofdstukken in met ieder audiobestand als een hoofdstuk en de audiobestandsnaam als hoofdstuktitel",
   "MessageStartPlaybackAtTime": "Afspelen van \"{0}\" beginnen op {1}?",
diff --git a/client/strings/no.json b/client/strings/no.json
index 511c8b86..37cbc7a8 100644
--- a/client/strings/no.json
+++ b/client/strings/no.json
@@ -406,6 +406,7 @@
   "LabelRegion": "Region",
   "LabelReleaseDate": "Utgivelsesdato",
   "LabelRemoveCover": "Fjern omslag",
+  "LabelRowsPerPage": "Rows per page",
   "LabelRSSFeedCustomOwnerEmail": "Tilpasset eier Epost",
   "LabelRSSFeedCustomOwnerName": "Tilpasset eier Navn",
   "LabelRSSFeedOpen": "RSS Feed åpne",
@@ -571,6 +572,7 @@
   "MessageConfirmRemoveCollection": "Er du sikker på at du vil fjerne samling\"{0}\"?",
   "MessageConfirmRemoveEpisode": "Er du sikker på at du vil fjerne episode \"{0}\"?",
   "MessageConfirmRemoveEpisodes": "Er du sikker på at du vil fjerne {0} episoder?",
+  "MessageConfirmRemoveListeningSessions": "Are you sure you want to remove {0} listening sessions?",
   "MessageConfirmRemoveNarrator": "Er du sikker på at du vil fjerne forteller \"{0}\"?",
   "MessageConfirmRemovePlaylist": "Er du sikker på at du vil fjerne spillelisten \"{0}\"?",
   "MessageConfirmRenameGenre": "Er du sikker på at du vil endre sjanger \"{0}\" til \"{1}\" for alle gjenstandene?",
@@ -650,6 +652,7 @@
   "MessageRestoreBackupConfirm": "Er du sikker på at du vil gjenopprette sikkerhetskopien som var laget",
   "MessageRestoreBackupWarning": "gjenoppretting av sikkerhetskopi vil overskrive hele databasen under /config og omslagsbilde under /metadata/items og /metadata/authors.<br /><br />Sikkerhetskopier endrer ikke noen filer under dine bibliotekmapper. Hvis du har aktivert tjenerinstillingen for å lagre omslagsbilder og metadata i bibliotekmapper så vil ikke de filene bli tatt sikkerhetskopi eller overskrevet.<br /><br />Alle klientene som bruker din tjener vil bli fornyet automatisk.",
   "MessageSearchResultsFor": "Søk resultat for",
+  "MessageSelected": "{0} selected",
   "MessageServerCouldNotBeReached": "Tjener kunne ikke bli nådd",
   "MessageSetChaptersFromTracksDescription": "Sett kapitler ved å bruke hver lydfil som kapittel og kapitteltittel som lydfilnavnet",
   "MessageStartPlaybackAtTime": "Start avspilling av \"{0}\" ved {1}?",
diff --git a/client/strings/pl.json b/client/strings/pl.json
index b51084e9..86e29274 100644
--- a/client/strings/pl.json
+++ b/client/strings/pl.json
@@ -406,6 +406,7 @@
   "LabelRegion": "Region",
   "LabelReleaseDate": "Data wydania",
   "LabelRemoveCover": "Remove cover",
+  "LabelRowsPerPage": "Rows per page",
   "LabelRSSFeedCustomOwnerEmail": "Custom owner Email",
   "LabelRSSFeedCustomOwnerName": "Custom owner Name",
   "LabelRSSFeedOpen": "RSS Feed otwarty",
@@ -571,6 +572,7 @@
   "MessageConfirmRemoveCollection": "Czy na pewno chcesz usunąć kolekcję \"{0}\"?",
   "MessageConfirmRemoveEpisode": "Czy na pewno chcesz usunąć odcinek \"{0}\"?",
   "MessageConfirmRemoveEpisodes": "Czy na pewno chcesz usunąć {0} odcinki?",
+  "MessageConfirmRemoveListeningSessions": "Are you sure you want to remove {0} listening sessions?",
   "MessageConfirmRemoveNarrator": "Are you sure you want to remove narrator \"{0}\"?",
   "MessageConfirmRemovePlaylist": "Are you sure you want to remove your playlist \"{0}\"?",
   "MessageConfirmRenameGenre": "Are you sure you want to rename genre \"{0}\" to \"{1}\" for all items?",
@@ -650,6 +652,7 @@
   "MessageRestoreBackupConfirm": "Czy na pewno chcesz przywrócić kopię zapasową utworzoną w dniu",
   "MessageRestoreBackupWarning": "Przywrócenie kopii zapasowej spowoduje nadpisane bazy danych w folderze /config oraz okładke w folderze /metadata/items & /metadata/authors.<br /><br />Kopie zapasowe nie modyfikują żadnego pliku w folderach z plikami audio. Jeśli włączyłeś ustawienia serwera, aby przechowywać okładki i metadane w folderach biblioteki, to nie są one zapisywane w kopii zapasowej lub nadpisywane<br /><br />Wszyscy klienci korzystający z Twojego serwera będą automatycznie odświeżani",
   "MessageSearchResultsFor": "Wyniki wyszukiwania dla",
+  "MessageSelected": "{0} selected",
   "MessageServerCouldNotBeReached": "Nie udało się uzyskać połączenia z serwerem",
   "MessageSetChaptersFromTracksDescription": "Set chapters using each audio file as a chapter and chapter title as the audio file name",
   "MessageStartPlaybackAtTime": "Rozpoczęcie odtwarzania \"{0}\" od {1}?",
diff --git a/client/strings/ru.json b/client/strings/ru.json
index 03e7385f..4d26c4aa 100644
--- a/client/strings/ru.json
+++ b/client/strings/ru.json
@@ -406,6 +406,7 @@
   "LabelRegion": "Регион",
   "LabelReleaseDate": "Дата выхода",
   "LabelRemoveCover": "Удалить обложку",
+  "LabelRowsPerPage": "Rows per page",
   "LabelRSSFeedCustomOwnerEmail": "Пользовательский Email владельца",
   "LabelRSSFeedCustomOwnerName": "Пользовательское Имя владельца",
   "LabelRSSFeedOpen": "Открыть RSS-канал",
@@ -571,6 +572,7 @@
   "MessageConfirmRemoveCollection": "Вы уверены, что хотите удалить коллекцию \"{0}\"?",
   "MessageConfirmRemoveEpisode": "Вы уверены, что хотите удалить эпизод \"{0}\"?",
   "MessageConfirmRemoveEpisodes": "Вы уверены, что хотите удалить {0} эпизодов?",
+  "MessageConfirmRemoveListeningSessions": "Are you sure you want to remove {0} listening sessions?",
   "MessageConfirmRemoveNarrator": "Вы уверены, что хотите удалить чтеца \"{0}\"?",
   "MessageConfirmRemovePlaylist": "Вы уверены, что хотите удалить плейлист \"{0}\"?",
   "MessageConfirmRenameGenre": "Вы уверены, что хотите переименовать жанр \"{0}\" в \"{1}\" для всех элементов?",
@@ -650,6 +652,7 @@
   "MessageRestoreBackupConfirm": "Вы уверены, что хотите восстановить резервную копию, созданную",
   "MessageRestoreBackupWarning": "Восстановление резервной копии перезапишет всю базу данных, расположенную в /config, и обложки изображений в /metadata/items и /metadata/authors.<br/><br/>Бэкапы не изменяют файлы в папках библиотеки. Если вы включили параметры сервера для хранения обложек и метаданных в папках библиотеки, то они не резервируются и не перезаписываются.<br/><br/>Все клиенты, использующие ваш сервер, будут автоматически обновлены.",
   "MessageSearchResultsFor": "Результаты поиска для",
+  "MessageSelected": "{0} selected",
   "MessageServerCouldNotBeReached": "Не удалось связаться с сервером",
   "MessageSetChaptersFromTracksDescription": "Установка глав с использованием каждого аудиофайла в качестве главы и заголовка главы в качестве имени аудиофайла",
   "MessageStartPlaybackAtTime": "Начать воспроизведение для \"{0}\" с {1}?",
diff --git a/client/strings/sv.json b/client/strings/sv.json
index fde0cd87..1d71fce5 100644
--- a/client/strings/sv.json
+++ b/client/strings/sv.json
@@ -406,6 +406,7 @@
   "LabelRegion": "Region",
   "LabelReleaseDate": "Utgivningsdatum",
   "LabelRemoveCover": "Ta bort omslag",
+  "LabelRowsPerPage": "Rows per page",
   "LabelRSSFeedCustomOwnerEmail": "Anpassad ägarens e-post",
   "LabelRSSFeedCustomOwnerName": "Anpassat ägarnamn",
   "LabelRSSFeedOpen": "Öppna RSS-flöde",
@@ -571,6 +572,7 @@
   "MessageConfirmRemoveCollection": "Är du säker på att du vill ta bort samlingen \"{0}\"?",
   "MessageConfirmRemoveEpisode": "Är du säker på att du vill ta bort avsnittet \"{0}\"?",
   "MessageConfirmRemoveEpisodes": "Är du säker på att du vill ta bort {0} avsnitt?",
+  "MessageConfirmRemoveListeningSessions": "Are you sure you want to remove {0} listening sessions?",
   "MessageConfirmRemoveNarrator": "Är du säker på att du vill ta bort berättaren \"{0}\"?",
   "MessageConfirmRemovePlaylist": "Är du säker på att du vill ta bort din spellista \"{0}\"?",
   "MessageConfirmRenameGenre": "Är du säker på att du vill byta namn på genren \"{0}\" till \"{1}\" för alla objekt?",
@@ -650,6 +652,7 @@
   "MessageRestoreBackupConfirm": "Är du säker på att du vill återställa säkerhetskopian som skapades den",
   "MessageRestoreBackupWarning": "Att återställa en säkerhetskopia kommer att skriva över hela databasen som finns i /config och omslagsbilder i /metadata/items & /metadata/authors.<br /><br />Säkerhetskopior ändrar inte några filer i dina biblioteksmappar. Om du har aktiverat serverinställningar för att lagra omslagskonst och metadata i dina biblioteksmappar säkerhetskopieras eller skrivs de inte över.<br /><br />Alla klienter som använder din server kommer att uppdateras automatiskt.",
   "MessageSearchResultsFor": "Sökresultat för",
+  "MessageSelected": "{0} selected",
   "MessageServerCouldNotBeReached": "Servern kunde inte nås",
   "MessageSetChaptersFromTracksDescription": "Ställ in kapitel med varje ljudfil som ett kapitel och kapitelrubrik som ljudfilens namn",
   "MessageStartPlaybackAtTime": "Starta uppspelning för \"{0}\" kl. {1}?",
diff --git a/client/strings/zh-cn.json b/client/strings/zh-cn.json
index edf09040..05553c08 100644
--- a/client/strings/zh-cn.json
+++ b/client/strings/zh-cn.json
@@ -406,6 +406,7 @@
   "LabelRegion": "区域",
   "LabelReleaseDate": "发布日期",
   "LabelRemoveCover": "移除封面",
+  "LabelRowsPerPage": "Rows per page",
   "LabelRSSFeedCustomOwnerEmail": "自定义所有者电子邮件",
   "LabelRSSFeedCustomOwnerName": "自定义所有者名称",
   "LabelRSSFeedOpen": "打开 RSS 源",
@@ -571,6 +572,7 @@
   "MessageConfirmRemoveCollection": "你确定要移除收藏 \"{0}\"?",
   "MessageConfirmRemoveEpisode": "你确定要移除剧集 \"{0}\"?",
   "MessageConfirmRemoveEpisodes": "你确定要移除 {0} 剧集?",
+  "MessageConfirmRemoveListeningSessions": "Are you sure you want to remove {0} listening sessions?",
   "MessageConfirmRemoveNarrator": "你确定要删除演播者 \"{0}\"?",
   "MessageConfirmRemovePlaylist": "你确定要移除播放列表 \"{0}\"?",
   "MessageConfirmRenameGenre": "你确定要将所有项目流派 \"{0}\" 重命名到 \"{1}\"?",
@@ -650,6 +652,7 @@
   "MessageRestoreBackupConfirm": "你确定要恢复创建的这个备份",
   "MessageRestoreBackupWarning": "恢复备份将覆盖位于 /config 的整个数据库并覆盖 /metadata/items & /metadata/authors 中的图像.<br /><br />备份不会修改媒体库文件夹中的任何文件. 如果您已启用服务器设置将封面和元数据存储在库文件夹中，则不会备份或覆盖这些内容.<br /><br />将自动刷新使用服务器的所有客户端.",
   "MessageSearchResultsFor": "搜索结果",
+  "MessageSelected": "{0} selected",
   "MessageServerCouldNotBeReached": "无法访问服务器",
   "MessageSetChaptersFromTracksDescription": "把每个音频文件设置为章节并将章节标题设置为音频文件名",
   "MessageStartPlaybackAtTime": "开始播放 \"{0}\" 在 {1}?",
@@ -747,4 +750,4 @@
   "ToastSocketFailedToConnect": "网络连接失败",
   "ToastUserDeleteFailed": "删除用户失败",
   "ToastUserDeleteSuccess": "用户已删除"
-}
+}
\ No newline at end of file
diff --git a/client/tailwind.config.js b/client/tailwind.config.js
index 1c39cb8f..9eb81923 100644
--- a/client/tailwind.config.js
+++ b/client/tailwind.config.js
@@ -56,6 +56,7 @@ module.exports = {
         '16': '4rem',
         '20': '5rem',
         '24': '6rem',
+        '26': '6.5rem',
         '32': '8rem',
         '48': '12rem',
         '64': '16rem',
diff --git a/server/controllers/SessionController.js b/server/controllers/SessionController.js
index 884f0cd6..22fcaa1c 100644
--- a/server/controllers/SessionController.js
+++ b/server/controllers/SessionController.js
@@ -1,6 +1,6 @@
 const Logger = require('../Logger')
 const Database = require('../Database')
-const { toNumber } = require('../utils/index')
+const { toNumber, isUUID } = require('../utils/index')
 
 class SessionController {
   constructor() { }
@@ -9,35 +9,97 @@ class SessionController {
     return res.json(req.playbackSession)
   }
 
+  /**
+   * GET: /api/sessions
+   * @this import('../routers/ApiRouter')
+   * 
+   * @param {import('express').Request} req 
+   * @param {import('express').Response} res 
+   */
   async getAllWithUserData(req, res) {
     if (!req.user.isAdminOrUp) {
       Logger.error(`[SessionController] getAllWithUserData: Non-admin user requested all session data ${req.user.id}/"${req.user.username}"`)
       return res.sendStatus(404)
     }
-
-    let listeningSessions = []
-    if (req.query.user) {
-      listeningSessions = await this.getUserListeningSessionsHelper(req.query.user)
-    } else {
-      listeningSessions = await this.getAllSessionsWithUserData()
+    // Validate "user" query
+    let userId = req.query.user
+    if (userId && !isUUID(userId)) {
+      Logger.warn(`[SessionController] Invalid "user" query string "${userId}"`)
+      userId = null
+    }
+    // Validate "sort" query
+    const validSortOrders = ['displayTitle', 'duration', 'playMethod', 'startTime', 'currentTime', 'timeListening', 'updatedAt', 'createdAt']
+    let orderKey = req.query.sort || 'updatedAt'
+    if (!validSortOrders.includes(orderKey)) {
+      Logger.warn(`[SessionController] Invalid "sort" query string "${orderKey}" (Must be one of "${validSortOrders.join('|')}")`)
+      orderKey = 'updatedAt'
+    }
+    let orderDesc = req.query.desc === '1' ? 'DESC' : 'ASC'
+    // Validate "itemsPerPage" and "page" query
+    let itemsPerPage = toNumber(req.query.itemsPerPage, 10) || 10
+    if (itemsPerPage < 1) {
+      Logger.warn(`[SessionController] Invalid "itemsPerPage" query string "${itemsPerPage}"`)
+      itemsPerPage = 10
+    }
+    let page = toNumber(req.query.page, 0)
+    if (page < 0) {
+      Logger.warn(`[SessionController] Invalid "page" query string "${page}"`)
+      page = 0
     }
 
-    const itemsPerPage = toNumber(req.query.itemsPerPage, 10) || 10
-    const page = toNumber(req.query.page, 0)
+    let where = null
+    const include = [
+      {
+        model: Database.models.device
+      }
+    ]
 
-    const start = page * itemsPerPage
-    const sessions = listeningSessions.slice(start, start + itemsPerPage)
+    if (userId) {
+      where = {
+        userId
+      }
+    } else {
+      include.push({
+        model: Database.userModel,
+        attributes: ['id', 'username']
+      })
+    }
+
+    const { rows, count } = await Database.playbackSessionModel.findAndCountAll({
+      where,
+      include,
+      order: [
+        [orderKey, orderDesc]
+      ],
+      limit: itemsPerPage,
+      offset: itemsPerPage * page
+    })
+
+    // Map playback sessions to old playback sessions
+    const sessions = rows.map(session => {
+      const oldPlaybackSession = Database.playbackSessionModel.getOldPlaybackSession(session)
+      if (session.user) {
+        return {
+          ...oldPlaybackSession,
+          user: {
+            id: session.user.id,
+            username: session.user.username
+          }
+        }
+      } else {
+        return oldPlaybackSession.toJSON()
+      }
+    })
 
     const payload = {
-      total: listeningSessions.length,
-      numPages: Math.ceil(listeningSessions.length / itemsPerPage),
+      total: count,
+      numPages: Math.ceil(count / itemsPerPage),
       page,
       itemsPerPage,
       sessions
     }
-
-    if (req.query.user) {
-      payload.userFilter = req.query.user
+    if (userId) {
+      payload.userId = userId
     }
 
     res.json(payload)
@@ -92,6 +154,49 @@ class SessionController {
     res.sendStatus(200)
   }
 
+  /**
+   * POST: /api/sessions/batch/delete
+   * @this import('../routers/ApiRouter')
+   * 
+   * @typedef batchDeleteReqBody
+   * @property {string[]} sessions
+   * 
+   * @param {import('express').Request<{}, {}, batchDeleteReqBody, {}} req 
+   * @param {import('express').Response} res 
+   */
+  async batchDelete(req, res) {
+    if (!req.user.isAdminOrUp) {
+      Logger.error(`[SessionController] Non-admin user attempted to batch delete sessions "${req.user.username}"`)
+      return res.sendStatus(403)
+    }
+    // Validate session ids
+    if (!req.body.sessions?.length || !Array.isArray(req.body.sessions) || req.body.sessions.some(s => !isUUID(s))) {
+      Logger.error(`[SessionController] Invalid request body. "sessions" array is required`, req.body)
+      return res.status(400).send('Invalid request body. "sessions" array of session id strings is required.')
+    }
+
+    // Check if any of these sessions are open and close it
+    for (const sessionId of req.body.sessions) {
+      const openSession = this.playbackSessionManager.getSession(sessionId)
+      if (openSession) {
+        await this.playbackSessionManager.removeSession(sessionId)
+      }
+    }
+
+    try {
+      const sessionsRemoved = await Database.playbackSessionModel.destroy({
+        where: {
+          id: req.body.sessions
+        }
+      })
+      Logger.info(`[SessionController] ${sessionsRemoved} playback sessions removed by "${req.user.username}"`)
+      res.sendStatus(200)
+    } catch (error) {
+      Logger.error(`[SessionController] Failed to remove playback sessions`, error)
+      res.status(500).send('Failed to remove sessions')
+    }
+  }
+
   // POST: api/session/local
   syncLocal(req, res) {
     this.playbackSessionManager.syncLocalSessionRequest(req, res)
diff --git a/server/routers/ApiRouter.js b/server/routers/ApiRouter.js
index f2418180..42e1d040 100644
--- a/server/routers/ApiRouter.js
+++ b/server/routers/ApiRouter.js
@@ -221,6 +221,7 @@ class ApiRouter {
     this.router.get('/sessions', SessionController.getAllWithUserData.bind(this))
     this.router.delete('/sessions/:id', SessionController.middleware.bind(this), SessionController.delete.bind(this))
     this.router.get('/sessions/open', SessionController.getOpenSessions.bind(this))
+    this.router.post('/sessions/batch/delete', SessionController.batchDelete.bind(this))
     this.router.post('/session/local', SessionController.syncLocal.bind(this))
     this.router.post('/session/local-all', SessionController.syncLocalSessions.bind(this))
     // TODO: Update these endpoints because they are only for open playback sessions
@@ -491,18 +492,6 @@ class ApiRouter {
     return userSessions.sort((a, b) => b.updatedAt - a.updatedAt)
   }
 
-  async getAllSessionsWithUserData() {
-    const sessions = await Database.getPlaybackSessions()
-    sessions.sort((a, b) => b.updatedAt - a.updatedAt)
-    const minifiedUserObjects = await Database.userModel.getMinifiedUserObjects()
-    return sessions.map(se => {
-      return {
-        ...se,
-        user: minifiedUserObjects.find(u => u.id === se.userId) || null
-      }
-    })
-  }
-
   async getUserListeningStatsHelpers(userId) {
     const today = date.format(new Date(), 'YYYY-MM-DD')
 
diff --git a/server/utils/index.js b/server/utils/index.js
index 29a65885..f75572ba 100644
--- a/server/utils/index.js
+++ b/server/utils/index.js
@@ -1,4 +1,5 @@
 const Path = require('path')
+const uuid = require('uuid')
 const Logger = require('../Logger')
 const { parseString } = require("xml2js")
 const areEquivalent = require('./areEquivalent')
@@ -220,4 +221,15 @@ module.exports.validateUrl = (rawUrl) => {
     Logger.error(`Invalid URL "${rawUrl}"`, error)
     return null
   }
+}
+
+/**
+ * Check if a string is a valid UUID
+ * 
+ * @param {string} str 
+ * @returns {boolean}
+ */
+module.exports.isUUID = (str) => {
+  if (!str || typeof str !== 'string') return false
+  return uuid.validate(str)
 }
\ No newline at end of file

From 24a587b944bce4111817c05336d751e2a789cb93 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 21 Dec 2023 14:29:36 -0600
Subject: [PATCH 33/47] Update:Remove playback sessions that are 3s or less on
 startup

---
 server/Database.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/server/Database.js b/server/Database.js
index 8a357481..fd606bac 100644
--- a/server/Database.js
+++ b/server/Database.js
@@ -1,5 +1,5 @@
 const Path = require('path')
-const { Sequelize } = require('sequelize')
+const { Sequelize, Op } = require('sequelize')
 
 const packageJson = require('../package.json')
 const fs = require('./libs/fsExtra')
@@ -698,6 +698,7 @@ class Database {
    * Clean invalid records in database
    * Series should have atleast one Book
    * Book and Podcast must have an associated LibraryItem
+   * Remove playback sessions that are 3 seconds or less
    */
   async cleanDatabase() {
     // Remove invalid Podcast records
@@ -738,6 +739,18 @@ class Database {
       Logger.warn(`Found series "${series.name}" with no books - removing it`)
       await series.destroy()
     }
+
+    // Remove playback sessions that were 3 seconds or less
+    const badSessionsRemoved = await this.playbackSessionModel.destroy({
+      where: {
+        timeListening: {
+          [Op.lte]: 3
+        }
+      }
+    })
+    if (badSessionsRemoved > 0) {
+      Logger.warn(`Removed ${badSessionsRemoved} sessions that were 3 seconds or less`)
+    }
   }
 }
 

From 68d36522b1bfa6da591d818bc99725b26b95dd0c Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 21 Dec 2023 14:36:51 -0600
Subject: [PATCH 34/47] Update:Listening sessions table UI for mobile

---
 client/pages/config/sessions.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/pages/config/sessions.vue b/client/pages/config/sessions.vue
index fb6e4c30..d90d849d 100644
--- a/client/pages/config/sessions.vue
+++ b/client/pages/config/sessions.vue
@@ -18,7 +18,7 @@
                 <ui-btn small color="error" :loading="deletingSessions" @click.stop="removeSessionsClick">{{ $strings.ButtonRemove }}</ui-btn>
               </div>
             </th>
-            <th v-if="!numSelected" class="w-48 min-w-48 text-left group cursor-pointer" @click.stop="sortColumn('displayTitle')">
+            <th v-if="!numSelected" class="flex-grow sm:flex-grow-0 sm:w-48 sm:max-w-48 text-left group cursor-pointer" @click.stop="sortColumn('displayTitle')">
               <div class="inline-flex items-center">
                 {{ $strings.LabelItem }} <span :class="{ 'opacity-0 group-hover:opacity-30': !isSortSelected('displayTitle') }" class="material-icons text-base pl-px">{{ sortDesc ? 'arrow_drop_down' : 'arrow_drop_up' }}</span>
               </div>
@@ -30,14 +30,14 @@
               </div>
             </th>
             <th v-if="!numSelected" class="w-32 min-w-32 text-left hidden sm:table-cell">{{ $strings.LabelDeviceInfo }}</th>
-            <th v-if="!numSelected" class="w-32 min-w-32 group cursor-pointer" @click.stop="sortColumn('timeListening')">
+            <th v-if="!numSelected" class="w-24 min-w-24 sm:w-32 sm:min-w-32 group cursor-pointer" @click.stop="sortColumn('timeListening')">
               <div class="inline-flex items-center">
-                {{ $strings.LabelTimeListened }} <span :class="{ 'opacity-0 group-hover:opacity-30': !isSortSelected('timeListening') }" class="material-icons text-base pl-px">{{ sortDesc ? 'arrow_drop_down' : 'arrow_drop_up' }}</span>
+                {{ $strings.LabelTimeListened }} <span :class="{ 'opacity-0 group-hover:opacity-30': !isSortSelected('timeListening') }" class="material-icons text-base pl-px hidden sm:inline-block">{{ sortDesc ? 'arrow_drop_down' : 'arrow_drop_up' }}</span>
               </div>
             </th>
             <th v-if="!numSelected" class="w-24 min-w-24 group cursor-pointer" @click.stop="sortColumn('currentTime')">
               <div class="inline-flex items-center">
-                {{ $strings.LabelLastTime }} <span :class="{ 'opacity-0 group-hover:opacity-30': !isSortSelected('currentTime') }" class="material-icons text-base pl-px">{{ sortDesc ? 'arrow_drop_down' : 'arrow_drop_up' }}</span>
+                {{ $strings.LabelLastTime }} <span :class="{ 'opacity-0 group-hover:opacity-30': !isSortSelected('currentTime') }" class="material-icons text-base pl-px hidden sm:inline-block">{{ sortDesc ? 'arrow_drop_down' : 'arrow_drop_up' }}</span>
               </div>
             </th>
             <th v-if="!numSelected" class="flex-grow hidden sm:table-cell cursor-pointer group" @click.stop="sortColumn('updatedAt')">
@@ -53,7 +53,7 @@
               <!-- overlay of the checkbox so that the entire box is clickable -->
               <div class="absolute inset-0 w-full h-full" @click.stop="session.selected = !session.selected" />
             </td>
-            <td class="py-1 w-48 max-w-48">
+            <td class="py-1 flex-grow sm:flex-grow-0 sm:w-48 sm:max-w-48">
               <p class="text-xs text-gray-200 truncate">{{ session.displayTitle }}</p>
               <p class="text-xs text-gray-400 truncate">{{ session.displayAuthor }}</p>
             </td>
@@ -67,7 +67,7 @@
             <td class="hidden sm:table-cell w-32 min-w-32">
               <p class="text-xs" v-html="getDeviceInfoString(session.deviceInfo)" />
             </td>
-            <td class="text-center w-32 min-w-32">
+            <td class="text-center w-24 min-w-24 sm:w-32 sm:min-w-32">
               <p class="text-xs font-mono">{{ $elapsedPretty(session.timeListening) }}</p>
             </td>
             <td class="text-center hover:underline w-24 min-w-24" @click.stop="clickCurrentTime(session)">
@@ -83,7 +83,7 @@
         <!-- table bottom options -->
         <div class="flex items-center my-2">
           <div class="flex-grow" />
-          <div class="inline-flex items-center">
+          <div class="hidden sm:inline-flex items-center">
             <p class="text-sm">{{ $strings.LabelRowsPerPage }}</p>
             <ui-dropdown v-model="itemsPerPage" :items="itemsPerPageOptions" small class="w-24 mx-2" @input="updatedItemsPerPage" />
           </div>

From 2738402aacbe43f21061667b417da35ceb8d5c10 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Fri, 22 Dec 2023 17:01:07 -0600
Subject: [PATCH 35/47] Add:Year in review card for server stats #2373

---
 client/components/stats/YearInReview.vue      |  89 ++++----
 .../components/stats/YearInReviewServer.vue   | 205 ++++++++++++++++++
 client/pages/config/stats.vue                 |  11 +-
 server/controllers/MeController.js            |   3 +-
 server/controllers/MiscController.js          |  21 ++
 server/routers/ApiRouter.js                   |   3 +-
 server/utils/queries/adminStats.js            | 118 ++++++++++
 server/utils/queries/userStats.js             |  12 +-
 8 files changed, 414 insertions(+), 48 deletions(-)
 create mode 100644 client/components/stats/YearInReviewServer.vue
 create mode 100644 server/utils/queries/adminStats.js

diff --git a/client/components/stats/YearInReview.vue b/client/components/stats/YearInReview.vue
index 74c57065..104392b4 100644
--- a/client/components/stats/YearInReview.vue
+++ b/client/components/stats/YearInReview.vue
@@ -24,12 +24,15 @@ export default {
       if (!this.yearStats) return
 
       const canvas = document.createElement('canvas')
-      canvas.width = 400
-      canvas.height = 400
+      canvas.width = 800
+      canvas.height = 800
       const ctx = canvas.getContext('2d')
 
       const createRoundedRect = (x, y, w, h) => {
-        ctx.fillStyle = '#37383866'
+        const grd1 = ctx.createLinearGradient(x, y, x + w, y + h)
+        grd1.addColorStop(0, '#44444466')
+        grd1.addColorStop(1, '#ffffff22')
+        ctx.fillStyle = grd1
         ctx.strokeStyle = '#C0C0C0aa'
         ctx.beginPath()
         ctx.roundRect(x, y, w, h, [20])
@@ -72,8 +75,13 @@ export default {
       if (this.yearStats.booksWithCovers.length) {
         let index = 0
         ctx.globalAlpha = 0.25
-        for (let x = 0; x < 4; x++) {
-          for (let y = 0; y < 4; y++) {
+        ctx.save()
+        ctx.translate(canvas.width / 2, canvas.height / 2)
+        ctx.rotate((-Math.PI / 180) * 25)
+        ctx.translate(-canvas.width / 2, -canvas.height / 2)
+        ctx.translate(-130, -120)
+        for (let x = 0; x < 5; x++) {
+          for (let y = 0; y < 5; y++) {
             const coverIndex = index % this.yearStats.booksWithCovers.length
             let libraryItemId = this.yearStats.booksWithCovers[coverIndex]
             index++
@@ -82,7 +90,13 @@ export default {
               const img = new Image()
               img.crossOrigin = 'anonymous'
               img.addEventListener('load', () => {
-                ctx.drawImage(img, 100 * x, 100 * y, 100, 100)
+                let sw = img.width
+                if (img.width > img.height) {
+                  sw = img.height
+                }
+                let sx = -(sw - img.width) / 2
+                let sy = -(sw - img.height) / 2
+                ctx.drawImage(img, sx, sy, sw, sw, 215 * x, 215 * y, 215, 215)
                 resolve()
               })
               img.addEventListener('error', () => {
@@ -92,13 +106,14 @@ export default {
             })
           }
         }
+        ctx.restore()
       }
 
       ctx.globalAlpha = 1
       ctx.textBaseline = 'middle'
 
       // Create gradient
-      const grd1 = ctx.createLinearGradient(0, 0, 400, 400)
+      const grd1 = ctx.createLinearGradient(0, 0, canvas.width, canvas.height)
       grd1.addColorStop(0, '#000000aa')
       grd1.addColorStop(1, '#cd9d49aa')
       ctx.fillStyle = grd1
@@ -107,60 +122,60 @@ export default {
       // Top Abs icon
       let tanColor = '#ffdb70'
       ctx.fillStyle = tanColor
-      ctx.font = '32px absicons'
-      ctx.fillText('\ue900', 15, 32)
+      ctx.font = '42px absicons'
+      ctx.fillText('\ue900', 15, 36)
 
       // Top text
-      addText('audiobookshelf', '22px', 'normal', tanColor, '0px', 55, 22)
-      addText(`${this.year} YEAR IN REVIEW`, '14px', 'bold', 'white', '1px', 55, 44)
+      addText('audiobookshelf', '28px', 'normal', tanColor, '0px', 65, 28)
+      addText(`${this.year} YEAR IN REVIEW`, '18px', 'bold', 'white', '1px', 65, 51)
 
       // Top left box
-      createRoundedRect(10, 65, 185, 80)
-      addText(this.yearStats.numBooksFinished, '32px', 'bold', 'white', '0px', 63, 98)
-      addText('books finished', '14px', 'normal', tanColor, '0px', 63, 120)
+      createRoundedRect(50, 100, 340, 160)
+      addText(this.yearStats.numBooksFinished, '64px', 'bold', 'white', '0px', 160, 165)
+      addText('books finished', '28px', 'normal', tanColor, '0px', 160, 210)
       const readIconPath = new Path2D()
-      readIconPath.addPath(new Path2D('M19 1H5c-1.1 0-1.99.9-1.99 2L3 15.93c0 .69.35 1.3.88 1.66L12 23l8.11-5.41c.53-.36.88-.97.88-1.66L21 3c0-1.1-.9-2-2-2zm-9 15l-5-5 1.41-1.41L10 13.17l7.59-7.59L19 7l-9 9z'), { a: 1.2, d: 1.2, e: 26, f: 90 })
+      readIconPath.addPath(new Path2D('M19 1H5c-1.1 0-1.99.9-1.99 2L3 15.93c0 .69.35 1.3.88 1.66L12 23l8.11-5.41c.53-.36.88-.97.88-1.66L21 3c0-1.1-.9-2-2-2zm-9 15l-5-5 1.41-1.41L10 13.17l7.59-7.59L19 7l-9 9z'), { a: 2, d: 2, e: 100, f: 160 })
       ctx.fillStyle = '#ffffff'
       ctx.fill(readIconPath)
 
       // Box top right
-      createRoundedRect(205, 65, 185, 80)
-      addText(this.$elapsedPrettyExtended(this.yearStats.totalListeningTime, true, false), '20px', 'bold', 'white', '0px', 257, 96)
-      addText('spent listening', '14px', 'normal', tanColor, '0px', 257, 117)
-      addIcon('watch_later', 'white', '32px', 218, 105)
+      createRoundedRect(410, 100, 340, 160)
+      addText(this.$elapsedPrettyExtended(this.yearStats.totalListeningTime, true, false), '40px', 'bold', 'white', '0px', 500, 165)
+      addText('spent listening', '28px', 'normal', tanColor, '0.5px', 500, 205)
+      addIcon('watch_later', 'white', '52px', 440, 180)
 
       // Box bottom left
-      createRoundedRect(10, 155, 185, 80)
-      addText(this.yearStats.totalListeningSessions, '32px', 'bold', 'white', '0px', 65, 188)
-      addText('sessions', '14px', 'normal', tanColor, '1px', 65, 210)
-      addIcon('headphones', 'white', '32px', 25, 195)
+      createRoundedRect(50, 280, 340, 160)
+      addText(this.yearStats.totalListeningSessions, '64px', 'bold', 'white', '0px', 160, 345)
+      addText('sessions', '28px', 'normal', tanColor, '1px', 160, 390)
+      addIcon('headphones', 'white', '52px', 95, 360)
 
       // Box bottom right
-      createRoundedRect(205, 155, 185, 80)
-      addText(this.yearStats.numBooksListened, '32px', 'bold', 'white', '0px', 258, 188)
-      addText('books listened to', '14px', 'normal', tanColor, '0.65px', 258, 210)
-      addIcon('local_library', 'white', '32px', 220, 195)
+      createRoundedRect(410, 280, 340, 160)
+      addText(this.yearStats.numBooksListened, '64px', 'bold', 'white', '0px', 500, 345)
+      addText('books listened to', '28px', 'normal', tanColor, '0.5px', 500, 390)
+      addIcon('local_library', 'white', '52px', 440, 360)
 
       // Text stats
       const topNarrator = this.yearStats.mostListenedNarrator
       if (topNarrator) {
-        addText('TOP NARRATOR', '12px', 'normal', tanColor, '1px', 20, 260)
-        addText(topNarrator.name, '18px', 'bolder', 'white', '0px', 20, 282, 180)
-        addText(this.$elapsedPrettyExtended(topNarrator.time, true, false), '14px', 'lighter', 'white', '1px', 20, 302)
+        addText('TOP NARRATOR', '24px', 'normal', tanColor, '1px', 70, 520)
+        addText(topNarrator.name, '36px', 'bolder', 'white', '0px', 70, 564, 330)
+        addText(this.$elapsedPrettyExtended(topNarrator.time, true, false), '24px', 'lighter', 'white', '1px', 70, 599)
       }
 
       const topGenre = this.yearStats.topGenres[0]
       if (topGenre) {
-        addText('TOP GENRE', '12px', 'normal', tanColor, '1px', 215, 260)
-        addText(topGenre.genre, '18px', 'bolder', 'white', '0px', 215, 282, 180)
-        addText(this.$elapsedPrettyExtended(topGenre.time, true, false), '14px', 'lighter', 'white', '1px', 215, 302)
+        addText('TOP GENRE', '24px', 'normal', tanColor, '1px', 430, 520)
+        addText(topGenre.genre, '36px', 'bolder', 'white', '0px', 430, 564, 330)
+        addText(this.$elapsedPrettyExtended(topGenre.time, true, false), '24px', 'lighter', 'white', '1px', 430, 599)
       }
 
       const topAuthor = this.yearStats.topAuthors[0]
       if (topAuthor) {
-        addText('TOP AUTHOR', '12px', 'normal', tanColor, '1px', 20, 335)
-        addText(topAuthor.name, '18px', 'bolder', 'white', '0px', 20, 357, 180)
-        addText(this.$elapsedPrettyExtended(topAuthor.time, true, false), '14px', 'lighter', 'white', '1px', 20, 377)
+        addText('TOP AUTHOR', '24px', 'normal', tanColor, '1px', 70, 670)
+        addText(topAuthor.name, '36px', 'bolder', 'white', '0px', 70, 714, 330)
+        addText(this.$elapsedPrettyExtended(topAuthor.time, true, false), '24px', 'lighter', 'white', '1px', 70, 749)
       }
 
       this.dataUrl = canvas.toDataURL('png')
@@ -173,7 +188,7 @@ export default {
       let year = new Date().getFullYear()
       if (new Date().getMonth() < 11) year--
       this.year = year
-      this.yearStats = await this.$axios.$get(`/api/me/year/${year}/stats`).catch((err) => {
+      this.yearStats = await this.$axios.$get(`/api/me/stats/year/${year}`).catch((err) => {
         console.error('Failed to load stats for year', err)
         this.$toast.error('Failed to load year stats')
         return null
diff --git a/client/components/stats/YearInReviewServer.vue b/client/components/stats/YearInReviewServer.vue
new file mode 100644
index 00000000..0d1fa8aa
--- /dev/null
+++ b/client/components/stats/YearInReviewServer.vue
@@ -0,0 +1,205 @@
+<template>
+  <div>
+    <div v-if="processing" class="w-[400px] h-[400px] flex items-center justify-center">
+      <widgets-loading-spinner />
+    </div>
+    <img v-else-if="dataUrl" :src="dataUrl" />
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    processing: Boolean
+  },
+  data() {
+    return {
+      dataUrl: null,
+      year: null,
+      yearStats: null
+    }
+  },
+  methods: {
+    async initCanvas() {
+      if (!this.yearStats) return
+
+      const canvas = document.createElement('canvas')
+      canvas.width = 800
+      canvas.height = 800
+      const ctx = canvas.getContext('2d')
+
+      const createRoundedRect = (x, y, w, h) => {
+        const grd1 = ctx.createLinearGradient(x, y, x + w, y + h)
+        grd1.addColorStop(0, '#44444466')
+        grd1.addColorStop(1, '#ffffff22')
+        ctx.fillStyle = grd1
+        ctx.strokeStyle = '#C0C0C0aa'
+        ctx.beginPath()
+        ctx.roundRect(x, y, w, h, [20])
+        ctx.fill()
+        ctx.stroke()
+      }
+
+      const addText = (text, fontSize, fontWeight, color, letterSpacing, x, y, maxWidth = 0) => {
+        ctx.fillStyle = color
+        ctx.font = `${fontWeight} ${fontSize} Source Sans Pro`
+        ctx.letterSpacing = letterSpacing
+
+        // If maxWidth is specified then continue to remove chars until under maxWidth and add ellipsis
+        if (maxWidth) {
+          let txtWidth = ctx.measureText(text).width
+          while (txtWidth > maxWidth) {
+            console.warn(`Text "${text}" is greater than max width ${maxWidth} (width:${txtWidth})`)
+            if (text.endsWith('...')) text = text.slice(0, -4) // Repeated checks remove 1 char at a time
+            else text = text.slice(0, -3) // First check remove last 3 chars
+            text += '...'
+            txtWidth = ctx.measureText(text).width
+            console.log(`Checking text "${text}" (width:${txtWidth})`)
+          }
+        }
+
+        ctx.fillText(text, x, y)
+      }
+
+      const addIcon = (icon, color, fontSize, x, y) => {
+        ctx.fillStyle = color
+        ctx.font = `${fontSize} Material Icons Outlined`
+        ctx.fillText(icon, x, y)
+      }
+
+      // Bg color
+      ctx.fillStyle = '#232323'
+      ctx.fillRect(0, 0, canvas.width, canvas.height)
+
+      // Cover image tiles
+      let imgsToAdd = {}
+
+      if (this.yearStats.booksAddedWithCovers.length) {
+        let index = 0
+        ctx.globalAlpha = 0.25
+        ctx.save()
+        ctx.translate(canvas.width / 2, canvas.height / 2)
+        ctx.rotate((-Math.PI / 180) * 25)
+        ctx.translate(-canvas.width / 2, -canvas.height / 2)
+        ctx.translate(-130, -120)
+        for (let x = 0; x < 5; x++) {
+          for (let y = 0; y < 5; y++) {
+            const coverIndex = index % this.yearStats.booksAddedWithCovers.length
+            let libraryItemId = this.yearStats.booksAddedWithCovers[coverIndex]
+            index++
+
+            await new Promise((resolve) => {
+              const img = new Image()
+              img.crossOrigin = 'anonymous'
+              img.addEventListener('load', () => {
+                let sw = img.width
+                if (img.width > img.height) {
+                  sw = img.height
+                }
+                let sx = -(sw - img.width) / 2
+                let sy = -(sw - img.height) / 2
+                ctx.drawImage(img, sx, sy, sw, sw, 215 * x, 215 * y, 215, 215)
+                if (!imgsToAdd[libraryItemId]) {
+                  imgsToAdd[libraryItemId] = {
+                    img,
+                    sx,
+                    sy,
+                    sw
+                  }
+                }
+                resolve()
+              })
+              img.addEventListener('error', () => {
+                resolve()
+              })
+              img.src = this.$store.getters['globals/getLibraryItemCoverSrcById'](libraryItemId)
+            })
+          }
+        }
+        ctx.restore()
+      }
+
+      ctx.globalAlpha = 1
+      ctx.textBaseline = 'middle'
+
+      // Create gradient
+      const grd1 = ctx.createLinearGradient(0, 0, canvas.width, canvas.height)
+      grd1.addColorStop(0, '#000000aa')
+      grd1.addColorStop(1, '#cd9d49aa')
+      ctx.fillStyle = grd1
+      ctx.fillRect(0, 0, canvas.width, canvas.height)
+
+      // Top Abs icon
+      let tanColor = '#ffdb70'
+      ctx.fillStyle = tanColor
+      ctx.font = '42px absicons'
+      ctx.fillText('\ue900', 15, 36)
+
+      // Top text
+      addText('audiobookshelf', '28px', 'normal', tanColor, '0px', 65, 28)
+      addText(`${this.year} YEAR IN REVIEW`, '18px', 'bold', 'white', '1px', 65, 51)
+
+      // Top left box
+      createRoundedRect(40, 100, 230, 100)
+      ctx.textAlign = 'center'
+      addText(this.yearStats.numBooksAdded, '48px', 'bold', 'white', '0px', 155, 140)
+      addText('books added', '18px', 'normal', tanColor, '0px', 155, 170)
+
+      // Box top right
+      createRoundedRect(285, 100, 230, 100)
+      addText(this.yearStats.numAuthorsAdded, '48px', 'bold', 'white', '0px', 400, 140)
+      addText('authors added', '18px', 'normal', tanColor, '0px', 400, 170)
+
+      // Box bottom left
+      createRoundedRect(530, 100, 230, 100)
+      addText(this.yearStats.numListeningSessions, '48px', 'bold', 'white', '0px', 645, 140)
+      addText('sessions', '18px', 'normal', tanColor, '1px', 645, 170)
+
+      // Text stats
+      if (this.yearStats.totalBooksAddedSize) {
+        addText('Your book collection grew to...', '24px', 'normal', tanColor, '0px', canvas.width / 2, 260)
+        addText(this.$bytesPretty(this.yearStats.totalBooksSize), '36px', 'bolder', 'white', '0px', canvas.width / 2, 300)
+        addText('+' + this.$bytesPretty(this.yearStats.totalBooksAddedSize), '20px', 'lighter', 'white', '0px', canvas.width / 2, 330)
+      }
+
+      if (this.yearStats.totalBooksAddedDuration) {
+        addText('With a total duration of...', '24px', 'normal', tanColor, '0px', canvas.width / 2, 400)
+        addText(this.$elapsedPrettyExtended(this.yearStats.totalBooksDuration, true, false), '36px', 'bolder', 'white', '0px', canvas.width / 2, 440)
+        addText('+' + this.$elapsedPrettyExtended(this.yearStats.totalBooksAddedDuration, true, false), '20px', 'lighter', 'white', '0px', canvas.width / 2, 470)
+      }
+
+      // Bottom images
+      imgsToAdd = Object.values(imgsToAdd)
+      if (imgsToAdd.length >= 5) {
+        addText('Some additions include...', '24px', 'normal', tanColor, '0px', canvas.width / 2, 540)
+
+        for (let i = 0; i < 5; i++) {
+          let imgToAdd = imgsToAdd[i]
+          ctx.drawImage(imgToAdd.img, imgToAdd.sx, imgToAdd.sy, imgToAdd.sw, imgToAdd.sw, 40 + 145 * i, 580, 140, 140)
+        }
+      }
+
+      this.dataUrl = canvas.toDataURL('png')
+    },
+    refresh() {
+      this.init()
+    },
+    async init() {
+      this.$emit('update:processing', true)
+      let year = new Date().getFullYear()
+      if (new Date().getMonth() < 11) year--
+      this.year = year
+      this.yearStats = await this.$axios.$get(`/api/stats/year/${year}`).catch((err) => {
+        console.error('Failed to load stats for year', err)
+        this.$toast.error('Failed to load year stats')
+        return null
+      })
+      await this.initCanvas()
+      this.$emit('update:processing', false)
+    }
+  },
+  mounted() {
+    this.init()
+  }
+}
+</script>
\ No newline at end of file
diff --git a/client/pages/config/stats.vue b/client/pages/config/stats.vue
index b527ea38..96581714 100644
--- a/client/pages/config/stats.vue
+++ b/client/pages/config/stats.vue
@@ -63,11 +63,13 @@
       </div>
       <stats-heatmap v-if="listeningStats" :days-listening="listeningStats.days" class="my-2" />
 
-      <ui-btn small :loading="processingYearInReview" @click.stop="clickShowYearInReview">Year in Review</ui-btn>
+      <ui-btn small :loading="processingYearInReview || processingYearInReviewAlt" @click.stop="clickShowYearInReview">{{ showYearInReview ? 'Refresh Year in Review' : 'Year in Review' }}</ui-btn>
       <div v-if="showYearInReview">
         <div class="w-full h-px bg-slate-200/10 my-4" />
 
         <stats-year-in-review ref="yearInReview" :processing.sync="processingYearInReview" />
+
+        <stats-year-in-review-server v-if="isAdminOrUp" ref="yearInReviewAlt" :processing.sync="processingYearInReviewAlt" />
       </div>
     </app-settings-content>
   </div>
@@ -80,7 +82,8 @@ export default {
       listeningStats: null,
       windowWidth: 0,
       showYearInReview: false,
-      processingYearInReview: false
+      processingYearInReview: false,
+      processingYearInReviewAlt: false
     }
   },
   watch: {
@@ -126,6 +129,10 @@ export default {
     clickShowYearInReview() {
       if (this.showYearInReview) {
         this.$refs.yearInReview.refresh()
+
+        if (this.$refs.yearInReviewAlt) {
+          this.$refs.yearInReviewAlt.refresh()
+        }
       } else {
         this.showYearInReview = true
       }
diff --git a/server/controllers/MeController.js b/server/controllers/MeController.js
index 42387b59..8fa5c6bc 100644
--- a/server/controllers/MeController.js
+++ b/server/controllers/MeController.js
@@ -336,6 +336,7 @@ class MeController {
   }
 
   /**
+   * GET: /api/stats/year/:year
    * 
    * @param {import('express').Request} req 
    * @param {import('express').Response} res 
@@ -346,7 +347,7 @@ class MeController {
       Logger.error(`[MeController] Invalid year "${year}"`)
       return res.status(400).send('Invalid year')
     }
-    const data = await userStats.getStatsForYear(req.user.id, year)
+    const data = await userStats.getStatsForYear(req.user, year)
     res.json(data)
   }
 }
diff --git a/server/controllers/MiscController.js b/server/controllers/MiscController.js
index db4110e0..c2272ee6 100644
--- a/server/controllers/MiscController.js
+++ b/server/controllers/MiscController.js
@@ -11,6 +11,7 @@ const { isObject, getTitleIgnorePrefix } = require('../utils/index')
 const { sanitizeFilename } = require('../utils/fileUtils')
 
 const TaskManager = require('../managers/TaskManager')
+const adminStats = require('../utils/queries/adminStats')
 
 //
 // This is a controller for routes that don't have a home yet :(
@@ -696,5 +697,25 @@ class MiscController {
       serverSettings: Database.serverSettings.toJSONForBrowser()
     })
   }
+
+  /**
+   * GET: /api/me/stats/year/:year
+   * 
+   * @param {import('express').Request} req 
+   * @param {import('express').Response} res 
+   */
+  async getAdminStatsForYear(req, res) {
+    if (!req.user.isAdminOrUp) {
+      Logger.error(`[MiscController] Non-admin user "${req.user.username}" attempted to get admin stats for year`)
+      return res.sendStatus(403)
+    }
+    const year = Number(req.params.year)
+    if (isNaN(year) || year < 2000 || year > 9999) {
+      Logger.error(`[MiscController] Invalid year "${year}"`)
+      return res.status(400).send('Invalid year')
+    }
+    const stats = await adminStats.getStatsForYear(year)
+    res.json(stats)
+  }
 }
 module.exports = new MiscController()
diff --git a/server/routers/ApiRouter.js b/server/routers/ApiRouter.js
index 42e1d040..3edce256 100644
--- a/server/routers/ApiRouter.js
+++ b/server/routers/ApiRouter.js
@@ -180,7 +180,7 @@ class ApiRouter {
     this.router.get('/me/items-in-progress', MeController.getAllLibraryItemsInProgress.bind(this))
     this.router.get('/me/series/:id/remove-from-continue-listening', MeController.removeSeriesFromContinueListening.bind(this))
     this.router.get('/me/series/:id/readd-to-continue-listening', MeController.readdSeriesFromContinueListening.bind(this))
-    this.router.get('/me/year/:year/stats', MeController.getStatsForYear.bind(this))
+    this.router.get('/me/stats/year/:year', MeController.getStatsForYear.bind(this))
 
     //
     // Backup Routes
@@ -317,6 +317,7 @@ class ApiRouter {
     this.router.get('/auth-settings', MiscController.getAuthSettings.bind(this))
     this.router.patch('/auth-settings', MiscController.updateAuthSettings.bind(this))
     this.router.post('/watcher/update', MiscController.updateWatchedPath.bind(this))
+    this.router.get('/stats/year/:year', MiscController.getAdminStatsForYear.bind(this))
   }
 
   async getDirectories(dir, relpath, excludedDirs, level = 0) {
diff --git a/server/utils/queries/adminStats.js b/server/utils/queries/adminStats.js
new file mode 100644
index 00000000..66a31e8d
--- /dev/null
+++ b/server/utils/queries/adminStats.js
@@ -0,0 +1,118 @@
+const Sequelize = require('sequelize')
+const Database = require('../../Database')
+const PlaybackSession = require('../../models/PlaybackSession')
+const fsExtra = require('../../libs/fsExtra')
+
+module.exports = {
+  /**
+   * 
+   * @param {number} year YYYY
+   * @returns {Promise<PlaybackSession[]>}
+   */
+  async getListeningSessionsForYear(year) {
+    const sessions = await Database.playbackSessionModel.findAll({
+      where: {
+        createdAt: {
+          [Sequelize.Op.gte]: `${year}-01-01`,
+          [Sequelize.Op.lt]: `${year + 1}-01-01`
+        }
+      }
+    })
+    return sessions
+  },
+
+  /**
+   * 
+   * @param {number} year YYYY
+   * @returns {Promise<number>}
+   */
+  async getNumAuthorsAddedForYear(year) {
+    const count = await Database.authorModel.count({
+      where: {
+        createdAt: {
+          [Sequelize.Op.gte]: `${year}-01-01`,
+          [Sequelize.Op.lt]: `${year + 1}-01-01`
+        }
+      }
+    })
+    return count
+  },
+
+  /**
+   * 
+   * @param {number} year YYYY
+   * @returns {Promise<import('../../models/Book')[]>}
+   */
+  async getBooksAddedForYear(year) {
+    const books = await Database.bookModel.findAll({
+      attributes: ['id', 'title', 'coverPath', 'duration', 'createdAt'],
+      where: {
+        createdAt: {
+          [Sequelize.Op.gte]: `${year}-01-01`,
+          [Sequelize.Op.lt]: `${year + 1}-01-01`
+        }
+      },
+      include: {
+        model: Database.libraryItemModel,
+        attributes: ['id', 'mediaId', 'mediaType', 'size'],
+        required: true
+      },
+      order: Database.sequelize.random()
+    })
+    return books
+  },
+
+  /**
+   * 
+   * @param {number} year YYYY
+   */
+  async getStatsForYear(year) {
+    const booksAdded = await this.getBooksAddedForYear(year)
+
+    let totalBooksAddedSize = 0
+    let totalBooksAddedDuration = 0
+    const booksWithCovers = []
+
+    for (const book of booksAdded) {
+      // Grab first 25 that have a cover
+      if (book.coverPath && !booksWithCovers.includes(book.libraryItem.id) && booksWithCovers.length < 25 && await fsExtra.pathExists(book.coverPath)) {
+        booksWithCovers.push(book.libraryItem.id)
+      }
+      if (book.duration && !isNaN(book.duration)) {
+        totalBooksAddedDuration += book.duration
+      }
+      if (book.libraryItem.size && !isNaN(book.libraryItem.size)) {
+        totalBooksAddedSize += book.libraryItem.size
+      }
+    }
+
+    const numAuthorsAdded = await this.getNumAuthorsAddedForYear(year)
+
+    const listeningSessions = await this.getListeningSessionsForYear(year)
+    let totalListeningTime = 0
+    for (const listeningSession of listeningSessions) {
+      totalListeningTime += (listeningSession.timeListening || 0)
+    }
+
+    // Stats for total books, size and duration for everything added this year or earlier
+    const [totalStatResultsRow] = await Database.sequelize.query(`SELECT SUM(li.size) AS totalSize, SUM(b.duration) AS totalDuration, COUNT(*) AS totalItems FROM libraryItems li, books b WHERE b.id = li.mediaId AND li.mediaType = 'book' AND li.createdAt < ":nextYear-01-01";`, {
+      replacements: {
+        nextYear: year + 1
+      }
+    })
+    const totalStatResults = totalStatResultsRow[0]
+
+    return {
+      numListeningSessions: listeningSessions.length,
+      numBooksAdded: booksAdded.length,
+      numAuthorsAdded,
+      totalBooksAddedSize,
+      totalBooksAddedDuration: Math.round(totalBooksAddedDuration),
+      booksAddedWithCovers: booksWithCovers,
+      totalBooksSize: totalStatResults?.totalSize || 0,
+      totalBooksDuration: totalStatResults?.totalDuration || 0,
+      totalListeningTime,
+      numBooks: totalStatResults?.totalItems || 0
+    }
+  }
+}
diff --git a/server/utils/queries/userStats.js b/server/utils/queries/userStats.js
index f9b9684e..0f997789 100644
--- a/server/utils/queries/userStats.js
+++ b/server/utils/queries/userStats.js
@@ -18,9 +18,6 @@ module.exports = {
         createdAt: {
           [Sequelize.Op.gte]: `${year}-01-01`,
           [Sequelize.Op.lt]: `${year + 1}-01-01`
-        },
-        timeListening: {
-          [Sequelize.Op.gt]: 5
         }
       },
       include: {
@@ -66,10 +63,11 @@ module.exports = {
   },
 
   /**
-   * @param {string} userId
+   * @param {import('../../objects/user/User')} user
    * @param {number} year YYYY
    */
-  async getStatsForYear(userId, year) {
+  async getStatsForYear(user, year) {
+    const userId = user.id
     const listeningSessions = await this.getUserListeningSessionsForYear(userId, year)
 
     let totalBookListeningTime = 0
@@ -84,8 +82,8 @@ module.exports = {
     const booksWithCovers = []
 
     for (const ls of listeningSessions) {
-      // Grab first 16 that have a cover
-      if (ls.mediaItem?.coverPath && !booksWithCovers.includes(ls.mediaItem.libraryItem.id) && booksWithCovers.length < 16 && await fsExtra.pathExists(ls.mediaItem.coverPath)) {
+      // Grab first 25 that have a cover
+      if (ls.mediaItem?.coverPath && !booksWithCovers.includes(ls.mediaItem.libraryItem.id) && booksWithCovers.length < 25 && await fsExtra.pathExists(ls.mediaItem.coverPath)) {
         booksWithCovers.push(ls.mediaItem.libraryItem.id)
       }
 

From 47bf9f7836ec04e9ebb4a05735b5611d0ac9859e Mon Sep 17 00:00:00 2001
From: JBlond <leet31337@web.de>
Date: Sat, 23 Dec 2023 14:42:56 +0100
Subject: [PATCH 36/47] Follow up Translations for
 76119445a302f0c1109bc4fdb44100f60be7107e

* Update:Listening sessions table for multi-select, sorting and rows per page
- Updated get all sessions API endpoint to include sorting
- Added sessions API endpoint for batch deleting
---
 client/strings/de.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/strings/de.json b/client/strings/de.json
index 8cf54cbe..20da77c1 100644
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -406,7 +406,7 @@
   "LabelRegion": "Region",
   "LabelReleaseDate": "Veröffentlichungsdatum",
   "LabelRemoveCover": "Lösche Titelbild",
-  "LabelRowsPerPage": "Rows per page",
+  "LabelRowsPerPage": "Zeilen pro Seite",
   "LabelRSSFeedCustomOwnerEmail": "Benutzerdefinierte Eigentümer-E-Mail",
   "LabelRSSFeedCustomOwnerName": "Benutzerdefinierter Name des Eigentümers",
   "LabelRSSFeedOpen": "RSS Feed Offen",
@@ -572,7 +572,7 @@
   "MessageConfirmRemoveCollection": "Sammlung \"{0}\" wird gelöscht! Sind Sie sicher?",
   "MessageConfirmRemoveEpisode": "Episode \"{0}\" wird geloscht! Sind Sie sicher?",
   "MessageConfirmRemoveEpisodes": "{0} Episoden werden gelöscht! Sind Sie sicher?",
-  "MessageConfirmRemoveListeningSessions": "Are you sure you want to remove {0} listening sessions?",
+  "MessageConfirmRemoveListeningSessions": "Sind Sie sicher, dass sie {0} Hörsitzungen enfernen möchten?",
   "MessageConfirmRemoveNarrator": "Erzähler \"{0}\" wird gelöscht! Sind Sie sicher?",
   "MessageConfirmRemovePlaylist": "Wiedergabeliste \"{0}\" wird entfernt! Sind Sie sicher?",
   "MessageConfirmRenameGenre": "Kategorie \"{0}\" in \"{1}\" für alle Hörbücher/Podcasts werden umbenannt! Sind Sie sicher?",
@@ -652,7 +652,7 @@
   "MessageRestoreBackupConfirm": "Sind Sie sicher, dass Sie die Sicherung wiederherstellen wollen, welche am",
   "MessageRestoreBackupWarning": "Bei der Wiederherstellung einer Sicherung wird die gesamte Datenbank unter /config und die Titelbilder in /metadata/items und /metadata/authors überschrieben.<br /><br />Bei der Sicherung werden keine Dateien in Ihren Bibliotheksordnern verändert. Wenn Sie die Servereinstellungen aktiviert haben, um Cover und Metadaten in Ihren Bibliotheksordnern zu speichern, werden diese nicht gesichert oder überschrieben.<br /><br />Alle Clients, die Ihren Server nutzen, werden automatisch aktualisiert.",
   "MessageSearchResultsFor": "Suchergebnisse für",
-  "MessageSelected": "{0} selected",
+  "MessageSelected": "{0} ausgewählt",
   "MessageServerCouldNotBeReached": "Server kann nicht erreicht werden",
   "MessageSetChaptersFromTracksDescription": "Kaitelerstellung basiert auf den existierenden einzelnen Audiodateien. Pro existierende Audiodatei wird 1 Kapitel erstellt, wobei deren Kapitelname aus dem Audiodateinamen extrahiert wird",
   "MessageStartPlaybackAtTime": "Start der Wiedergabe für \"{0}\" bei {1}?",
@@ -750,4 +750,4 @@
   "ToastSocketFailedToConnect": "Verbindung zum WebSocket fehlgeschlagen",
   "ToastUserDeleteFailed": "Benutzer konnte nicht gelöscht werden",
   "ToastUserDeleteSuccess": "Benutzer gelöscht"
-}
\ No newline at end of file
+}

From 72fa6b8200fb66ade979cbaf2479d92bd972ea83 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 23 Dec 2023 10:50:04 -0600
Subject: [PATCH 37/47] Fix:Show cover size widget when audio player is open
 #2443

---
 client/components/app/BookShelfCategorized.vue | 5 ++++-
 client/components/app/LazyBookshelf.vue        | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/client/components/app/BookShelfCategorized.vue b/client/components/app/BookShelfCategorized.vue
index 15f34867..eb4e9424 100644
--- a/client/components/app/BookShelfCategorized.vue
+++ b/client/components/app/BookShelfCategorized.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="bookshelf" ref="wrapper" class="w-full max-w-full h-full overflow-y-scroll relative">
     <!-- Cover size widget -->
-    <widgets-cover-size-widget class="fixed bottom-4 right-4 z-50" />
+    <widgets-cover-size-widget class="fixed right-4 z-50" :style="{ bottom: streamLibraryItem ? '181px' : '16px' }" />
 
     <div v-if="loaded && !shelves.length && !search" class="w-full flex flex-col items-center justify-center py-12">
       <p class="text-center text-2xl mb-4 py-4">{{ libraryName }} Library is empty!</p>
@@ -94,6 +94,9 @@ export default {
     },
     selectedMediaItems() {
       return this.$store.state.globals.selectedMediaItems || []
+    },
+    streamLibraryItem() {
+      return this.$store.state.streamLibraryItem
     }
   },
   methods: {
diff --git a/client/components/app/LazyBookshelf.vue b/client/components/app/LazyBookshelf.vue
index 189f2c83..5291cdbb 100644
--- a/client/components/app/LazyBookshelf.vue
+++ b/client/components/app/LazyBookshelf.vue
@@ -21,7 +21,7 @@
       </div>
     </div>
 
-    <widgets-cover-size-widget class="fixed bottom-4 right-4 z-50" />
+    <widgets-cover-size-widget class="fixed right-4 z-50" :style="{ bottom: streamLibraryItem ? '181px' : '16px' }" />
   </div>
 </template>
 
@@ -205,6 +205,9 @@ export default {
     sizeMultiplier() {
       const baseSize = this.isCoverSquareAspectRatio ? 192 : 120
       return this.entityWidth / baseSize
+    },
+    streamLibraryItem() {
+      return this.$store.state.streamLibraryItem
     }
   },
   methods: {

From 0d644fe0c995f7f94ba7a4947241bbe16db898f7 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 23 Dec 2023 15:29:34 -0600
Subject: [PATCH 38/47] Add:Year in review banner for user stats page #2373

---
 client/components/stats/YearInReview.vue      | 143 +++++++++++----
 .../components/stats/YearInReviewBanner.vue   | 134 ++++++++++++++
 .../components/stats/YearInReviewServer.vue   |  99 +++++++---
 client/components/stats/YearInReviewShort.vue | 169 ++++++++++++++++++
 client/pages/config/stats.vue                 |  38 ++--
 server/utils/queries/adminStats.js            |  50 +++++-
 server/utils/queries/userStats.js             |  49 +++--
 7 files changed, 583 insertions(+), 99 deletions(-)
 create mode 100644 client/components/stats/YearInReviewBanner.vue
 create mode 100644 client/components/stats/YearInReviewShort.vue

diff --git a/client/components/stats/YearInReview.vue b/client/components/stats/YearInReview.vue
index 104392b4..3fef3a8c 100644
--- a/client/components/stats/YearInReview.vue
+++ b/client/components/stats/YearInReview.vue
@@ -1,24 +1,34 @@
 <template>
   <div>
-    <div v-if="processing" class="w-[400px] h-[400px] flex items-center justify-center">
+    <div v-if="processing" class="max-w-[800px] h-80 md:h-[800px] mx-auto flex items-center justify-center">
       <widgets-loading-spinner />
     </div>
-    <img v-else-if="dataUrl" :src="dataUrl" />
+    <img v-else-if="dataUrl" :src="dataUrl" class="mx-auto" />
   </div>
 </template>
 
 <script>
 export default {
   props: {
+    variant: {
+      type: Number,
+      default: 0
+    },
+    year: Number,
     processing: Boolean
   },
   data() {
     return {
+      canvas: null,
       dataUrl: null,
-      year: null,
       yearStats: null
     }
   },
+  watch: {
+    variant() {
+      this.init()
+    }
+  },
   methods: {
     async initCanvas() {
       if (!this.yearStats) return
@@ -72,7 +82,12 @@ export default {
       ctx.fillRect(0, 0, canvas.width, canvas.height)
 
       // Cover image tiles
-      if (this.yearStats.booksWithCovers.length) {
+      const bookCovers = this.yearStats.finishedBooksWithCovers
+      bookCovers.push(...this.yearStats.booksWithCovers)
+
+      let finishedBookCoverImgs = {}
+
+      if (bookCovers.length) {
         let index = 0
         ctx.globalAlpha = 0.25
         ctx.save()
@@ -82,8 +97,8 @@ export default {
         ctx.translate(-130, -120)
         for (let x = 0; x < 5; x++) {
           for (let y = 0; y < 5; y++) {
-            const coverIndex = index % this.yearStats.booksWithCovers.length
-            let libraryItemId = this.yearStats.booksWithCovers[coverIndex]
+            const coverIndex = index % bookCovers.length
+            let libraryItemId = bookCovers[coverIndex]
             index++
 
             await new Promise((resolve) => {
@@ -98,6 +113,14 @@ export default {
                 let sy = -(sw - img.height) / 2
                 ctx.drawImage(img, sx, sy, sw, sw, 215 * x, 215 * y, 215, 215)
                 resolve()
+                if (this.yearStats.finishedBooksWithCovers.includes(libraryItemId) && !finishedBookCoverImgs[libraryItemId]) {
+                  finishedBookCoverImgs[libraryItemId] = {
+                    img,
+                    sx,
+                    sy,
+                    sw
+                  }
+                }
               })
               img.addEventListener('error', () => {
                 resolve()
@@ -141,7 +164,7 @@ export default {
       // Box top right
       createRoundedRect(410, 100, 340, 160)
       addText(this.$elapsedPrettyExtended(this.yearStats.totalListeningTime, true, false), '40px', 'bold', 'white', '0px', 500, 165)
-      addText('spent listening', '28px', 'normal', tanColor, '0.5px', 500, 205)
+      addText('spent listening', '28px', 'normal', tanColor, '0px', 500, 205)
       addIcon('watch_later', 'white', '52px', 440, 180)
 
       // Box bottom left
@@ -153,42 +176,98 @@ export default {
       // Box bottom right
       createRoundedRect(410, 280, 340, 160)
       addText(this.yearStats.numBooksListened, '64px', 'bold', 'white', '0px', 500, 345)
-      addText('books listened to', '28px', 'normal', tanColor, '0.5px', 500, 390)
+      addText('books listened to', '28px', 'normal', tanColor, '0px', 500, 390)
       addIcon('local_library', 'white', '52px', 440, 360)
 
-      // Text stats
-      const topNarrator = this.yearStats.mostListenedNarrator
-      if (topNarrator) {
-        addText('TOP NARRATOR', '24px', 'normal', tanColor, '1px', 70, 520)
-        addText(topNarrator.name, '36px', 'bolder', 'white', '0px', 70, 564, 330)
-        addText(this.$elapsedPrettyExtended(topNarrator.time, true, false), '24px', 'lighter', 'white', '1px', 70, 599)
-      }
-
-      const topGenre = this.yearStats.topGenres[0]
-      if (topGenre) {
-        addText('TOP GENRE', '24px', 'normal', tanColor, '1px', 430, 520)
-        addText(topGenre.genre, '36px', 'bolder', 'white', '0px', 430, 564, 330)
-        addText(this.$elapsedPrettyExtended(topGenre.time, true, false), '24px', 'lighter', 'white', '1px', 430, 599)
-      }
-
-      const topAuthor = this.yearStats.topAuthors[0]
-      if (topAuthor) {
-        addText('TOP AUTHOR', '24px', 'normal', tanColor, '1px', 70, 670)
-        addText(topAuthor.name, '36px', 'bolder', 'white', '0px', 70, 714, 330)
-        addText(this.$elapsedPrettyExtended(topAuthor.time, true, false), '24px', 'lighter', 'white', '1px', 70, 749)
+      if (!this.variant) {
+        // Text stats
+        const topNarrator = this.yearStats.mostListenedNarrator
+        if (topNarrator) {
+          addText('TOP NARRATOR', '24px', 'normal', tanColor, '1px', 70, 520)
+          addText(topNarrator.name, '36px', 'bolder', 'white', '0px', 70, 564, 330)
+          addText(this.$elapsedPrettyExtended(topNarrator.time, true, false), '24px', 'lighter', 'white', '1px', 70, 599)
+        }
+
+        const topGenre = this.yearStats.topGenres[0]
+        if (topGenre) {
+          addText('TOP GENRE', '24px', 'normal', tanColor, '1px', 430, 520)
+          addText(topGenre.genre, '36px', 'bolder', 'white', '0px', 430, 564, 330)
+          addText(this.$elapsedPrettyExtended(topGenre.time, true, false), '24px', 'lighter', 'white', '1px', 430, 599)
+        }
+
+        const topAuthor = this.yearStats.topAuthors[0]
+        if (topAuthor) {
+          addText('TOP AUTHOR', '24px', 'normal', tanColor, '1px', 70, 670)
+          addText(topAuthor.name, '36px', 'bolder', 'white', '0px', 70, 714, 330)
+          addText(this.$elapsedPrettyExtended(topAuthor.time, true, false), '24px', 'lighter', 'white', '1px', 70, 749)
+        }
+
+        if (this.yearStats.mostListenedMonth?.time) {
+          const jsdate = new Date(this.year, this.yearStats.mostListenedMonth.month, 1)
+          const monthName = this.$formatJsDate(jsdate, 'LLLL')
+          addText('TOP MONTH', '24px', 'normal', tanColor, '1px', 430, 670)
+          addText(monthName, '36px', 'bolder', 'white', '0px', 430, 714, 330)
+          addText(this.$elapsedPrettyExtended(this.yearStats.mostListenedMonth.time, true, false), '24px', 'lighter', 'white', '1px', 430, 749)
+        }
+      } else if (this.variant === 1) {
+        // Bottom images
+        finishedBookCoverImgs = Object.values(finishedBookCoverImgs)
+        if (finishedBookCoverImgs.length > 0) {
+          ctx.textAlign = 'center'
+          addText('Some books finished this year...', '28px', 'normal', tanColor, '0px', canvas.width / 2, 530)
+
+          for (let i = 0; i < Math.min(5, finishedBookCoverImgs.length); i++) {
+            let imgToAdd = finishedBookCoverImgs[i]
+            ctx.drawImage(imgToAdd.img, imgToAdd.sx, imgToAdd.sy, imgToAdd.sw, imgToAdd.sw, 40 + 145 * i, 570, 140, 140)
+          }
+        }
+      } else if (this.variant === 2) {
+        // Text stats
+        if (this.yearStats.topAuthors.length) {
+          addText('TOP AUTHORS', '24px', 'normal', tanColor, '1px', 70, 524)
+          for (let i = 0; i < this.yearStats.topAuthors.length; i++) {
+            addText(this.yearStats.topAuthors[i].name, '36px', 'bolder', 'white', '0px', 70, 584 + i * 60, 330)
+          }
+        }
+
+        if (this.yearStats.topGenres.length) {
+          addText('TOP GENRES', '24px', 'normal', tanColor, '1px', 430, 524)
+          for (let i = 0; i < this.yearStats.topGenres.length; i++) {
+            addText(this.yearStats.topGenres[i].genre, '36px', 'bolder', 'white', '0px', 430, 584 + i * 60, 330)
+          }
+        }
       }
 
+      this.canvas = canvas
       this.dataUrl = canvas.toDataURL('png')
     },
     refresh() {
       this.init()
     },
+    share() {
+      this.canvas.toBlob((blob) => {
+        const file = new File([blob], 'yearinreview.png', { type: blob.type })
+        const shareData = {
+          files: [file]
+        }
+        if (navigator.canShare(shareData)) {
+          navigator
+            .share(shareData)
+            .then(() => {
+              console.log('Share success')
+            })
+            .catch((error) => {
+              console.error('Failed to share', error)
+              this.$toast.error('Failed to share: ' + error.message)
+            })
+        } else {
+          this.$toast.error('Cannot share natively on this device')
+        }
+      })
+    },
     async init() {
       this.$emit('update:processing', true)
-      let year = new Date().getFullYear()
-      if (new Date().getMonth() < 11) year--
-      this.year = year
-      this.yearStats = await this.$axios.$get(`/api/me/stats/year/${year}`).catch((err) => {
+      this.yearStats = await this.$axios.$get(`/api/me/stats/year/${this.year}`).catch((err) => {
         console.error('Failed to load stats for year', err)
         this.$toast.error('Failed to load year stats')
         return null
diff --git a/client/components/stats/YearInReviewBanner.vue b/client/components/stats/YearInReviewBanner.vue
new file mode 100644
index 00000000..9a0a0bbf
--- /dev/null
+++ b/client/components/stats/YearInReviewBanner.vue
@@ -0,0 +1,134 @@
+<template>
+  <div class="bg-bg rounded-md shadow-lg border border-white border-opacity-5 p-4 mb-4">
+    <!-- hack to get icon fonts loaded on init -->
+    <div class="h-0 w-0 overflow-hidden opacity-0">
+      <span class="material-icons-outlined">close</span>
+      <span class="abs-icons icon-audiobookshelf" />
+    </div>
+
+    <div class="flex items-center">
+      <p class="hidden md:block text-xl font-semibold">{{ yearInReviewYear }} Year in Review</p>
+      <div class="hidden md:block flex-grow" />
+      <ui-btn class="w-full md:w-auto" @click.stop="clickShowYearInReview">{{ showYearInReview ? 'Hide Year in Review' : 'See Year in Review' }}</ui-btn>
+    </div>
+
+    <!-- your year in review -->
+    <div v-if="showYearInReview">
+      <div class="w-full h-px bg-slate-200/10 my-4" />
+
+      <div class="flex items-center justify-center mb-2 max-w-[800px] mx-auto">
+        <!-- previous button -->
+        <ui-btn small :disabled="!yearInReviewVariant || processingYearInReview" class="inline-flex items-center font-semibold" @click="yearInReviewVariant--">
+          <span class="material-icons text-lg sm:pr-1 py-px sm:py-0">chevron_left</span>
+          <span class="hidden sm:inline-block pr-2">Previous</span>
+        </ui-btn>
+        <!-- share button -->
+        <ui-btn v-if="showShareButton" small :disabled="processingYearInReview" class="inline-flex sm:hidden items-center font-semibold ml-1 sm:ml-2" @click="shareYearInReview"> Share </ui-btn>
+
+        <div class="flex-grow" />
+        <p class="text-lg font-semibold">Your Year <span class="hidden md:inline-block">in Review&nbsp;</span>({{ yearInReviewVariant + 1 }})</p>
+        <div class="flex-grow" />
+
+        <!-- refresh button -->
+        <ui-btn small :disabled="processingYearInReview" class="inline-flex items-center font-semibold mr-1 sm:mr-2" @click="refreshYearInReview">
+          <span class="hidden sm:inline-block">Refresh</span>
+          <span class="material-icons sm:!hidden text-lg py-px">refresh</span>
+        </ui-btn>
+        <!-- next button -->
+        <ui-btn small :disabled="yearInReviewVariant >= 2 || processingYearInReview" class="inline-flex items-center font-semibold" @click="yearInReviewVariant++">
+          <span class="hidden sm:inline-block pl-2">Next</span>
+          <span class="material-icons-outlined text-lg sm:pl-1 py-px sm:py-0">chevron_right</span>
+        </ui-btn>
+      </div>
+      <stats-year-in-review ref="yearInReview" :variant="yearInReviewVariant" :year="yearInReviewYear" :processing.sync="processingYearInReview" />
+
+      <!-- your year in review short -->
+      <div class="w-full max-w-[800px] mx-auto my-4">
+        <stats-year-in-review-short ref="yearInReviewShort" :year="yearInReviewYear" :processing.sync="processingYearInReviewShort" />
+      </div>
+
+      <!-- your server in review -->
+      <div v-if="isAdminOrUp" class="w-full max-w-[800px] mx-auto mb-2 mt-4 border-t pt-4 border-white/10">
+        <div class="flex items-center justify-center mb-2">
+          <!-- previous button -->
+          <ui-btn small :disabled="!yearInReviewServerVariant || processingYearInReviewServer" class="inline-flex items-center font-semibold" @click="yearInReviewServerVariant--">
+            <span class="material-icons-outlined text-lg px-1 sm:pr-1 py-px sm:py-0">chevron_left</span>
+            <span class="hidden sm:inline-block pr-2">Previous</span>
+          </ui-btn>
+          <!-- share button -->
+          <ui-btn v-if="showShareButton" small :disabled="processingYearInReviewServer" class="inline-flex sm:hidden items-center font-semibold ml-1 sm:ml-2" @click="shareYearInReviewServer"> Share </ui-btn>
+
+          <div class="flex-grow" />
+          <p class="text-lg font-semibold">Server <span class="hidden md:inline-block">Year in Review&nbsp;</span>({{ yearInReviewServerVariant + 1 }})</p>
+          <div class="flex-grow" />
+
+          <!-- refresh button -->
+          <ui-btn small :disabled="processingYearInReviewServer" class="inline-flex items-center font-semibold mr-1 sm:mr-2" @click="refreshYearInReviewServer">
+            <span class="hidden sm:inline-block">Refresh</span>
+            <span class="material-icons sm:!hidden text-lg py-px">refresh</span>
+          </ui-btn>
+          <!-- next button -->
+          <ui-btn small :disabled="yearInReviewServerVariant >= 2 || processingYearInReviewServer" class="inline-flex items-center font-semibold" @click="yearInReviewServerVariant++">
+            <span class="hidden sm:inline-block pl-2">Next</span>
+            <span class="material-icons-outlined text-lg px-1 sm:pl-1 py-px sm:py-0">chevron_right</span>
+          </ui-btn>
+        </div>
+      </div>
+      <stats-year-in-review-server v-if="isAdminOrUp" ref="yearInReviewServer" :year="yearInReviewYear" :variant="yearInReviewServerVariant" :processing.sync="processingYearInReviewServer" />
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      showYearInReview: false,
+      yearInReviewYear: 0,
+      yearInReviewVariant: 0,
+      yearInReviewServerVariant: 0,
+      processingYearInReview: false,
+      processingYearInReviewShort: false,
+      processingYearInReviewServer: false,
+      showShareButton: false
+    }
+  },
+  computed: {
+    isAdminOrUp() {
+      return this.$store.getters['user/getIsAdminOrUp']
+    }
+  },
+  methods: {
+    shareYearInReviewServer() {
+      this.$refs.yearInReviewServer.share()
+    },
+    shareYearInReview() {
+      this.$refs.yearInReview.share()
+    },
+    refreshYearInReviewServer() {
+      this.$refs.yearInReviewServer.refresh()
+    },
+    refreshYearInReview() {
+      this.$refs.yearInReview.refresh()
+      this.$refs.yearInReviewShort.refresh()
+    },
+    clickShowYearInReview() {
+      this.showYearInReview = !this.showYearInReview
+    }
+  },
+  beforeMount() {
+    this.yearInReviewYear = new Date().getFullYear()
+    // When not December show previous year
+    if (new Date().getMonth() < 11) {
+      this.yearInReviewYear--
+    }
+  },
+  mounted() {
+    if (typeof navigator.share !== 'undefined' && navigator.share) {
+      this.showShareButton = true
+    } else {
+      console.warn('Navigator.share not supported')
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/client/components/stats/YearInReviewServer.vue b/client/components/stats/YearInReviewServer.vue
index 0d1fa8aa..3aeddfaf 100644
--- a/client/components/stats/YearInReviewServer.vue
+++ b/client/components/stats/YearInReviewServer.vue
@@ -1,24 +1,34 @@
 <template>
   <div>
-    <div v-if="processing" class="w-[400px] h-[400px] flex items-center justify-center">
+    <div v-if="processing" class="max-w-[800px] h-80 md:h-[800px] mx-auto flex items-center justify-center">
       <widgets-loading-spinner />
     </div>
-    <img v-else-if="dataUrl" :src="dataUrl" />
+    <img v-else-if="dataUrl" :src="dataUrl" class="mx-auto" />
   </div>
 </template>
 
 <script>
 export default {
   props: {
-    processing: Boolean
+    variant: {
+      type: Number,
+      default: 0
+    },
+    processing: Boolean,
+    year: Number
   },
   data() {
     return {
+      canvas: null,
       dataUrl: null,
-      year: null,
       yearStats: null
     }
   },
+  watch: {
+    variant() {
+      this.init()
+    }
+  },
   methods: {
     async initCanvas() {
       if (!this.yearStats) return
@@ -61,12 +71,6 @@ export default {
         ctx.fillText(text, x, y)
       }
 
-      const addIcon = (icon, color, fontSize, x, y) => {
-        ctx.fillStyle = color
-        ctx.font = `${fontSize} Material Icons Outlined`
-        ctx.fillText(icon, x, y)
-      }
-
       // Bg color
       ctx.fillStyle = '#232323'
       ctx.fillRect(0, 0, canvas.width, canvas.height)
@@ -168,28 +172,81 @@ export default {
         addText('+' + this.$elapsedPrettyExtended(this.yearStats.totalBooksAddedDuration, true, false), '20px', 'lighter', 'white', '0px', canvas.width / 2, 470)
       }
 
-      // Bottom images
-      imgsToAdd = Object.values(imgsToAdd)
-      if (imgsToAdd.length >= 5) {
-        addText('Some additions include...', '24px', 'normal', tanColor, '0px', canvas.width / 2, 540)
+      if (!this.variant) {
+        // Bottom images
+        imgsToAdd = Object.values(imgsToAdd)
+        if (imgsToAdd.length > 0) {
+          addText('Some additions include...', '24px', 'normal', tanColor, '0px', canvas.width / 2, 540)
 
-        for (let i = 0; i < 5; i++) {
-          let imgToAdd = imgsToAdd[i]
-          ctx.drawImage(imgToAdd.img, imgToAdd.sx, imgToAdd.sy, imgToAdd.sw, imgToAdd.sw, 40 + 145 * i, 580, 140, 140)
+          for (let i = 0; i < Math.min(5, imgsToAdd.length); i++) {
+            let imgToAdd = imgsToAdd[i]
+            ctx.drawImage(imgToAdd.img, imgToAdd.sx, imgToAdd.sy, imgToAdd.sw, imgToAdd.sw, 40 + 145 * i, 580, 140, 140)
+          }
+        }
+      } else if (this.variant === 1) {
+        // Text stats
+        ctx.textAlign = 'left'
+        if (this.yearStats.topAuthors.length) {
+          addText('TOP AUTHORS', '24px', 'normal', tanColor, '1px', 70, 549)
+          for (let i = 0; i < this.yearStats.topAuthors.length; i++) {
+            addText(this.yearStats.topAuthors[i].name, '36px', 'bolder', 'white', '0px', 70, 609 + i * 60, 330)
+          }
+        }
+
+        if (this.yearStats.topNarrators.length) {
+          addText('TOP NARRATORS', '24px', 'normal', tanColor, '1px', 430, 549)
+          for (let i = 0; i < this.yearStats.topNarrators.length; i++) {
+            addText(this.yearStats.topNarrators[i].name, '36px', 'bolder', 'white', '0px', 430, 609 + i * 60, 330)
+          }
+        }
+      } else if (this.variant === 2) {
+        // Text stats
+        ctx.textAlign = 'left'
+        if (this.yearStats.topAuthors.length) {
+          addText('TOP AUTHORS', '24px', 'normal', tanColor, '1px', 70, 549)
+          for (let i = 0; i < this.yearStats.topAuthors.length; i++) {
+            addText(this.yearStats.topAuthors[i].name, '36px', 'bolder', 'white', '0px', 70, 609 + i * 60, 330)
+          }
+        }
+
+        if (this.yearStats.topGenres.length) {
+          addText('TOP GENRES', '24px', 'normal', tanColor, '1px', 430, 549)
+          for (let i = 0; i < this.yearStats.topGenres.length; i++) {
+            addText(this.yearStats.topGenres[i].genre, '36px', 'bolder', 'white', '0px', 430, 609 + i * 60, 330)
+          }
         }
       }
 
+      this.canvas = canvas
       this.dataUrl = canvas.toDataURL('png')
     },
+    share() {
+      this.canvas.toBlob((blob) => {
+        const file = new File([blob], 'yearinreviewserver.png', { type: blob.type })
+        const shareData = {
+          files: [file]
+        }
+        if (navigator.canShare(shareData)) {
+          navigator
+            .share(shareData)
+            .then(() => {
+              console.log('Share success')
+            })
+            .catch((error) => {
+              console.error('Failed to share', error)
+              this.$toast.error('Failed to share: ' + error.message)
+            })
+        } else {
+          this.$toast.error('Cannot share natively on this device')
+        }
+      })
+    },
     refresh() {
       this.init()
     },
     async init() {
       this.$emit('update:processing', true)
-      let year = new Date().getFullYear()
-      if (new Date().getMonth() < 11) year--
-      this.year = year
-      this.yearStats = await this.$axios.$get(`/api/stats/year/${year}`).catch((err) => {
+      this.yearStats = await this.$axios.$get(`/api/stats/year/${this.year}`).catch((err) => {
         console.error('Failed to load stats for year', err)
         this.$toast.error('Failed to load year stats')
         return null
diff --git a/client/components/stats/YearInReviewShort.vue b/client/components/stats/YearInReviewShort.vue
new file mode 100644
index 00000000..49abe122
--- /dev/null
+++ b/client/components/stats/YearInReviewShort.vue
@@ -0,0 +1,169 @@
+<template>
+  <div>
+    <div v-if="processing" class="max-w-[600px] h-32 sm:h-[200px] flex items-center justify-center">
+      <widgets-loading-spinner />
+    </div>
+    <img v-else-if="dataUrl" :src="dataUrl" />
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    processing: Boolean,
+    year: Number
+  },
+  data() {
+    return {
+      dataUrl: null,
+      yearStats: null
+    }
+  },
+  methods: {
+    async initCanvas() {
+      if (!this.yearStats) return
+
+      const canvas = document.createElement('canvas')
+      canvas.width = 600
+      canvas.height = 200
+      const ctx = canvas.getContext('2d')
+
+      const createRoundedRect = (x, y, w, h) => {
+        const grd1 = ctx.createLinearGradient(x, y, x + w, y + h)
+        grd1.addColorStop(0, '#44444455')
+        grd1.addColorStop(1, '#ffffff11')
+        ctx.fillStyle = grd1
+        ctx.strokeStyle = '#C0C0C088'
+        ctx.beginPath()
+        ctx.roundRect(x, y, w, h, [20])
+        ctx.fill()
+        ctx.stroke()
+      }
+
+      const addText = (text, fontSize, fontWeight, color, letterSpacing, x, y, maxWidth = 0) => {
+        ctx.fillStyle = color
+        ctx.font = `${fontWeight} ${fontSize} Source Sans Pro`
+        ctx.letterSpacing = letterSpacing
+
+        // If maxWidth is specified then continue to remove chars until under maxWidth and add ellipsis
+        if (maxWidth) {
+          let txtWidth = ctx.measureText(text).width
+          while (txtWidth > maxWidth) {
+            console.warn(`Text "${text}" is greater than max width ${maxWidth} (width:${txtWidth})`)
+            if (text.endsWith('...')) text = text.slice(0, -4) // Repeated checks remove 1 char at a time
+            else text = text.slice(0, -3) // First check remove last 3 chars
+            text += '...'
+            txtWidth = ctx.measureText(text).width
+            console.log(`Checking text "${text}" (width:${txtWidth})`)
+          }
+        }
+
+        ctx.fillText(text, x, y)
+      }
+
+      const addIcon = (icon, color, fontSize, x, y) => {
+        ctx.fillStyle = color
+        ctx.font = `${fontSize} Material Icons Outlined`
+        ctx.fillText(icon, x, y)
+      }
+
+      // Bg color
+      ctx.fillStyle = '#232323'
+      ctx.fillRect(0, 0, canvas.width, canvas.height)
+
+      // Cover image tiles
+      const bookCovers = this.yearStats.finishedBooksWithCovers
+      bookCovers.push(...this.yearStats.booksWithCovers)
+
+      if (bookCovers.length) {
+        let index = 0
+        ctx.globalAlpha = 0.25
+        ctx.save()
+        ctx.translate(canvas.width / 2, canvas.height / 2)
+        ctx.rotate((-Math.PI / 180) * 25)
+        ctx.translate(-canvas.width / 2, -canvas.height / 2)
+        ctx.translate(-10, -90)
+        for (let x = 0; x < 4; x++) {
+          for (let y = 0; y < 3; y++) {
+            const coverIndex = index % bookCovers.length
+            let libraryItemId = bookCovers[coverIndex]
+            index++
+
+            await new Promise((resolve) => {
+              const img = new Image()
+              img.crossOrigin = 'anonymous'
+              img.addEventListener('load', () => {
+                let sw = img.width
+                if (img.width > img.height) {
+                  sw = img.height
+                }
+                let sx = -(sw - img.width) / 2
+                let sy = -(sw - img.height) / 2
+                ctx.drawImage(img, sx, sy, sw, sw, 155 * x, 155 * y, 155, 155)
+                resolve()
+              })
+              img.addEventListener('error', () => {
+                resolve()
+              })
+              img.src = this.$store.getters['globals/getLibraryItemCoverSrcById'](libraryItemId)
+            })
+          }
+        }
+        ctx.restore()
+      }
+
+      ctx.globalAlpha = 1
+      ctx.textBaseline = 'middle'
+
+      // Create gradient
+      const grd1 = ctx.createLinearGradient(0, 0, canvas.width, canvas.height)
+      grd1.addColorStop(0, '#000000aa')
+      grd1.addColorStop(1, '#cd9d49aa')
+      ctx.fillStyle = grd1
+      ctx.fillRect(0, 0, canvas.width, canvas.height)
+
+      // Top Abs icon
+      let tanColor = '#ffdb70'
+      ctx.fillStyle = tanColor
+      ctx.font = '42px absicons'
+      ctx.fillText('\ue900', 15, 36)
+
+      // Top text
+      addText('audiobookshelf', '28px', 'normal', tanColor, '0px', 65, 28)
+      addText(`${this.year} YEAR IN REVIEW`, '18px', 'bold', 'white', '1px', 65, 51)
+
+      // Top left box
+      createRoundedRect(15, 75, 280, 110)
+      addText(this.yearStats.numBooksFinished, '48px', 'bold', 'white', '0px', 105, 120)
+      addText('books finished', '20px', 'normal', tanColor, '0px', 105, 155)
+      const readIconPath = new Path2D()
+      readIconPath.addPath(new Path2D('M19 1H5c-1.1 0-1.99.9-1.99 2L3 15.93c0 .69.35 1.3.88 1.66L12 23l8.11-5.41c.53-.36.88-.97.88-1.66L21 3c0-1.1-.9-2-2-2zm-9 15l-5-5 1.41-1.41L10 13.17l7.59-7.59L19 7l-9 9z'), { a: 1.5, d: 1.5, e: 55, f: 115 })
+      ctx.fillStyle = '#ffffff'
+      ctx.fill(readIconPath)
+
+      createRoundedRect(305, 75, 280, 110)
+      addText(this.yearStats.numBooksListened, '48px', 'bold', 'white', '0px', 400, 120)
+      addText('books listened to', '20px', 'normal', tanColor, '0px', 400, 155)
+      addIcon('local_library', 'white', '42px', 345, 130)
+
+      this.dataUrl = canvas.toDataURL('png')
+    },
+    refresh() {
+      this.init()
+    },
+    async init() {
+      this.$emit('update:processing', true)
+      this.yearStats = await this.$axios.$get(`/api/me/stats/year/${this.year}`).catch((err) => {
+        console.error('Failed to load stats for year', err)
+        this.$toast.error('Failed to load year stats')
+        return null
+      })
+      await this.initCanvas()
+      this.$emit('update:processing', false)
+    }
+  },
+  mounted() {
+    this.init()
+  }
+}
+</script>
\ No newline at end of file
diff --git a/client/pages/config/stats.vue b/client/pages/config/stats.vue
index 96581714..05d0550f 100644
--- a/client/pages/config/stats.vue
+++ b/client/pages/config/stats.vue
@@ -1,6 +1,9 @@
 <template>
   <div>
-    <app-settings-content :header-text="$strings.HeaderYourStats">
+    <!-- Year in review banner shown at the top in December and January -->
+    <stats-year-in-review-banner v-if="showYearInReviewBanner" />
+
+    <app-settings-content :header-text="$strings.HeaderYourStats" class="!mb-4">
       <div class="flex justify-center">
         <div class="flex p-2">
           <svg class="hidden sm:block h-14 w-14 lg:h-18 lg:w-18" viewBox="0 0 24 24">
@@ -62,16 +65,10 @@
         </div>
       </div>
       <stats-heatmap v-if="listeningStats" :days-listening="listeningStats.days" class="my-2" />
-
-      <ui-btn small :loading="processingYearInReview || processingYearInReviewAlt" @click.stop="clickShowYearInReview">{{ showYearInReview ? 'Refresh Year in Review' : 'Year in Review' }}</ui-btn>
-      <div v-if="showYearInReview">
-        <div class="w-full h-px bg-slate-200/10 my-4" />
-
-        <stats-year-in-review ref="yearInReview" :processing.sync="processingYearInReview" />
-
-        <stats-year-in-review-server v-if="isAdminOrUp" ref="yearInReviewAlt" :processing.sync="processingYearInReviewAlt" />
-      </div>
     </app-settings-content>
+
+    <!-- Year in review banner shown at the bottom Feb - Nov -->
+    <stats-year-in-review-banner v-if="!showYearInReviewBanner" />
   </div>
 </template>
 
@@ -81,9 +78,7 @@ export default {
     return {
       listeningStats: null,
       windowWidth: 0,
-      showYearInReview: false,
-      processingYearInReview: false,
-      processingYearInReviewAlt: false
+      showYearInReviewBanner: false
     }
   },
   watch: {
@@ -126,22 +121,17 @@ export default {
     }
   },
   methods: {
-    clickShowYearInReview() {
-      if (this.showYearInReview) {
-        this.$refs.yearInReview.refresh()
-
-        if (this.$refs.yearInReviewAlt) {
-          this.$refs.yearInReviewAlt.refresh()
-        }
-      } else {
-        this.showYearInReview = true
-      }
-    },
     async init() {
       this.listeningStats = await this.$axios.$get(`/api/me/listening-stats`).catch((err) => {
         console.error('Failed to load listening sesions', err)
         return []
       })
+
+      let month = new Date().getMonth()
+      // January and December show year in review banner
+      if (month === 11 || month === 0) {
+        this.showYearInReviewBanner = true
+      }
     }
   },
   mounted() {
diff --git a/server/utils/queries/adminStats.js b/server/utils/queries/adminStats.js
index 66a31e8d..f1d64f47 100644
--- a/server/utils/queries/adminStats.js
+++ b/server/utils/queries/adminStats.js
@@ -88,12 +88,53 @@ module.exports = {
 
     const numAuthorsAdded = await this.getNumAuthorsAddedForYear(year)
 
+    let authorListeningMap = {}
+    let narratorListeningMap = {}
+    let genreListeningMap = {}
+
     const listeningSessions = await this.getListeningSessionsForYear(year)
     let totalListeningTime = 0
-    for (const listeningSession of listeningSessions) {
-      totalListeningTime += (listeningSession.timeListening || 0)
+    for (const ls of listeningSessions) {
+      totalListeningTime += (ls.timeListening || 0)
+
+      const authors = ls.mediaMetadata.authors || []
+      authors.forEach((au) => {
+        if (!authorListeningMap[au.name]) authorListeningMap[au.name] = 0
+        authorListeningMap[au.name] += (ls.timeListening || 0)
+      })
+
+      const narrators = ls.mediaMetadata.narrators || []
+      narrators.forEach((narrator) => {
+        if (!narratorListeningMap[narrator]) narratorListeningMap[narrator] = 0
+        narratorListeningMap[narrator] += (ls.timeListening || 0)
+      })
+
+      // Filter out bad genres like "audiobook" and "audio book"
+      const genres = (ls.mediaMetadata.genres || []).filter(g => !g.toLowerCase().includes('audiobook') && !g.toLowerCase().includes('audio book'))
+      genres.forEach((genre) => {
+        if (!genreListeningMap[genre]) genreListeningMap[genre] = 0
+        genreListeningMap[genre] += (ls.timeListening || 0)
+      })
     }
 
+    let topAuthors = null
+    topAuthors = Object.keys(authorListeningMap).map(authorName => ({
+      name: authorName,
+      time: Math.round(authorListeningMap[authorName])
+    })).sort((a, b) => b.time - a.time).slice(0, 3)
+
+    let topNarrators = null
+    topNarrators = Object.keys(narratorListeningMap).map(narratorName => ({
+      name: narratorName,
+      time: Math.round(narratorListeningMap[narratorName])
+    })).sort((a, b) => b.time - a.time).slice(0, 3)
+
+    let topGenres = null
+    topGenres = Object.keys(genreListeningMap).map(genre => ({
+      genre,
+      time: Math.round(genreListeningMap[genre])
+    })).sort((a, b) => b.time - a.time).slice(0, 3)
+
     // Stats for total books, size and duration for everything added this year or earlier
     const [totalStatResultsRow] = await Database.sequelize.query(`SELECT SUM(li.size) AS totalSize, SUM(b.duration) AS totalDuration, COUNT(*) AS totalItems FROM libraryItems li, books b WHERE b.id = li.mediaId AND li.mediaType = 'book' AND li.createdAt < ":nextYear-01-01";`, {
       replacements: {
@@ -112,7 +153,10 @@ module.exports = {
       totalBooksSize: totalStatResults?.totalSize || 0,
       totalBooksDuration: totalStatResults?.totalDuration || 0,
       totalListeningTime,
-      numBooks: totalStatResults?.totalItems || 0
+      numBooks: totalStatResults?.totalItems || 0,
+      topAuthors,
+      topNarrators,
+      topGenres
     }
   }
 }
diff --git a/server/utils/queries/userStats.js b/server/utils/queries/userStats.js
index 0f997789..6fd5d506 100644
--- a/server/utils/queries/userStats.js
+++ b/server/utils/queries/userStats.js
@@ -52,12 +52,14 @@ module.exports = {
       },
       include: {
         model: Database.bookModel,
+        attributes: ['id', 'title', 'coverPath'],
         include: {
           model: Database.libraryItemModel,
           attributes: ['id', 'mediaId', 'mediaType']
         },
         required: true
-      }
+      },
+      order: Database.sequelize.random()
     })
     return progresses
   },
@@ -69,6 +71,7 @@ module.exports = {
   async getStatsForYear(user, year) {
     const userId = user.id
     const listeningSessions = await this.getUserListeningSessionsForYear(userId, year)
+    const bookProgressesFinished = await this.getBookMediaProgressFinishedForYear(userId, year)
 
     let totalBookListeningTime = 0
     let totalPodcastListeningTime = 0
@@ -79,11 +82,33 @@ module.exports = {
     let narratorListeningMap = {}
     let monthListeningMap = {}
     let bookListeningMap = {}
-    const booksWithCovers = []
 
+    const booksWithCovers = []
+    const finishedBooksWithCovers = []
+
+    // Get finished book stats
+    const numBooksFinished = bookProgressesFinished.length
+    let longestAudiobookFinished = null
+    for (const mediaProgress of bookProgressesFinished) {
+      // Grab first 5 that have a cover
+      if (mediaProgress.mediaItem?.coverPath && !finishedBooksWithCovers.includes(mediaProgress.mediaItem.libraryItem.id) && finishedBooksWithCovers.length < 5 && await fsExtra.pathExists(mediaProgress.mediaItem.coverPath)) {
+        finishedBooksWithCovers.push(mediaProgress.mediaItem.libraryItem.id)
+      }
+
+      if (mediaProgress.duration && (!longestAudiobookFinished?.duration || mediaProgress.duration > longestAudiobookFinished.duration)) {
+        longestAudiobookFinished = {
+          id: mediaProgress.mediaItem.id,
+          title: mediaProgress.mediaItem.title,
+          duration: Math.round(mediaProgress.duration),
+          finishedAt: mediaProgress.finishedAt
+        }
+      }
+    }
+
+    // Get listening session stats
     for (const ls of listeningSessions) {
       // Grab first 25 that have a cover
-      if (ls.mediaItem?.coverPath && !booksWithCovers.includes(ls.mediaItem.libraryItem.id) && booksWithCovers.length < 25 && await fsExtra.pathExists(ls.mediaItem.coverPath)) {
+      if (ls.mediaItem?.coverPath && !booksWithCovers.includes(ls.mediaItem.libraryItem.id) && !finishedBooksWithCovers.includes(ls.mediaItem.libraryItem.id) && booksWithCovers.length < 25 && await fsExtra.pathExists(ls.mediaItem.coverPath)) {
         booksWithCovers.push(ls.mediaItem.libraryItem.id)
       }
 
@@ -162,21 +187,6 @@ module.exports = {
       }
     }
 
-    const bookProgressesFinished = await this.getBookMediaProgressFinishedForYear(userId, year)
-
-    const numBooksFinished = bookProgressesFinished.length
-    let longestAudiobookFinished = null
-    bookProgressesFinished.forEach((mediaProgress) => {
-      if (mediaProgress.duration && (!longestAudiobookFinished?.duration || mediaProgress.duration > longestAudiobookFinished.duration)) {
-        longestAudiobookFinished = {
-          id: mediaProgress.mediaItem.id,
-          title: mediaProgress.mediaItem.title,
-          duration: Math.round(mediaProgress.duration),
-          finishedAt: mediaProgress.finishedAt
-        }
-      }
-    })
-
     return {
       totalListeningSessions: listeningSessions.length,
       totalListeningTime,
@@ -189,7 +199,8 @@ module.exports = {
       numBooksFinished,
       numBooksListened: Object.keys(bookListeningMap).length,
       longestAudiobookFinished,
-      booksWithCovers
+      booksWithCovers,
+      finishedBooksWithCovers
     }
   }
 }

From 9f366863a94ab4c241b6f650db9e6c00b4cb0a45 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 23 Dec 2023 16:16:24 -0600
Subject: [PATCH 39/47] Update comic reader buttons for mobile screens, add
 left scrollBy

---
 client/components/readers/ComicReader.vue | 30 +++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/client/components/readers/ComicReader.vue b/client/components/readers/ComicReader.vue
index 9b09f5b6..67aa16c6 100644
--- a/client/components/readers/ComicReader.vue
+++ b/client/components/readers/ComicReader.vue
@@ -14,19 +14,20 @@
       </div>
     </div>
 
-    <a v-if="pages && numPages" :href="mainImg" :download="pages[page - 1]" class="absolute top-0 bg-bg text-gray-100 border-b border-l border-r border-gray-400 hover:bg-black-200 cursor-pointer rounded-b-md w-10 h-9 flex items-center justify-center text-center z-20" :class="comicMetadata ? 'left-32' : 'left-20'">
-      <span class="material-icons text-xl">download</span>
-    </a>
-    <div v-if="comicMetadata" class="absolute top-0 left-20 bg-bg text-gray-100 border-b border-l border-r border-gray-400 hover:bg-black-200 cursor-pointer rounded-b-md w-10 h-9 flex items-center justify-center text-center z-20" @mousedown.prevent @click.stop.prevent="clickShowInfoMenu">
-      <span class="material-icons text-xl">more</span>
-    </div>
-    <div v-if="numPages" class="absolute top-0 left-8 bg-bg text-gray-100 border-b border-l border-r border-gray-400 hover:bg-black-200 cursor-pointer rounded-b-md w-10 h-9 flex items-center justify-center text-center z-20" @mousedown.prevent @click.stop.prevent="clickShowPageMenu">
+    <div v-if="numPages" class="absolute top-0 left-4 sm:left-8 bg-bg text-gray-100 border-b border-l border-r border-gray-400 hover:bg-black-200 cursor-pointer rounded-b-md w-10 h-9 flex items-center justify-center text-center z-20" @mousedown.prevent @click.stop.prevent="clickShowPageMenu">
       <span class="material-icons text-xl">menu</span>
     </div>
-    <div v-if="numPages" class="absolute top-0 right-16 bg-bg text-gray-100 border-b border-l border-r border-gray-400 rounded-b-md px-2 h-9 flex items-center text-center z-20">
+    <div v-if="comicMetadata" class="absolute top-0 left-16 sm:left-20 bg-bg text-gray-100 border-b border-l border-r border-gray-400 hover:bg-black-200 cursor-pointer rounded-b-md w-10 h-9 flex items-center justify-center text-center z-20" @mousedown.prevent @click.stop.prevent="clickShowInfoMenu">
+      <span class="material-icons text-xl">more</span>
+    </div>
+    <a v-if="pages && numPages" :href="mainImg" :download="pages[page - 1]" class="absolute top-0 bg-bg text-gray-100 border-b border-l border-r border-gray-400 hover:bg-black-200 cursor-pointer rounded-b-md w-10 h-9 flex items-center justify-center text-center z-20" :class="comicMetadata ? 'left-28 sm:left-32' : 'left-16 sm:left-20'">
+      <span class="material-icons text-xl">download</span>
+    </a>
+
+    <div v-if="numPages" class="absolute top-0 right-14 sm:right-16 bg-bg text-gray-100 border-b border-l border-r border-gray-400 rounded-b-md px-2 h-9 flex items-center text-center z-20">
       <p class="font-mono">{{ page }} / {{ numPages }}</p>
     </div>
-    <div v-if="mainImg" class="absolute top-0 right-40 bg-bg text-gray-100 border-b border-l border-r border-gray-400 rounded-b-md px-2 h-9 flex items-center text-center z-20">
+    <div v-if="mainImg" class="absolute top-0 right-36 sm:right-40 bg-bg text-gray-100 border-b border-l border-r border-gray-400 rounded-b-md px-2 h-9 flex items-center text-center z-20">
       <ui-icon-btn icon="zoom_out" :size="8" :disabled="!canScaleDown" borderless class="mr-px" @click="zoomOut" />
       <ui-icon-btn icon="zoom_in" :size="8" :disabled="!canScaleUp" borderless class="ml-px" @click="zoomIn" />
     </div>
@@ -91,7 +92,7 @@ export default {
       loadTimeout: null,
       loadedFirstPage: false,
       comicMetadata: null,
-      scale: 80,
+      scale: 80
     }
   },
   watch: {
@@ -357,20 +358,19 @@ export default {
     scroll(event) {
       const imageContainer = this.$refs.imageContainer
 
-      console.log("Scrolling by " + event.deltaY)
       imageContainer.scrollBy({
         top: event.deltaY,
-        behavior: "auto",
-      });
+        left: event.deltaX,
+        behavior: 'auto'
+      })
     }
   },
   mounted() {
     const prevButton = this.$refs.prevButton
     const nextButton = this.$refs.nextButton
-    
+
     prevButton.addEventListener('wheel', this.scroll, { passive: false })
     nextButton.addEventListener('wheel', this.scroll, { passive: false })
-
   },
   beforeDestroy() {
     const prevButton = this.$refs.prevButton

From 5633113f256b5e9d70c6b32e7e61faf245616369 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 23 Dec 2023 16:39:56 -0600
Subject: [PATCH 40/47] Update share buttons to not show an error on abort

---
 client/components/stats/YearInReview.vue      | 10 +++++---
 .../components/stats/YearInReviewBanner.vue   | 17 +++++++++----
 .../components/stats/YearInReviewServer.vue   | 10 +++++---
 client/components/stats/YearInReviewShort.vue | 25 +++++++++++++++++++
 4 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/client/components/stats/YearInReview.vue b/client/components/stats/YearInReview.vue
index 3fef3a8c..a6bed203 100644
--- a/client/components/stats/YearInReview.vue
+++ b/client/components/stats/YearInReview.vue
@@ -40,10 +40,10 @@ export default {
 
       const createRoundedRect = (x, y, w, h) => {
         const grd1 = ctx.createLinearGradient(x, y, x + w, y + h)
-        grd1.addColorStop(0, '#44444466')
-        grd1.addColorStop(1, '#ffffff22')
+        grd1.addColorStop(0, '#44444455')
+        grd1.addColorStop(1, '#ffffff11')
         ctx.fillStyle = grd1
-        ctx.strokeStyle = '#C0C0C0aa'
+        ctx.strokeStyle = '#C0C0C088'
         ctx.beginPath()
         ctx.roundRect(x, y, w, h, [20])
         ctx.fill()
@@ -258,7 +258,9 @@ export default {
             })
             .catch((error) => {
               console.error('Failed to share', error)
-              this.$toast.error('Failed to share: ' + error.message)
+              if (error.name !== 'AbortError') {
+                this.$toast.error('Failed to share: ' + error.message)
+              }
             })
         } else {
           this.$toast.error('Cannot share natively on this device')
diff --git a/client/components/stats/YearInReviewBanner.vue b/client/components/stats/YearInReviewBanner.vue
index 9a0a0bbf..f7736078 100644
--- a/client/components/stats/YearInReviewBanner.vue
+++ b/client/components/stats/YearInReviewBanner.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="bg-bg rounded-md shadow-lg border border-white border-opacity-5 p-4 mb-4">
+  <div class="bg-bg rounded-md shadow-lg border border-white border-opacity-5 p-1 sm:p-4 mb-4">
     <!-- hack to get icon fonts loaded on init -->
     <div class="h-0 w-0 overflow-hidden opacity-0">
       <span class="material-icons-outlined">close</span>
@@ -26,7 +26,8 @@
         <ui-btn v-if="showShareButton" small :disabled="processingYearInReview" class="inline-flex sm:hidden items-center font-semibold ml-1 sm:ml-2" @click="shareYearInReview"> Share </ui-btn>
 
         <div class="flex-grow" />
-        <p class="text-lg font-semibold">Your Year <span class="hidden md:inline-block">in Review&nbsp;</span>({{ yearInReviewVariant + 1 }})</p>
+        <p class="hidden sm:block text-lg font-semibold">Your Year in Review ({{ yearInReviewVariant + 1 }})</p>
+        <p class="block sm:hidden text-lg font-semibold">{{ yearInReviewVariant + 1 }}</p>
         <div class="flex-grow" />
 
         <!-- refresh button -->
@@ -44,6 +45,8 @@
 
       <!-- your year in review short -->
       <div class="w-full max-w-[800px] mx-auto my-4">
+        <!-- share button -->
+        <ui-btn v-if="showShareButton" small :disabled="processingYearInReviewShort" class="inline-flex sm:hidden items-center font-semibold mb-1" @click="shareYearInReviewShort"> Share </ui-btn>
         <stats-year-in-review-short ref="yearInReviewShort" :year="yearInReviewYear" :processing.sync="processingYearInReviewShort" />
       </div>
 
@@ -52,14 +55,15 @@
         <div class="flex items-center justify-center mb-2">
           <!-- previous button -->
           <ui-btn small :disabled="!yearInReviewServerVariant || processingYearInReviewServer" class="inline-flex items-center font-semibold" @click="yearInReviewServerVariant--">
-            <span class="material-icons-outlined text-lg px-1 sm:pr-1 py-px sm:py-0">chevron_left</span>
+            <span class="material-icons text-lg sm:pr-1 py-px sm:py-0">chevron_left</span>
             <span class="hidden sm:inline-block pr-2">Previous</span>
           </ui-btn>
           <!-- share button -->
           <ui-btn v-if="showShareButton" small :disabled="processingYearInReviewServer" class="inline-flex sm:hidden items-center font-semibold ml-1 sm:ml-2" @click="shareYearInReviewServer"> Share </ui-btn>
 
           <div class="flex-grow" />
-          <p class="text-lg font-semibold">Server <span class="hidden md:inline-block">Year in Review&nbsp;</span>({{ yearInReviewServerVariant + 1 }})</p>
+          <p class="hidden sm:block text-lg font-semibold">Server Year in Review ({{ yearInReviewServerVariant + 1 }})</p>
+          <p class="block sm:hidden text-lg font-semibold">{{ yearInReviewServerVariant + 1 }}</p>
           <div class="flex-grow" />
 
           <!-- refresh button -->
@@ -70,7 +74,7 @@
           <!-- next button -->
           <ui-btn small :disabled="yearInReviewServerVariant >= 2 || processingYearInReviewServer" class="inline-flex items-center font-semibold" @click="yearInReviewServerVariant++">
             <span class="hidden sm:inline-block pl-2">Next</span>
-            <span class="material-icons-outlined text-lg px-1 sm:pl-1 py-px sm:py-0">chevron_right</span>
+            <span class="material-icons-outlined text-lg sm:pl-1 py-px sm:py-0">chevron_right</span>
           </ui-btn>
         </div>
       </div>
@@ -105,6 +109,9 @@ export default {
     shareYearInReview() {
       this.$refs.yearInReview.share()
     },
+    shareYearInReviewShort() {
+      this.$refs.yearInReviewShort.share()
+    },
     refreshYearInReviewServer() {
       this.$refs.yearInReviewServer.refresh()
     },
diff --git a/client/components/stats/YearInReviewServer.vue b/client/components/stats/YearInReviewServer.vue
index 3aeddfaf..e6c10fa2 100644
--- a/client/components/stats/YearInReviewServer.vue
+++ b/client/components/stats/YearInReviewServer.vue
@@ -40,10 +40,10 @@ export default {
 
       const createRoundedRect = (x, y, w, h) => {
         const grd1 = ctx.createLinearGradient(x, y, x + w, y + h)
-        grd1.addColorStop(0, '#44444466')
-        grd1.addColorStop(1, '#ffffff22')
+        grd1.addColorStop(0, '#44444455')
+        grd1.addColorStop(1, '#ffffff11')
         ctx.fillStyle = grd1
-        ctx.strokeStyle = '#C0C0C0aa'
+        ctx.strokeStyle = '#C0C0C088'
         ctx.beginPath()
         ctx.roundRect(x, y, w, h, [20])
         ctx.fill()
@@ -234,7 +234,9 @@ export default {
             })
             .catch((error) => {
               console.error('Failed to share', error)
-              this.$toast.error('Failed to share: ' + error.message)
+              if (error.name !== 'AbortError') {
+                this.$toast.error('Failed to share: ' + error.message)
+              }
             })
         } else {
           this.$toast.error('Cannot share natively on this device')
diff --git a/client/components/stats/YearInReviewShort.vue b/client/components/stats/YearInReviewShort.vue
index 49abe122..daa566a6 100644
--- a/client/components/stats/YearInReviewShort.vue
+++ b/client/components/stats/YearInReviewShort.vue
@@ -15,6 +15,7 @@ export default {
   },
   data() {
     return {
+      canvas: null,
       dataUrl: null,
       yearStats: null
     }
@@ -146,8 +147,32 @@ export default {
       addText('books listened to', '20px', 'normal', tanColor, '0px', 400, 155)
       addIcon('local_library', 'white', '42px', 345, 130)
 
+      this.canvas = canvas
       this.dataUrl = canvas.toDataURL('png')
     },
+    share() {
+      this.canvas.toBlob((blob) => {
+        const file = new File([blob], 'yearinreviewserver.png', { type: blob.type + 'cat' })
+        const shareData = {
+          files: [file]
+        }
+        if (navigator.canShare(shareData)) {
+          navigator
+            .share(shareData)
+            .then(() => {
+              console.log('Share success')
+            })
+            .catch((error) => {
+              console.error('Failed to share', error)
+              if (error.name !== 'AbortError') {
+                this.$toast.error('Failed to share: ' + error.message)
+              }
+            })
+        } else {
+          this.$toast.error('Cannot share natively on this device')
+        }
+      })
+    },
     refresh() {
       this.init()
     },

From b376f89ce5bb6483cf74b287ac0d37a9c1929530 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 23 Dec 2023 17:05:44 -0600
Subject: [PATCH 41/47] Version bump v2.7.0

---
 client/package-lock.json | 4 ++--
 client/package.json      | 2 +-
 package-lock.json        | 4 ++--
 package.json             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index 16adf9db..fb8be23f 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "audiobookshelf-client",
-      "version": "2.6.0",
+      "version": "2.7.0",
       "license": "ISC",
       "dependencies": {
         "@nuxtjs/axios": "^5.13.6",
diff --git a/client/package.json b/client/package.json
index a13b5815..e404e7d4 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "buildNumber": 1,
   "description": "Self-hosted audiobook and podcast client",
   "main": "index.js",
diff --git a/package-lock.json b/package-lock.json
index 9df54fdd..8bd0b115 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "audiobookshelf",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "audiobookshelf",
-      "version": "2.6.0",
+      "version": "2.7.0",
       "license": "GPL-3.0",
       "dependencies": {
         "axios": "^0.27.2",
diff --git a/package.json b/package.json
index 061e2a7f..33f483b0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "buildNumber": 1,
   "description": "Self-hosted audiobook and podcast server",
   "main": "index.js",

From a2db81bf7d07a5b8c5f91cf5dcc4e4395c494fc4 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 23 Dec 2023 17:13:44 -0600
Subject: [PATCH 42/47] Fix share button for year in review short card

---
 client/components/stats/YearInReviewShort.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/stats/YearInReviewShort.vue b/client/components/stats/YearInReviewShort.vue
index daa566a6..18b12087 100644
--- a/client/components/stats/YearInReviewShort.vue
+++ b/client/components/stats/YearInReviewShort.vue
@@ -152,7 +152,7 @@ export default {
     },
     share() {
       this.canvas.toBlob((blob) => {
-        const file = new File([blob], 'yearinreviewserver.png', { type: blob.type + 'cat' })
+        const file = new File([blob], 'yearinreviewshort.png', { type: blob.type })
         const shareData = {
           files: [file]
         }

From cd7c4baaafd46fe165e6c561bb6e881e2429cc2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20Barga=C5=84ski?= <a.barganski@gmail.com>
Date: Fri, 22 Dec 2023 20:35:38 +0100
Subject: [PATCH 43/47] Add: OPF file supports multiple series as sequence of :
 calibre:series and calibre:series_index; including tests

---
 server/scanner/OpfFileScanner.js              |  7 +-
 server/utils/parsers/parseOpfMetadata.js      | 24 ++++--
 .../utils/parsers/parseOpfMetadata.test.js    | 85 +++++++++++++++++++
 3 files changed, 102 insertions(+), 14 deletions(-)
 create mode 100644 test/server/utils/parsers/parseOpfMetadata.test.js

diff --git a/server/scanner/OpfFileScanner.js b/server/scanner/OpfFileScanner.js
index abc2540a..87c4f565 100644
--- a/server/scanner/OpfFileScanner.js
+++ b/server/scanner/OpfFileScanner.js
@@ -32,11 +32,8 @@ class OpfFileScanner {
             bookMetadata.narrators = opfMetadata.narrators
           }
         } else if (key === 'series') {
-          if (opfMetadata.series) {
-            bookMetadata.series = [{
-              name: opfMetadata.series,
-              sequence: opfMetadata.sequence || null
-            }]
+          if (opfMetadata.series?.length) {
+            bookMetadata.series = opfMetadata.series
           }
         } else if (opfMetadata[key] && key !== 'sequence') {
           bookMetadata[key] = opfMetadata[key]
diff --git a/server/utils/parsers/parseOpfMetadata.js b/server/utils/parsers/parseOpfMetadata.js
index d5fb4651..4c057197 100644
--- a/server/utils/parsers/parseOpfMetadata.js
+++ b/server/utils/parsers/parseOpfMetadata.js
@@ -100,13 +100,20 @@ function fetchLanguage(metadata) {
 }
 
 function fetchSeries(metadataMeta) {
-  if (!metadataMeta) return null
-  return fetchTagString(metadataMeta, "calibre:series")
-}
-
-function fetchVolumeNumber(metadataMeta) {
-  if (!metadataMeta) return null
-  return fetchTagString(metadataMeta, "calibre:series_index")
+  if (!metadataMeta) return []
+  const result = []
+  for (let i = 0; i < metadataMeta.length; i++) {
+    if (metadataMeta[i].$.name === "calibre:series") {
+      const name = metadataMeta[i].$.content
+      let sequence = null
+      if (i + 1 < metadataMeta.length &&
+          metadataMeta[i + 1].$.name === "calibre:series_index" && metadataMeta[i + 1].$.content) {
+        sequence = metadataMeta[i + 1].$.content
+      }
+      result.push({ name, sequence })
+    }
+  }
+  return result
 }
 
 function fetchNarrators(creators, metadata) {
@@ -173,8 +180,7 @@ module.exports.parseOpfMetadataXML = async (xml) => {
     description: fetchDescription(metadata),
     genres: fetchGenres(metadata),
     language: fetchLanguage(metadata),
-    series: fetchSeries(metadata.meta),
-    sequence: fetchVolumeNumber(metadata.meta),
+    series: fetchSeries(metadataMeta),
     tags: fetchTags(metadata)
   }
   return data
diff --git a/test/server/utils/parsers/parseOpfMetadata.test.js b/test/server/utils/parsers/parseOpfMetadata.test.js
new file mode 100644
index 00000000..c0732273
--- /dev/null
+++ b/test/server/utils/parsers/parseOpfMetadata.test.js
@@ -0,0 +1,85 @@
+const chai = require('chai')
+const expect = chai.expect
+const { parseOpfMetadataXML } = require('../../../../server/utils/parsers/parseOpfMetadata')
+
+
+describe('parseOpfMetadata - test series',  async () => {
+    it('test one serie', async() => {
+        const opf = `
+            <?xml version='1.0' encoding='UTF-8'?>
+            <package xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf" xml:lang="en" version="3.0" unique-identifier="bookid">
+              <metadata>        
+                  <meta name="calibre:series" content="Serie"/>
+                  <meta name="calibre:series_index" content="1"/>
+              </metadata>
+            </package>          
+        `
+        const parsedOpf = await parseOpfMetadataXML(opf)
+        expect(parsedOpf.series).to.deep.equal([{"name": "Serie","sequence": "1"}])
+    })
+
+    it('test more then 1 serie - in correct order', async() => {
+        const opf = `
+            <?xml version='1.0' encoding='UTF-8'?>
+            <package xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf" xml:lang="en" version="3.0" unique-identifier="bookid">
+              <metadata>        
+                  <meta name="calibre:series" content="Serie 1"/>
+                  <meta name="calibre:series_index" content="1"/>
+                  <meta name="calibre:series" content="Serie 2"/>
+                  <meta name="calibre:series_index" content="2"/>
+                  <meta name="calibre:series" content="Serie 3"/>
+                  <meta name="calibre:series_index" content="3"/>
+              </metadata>
+            </package>          
+        `
+        const parsedOpf = await parseOpfMetadataXML(opf)
+        expect(parsedOpf.series).to.deep.equal([
+            {"name": "Serie 1","sequence": "1"},
+            {"name": "Serie 2","sequence": "2"},
+            {"name": "Serie 3","sequence": "3"},
+        ])
+    })
+
+    it('test messed order of series content and index', async() => {
+        const opf = `
+            <?xml version='1.0' encoding='UTF-8'?>
+            <package xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf" xml:lang="en" version="3.0" unique-identifier="bookid">
+              <metadata>        
+                  <meta name="calibre:series" content="Serie 1"/>
+                  <meta name="calibre:series_index" content="1"/>
+                  <meta name="calibre:series_index" content="2"/>
+                  <meta name="calibre:series_index" content="3"/>
+                  <meta name="calibre:series" content="Serie 3"/>
+              </metadata>
+            </package>          
+        `
+        const parsedOpf = await parseOpfMetadataXML(opf)
+        expect(parsedOpf.series).to.deep.equal([
+            {"name": "Serie 1","sequence": "1"},
+            {"name": "Serie 3","sequence": null},
+        ])
+    })
+
+    it('test different values of series content and index', async() => {
+        const opf = `
+            <?xml version='1.0' encoding='UTF-8'?>
+            <package xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf" xml:lang="en" version="3.0" unique-identifier="bookid">
+              <metadata>        
+                  <meta name="calibre:series" content="Serie 1"/>
+                  <meta name="calibre:series_index"/>
+                  <meta name="calibre:series" content="Serie 2"/>
+                  <meta name="calibre:series_index" content="abc"/>
+                  <meta name="calibre:series" content="Serie 3"/>
+                  <meta name="calibre:series_index" content=""/>
+              </metadata>
+            </package>          
+        `
+        const parsedOpf = await parseOpfMetadataXML(opf)
+        // console.log(JSON.stringify(parsedOpf, null, 4))
+        expect(parsedOpf.series).to.deep.equal([
+            {"name": "Serie 1", "sequence": null},
+            {"name": "Serie 2", "sequence": "abc"},
+            {"name": "Serie 3", "sequence": null},
+        ])
+    })
+})

From 6de0465b869aadecc80366e3fcd4cbc8483eb318 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 24 Dec 2023 11:41:27 -0600
Subject: [PATCH 44/47] Update opf parser to ignore series with empty content
 and add tests

---
 server/utils/parsers/parseOpfMetadata.js      |  9 +--
 .../utils/parsers/parseOpfMetadata.test.js    | 76 +++++++++++++------
 2 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/server/utils/parsers/parseOpfMetadata.js b/server/utils/parsers/parseOpfMetadata.js
index 4c057197..b51ceea5 100644
--- a/server/utils/parsers/parseOpfMetadata.js
+++ b/server/utils/parsers/parseOpfMetadata.js
@@ -103,12 +103,11 @@ function fetchSeries(metadataMeta) {
   if (!metadataMeta) return []
   const result = []
   for (let i = 0; i < metadataMeta.length; i++) {
-    if (metadataMeta[i].$.name === "calibre:series") {
-      const name = metadataMeta[i].$.content
+    if (metadataMeta[i].$?.name === "calibre:series" && metadataMeta[i].$.content?.trim()) {
+      const name = metadataMeta[i].$.content.trim()
       let sequence = null
-      if (i + 1 < metadataMeta.length &&
-          metadataMeta[i + 1].$.name === "calibre:series_index" && metadataMeta[i + 1].$.content) {
-        sequence = metadataMeta[i + 1].$.content
+      if (metadataMeta[i + 1]?.$?.name === "calibre:series_index" && metadataMeta[i + 1].$?.content?.trim()) {
+        sequence = metadataMeta[i + 1].$.content.trim()
       }
       result.push({ name, sequence })
     }
diff --git a/test/server/utils/parsers/parseOpfMetadata.test.js b/test/server/utils/parsers/parseOpfMetadata.test.js
index c0732273..f1d5ce89 100644
--- a/test/server/utils/parsers/parseOpfMetadata.test.js
+++ b/test/server/utils/parsers/parseOpfMetadata.test.js
@@ -2,27 +2,26 @@ const chai = require('chai')
 const expect = chai.expect
 const { parseOpfMetadataXML } = require('../../../../server/utils/parsers/parseOpfMetadata')
 
-
-describe('parseOpfMetadata - test series',  async () => {
-    it('test one serie', async() => {
+describe('parseOpfMetadata - test series', async () => {
+    it('test one series', async () => {
         const opf = `
             <?xml version='1.0' encoding='UTF-8'?>
             <package xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf" xml:lang="en" version="3.0" unique-identifier="bookid">
-              <metadata>        
+              <metadata>
                   <meta name="calibre:series" content="Serie"/>
                   <meta name="calibre:series_index" content="1"/>
               </metadata>
-            </package>          
+            </package>
         `
         const parsedOpf = await parseOpfMetadataXML(opf)
-        expect(parsedOpf.series).to.deep.equal([{"name": "Serie","sequence": "1"}])
+        expect(parsedOpf.series).to.deep.equal([{ "name": "Serie", "sequence": "1" }])
     })
 
-    it('test more then 1 serie - in correct order', async() => {
+    it('test more then 1 series - in correct order', async () => {
         const opf = `
             <?xml version='1.0' encoding='UTF-8'?>
             <package xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf" xml:lang="en" version="3.0" unique-identifier="bookid">
-              <metadata>        
+              <metadata>
                   <meta name="calibre:series" content="Serie 1"/>
                   <meta name="calibre:series_index" content="1"/>
                   <meta name="calibre:series" content="Serie 2"/>
@@ -30,41 +29,41 @@ describe('parseOpfMetadata - test series',  async () => {
                   <meta name="calibre:series" content="Serie 3"/>
                   <meta name="calibre:series_index" content="3"/>
               </metadata>
-            </package>          
+            </package>
         `
         const parsedOpf = await parseOpfMetadataXML(opf)
         expect(parsedOpf.series).to.deep.equal([
-            {"name": "Serie 1","sequence": "1"},
-            {"name": "Serie 2","sequence": "2"},
-            {"name": "Serie 3","sequence": "3"},
+            { "name": "Serie 1", "sequence": "1" },
+            { "name": "Serie 2", "sequence": "2" },
+            { "name": "Serie 3", "sequence": "3" },
         ])
     })
 
-    it('test messed order of series content and index', async() => {
+    it('test messed order of series content and index', async () => {
         const opf = `
             <?xml version='1.0' encoding='UTF-8'?>
             <package xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf" xml:lang="en" version="3.0" unique-identifier="bookid">
-              <metadata>        
+              <metadata>
                   <meta name="calibre:series" content="Serie 1"/>
                   <meta name="calibre:series_index" content="1"/>
                   <meta name="calibre:series_index" content="2"/>
                   <meta name="calibre:series_index" content="3"/>
                   <meta name="calibre:series" content="Serie 3"/>
               </metadata>
-            </package>          
+            </package>
         `
         const parsedOpf = await parseOpfMetadataXML(opf)
         expect(parsedOpf.series).to.deep.equal([
-            {"name": "Serie 1","sequence": "1"},
-            {"name": "Serie 3","sequence": null},
+            { "name": "Serie 1", "sequence": "1" },
+            { "name": "Serie 3", "sequence": null },
         ])
     })
 
-    it('test different values of series content and index', async() => {
+    it('test different values of series content and index', async () => {
         const opf = `
             <?xml version='1.0' encoding='UTF-8'?>
             <package xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf" xml:lang="en" version="3.0" unique-identifier="bookid">
-              <metadata>        
+              <metadata>
                   <meta name="calibre:series" content="Serie 1"/>
                   <meta name="calibre:series_index"/>
                   <meta name="calibre:series" content="Serie 2"/>
@@ -72,14 +71,43 @@ describe('parseOpfMetadata - test series',  async () => {
                   <meta name="calibre:series" content="Serie 3"/>
                   <meta name="calibre:series_index" content=""/>
               </metadata>
-            </package>          
+            </package>
         `
         const parsedOpf = await parseOpfMetadataXML(opf)
-        // console.log(JSON.stringify(parsedOpf, null, 4))
         expect(parsedOpf.series).to.deep.equal([
-            {"name": "Serie 1", "sequence": null},
-            {"name": "Serie 2", "sequence": "abc"},
-            {"name": "Serie 3", "sequence": null},
+            { "name": "Serie 1", "sequence": null },
+            { "name": "Serie 2", "sequence": "abc" },
+            { "name": "Serie 3", "sequence": null },
+        ])
+    })
+
+    it('test empty series content', async () => {
+        const opf = `
+            <?xml version='1.0' encoding='UTF-8'?>
+            <package xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf" xml:lang="en" version="3.0" unique-identifier="bookid">
+              <metadata>
+                  <meta name="calibre:series" content=""/>
+                  <meta name="calibre:series_index" content=""/>
+              </metadata>
+            </package>
+        `
+        const parsedOpf = await parseOpfMetadataXML(opf)
+        expect(parsedOpf.series).to.deep.equal([])
+    })
+
+    it('test series and index using an xml namespace', async () => {
+        const opf = `
+            <?xml version='1.0' encoding='UTF-8'?>
+            <ns0:package xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf" xml:lang="en" version="3.0" unique-identifier="bookid">
+              <ns0:metadata>
+                  <ns0:meta name="calibre:series" content="Serie 1"/>
+                  <ns0:meta name="calibre:series_index" content=""/>
+              </ns0:metadata>
+            </ns0:package>
+        `
+        const parsedOpf = await parseOpfMetadataXML(opf)
+        expect(parsedOpf.series).to.deep.equal([
+            { "name": "Serie 1", "sequence": null }
         ])
     })
 })

From 14f42e15d1ef002e3504ab6509e0e90f704b1dbe Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 24 Dec 2023 11:53:57 -0600
Subject: [PATCH 45/47] Fix:Book scanner update book series sequence if changed

---
 server/scanner/BookScanner.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/server/scanner/BookScanner.js b/server/scanner/BookScanner.js
index 48e8529a..6c93dddf 100644
--- a/server/scanner/BookScanner.js
+++ b/server/scanner/BookScanner.js
@@ -217,7 +217,8 @@ class BookScanner {
       } else if (key === 'series') {
         // Check for series added
         for (const seriesObj of bookMetadata.series) {
-          if (!media.series.some(se => se.name === seriesObj.name)) {
+          const existingBookSeries = media.series.find(se => se.name === seriesObj.name)
+          if (!existingBookSeries) {
             const existingSeries = Database.libraryFilterData[libraryItemData.libraryId].series.find(se => se.name === seriesObj.name)
             if (existingSeries) {
               await Database.bookSeriesModel.create({
@@ -238,6 +239,11 @@ class BookScanner {
               libraryScan.addLog(LogLevel.DEBUG, `Updating book "${bookMetadata.title}" added new series "${seriesObj.name}"${seriesObj.sequence ? ` with sequence "${seriesObj.sequence}"` : ''}`)
               seriesUpdated = true
             }
+          } else if (seriesObj.sequence && existingBookSeries.bookSeries.sequence !== seriesObj.sequence) {
+            libraryScan.addLog(LogLevel.DEBUG, `Updating book "${bookMetadata.title}" series "${seriesObj.name}" sequence "${existingBookSeries.bookSeries.sequence || ''}" => "${seriesObj.sequence}"`)
+            seriesUpdated = true
+            existingBookSeries.bookSeries.sequence = seriesObj.sequence
+            await existingBookSeries.bookSeries.save()
           }
         }
         // Check for series removed
@@ -657,7 +663,7 @@ class BookScanner {
       if (!this.libraryItemData.metadataNfoLibraryFile) return
       await NfoFileScanner.scanBookNfoFile(this.libraryItemData.metadataNfoLibraryFile, this.bookMetadata)
     }
-    
+
     /**
      * Description from desc.txt and narrator from reader.txt
      */

From 209847d98ad67118e567c767d4cd2b07c3d4427e Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Mon, 25 Dec 2023 09:25:04 +0200
Subject: [PATCH 46/47] Add a SIGINT handler for proper server shutdown

---
 server/Server.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/server/Server.js b/server/Server.js
index 5e8cab76..3de8ff7f 100644
--- a/server/Server.js
+++ b/server/Server.js
@@ -276,6 +276,19 @@ class Server {
     })
     app.get('/healthcheck', (req, res) => res.sendStatus(200))
 
+    let sigintAlreadyReceived = false
+    process.on('SIGINT', async () => {
+      if (!sigintAlreadyReceived) {
+        sigintAlreadyReceived = true
+        Logger.info('SIGINT (Ctrl+C) received. Shutting down...')
+        await this.stop()
+        Logger.info('Server stopped. Exiting.')
+      } else {
+        Logger.info('SIGINT (Ctrl+C) received again. Exiting immediately.')        
+      }
+      process.exit(0)
+    })
+
     this.server.listen(this.Port, this.Host, () => {
       if (this.Host) Logger.info(`Listening on http://${this.Host}:${this.Port}`)
       else Logger.info(`Listening on port :${this.Port}`)
@@ -383,6 +396,7 @@ class Server {
   }
 
   async stop() {
+    Logger.info('=== Stopping Server ===')
     await this.watcher.close()
     Logger.info('Watcher Closed')
 

From 0d0bdce3374108dfa21a1c6d3ff6469d9c6b63f3 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Mon, 25 Dec 2023 13:15:55 -0600
Subject: [PATCH 47/47] Fix:Fetch RSS feed request accept header #2446

---
 server/utils/podcastUtils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/utils/podcastUtils.js b/server/utils/podcastUtils.js
index 819ec914..4e01c92b 100644
--- a/server/utils/podcastUtils.js
+++ b/server/utils/podcastUtils.js
@@ -233,7 +233,7 @@ module.exports.getPodcastFeed = (feedUrl, excludeEpisodeMetadata = false) => {
     method: 'GET',
     timeout: 12000,
     responseType: 'arraybuffer',
-    headers: { Accept: 'application/rss+xml' },
+    headers: { Accept: 'application/rss+xml, application/xhtml+xml, application/xml' },
     httpAgent: ssrfFilter(feedUrl),
     httpsAgent: ssrfFilter(feedUrl)
   }).then(async (data) => {