Fix user stats heatmap caption text to be accurate

Merge pull request #3754 from maxlajoie99/feature/experimental-proxy-support
Experimental proxy support by manually following redirects
2025-12-31 11:38:47 -05:00 · 2025-01-01 13:49:22 -06:00 · 2025-01-01 12:54:25 -06:00 · 2025-01-01 12:48:58 -06:00 · 2025-01-01 12:17:10 -06:00 · 2025-01-01 12:06:01 -06:00
45 changed files with 834 additions and 623 deletions
--- a/client/components/app/MediaPlayerContainer.vue
+++ b/client/components/app/MediaPlayerContainer.vue
@@ -374,19 +374,27 @@ export default {
        return
      }

+      // https://developer.mozilla.org/en-US/docs/Web/API/Media_Session_API
      if ('mediaSession' in navigator) {
-        var coverImageSrc = this.$store.getters['globals/getLibraryItemCoverSrc'](this.streamLibraryItem, '/Logo.png', true)
-        const artwork = [
-          {
-            src: coverImageSrc
-          }
-        ]
+        const chapterInfo = []
+        if (this.chapters.length) {
+          this.chapters.forEach((chapter) => {
+            chapterInfo.push({
+              title: chapter.title,
+              startTime: chapter.start
+            })
+          })
+        }

        navigator.mediaSession.metadata = new MediaMetadata({
          title: this.title,
          artist: this.playerHandler.displayAuthor || this.mediaMetadata.authorName || 'Unknown',
          album: this.mediaMetadata.seriesName || '',
-          artwork
+          artwork: [
+            {
+              src: this.$store.getters['globals/getLibraryItemCoverSrc'](this.streamLibraryItem, '/Logo.png', true)
+            }
+          ]
        })
        console.log('Set media session metadata', navigator.mediaSession.metadata)

--- a/client/components/modals/playlists/AddCreateModal.vue
+++ b/client/components/modals/playlists/AddCreateModal.vue
@@ -130,7 +130,6 @@ export default {
        .$post(`/api/playlists/${playlist.id}/batch/remove`, { items: itemObjects })
        .then((updatedPlaylist) => {
          console.log(`Items removed from playlist`, updatedPlaylist)
-          this.$toast.success(this.$strings.ToastPlaylistUpdateSuccess)
          this.processing = false
        })
        .catch((error) => {
@@ -148,7 +147,6 @@ export default {
        .$post(`/api/playlists/${playlist.id}/batch/add`, { items: itemObjects })
        .then((updatedPlaylist) => {
          console.log(`Items added to playlist`, updatedPlaylist)
-          this.$toast.success(this.$strings.ToastPlaylistUpdateSuccess)
          this.processing = false
        })
        .catch((error) => {
@@ -174,7 +172,6 @@ export default {
        .$post('/api/playlists', newPlaylist)
        .then((data) => {
          console.log('New playlist created', data)
-          this.$toast.success(this.$strings.ToastPlaylistCreateSuccess + ': ' + data.name)
          this.processing = false
          this.newPlaylistName = ''
        })
--- a/client/components/stats/Heatmap.vue
+++ b/client/components/stats/Heatmap.vue
@@ -1,7 +1,7 @@
 <template>
  <div id="heatmap" class="w-full">
    <div class="mx-auto" :style="{ height: innerHeight + 160 + 'px', width: innerWidth + 52 + 'px' }" style="background-color: rgba(13, 17, 23, 0)">
-      <p class="mb-2 px-1 text-sm text-gray-200">{{ $getString('MessageListeningSessionsInTheLastYear', [Object.values(daysListening).length]) }}</p>
+      <p class="mb-2 px-1 text-sm text-gray-200">{{ $getString('MessageDaysListenedInTheLastYear', [daysListenedInTheLastYear]) }}</p>
      <div class="border border-white border-opacity-25 rounded py-2 w-full" style="background-color: #232323" :style="{ height: innerHeight + 80 + 'px' }">
        <div :style="{ width: innerWidth + 'px', height: innerHeight + 'px' }" class="ml-10 mt-5 absolute" @mouseover="mouseover" @mouseout="mouseout">
          <div v-for="dayLabel in dayLabels" :key="dayLabel.label" :style="dayLabel.style" class="absolute top-0 left-0 text-gray-300">{{ dayLabel.label }}</div>
@@ -37,6 +37,7 @@ export default {
      innerHeight: 13 * 7,
      blockWidth: 13,
      data: [],
+      daysListenedInTheLastYear: 0,
      monthLabels: [],
      tooltipEl: null,
      tooltipTextEl: null,
@@ -193,46 +194,47 @@ export default {
    buildData() {
      this.data = []

-      var maxValue = 0
-      var minValue = 0
-      Object.values(this.daysListening).forEach((val) => {
-        if (val > maxValue) maxValue = val
-        if (!minValue || val < minValue) minValue = val
-      })
-      const range = maxValue - minValue + 0.01
+      let maxValue = 0
+      let minValue = 0

+      const dates = []
      for (let i = 0; i < this.daysToShow + 1; i++) {
-        const col = Math.floor(i / 7)
-        const row = i % 7
-
        const date = i === 0 ? this.firstWeekStart : this.$addDaysToDate(this.firstWeekStart, i)
        const dateString = this.$formatJsDate(date, 'yyyy-MM-dd')
-        const datePretty = this.$formatJsDate(date, 'MMM d, yyyy')
-        const monthString = this.$formatJsDate(date, 'MMM')
-        const value = this.daysListening[dateString] || 0
-        const x = col * 13
-        const y = row * 13
+        const dateObj = {
+          col: Math.floor(i / 7),
+          row: i % 7,
+          date,
+          dateString,
+          datePretty: this.$formatJsDate(date, 'MMM d, yyyy'),
+          monthString: this.$formatJsDate(date, 'MMM'),
+          dayOfMonth: Number(dateString.split('-').pop()),
+          yearString: dateString.split('-').shift(),
+          value: this.daysListening[dateString] || 0
+        }
+        dates.push(dateObj)

-        var bgColor = this.bgColors[0]
-        var outlineColor = this.outlineColors[0]
-        if (value) {
+        if (dateObj.value > 0) {
+          this.daysListenedInTheLastYear++
+          if (dateObj.value > maxValue) maxValue = dateObj.value
+          if (!minValue || dateObj.value < minValue) minValue = dateObj.value
+        }
+      }
+      const range = maxValue - minValue + 0.01
+
+      for (const dateObj of dates) {
+        let bgColor = this.bgColors[0]
+        let outlineColor = this.outlineColors[0]
+        if (dateObj.value) {
          outlineColor = this.outlineColors[1]
-          var percentOfAvg = (value - minValue) / range
-          var bgIndex = Math.floor(percentOfAvg * 4) + 1
+          const percentOfAvg = (dateObj.value - minValue) / range
+          const bgIndex = Math.floor(percentOfAvg * 4) + 1
          bgColor = this.bgColors[bgIndex] || 'red'
        }

        this.data.push({
-          date,
-          dateString,
-          datePretty,
-          monthString,
-          dayOfMonth: Number(dateString.split('-').pop()),
-          yearString: dateString.split('-').shift(),
-          value,
-          col,
-          row,
-          style: `transform:translate(${x}px,${y}px);background-color:${bgColor};outline:1px solid ${outlineColor};outline-offset:-1px;`
+          ...dateObj,
+          style: `transform:translate(${dateObj.col * 13}px,${dateObj.row * 13}px);background-color:${bgColor};outline:1px solid ${outlineColor};outline-offset:-1px;`
        })
      }

@@ -260,6 +262,7 @@ export default {
      const heatmapEl = document.getElementById('heatmap')
      this.contentWidth = heatmapEl.clientWidth
      this.maxInnerWidth = this.contentWidth - 52
+      this.daysListenedInTheLastYear = 0
      this.buildData()
    }
  },
--- a/client/components/tables/playlist/ItemTableRow.vue
+++ b/client/components/tables/playlist/ItemTableRow.vue
@@ -218,7 +218,6 @@ export default {
            this.$toast.success(this.$strings.ToastPlaylistRemoveSuccess)
          } else {
            console.log(`Item removed from playlist`, updatedPlaylist)
-            this.$toast.success(this.$strings.ToastPlaylistUpdateSuccess)
          }
        })
        .catch((error) => {
--- a/client/pages/share/_slug.vue
+++ b/client/pages/share/_slug.vue
@@ -110,6 +110,84 @@ export default {
    }
  },
  methods: {
+    mediaSessionPlay() {
+      console.log('Media session play')
+      this.play()
+    },
+    mediaSessionPause() {
+      console.log('Media session pause')
+      this.pause()
+    },
+    mediaSessionStop() {
+      console.log('Media session stop')
+      this.pause()
+    },
+    mediaSessionSeekBackward() {
+      console.log('Media session seek backward')
+      this.jumpBackward()
+    },
+    mediaSessionSeekForward() {
+      console.log('Media session seek forward')
+      this.jumpForward()
+    },
+    mediaSessionSeekTo(e) {
+      console.log('Media session seek to', e)
+      if (e.seekTime !== null && !isNaN(e.seekTime)) {
+        this.seek(e.seekTime)
+      }
+    },
+    mediaSessionPreviousTrack() {
+      if (this.$refs.audioPlayer) {
+        this.$refs.audioPlayer.prevChapter()
+      }
+    },
+    mediaSessionNextTrack() {
+      if (this.$refs.audioPlayer) {
+        this.$refs.audioPlayer.nextChapter()
+      }
+    },
+    updateMediaSessionPlaybackState() {
+      if ('mediaSession' in navigator) {
+        navigator.mediaSession.playbackState = this.isPlaying ? 'playing' : 'paused'
+      }
+    },
+    setMediaSession() {
+      // https://developer.mozilla.org/en-US/docs/Web/API/Media_Session_API
+      if ('mediaSession' in navigator) {
+        const chapterInfo = []
+        if (this.chapters.length > 0) {
+          this.chapters.forEach((chapter) => {
+            chapterInfo.push({
+              title: chapter.title,
+              startTime: chapter.start
+            })
+          })
+        }
+
+        navigator.mediaSession.metadata = new MediaMetadata({
+          title: this.mediaItemShare.playbackSession.displayTitle || 'No title',
+          artist: this.mediaItemShare.playbackSession.displayAuthor || 'Unknown',
+          artwork: [
+            {
+              src: this.coverUrl
+            }
+          ],
+          chapterInfo
+        })
+        console.log('Set media session metadata', navigator.mediaSession.metadata)
+
+        navigator.mediaSession.setActionHandler('play', this.mediaSessionPlay)
+        navigator.mediaSession.setActionHandler('pause', this.mediaSessionPause)
+        navigator.mediaSession.setActionHandler('stop', this.mediaSessionStop)
+        navigator.mediaSession.setActionHandler('seekbackward', this.mediaSessionSeekBackward)
+        navigator.mediaSession.setActionHandler('seekforward', this.mediaSessionSeekForward)
+        navigator.mediaSession.setActionHandler('seekto', this.mediaSessionSeekTo)
+        navigator.mediaSession.setActionHandler('previoustrack', this.mediaSessionSeekBackward)
+        navigator.mediaSession.setActionHandler('nexttrack', this.mediaSessionSeekForward)
+      } else {
+        console.warn('Media session not available')
+      }
+    },
    async coverImageLoaded(e) {
      if (!this.playbackSession.coverPath) return
      const fac = new FastAverageColor()
@@ -126,8 +204,19 @@ export default {
        })
    },
    playPause() {
+      if (this.isPlaying) {
+        this.pause()
+      } else {
+        this.play()
+      }
+    },
+    play() {
      if (!this.localAudioPlayer || !this.hasLoaded) return
-      this.localAudioPlayer.playPause()
+      this.localAudioPlayer.play()
+    },
+    pause() {
+      if (!this.localAudioPlayer || !this.hasLoaded) return
+      this.localAudioPlayer.pause()
    },
    jumpForward() {
      if (!this.localAudioPlayer || !this.hasLoaded) return
@@ -213,6 +302,7 @@ export default {
      } else {
        this.stopPlayInterval()
      }
+      this.updateMediaSessionPlaybackState()
    },
    playerTimeUpdate(time) {
      this.setCurrentTime(time)
@@ -276,6 +366,8 @@ export default {
    this.localAudioPlayer.on('timeupdate', this.playerTimeUpdate.bind(this))
    this.localAudioPlayer.on('error', this.playerError.bind(this))
    this.localAudioPlayer.on('finished', this.playerFinished.bind(this))
+
+    this.setMediaSession()
  },
  beforeDestroy() {
    window.removeEventListener('resize', this.resize)
--- a/client/strings/bg.json
+++ b/client/strings/bg.json
@@ -629,7 +629,6 @@
  "MessageItemsSelected": "{0} избрани",
  "MessageItemsUpdated": "{0} елемента обновени",
  "MessageJoinUsOn": "Присъединете се към нас",
-  "MessageListeningSessionsInTheLastYear": "{0} слушателски сесии през последната година",
  "MessageLoading": "Зареждане...",
  "MessageLoadingFolders": "Зареждане на Папки...",
  "MessageM4BFailed": "M4B Провалено!",
--- a/client/strings/bn.json
+++ b/client/strings/bn.json
@@ -763,7 +763,6 @@
  "MessageItemsSelected": "{0}টি আইটেম নির্বাচিত",
  "MessageItemsUpdated": "{0}টি আইটেম আপডেট করা হয়েছে",
  "MessageJoinUsOn": "আমাদের সাথে যোগ দিন",
-  "MessageListeningSessionsInTheLastYear": "গত বছরে {0}টি শোনার সেশন",
  "MessageLoading": "লোড হচ্ছে.।",
  "MessageLoadingFolders": "ফোল্ডার লোড হচ্ছে...",
  "MessageLogsDescription": "লগগুলি JSON ফাইল হিসাবে <code>/metadata/logs</code>-এ সংরক্ষণ করা হয়। ক্র্যাশ লগগুলি <code>/metadata/logs/crash_logs.txt</code>-এ সংরক্ষণ করা হয়।",
--- a/client/strings/cs.json
+++ b/client/strings/cs.json
@@ -771,7 +771,6 @@
  "MessageItemsSelected": "{0} vybraných položek",
  "MessageItemsUpdated": "{0} položky byly aktualizovány",
  "MessageJoinUsOn": "Přidejte se k nám",
-  "MessageListeningSessionsInTheLastYear": "{0} poslechových relací za poslední rok",
  "MessageLoading": "Načítá se...",
  "MessageLoadingFolders": "Načítám složky...",
  "MessageLogsDescription": "Protokoly se ukládají do souborů JSON v <code>/metadata/logs</code>. Protokoly o pádech jsou uloženy v <code>/metadata/logs/crash_logs.txt</code>.",
--- a/client/strings/da.json
+++ b/client/strings/da.json
@@ -539,7 +539,6 @@
  "MessageItemsSelected": "{0} elementer valgt",
  "MessageItemsUpdated": "{0} elementer opdateret",
  "MessageJoinUsOn": "Deltag i os på",
-  "MessageListeningSessionsInTheLastYear": "{0} lyttesessioner i det sidste år",
  "MessageLoading": "Indlæser...",
  "MessageLoadingFolders": "Indlæser mapper...",
  "MessageM4BFailed": "M4B mislykkedes!",
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -771,7 +771,6 @@
  "MessageItemsSelected": "{0} ausgewählte Medien",
  "MessageItemsUpdated": "{0} Medien aktualisiert",
  "MessageJoinUsOn": "Besuche uns auf",
-  "MessageListeningSessionsInTheLastYear": "{0} Ereignisse im letzten Jahr",
  "MessageLoading": "Wird geladen …",
  "MessageLoadingFolders": "Lade Ordner...",
  "MessageLogsDescription": "Die Logs werdern in <code>/metadata/logs</code> als JSON Dateien gespeichert. Crash logs werden in <code>/metadata/logs/crash_logs.txt</code> gespeichert.",
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -758,6 +758,7 @@
  "MessageConfirmResetProgress": "Are you sure you want to reset your progress?",
  "MessageConfirmSendEbookToDevice": "Are you sure you want to send {0} ebook \"{1}\" to device \"{2}\"?",
  "MessageConfirmUnlinkOpenId": "Are you sure you want to unlink this user from OpenID?",
+  "MessageDaysListenedInTheLastYear": "{0} days listened in the last year",
  "MessageDownloadingEpisode": "Downloading episode",
  "MessageDragFilesIntoTrackOrder": "Drag files into correct track order",
  "MessageEmbedFailed": "Embed Failed!",
@@ -773,7 +774,6 @@
  "MessageItemsSelected": "{0} Items Selected",
  "MessageItemsUpdated": "{0} Items Updated",
  "MessageJoinUsOn": "Join us on",
-  "MessageListeningSessionsInTheLastYear": "{0} listening sessions in the last year",
  "MessageLoading": "Loading...",
  "MessageLoadingFolders": "Loading folders...",
  "MessageLogsDescription": "Logs are stored in <code>/metadata/logs</code> as JSON files. Crash logs are stored in <code>/metadata/logs/crash_logs.txt</code>.",
--- a/client/strings/es.json
+++ b/client/strings/es.json
@@ -771,7 +771,6 @@
  "MessageItemsSelected": "{0} Elementos Seleccionados",
  "MessageItemsUpdated": "{0} Elementos Actualizados",
  "MessageJoinUsOn": "Únetenos en",
-  "MessageListeningSessionsInTheLastYear": "{0} sesiones de escucha en el último año",
  "MessageLoading": "Cargando...",
  "MessageLoadingFolders": "Cargando archivos...",
  "MessageLogsDescription": "Logs son almacenados en <code>/metadata/logs</code> en archivos bajo formato JSON. Logs de fallos son almacenados en <code>/metadata/logs/crash_logs.txt</code>.",
--- a/client/strings/et.json
+++ b/client/strings/et.json
@@ -611,7 +611,6 @@
  "MessageItemsSelected": "{0} Valitud üksust",
  "MessageItemsUpdated": "{0} Üksust on uuendatud",
  "MessageJoinUsOn": "Liitu meiega",
-  "MessageListeningSessionsInTheLastYear": "Kuulamissessioone viimase aasta jooksul: {0}",
  "MessageLoading": "Laadimine...",
  "MessageLoadingFolders": "Kaustade laadimine...",
  "MessageM4BFailed": "M4B ebaõnnestus!",
--- a/client/strings/fr.json
+++ b/client/strings/fr.json
@@ -765,7 +765,6 @@
  "MessageItemsSelected": "{0} éléments sélectionnés",
  "MessageItemsUpdated": "{0} éléments mis à jour",
  "MessageJoinUsOn": "Rejoignez-nous sur",
-  "MessageListeningSessionsInTheLastYear": "{0} sessions d’écoute l’an dernier",
  "MessageLoading": "Chargement…",
  "MessageLoadingFolders": "Chargement des dossiers…",
  "MessageLogsDescription": "Les journaux sont stockés dans <code>/metadata/logs</code> sous forme de fichiers JSON. Les journaux d’incidents sont stockés dans <code>/metadata/logs/crash_logs.txt</code>.",
--- a/client/strings/he.json
+++ b/client/strings/he.json
@@ -642,7 +642,6 @@
  "MessageItemsSelected": "{0} פריטים נבחרו",
  "MessageItemsUpdated": "{0} פריטים עודכנו",
  "MessageJoinUsOn": "הצטרף אלינו ב-",
-  "MessageListeningSessionsInTheLastYear": "{0} מפגשי האזנה בשנה האחרונה",
  "MessageLoading": "טוען...",
  "MessageLoadingFolders": "טוען תיקיות...",
  "MessageM4BFailed": "M4B נכשל!",
--- a/client/strings/hr.json
+++ b/client/strings/hr.json
@@ -771,7 +771,6 @@
  "MessageItemsSelected": "{0} odabranih stavki",
  "MessageItemsUpdated": "{0} stavki ažurirano",
  "MessageJoinUsOn": "Pridruži nam se na",
-  "MessageListeningSessionsInTheLastYear": "{0} slušanja u prošloj godini",
  "MessageLoading": "Učitavam...",
  "MessageLoadingFolders": "Učitavam mape...",
  "MessageLogsDescription": "Zapisnici se čuvaju u <code>/metadata/logs</code> u obliku JSON datoteka. Zapisnici pada sustava čuvaju se u datoteci <code>/metadata/logs/crash_logs.txt</code>.",
--- a/client/strings/hu.json
+++ b/client/strings/hu.json
@@ -764,7 +764,6 @@
  "MessageItemsSelected": "{0} kiválasztott elem",
  "MessageItemsUpdated": "{0} frissített elem",
  "MessageJoinUsOn": "Csatlakozzon hozzánk a",
-  "MessageListeningSessionsInTheLastYear": "{0} hallgatási munkamenet az elmúlt évben",
  "MessageLoading": "Betöltés...",
  "MessageLoadingFolders": "Mappák betöltése...",
  "MessageLogsDescription": "A naplók a <code>/metadata/logs</code> mappában JSON-fájlokként tárolódnak. Az összeomlási naplók a <code>/metadata/logs/crash_logs.txt</code> fájlban tárolódnak.",
--- a/client/strings/it.json
+++ b/client/strings/it.json
@@ -762,7 +762,6 @@
  "MessageItemsSelected": "{0} oggetti Selezionati",
  "MessageItemsUpdated": "{0} Oggetti aggiornati",
  "MessageJoinUsOn": "Unisciti a noi su",
-  "MessageListeningSessionsInTheLastYear": "{0} sessioni di ascolto nell'ultimo anno",
  "MessageLoading": "Caricamento…",
  "MessageLoadingFolders": "Caricamento Cartelle...",
  "MessageLogsDescription": "I log vengono archiviati nel percorso <code>/metadata/logs</code> as JSON files. I registri degli arresti anomali vengono archiviati nel percorso <code>/metadata/logs/crash_logs.txt</code>.",
--- a/client/strings/lt.json
+++ b/client/strings/lt.json
@@ -563,7 +563,6 @@
  "MessageItemsSelected": "Pasirinkti {0} elementai (-ų)",
  "MessageItemsUpdated": "Atnaujinti {0} elementai (-ų)",
  "MessageJoinUsOn": "Prisijunkite prie mūsų",
-  "MessageListeningSessionsInTheLastYear": "{0} klausymo sesijų per paskutinius metus",
  "MessageLoading": "Kraunama...",
  "MessageLoadingFolders": "Kraunami aplankai...",
  "MessageM4BFailed": "M4B Nepavyko!",
--- a/client/strings/nl.json
+++ b/client/strings/nl.json
@@ -758,7 +758,6 @@
  "MessageItemsSelected": "{0} onderdelen geselecteerd",
  "MessageItemsUpdated": "{0} onderdelen bijgewerkt",
  "MessageJoinUsOn": "Doe mee op",
-  "MessageListeningSessionsInTheLastYear": "{0} luistersessies in het laatste jaar",
  "MessageLoading": "Aan het laden...",
  "MessageLoadingFolders": "Mappen aan het laden...",
  "MessageLogsDescription": "Logs worden opgeslagen in <code>/metadata/logs</code> als JSON-bestanden. Crashlogs worden opgeslagen in <code>/metadata/logs/crash_logs.txt</code>.",
--- a/client/strings/no.json
+++ b/client/strings/no.json
@@ -769,7 +769,6 @@
  "MessageItemsSelected": "{0} Gjenstander valgt",
  "MessageItemsUpdated": "{0} Gjenstander oppdatert",
  "MessageJoinUsOn": "Følg oss nå",
-  "MessageListeningSessionsInTheLastYear": "{0} Lyttesesjoner iløpet av siste året",
  "MessageLoading": "Laster...",
  "MessageLoadingFolders": "Laster mapper...",
  "MessageM4BFailed": "M4B mislykkes!",
--- a/client/strings/pl.json
+++ b/client/strings/pl.json
@@ -657,7 +657,6 @@
  "MessageInsertChapterBelow": "Wstaw rozdział poniżej",
  "MessageItemsSelected": "{0} zaznaczone elementy",
  "MessageJoinUsOn": "Dołącz do nas na",
-  "MessageListeningSessionsInTheLastYear": "Sesje słuchania w ostatnim roku: {0}",
  "MessageLoading": "Ładowanie...",
  "MessageLoadingFolders": "Ładowanie folderów...",
  "MessageLogsDescription": "Logi zapisane są w <code>/metadata/logs</code> jako pliki JSON. Logi awaryjne są zapisane w <code>/metadata/logs/crash_logs.txt</code>.",
--- a/client/strings/pt-br.json
+++ b/client/strings/pt-br.json
@@ -630,7 +630,6 @@
  "MessageItemsSelected": "{0} Itens Selecionados",
  "MessageItemsUpdated": "{0} Itens Atualizados",
  "MessageJoinUsOn": "Junte-se a nós",
-  "MessageListeningSessionsInTheLastYear": "{0} sessões de escuta no ano anterior",
  "MessageLoading": "Carregando...",
  "MessageLoadingFolders": "Carregando pastas...",
  "MessageLogsDescription": "Os logs estão armazenados em <code>/metadata/logs</code> como arquivos JSON. Logs de crash estão armazenados em <code>/metadata/logs/crash_logs.txt</code>.",
--- a/client/strings/ru.json
+++ b/client/strings/ru.json
@@ -771,7 +771,6 @@
  "MessageItemsSelected": "{0} Элементов выделено",
  "MessageItemsUpdated": "{0} Элементов обновлено",
  "MessageJoinUsOn": "Присоединяйтесь к нам в",
-  "MessageListeningSessionsInTheLastYear": "{0} сеансов прослушивания в прошлом году",
  "MessageLoading": "Загрузка...",
  "MessageLoadingFolders": "Загрузка каталогов...",
  "MessageLogsDescription": "Журналы хранятся в <code>/metadata/logs</code> в виде JSON-файлов. Журналы сбоев хранятся в <code>/metadata/logs/crash_logs.txt</code>.",
--- a/client/strings/sl.json
+++ b/client/strings/sl.json
@@ -771,7 +771,6 @@
  "MessageItemsSelected": "{0} izbranih elementov",
  "MessageItemsUpdated": "Št. posodobljenih elementov: {0}",
  "MessageJoinUsOn": "Pridružite se nam",
-  "MessageListeningSessionsInTheLastYear": "{0} sej poslušanja v zadnjem letu",
  "MessageLoading": "Nalagam...",
  "MessageLoadingFolders": "Nalagam mape...",
  "MessageLogsDescription": "Dnevniki so shranjeni v <code>/metadata/logs</code> kot datoteke JSON. Dnevniki zrušitev so shranjeni v <code>/metadata/logs/crash_logs.txt</code>.",
--- a/client/strings/sv.json
+++ b/client/strings/sv.json
@@ -590,7 +590,6 @@
  "MessageItemsSelected": "{0} Objekt markerade",
  "MessageItemsUpdated": "{0} Objekt uppdaterade",
  "MessageJoinUsOn": "Anslut dig till oss på",
-  "MessageListeningSessionsInTheLastYear": "{0} lyssningssessioner det senaste året",
  "MessageLoading": "Laddar...",
  "MessageLoadingFolders": "Laddar mappar...",
  "MessageM4BFailed": "M4B misslyckades!",
--- a/client/strings/uk.json
+++ b/client/strings/uk.json
@@ -771,7 +771,6 @@
  "MessageItemsSelected": "Обрано елементів: {0}",
  "MessageItemsUpdated": "Оновлено елементів: {0}",
  "MessageJoinUsOn": "Приєднуйтесь до",
-  "MessageListeningSessionsInTheLastYear": "Сесій прослуховування минулого року: {0}",
  "MessageLoading": "Завантаження...",
  "MessageLoadingFolders": "Завантаження тек...",
  "MessageLogsDescription": "Журнали зберігаються у <code>/metadata/logs</code> як JSON-файли. Журнали збоїв зберігаються у <code>/metadata/logs/crash_logs.txt</code>.",
--- a/client/strings/vi-vn.json
+++ b/client/strings/vi-vn.json
@@ -581,7 +581,6 @@
  "MessageItemsSelected": "{0} Mục Đã Chọn",
  "MessageItemsUpdated": "{0} Mục Đã Cập Nhật",
  "MessageJoinUsOn": "Tham gia cùng chúng tôi trên",
-  "MessageListeningSessionsInTheLastYear": "{0} phiên nghe trong năm qua",
  "MessageLoading": "Đang tải...",
  "MessageLoadingFolders": "Đang tải các thư mục...",
  "MessageM4BFailed": "M4B thất bại!",
--- a/client/strings/zh-cn.json
+++ b/client/strings/zh-cn.json
@@ -771,7 +771,6 @@
  "MessageItemsSelected": "已选定 {0} 个项目",
  "MessageItemsUpdated": "已更新 {0} 个项目",
  "MessageJoinUsOn": "加入我们",
-  "MessageListeningSessionsInTheLastYear": "去年收听 {0} 个会话",
  "MessageLoading": "正在加载...",
  "MessageLoadingFolders": "加载文件夹...",
  "MessageLogsDescription": "日志以 JSON 文件形式存储在 <code>/metadata/logs</code> 目录中. 崩溃日志存储在 <code>/metadata/logs/crash_logs.txt</code> 目录中.",
--- a/client/strings/zh-tw.json
+++ b/client/strings/zh-tw.json
@@ -625,7 +625,6 @@
  "MessageItemsSelected": "已選定 {0} 個項目",
  "MessageItemsUpdated": "已更新 {0} 個項目",
  "MessageJoinUsOn": "加入我們",
-  "MessageListeningSessionsInTheLastYear": "去年收聽 {0} 個會話",
  "MessageLoading": "讀取...",
  "MessageLoadingFolders": "讀取資料夾...",
  "MessageM4BFailed": "M4B 失敗!",
--- a/server/Database.js
+++ b/server/Database.js
@@ -406,16 +406,6 @@ class Database {
    return Promise.all(oldBooks.map((oldBook) => this.models.book.saveFromOld(oldBook)))
  }

-  createPlaylistMediaItem(playlistMediaItem) {
-    if (!this.sequelize) return false
-    return this.models.playlistMediaItem.create(playlistMediaItem)
-  }
-
-  createBulkPlaylistMediaItems(playlistMediaItems) {
-    if (!this.sequelize) return false
-    return this.models.playlistMediaItem.bulkCreate(playlistMediaItems)
-  }
-
  async createLibraryItem(oldLibraryItem) {
    if (!this.sequelize) return false
    await oldLibraryItem.saveMetadata()
--- a/server/Server.js
+++ b/server/Server.js
@@ -6,6 +6,7 @@ const util = require('util')
 const fs = require('./libs/fsExtra')
 const fileUpload = require('./libs/expressFileupload')
 const cookieParser = require('cookie-parser')
+const axios = require('axios')

 const { version } = require('../package.json')

@@ -54,7 +55,26 @@ class Server {
    global.XAccel = process.env.USE_X_ACCEL
    global.AllowCors = process.env.ALLOW_CORS === '1'

-    if (process.env.DISABLE_SSRF_REQUEST_FILTER === '1') {
+    if (process.env.EXP_PROXY_SUPPORT === '1') {
+      // https://github.com/advplyr/audiobookshelf/pull/3754
+      Logger.info(`[Server] Experimental Proxy Support Enabled, SSRF Request Filter was Disabled`)
+      global.DisableSsrfRequestFilter = () => true
+
+      axios.defaults.maxRedirects = 0
+      axios.interceptors.response.use(
+        (response) => response,
+        (error) => {
+          if ([301, 302].includes(error.response?.status)) {
+            return axios({
+              ...error.config,
+              url: error.response.headers.location
+            })
+          }
+
+          return Promise.reject(error)
+        }
+      )
+    } else if (process.env.DISABLE_SSRF_REQUEST_FILTER === '1') {
      Logger.info(`[Server] SSRF Request Filter Disabled`)
      global.DisableSsrfRequestFilter = () => true
    } else if (process.env.SSRF_REQUEST_FILTER_WHITELIST?.length) {
--- a/server/controllers/CollectionController.js
+++ b/server/controllers/CollectionController.js
@@ -35,6 +35,9 @@ class CollectionController {
    if (!reqBody.name || !reqBody.libraryId) {
      return res.status(400).send('Invalid collection data')
    }
+    if (reqBody.description && typeof reqBody.description !== 'string') {
+      return res.status(400).send('Invalid collection description')
+    }
    const libraryItemIds = (reqBody.books || []).filter((b) => !!b && typeof b == 'string')
    if (!libraryItemIds.length) {
      return res.status(400).send('Invalid collection data. No books')
--- a/server/controllers/PlaylistController.js
+++ b/server/controllers/PlaylistController.js
@@ -3,13 +3,16 @@ const Logger = require('../Logger')
 const SocketAuthority = require('../SocketAuthority')
 const Database = require('../Database')

-const Playlist = require('../objects/Playlist')
-
 /**
 * @typedef RequestUserObject
 * @property {import('../models/User')} user
 *
 * @typedef {Request & RequestUserObject} RequestWithUser
+ *
+ * @typedef RequestEntityObject
+ * @property {import('../models/Playlist')} playlist
+ *
+ * @typedef {RequestWithUser & RequestEntityObject} PlaylistControllerRequest
 */

 class PlaylistController {
@@ -23,48 +26,103 @@ class PlaylistController {
   * @param {Response} res
   */
  async create(req, res) {
-    const oldPlaylist = new Playlist()
-    req.body.userId = req.user.id
-    const success = oldPlaylist.setData(req.body)
-    if (!success) {
-      return res.status(400).send('Invalid playlist request data')
+    const reqBody = req.body || {}
+
+    // Validation
+    if (!reqBody.name || !reqBody.libraryId) {
+      return res.status(400).send('Invalid playlist data')
+    }
+    if (reqBody.description && typeof reqBody.description !== 'string') {
+      return res.status(400).send('Invalid playlist description')
+    }
+    const items = reqBody.items || []
+    const isPodcast = items.some((i) => i.episodeId)
+    const libraryItemIds = new Set()
+    for (const item of items) {
+      if (!item.libraryItemId || typeof item.libraryItemId !== 'string') {
+        return res.status(400).send('Invalid playlist item')
+      }
+      if (isPodcast && (!item.episodeId || typeof item.episodeId !== 'string')) {
+        return res.status(400).send('Invalid playlist item episodeId')
+      } else if (!isPodcast && item.episodeId) {
+        return res.status(400).send('Invalid playlist item episodeId')
+      }
+      libraryItemIds.add(item.libraryItemId)
    }

-    // Create Playlist record
-    const newPlaylist = await Database.playlistModel.createFromOld(oldPlaylist)
-
-    // Lookup all library items in playlist
-    const libraryItemIds = oldPlaylist.items.map((i) => i.libraryItemId).filter((i) => i)
-    const libraryItemsInPlaylist = await Database.libraryItemModel.findAll({
+    // Load library items
+    const libraryItems = await Database.libraryItemModel.findAll({
+      attributes: ['id', 'mediaId', 'mediaType', 'libraryId'],
      where: {
-        id: libraryItemIds
+        id: Array.from(libraryItemIds),
+        libraryId: reqBody.libraryId,
+        mediaType: isPodcast ? 'podcast' : 'book'
      }
    })
+    if (libraryItems.length !== libraryItemIds.size) {
+      return res.status(400).send('Invalid playlist data. Invalid items')
+    }

-    // Create playlistMediaItem records
-    const mediaItemsToAdd = []
-    let order = 1
-    for (const mediaItemObj of oldPlaylist.items) {
-      const libraryItem = libraryItemsInPlaylist.find((li) => li.id === mediaItemObj.libraryItemId)
-      if (!libraryItem) continue
-
-      mediaItemsToAdd.push({
-        mediaItemId: mediaItemObj.episodeId || libraryItem.mediaId,
-        mediaItemType: mediaItemObj.episodeId ? 'podcastEpisode' : 'book',
-        playlistId: oldPlaylist.id,
-        order: order++
+    // Validate podcast episodes
+    if (isPodcast) {
+      const podcastEpisodeIds = items.map((i) => i.episodeId)
+      const podcastEpisodes = await Database.podcastEpisodeModel.findAll({
+        attributes: ['id'],
+        where: {
+          id: podcastEpisodeIds
+        }
      })
-    }
-    if (mediaItemsToAdd.length) {
-      await Database.createBulkPlaylistMediaItems(mediaItemsToAdd)
+      if (podcastEpisodes.length !== podcastEpisodeIds.length) {
+        return res.status(400).send('Invalid playlist data. Invalid podcast episodes')
+      }
    }

-    const jsonExpanded = await newPlaylist.getOldJsonExpanded()
-    SocketAuthority.clientEmitter(newPlaylist.userId, 'playlist_added', jsonExpanded)
-    res.json(jsonExpanded)
+    const transaction = await Database.sequelize.transaction()
+    try {
+      // Create playlist
+      const newPlaylist = await Database.playlistModel.create(
+        {
+          libraryId: reqBody.libraryId,
+          userId: req.user.id,
+          name: reqBody.name,
+          description: reqBody.description || null
+        },
+        { transaction }
+      )
+
+      // Create playlistMediaItems
+      const playlistItemPayloads = []
+      for (const [index, item] of items.entries()) {
+        const libraryItem = libraryItems.find((li) => li.id === item.libraryItemId)
+        playlistItemPayloads.push({
+          playlistId: newPlaylist.id,
+          mediaItemId: item.episodeId || libraryItem.mediaId,
+          mediaItemType: item.episodeId ? 'podcastEpisode' : 'book',
+          order: index + 1
+        })
+      }
+
+      await Database.playlistMediaItemModel.bulkCreate(playlistItemPayloads, { transaction })
+
+      await transaction.commit()
+
+      newPlaylist.playlistMediaItems = await newPlaylist.getMediaItemsExpandedWithLibraryItem()
+
+      const jsonExpanded = newPlaylist.toOldJSONExpanded()
+      SocketAuthority.clientEmitter(newPlaylist.userId, 'playlist_added', jsonExpanded)
+      res.json(jsonExpanded)
+    } catch (error) {
+      await transaction.rollback()
+      Logger.error('[PlaylistController] create:', error)
+      res.status(500).send('Failed to create playlist')
+    }
  }

  /**
+   * @deprecated - Use /api/libraries/:libraryId/playlists
+   * This is not used by Abs web client or mobile apps
+   * TODO: Remove this endpoint or make it the primary
+   *
   * GET: /api/playlists
   * Get all playlists for user
   *
@@ -72,68 +130,89 @@ class PlaylistController {
   * @param {Response} res
   */
  async findAllForUser(req, res) {
-    const playlistsForUser = await Database.playlistModel.findAll({
-      where: {
-        userId: req.user.id
-      }
-    })
-    const playlists = []
-    for (const playlist of playlistsForUser) {
-      const jsonExpanded = await playlist.getOldJsonExpanded()
-      playlists.push(jsonExpanded)
-    }
+    const playlistsForUser = await Database.playlistModel.getOldPlaylistsForUserAndLibrary(req.user.id)
    res.json({
-      playlists
+      playlists: playlistsForUser
    })
  }

  /**
   * GET: /api/playlists/:id
   *
-   * @param {RequestWithUser} req
+   * @param {PlaylistControllerRequest} req
   * @param {Response} res
   */
  async findOne(req, res) {
-    const jsonExpanded = await req.playlist.getOldJsonExpanded()
-    res.json(jsonExpanded)
+    req.playlist.playlistMediaItems = await req.playlist.getMediaItemsExpandedWithLibraryItem()
+    res.json(req.playlist.toOldJSONExpanded())
  }

  /**
   * PATCH: /api/playlists/:id
   * Update playlist
   *
-   * @param {RequestWithUser} req
+   * Used for updating name and description or reordering items
+   *
+   * @param {PlaylistControllerRequest} req
   * @param {Response} res
   */
  async update(req, res) {
-    const updatedPlaylist = req.playlist.set(req.body)
-    let wasUpdated = false
-    const changed = updatedPlaylist.changed()
-    if (changed?.length) {
-      await req.playlist.save()
-      Logger.debug(`[PlaylistController] Updated playlist ${req.playlist.id} keys [${changed.join(',')}]`)
-      wasUpdated = true
+    // Validation
+    const reqBody = req.body || {}
+    if (reqBody.libraryId || reqBody.userId) {
+      // Could allow support for this if needed with additional validation
+      return res.status(400).send('Invalid playlist data. Cannot update libraryId or userId')
+    }
+    if (reqBody.name && typeof reqBody.name !== 'string') {
+      return res.status(400).send('Invalid playlist name')
+    }
+    if (reqBody.description && typeof reqBody.description !== 'string') {
+      return res.status(400).send('Invalid playlist description')
+    }
+    if (reqBody.items && (!Array.isArray(reqBody.items) || reqBody.items.some((i) => !i.libraryItemId || typeof i.libraryItemId !== 'string' || (i.episodeId && typeof i.episodeId !== 'string')))) {
+      return res.status(400).send('Invalid playlist items')
    }

-    // If array of items is passed in then update order of playlist media items
-    const libraryItemIds = req.body.items?.map((i) => i.libraryItemId).filter((i) => i) || []
-    if (libraryItemIds.length) {
+    const playlistUpdatePayload = {}
+    if (reqBody.name) playlistUpdatePayload.name = reqBody.name
+    if (reqBody.description) playlistUpdatePayload.description = reqBody.description
+
+    // Update name and description
+    let wasUpdated = false
+    if (Object.keys(playlistUpdatePayload).length) {
+      req.playlist.set(playlistUpdatePayload)
+      const changed = req.playlist.changed()
+      if (changed?.length) {
+        await req.playlist.save()
+        Logger.debug(`[PlaylistController] Updated playlist ${req.playlist.id} keys [${changed.join(',')}]`)
+        wasUpdated = true
+      }
+    }
+
+    // If array of items is set then update order of playlist media items
+    if (reqBody.items?.length) {
+      const libraryItemIds = Array.from(new Set(reqBody.items.map((i) => i.libraryItemId)))
      const libraryItems = await Database.libraryItemModel.findAll({
+        attributes: ['id', 'mediaId', 'mediaType'],
        where: {
          id: libraryItemIds
        }
      })
-      const existingPlaylistMediaItems = await updatedPlaylist.getPlaylistMediaItems({
+      if (libraryItems.length !== libraryItemIds.length) {
+        return res.status(400).send('Invalid playlist items. Items not found')
+      }
+      /** @type {import('../models/PlaylistMediaItem')[]} */
+      const existingPlaylistMediaItems = await req.playlist.getPlaylistMediaItems({
        order: [['order', 'ASC']]
      })
+      if (existingPlaylistMediaItems.length !== reqBody.items.length) {
+        return res.status(400).send('Invalid playlist items. Length mismatch')
+      }

      // Set an array of mediaItemId
      const newMediaItemIdOrder = []
-      for (const item of req.body.items) {
+      for (const item of reqBody.items) {
        const libraryItem = libraryItems.find((li) => li.id === item.libraryItemId)
-        if (!libraryItem) {
-          continue
-        }
        const mediaItemId = item.episodeId || libraryItem.mediaId
        newMediaItemIdOrder.push(mediaItemId)
      }
@@ -146,21 +225,21 @@ class PlaylistController {
      })

      // Update order on playlistMediaItem records
-      let order = 1
-      for (const playlistMediaItem of existingPlaylistMediaItems) {
-        if (playlistMediaItem.order !== order) {
+      for (const [index, playlistMediaItem] of existingPlaylistMediaItems.entries()) {
+        if (playlistMediaItem.order !== index + 1) {
          await playlistMediaItem.update({
-            order
+            order: index + 1
          })
          wasUpdated = true
        }
-        order++
      }
    }

-    const jsonExpanded = await updatedPlaylist.getOldJsonExpanded()
+    req.playlist.playlistMediaItems = await req.playlist.getMediaItemsExpandedWithLibraryItem()
+
+    const jsonExpanded = req.playlist.toOldJSONExpanded()
    if (wasUpdated) {
-      SocketAuthority.clientEmitter(updatedPlaylist.userId, 'playlist_updated', jsonExpanded)
+      SocketAuthority.clientEmitter(req.playlist.userId, 'playlist_updated', jsonExpanded)
    }
    res.json(jsonExpanded)
  }
@@ -169,11 +248,13 @@ class PlaylistController {
   * DELETE: /api/playlists/:id
   * Remove playlist
   *
-   * @param {RequestWithUser} req
+   * @param {PlaylistControllerRequest} req
   * @param {Response} res
   */
  async delete(req, res) {
-    const jsonExpanded = await req.playlist.getOldJsonExpanded()
+    req.playlist.playlistMediaItems = await req.playlist.getMediaItemsExpandedWithLibraryItem()
+    const jsonExpanded = req.playlist.toOldJSONExpanded()
+
    await req.playlist.destroy()
    SocketAuthority.clientEmitter(jsonExpanded.userId, 'playlist_removed', jsonExpanded)
    res.sendStatus(200)
@@ -183,12 +264,13 @@ class PlaylistController {
   * POST: /api/playlists/:id/item
   * Add item to playlist
   *
-   * @param {RequestWithUser} req
+   * This is not used by Abs web client or mobile apps. Only the batch endpoints are used.
+   *
+   * @param {PlaylistControllerRequest} req
   * @param {Response} res
   */
  async addItem(req, res) {
-    const oldPlaylist = await Database.playlistModel.getById(req.playlist.id)
-    const itemToAdd = req.body
+    const itemToAdd = req.body || {}

    if (!itemToAdd.libraryItemId) {
      return res.status(400).send('Request body has no libraryItemId')
@@ -198,12 +280,9 @@ class PlaylistController {
    if (!libraryItem) {
      return res.status(400).send('Library item not found')
    }
-    if (libraryItem.libraryId !== oldPlaylist.libraryId) {
+    if (libraryItem.libraryId !== req.playlist.libraryId) {
      return res.status(400).send('Library item in different library')
    }
-    if (oldPlaylist.containsItem(itemToAdd)) {
-      return res.status(400).send('Item already in playlist')
-    }
    if ((itemToAdd.episodeId && !libraryItem.isPodcast) || (libraryItem.isPodcast && !itemToAdd.episodeId)) {
      return res.status(400).send('Invalid item to add for this library type')
    }
@@ -211,15 +290,38 @@ class PlaylistController {
      return res.status(400).send('Episode not found in library item')
    }

-    const playlistMediaItem = {
-      playlistId: oldPlaylist.id,
-      mediaItemId: itemToAdd.episodeId || libraryItem.media.id,
-      mediaItemType: itemToAdd.episodeId ? 'podcastEpisode' : 'book',
-      order: oldPlaylist.items.length + 1
+    req.playlist.playlistMediaItems = await req.playlist.getMediaItemsExpandedWithLibraryItem()
+
+    if (req.playlist.checkHasMediaItem(itemToAdd.libraryItemId, itemToAdd.episodeId)) {
+      return res.status(400).send('Item already in playlist')
+    }
+
+    const jsonExpanded = req.playlist.toOldJSONExpanded()
+
+    const playlistMediaItem = {
+      playlistId: req.playlist.id,
+      mediaItemId: itemToAdd.episodeId || libraryItem.media.id,
+      mediaItemType: itemToAdd.episodeId ? 'podcastEpisode' : 'book',
+      order: req.playlist.playlistMediaItems.length + 1
+    }
+    await Database.playlistMediaItemModel.create(playlistMediaItem)
+
+    // Add the new item to to the old json expanded to prevent having to fully reload the playlist media items
+    if (itemToAdd.episodeId) {
+      const episode = libraryItem.media.episodes.find((ep) => ep.id === itemToAdd.episodeId)
+      jsonExpanded.items.push({
+        episodeId: itemToAdd.episodeId,
+        episode: episode.toJSONExpanded(),
+        libraryItemId: libraryItem.id,
+        libraryItem: libraryItem.toJSONMinified()
+      })
+    } else {
+      jsonExpanded.items.push({
+        libraryItemId: libraryItem.id,
+        libraryItem: libraryItem.toJSONExpanded()
+      })
    }

-    await Database.createPlaylistMediaItem(playlistMediaItem)
-    const jsonExpanded = await req.playlist.getOldJsonExpanded()
    SocketAuthority.clientEmitter(jsonExpanded.userId, 'playlist_updated', jsonExpanded)
    res.json(jsonExpanded)
  }
@@ -228,43 +330,36 @@ class PlaylistController {
   * DELETE: /api/playlists/:id/item/:libraryItemId/:episodeId?
   * Remove item from playlist
   *
-   * @param {RequestWithUser} req
+   * @param {PlaylistControllerRequest} req
   * @param {Response} res
   */
  async removeItem(req, res) {
-    const oldLibraryItem = await Database.libraryItemModel.getOldById(req.params.libraryItemId)
-    if (!oldLibraryItem) {
-      return res.status(404).send('Library item not found')
+    req.playlist.playlistMediaItems = await req.playlist.getMediaItemsExpandedWithLibraryItem()
+
+    let playlistMediaItem = null
+    if (req.params.episodeId) {
+      playlistMediaItem = req.playlist.playlistMediaItems.find((pmi) => pmi.mediaItemId === req.params.episodeId)
+    } else {
+      playlistMediaItem = req.playlist.playlistMediaItems.find((pmi) => pmi.mediaItem.libraryItem?.id === req.params.libraryItemId)
    }
-
-    // Get playlist media items
-    const mediaItemId = req.params.episodeId || oldLibraryItem.media.id
-    const playlistMediaItems = await req.playlist.getPlaylistMediaItems({
-      order: [['order', 'ASC']]
-    })
-
-    // Check if media item to delete is in playlist
-    const mediaItemToRemove = playlistMediaItems.find((pmi) => pmi.mediaItemId === mediaItemId)
-    if (!mediaItemToRemove) {
+    if (!playlistMediaItem) {
      return res.status(404).send('Media item not found in playlist')
    }

    // Remove record
-    await mediaItemToRemove.destroy()
+    await playlistMediaItem.destroy()
+    req.playlist.playlistMediaItems = req.playlist.playlistMediaItems.filter((pmi) => pmi.id !== playlistMediaItem.id)

    // Update playlist media items order
-    let order = 1
-    for (const mediaItem of playlistMediaItems) {
-      if (mediaItem.mediaItemId === mediaItemId) continue
-      if (mediaItem.order !== order) {
+    for (const [index, mediaItem] of req.playlist.playlistMediaItems.entries()) {
+      if (mediaItem.order !== index + 1) {
        await mediaItem.update({
-          order
+          order: index + 1
        })
      }
-      order++
    }

-    const jsonExpanded = await req.playlist.getOldJsonExpanded()
+    const jsonExpanded = req.playlist.toOldJSONExpanded()

    // Playlist is removed when there are no items
    if (!jsonExpanded.items.length) {
@@ -282,64 +377,68 @@ class PlaylistController {
   * POST: /api/playlists/:id/batch/add
   * Batch add playlist items
   *
-   * @param {RequestWithUser} req
+   * @param {PlaylistControllerRequest} req
   * @param {Response} res
   */
  async addBatch(req, res) {
-    if (!req.body.items?.length) {
-      return res.status(400).send('Invalid request body')
-    }
-    const itemsToAdd = req.body.items
-
-    const libraryItemIds = itemsToAdd.map((i) => i.libraryItemId).filter((i) => i)
-    if (!libraryItemIds.length) {
-      return res.status(400).send('Invalid request body')
+    if (!req.body.items?.length || !Array.isArray(req.body.items) || req.body.items.some((i) => !i?.libraryItemId || typeof i.libraryItemId !== 'string' || (i.episodeId && typeof i.episodeId !== 'string'))) {
+      return res.status(400).send('Invalid request body items')
    }

    // Find all library items
-    const libraryItems = await Database.libraryItemModel.findAll({
-      where: {
-        id: libraryItemIds
-      }
-    })
+    const libraryItemIds = new Set(req.body.items.map((i) => i.libraryItemId).filter((i) => i))

-    // Get all existing playlist media items
-    const existingPlaylistMediaItems = await req.playlist.getPlaylistMediaItems({
-      order: [['order', 'ASC']]
-    })
+    const oldLibraryItems = await Database.libraryItemModel.getAllOldLibraryItems({ id: Array.from(libraryItemIds) })
+    if (oldLibraryItems.length !== libraryItemIds.size) {
+      return res.status(400).send('Invalid request body items')
+    }
+
+    req.playlist.playlistMediaItems = await req.playlist.getMediaItemsExpandedWithLibraryItem()

    const mediaItemsToAdd = []
+    const jsonExpanded = req.playlist.toOldJSONExpanded()

    // Setup array of playlistMediaItem records to add
-    let order = existingPlaylistMediaItems.length + 1
-    for (const item of itemsToAdd) {
-      const libraryItem = libraryItems.find((li) => li.id === item.libraryItemId)
-      if (!libraryItem) {
-        return res.status(404).send('Item not found with id ' + item.libraryItemId)
+    let order = req.playlist.playlistMediaItems.length + 1
+    for (const item of req.body.items) {
+      const libraryItem = oldLibraryItems.find((li) => li.id === item.libraryItemId)
+
+      const mediaItemId = item.episodeId || libraryItem.media.id
+      if (req.playlist.playlistMediaItems.some((pmi) => pmi.mediaItemId === mediaItemId)) {
+        // Already exists in playlist
+        continue
      } else {
-        const mediaItemId = item.episodeId || libraryItem.mediaId
-        if (existingPlaylistMediaItems.some((pmi) => pmi.mediaItemId === mediaItemId)) {
-          // Already exists in playlist
-          continue
+        mediaItemsToAdd.push({
+          playlistId: req.playlist.id,
+          mediaItemId,
+          mediaItemType: item.episodeId ? 'podcastEpisode' : 'book',
+          order: order++
+        })
+
+        // Add the new item to to the old json expanded to prevent having to fully reload the playlist media items
+        if (item.episodeId) {
+          const episode = libraryItem.media.episodes.find((ep) => ep.id === item.episodeId)
+          jsonExpanded.items.push({
+            episodeId: item.episodeId,
+            episode: episode.toJSONExpanded(),
+            libraryItemId: libraryItem.id,
+            libraryItem: libraryItem.toJSONMinified()
+          })
        } else {
-          mediaItemsToAdd.push({
-            playlistId: req.playlist.id,
-            mediaItemId,
-            mediaItemType: item.episodeId ? 'podcastEpisode' : 'book',
-            order: order++
+          jsonExpanded.items.push({
+            libraryItemId: libraryItem.id,
+            libraryItem: libraryItem.toJSONExpanded()
          })
        }
      }
    }

-    let jsonExpanded = null
    if (mediaItemsToAdd.length) {
-      await Database.createBulkPlaylistMediaItems(mediaItemsToAdd)
-      jsonExpanded = await req.playlist.getOldJsonExpanded()
+      await Database.playlistMediaItemModel.bulkCreate(mediaItemsToAdd)
+
      SocketAuthority.clientEmitter(req.playlist.userId, 'playlist_updated', jsonExpanded)
-    } else {
-      jsonExpanded = await req.playlist.getOldJsonExpanded()
    }
+
    res.json(jsonExpanded)
  }

@@ -347,50 +446,40 @@ class PlaylistController {
   * POST: /api/playlists/:id/batch/remove
   * Batch remove playlist items
   *
-   * @param {RequestWithUser} req
+   * @param {PlaylistControllerRequest} req
   * @param {Response} res
   */
  async removeBatch(req, res) {
-    if (!req.body.items?.length) {
-      return res.status(400).send('Invalid request body')
+    if (!req.body.items?.length || !Array.isArray(req.body.items) || req.body.items.some((i) => !i?.libraryItemId || typeof i.libraryItemId !== 'string' || (i.episodeId && typeof i.episodeId !== 'string'))) {
+      return res.status(400).send('Invalid request body items')
    }

-    const itemsToRemove = req.body.items
-    const libraryItemIds = itemsToRemove.map((i) => i.libraryItemId).filter((i) => i)
-    if (!libraryItemIds.length) {
-      return res.status(400).send('Invalid request body')
-    }
-
-    // Find all library items
-    const libraryItems = await Database.libraryItemModel.findAll({
-      where: {
-        id: libraryItemIds
-      }
-    })
-
-    // Get all existing playlist media items for playlist
-    const existingPlaylistMediaItems = await req.playlist.getPlaylistMediaItems({
-      order: [['order', 'ASC']]
-    })
-    let numMediaItems = existingPlaylistMediaItems.length
+    req.playlist.playlistMediaItems = await req.playlist.getMediaItemsExpandedWithLibraryItem()

    // Remove playlist media items
    let hasUpdated = false
-    for (const item of itemsToRemove) {
-      const libraryItem = libraryItems.find((li) => li.id === item.libraryItemId)
-      if (!libraryItem) continue
-      const mediaItemId = item.episodeId || libraryItem.mediaId
-      const existingMediaItem = existingPlaylistMediaItems.find((pmi) => pmi.mediaItemId === mediaItemId)
-      if (!existingMediaItem) continue
-      await existingMediaItem.destroy()
+    for (const item of req.body.items) {
+      let playlistMediaItem = null
+      if (item.episodeId) {
+        playlistMediaItem = req.playlist.playlistMediaItems.find((pmi) => pmi.mediaItemId === item.episodeId)
+      } else {
+        playlistMediaItem = req.playlist.playlistMediaItems.find((pmi) => pmi.mediaItem.libraryItem?.id === item.libraryItemId)
+      }
+      if (!playlistMediaItem) {
+        Logger.warn(`[PlaylistController] Playlist item not found in playlist ${req.playlist.id}`, item)
+        continue
+      }
+
+      await playlistMediaItem.destroy()
+      req.playlist.playlistMediaItems = req.playlist.playlistMediaItems.filter((pmi) => pmi.id !== playlistMediaItem.id)
+
      hasUpdated = true
-      numMediaItems--
    }

-    const jsonExpanded = await req.playlist.getOldJsonExpanded()
+    const jsonExpanded = req.playlist.toOldJSONExpanded()
    if (hasUpdated) {
      // Playlist is removed when there are no items
-      if (!numMediaItems) {
+      if (!req.playlist.playlistMediaItems.length) {
        Logger.info(`[PlaylistController] Playlist "${req.playlist.name}" has no more items - removing it`)
        await req.playlist.destroy()
        SocketAuthority.clientEmitter(jsonExpanded.userId, 'playlist_removed', jsonExpanded)
@@ -425,33 +514,41 @@ class PlaylistController {
      return res.status(400).send('Collection has no books')
    }

-    const oldPlaylist = new Playlist()
-    oldPlaylist.setData({
-      userId: req.user.id,
-      libraryId: collection.libraryId,
-      name: collection.name,
-      description: collection.description || null
-    })
+    const transaction = await Database.sequelize.transaction()
+    try {
+      const playlist = await Database.playlistModel.create(
+        {
+          userId: req.user.id,
+          libraryId: collection.libraryId,
+          name: collection.name,
+          description: collection.description || null
+        },
+        { transaction }
+      )

-    // Create Playlist record
-    const newPlaylist = await Database.playlistModel.createFromOld(oldPlaylist)
+      const mediaItemsToAdd = []
+      for (const [index, libraryItem] of collectionExpanded.books.entries()) {
+        mediaItemsToAdd.push({
+          playlistId: playlist.id,
+          mediaItemId: libraryItem.media.id,
+          mediaItemType: 'book',
+          order: index + 1
+        })
+      }
+      await Database.playlistMediaItemModel.bulkCreate(mediaItemsToAdd, { transaction })

-    // Create PlaylistMediaItem records
-    const mediaItemsToAdd = []
-    let order = 1
-    for (const libraryItem of collectionExpanded.books) {
-      mediaItemsToAdd.push({
-        playlistId: newPlaylist.id,
-        mediaItemId: libraryItem.media.id,
-        mediaItemType: 'book',
-        order: order++
-      })
+      await transaction.commit()
+
+      playlist.playlistMediaItems = await playlist.getMediaItemsExpandedWithLibraryItem()
+
+      const jsonExpanded = playlist.toOldJSONExpanded()
+      SocketAuthority.clientEmitter(playlist.userId, 'playlist_added', jsonExpanded)
+      res.json(jsonExpanded)
+    } catch (error) {
+      await transaction.rollback()
+      Logger.error('[PlaylistController] createFromCollection:', error)
+      res.status(500).send('Failed to create playlist')
    }
-    await Database.createBulkPlaylistMediaItems(mediaItemsToAdd)
-
-    const jsonExpanded = await newPlaylist.getOldJsonExpanded()
-    SocketAuthority.clientEmitter(newPlaylist.userId, 'playlist_added', jsonExpanded)
-    res.json(jsonExpanded)
  }

  /**
--- a/server/managers/RssFeedManager.js
+++ b/server/managers/RssFeedManager.js
@@ -98,11 +98,22 @@ class RssFeedManager {
            podcastId: feed.entity.mediaId
          },
          attributes: ['id', 'updatedAt'],
-          order: [['createdAt', 'DESC']]
+          order: [['updatedAt', 'DESC']]
        })
+
        if (mostRecentPodcastEpisode && mostRecentPodcastEpisode.updatedAt > newEntityUpdatedAt) {
          newEntityUpdatedAt = mostRecentPodcastEpisode.updatedAt
        }
+      } else {
+        const book = await Database.bookModel.findOne({
+          where: {
+            id: feed.entity.mediaId
+          },
+          attributes: ['id', 'updatedAt']
+        })
+        if (book && book.updatedAt > newEntityUpdatedAt) {
+          newEntityUpdatedAt = book.updatedAt
+        }
      }

      return newEntityUpdatedAt > feed.entityUpdatedAt
@@ -111,7 +122,7 @@ class RssFeedManager {
        attributes: ['id', 'updatedAt'],
        include: {
          model: Database.bookModel,
-          attributes: ['id'],
+          attributes: ['id', 'audioFiles', 'updatedAt'],
          through: {
            attributes: []
          },
@@ -122,13 +133,16 @@ class RssFeedManager {
        }
      })

+      const totalBookTracks = feed.entity.books.reduce((total, book) => total + book.includedAudioFiles.length, 0)
+      if (feed.feedEpisodes.length !== totalBookTracks) {
+        return true
+      }
+
      let newEntityUpdatedAt = feed.entity.updatedAt

      const mostRecentItemUpdatedAt = feed.entity.books.reduce((mostRecent, book) => {
-        if (book.libraryItem.updatedAt > mostRecent) {
-          return book.libraryItem.updatedAt
-        }
-        return mostRecent
+        let updatedAt = book.libraryItem.updatedAt > book.updatedAt ? book.libraryItem.updatedAt : book.updatedAt
+        return updatedAt > mostRecent ? updatedAt : mostRecent
      }, 0)

      if (mostRecentItemUpdatedAt > newEntityUpdatedAt) {
@@ -151,6 +165,9 @@ class RssFeedManager {
    let feed = await Database.feedModel.findOne({
      where: {
        slug: req.params.slug
+      },
+      include: {
+        model: Database.feedEpisodeModel
      }
    })
    if (!feed) {
@@ -163,8 +180,6 @@ class RssFeedManager {
    if (feedRequiresUpdate) {
      Logger.info(`[RssFeedManager] Feed "${feed.title}" requires update - updating feed`)
      feed = await feed.updateFeedForEntity()
-    } else {
-      feed.feedEpisodes = await feed.getFeedEpisodes()
    }

    const xml = feed.buildXml(req.originalHostPrefix)
--- a/server/migrations/changelog.md
+++ b/server/migrations/changelog.md
@@ -12,3 +12,4 @@ Please add a record of every database migration that you create to this file. Th
 | v2.17.4        | v2.17.4-use-subfolder-for-oidc-redirect-uris | Save subfolder to OIDC redirect URIs to support existing installations                                        |
 | v2.17.5        | v2.17.5-remove-host-from-feed-urls           | removes the host (serverAddress) from URL columns in the feeds and feedEpisodes tables                        |
 | v2.17.6        | v2.17.6-share-add-isdownloadable             | Adds the isDownloadable column to the mediaItemShares table                                                   |
+| v2.17.7        | v2.17.7-add-indices                          | Adds indices to the libraryItems and books tables to reduce query times                                       |
--- a/server/migrations/v2.17.7-add-indices.js
+++ b/server/migrations/v2.17.7-add-indices.js
@@ -0,0 +1,83 @@
+/**
+ * @typedef MigrationContext
+ * @property {import('sequelize').QueryInterface} queryInterface - a suquelize QueryInterface object.
+ * @property {import('../Logger')} logger - a Logger object.
+ *
+ * @typedef MigrationOptions
+ * @property {MigrationContext} context - an object containing the migration context.
+ */
+
+const migrationVersion = '2.17.7'
+const migrationName = `${migrationVersion}-add-indices`
+const loggerPrefix = `[${migrationVersion} migration]`
+
+/**
+ * This upward migration adds some indices to the libraryItems and books tables to improve query performance
+ *
+ * @param {MigrationOptions} options - an object containing the migration context.
+ * @returns {Promise<void>} - A promise that resolves when the migration is complete.
+ */
+async function up({ context: { queryInterface, logger } }) {
+  // Upwards migration script
+  logger.info(`${loggerPrefix} UPGRADE BEGIN: ${migrationName}`)
+
+  await addIndex(queryInterface, logger, 'libraryItems', ['libraryId', 'mediaType', 'size'])
+  await addIndex(queryInterface, logger, 'books', ['duration'])
+
+  logger.info(`${loggerPrefix} UPGRADE END: ${migrationName}`)
+}
+
+/**
+ * This downward migration script removes the indices added in the upward migration script
+ *
+ * @param {MigrationOptions} options - an object containing the migration context.
+ * @returns {Promise<void>} - A promise that resolves when the migration is complete.
+ */
+async function down({ context: { queryInterface, logger } }) {
+  // Downward migration script
+  logger.info(`${loggerPrefix} DOWNGRADE BEGIN: ${migrationName}`)
+
+  await removeIndex(queryInterface, logger, 'libraryItems', ['libraryId', 'mediaType', 'size'])
+  await removeIndex(queryInterface, logger, 'books', ['duration'])
+
+  logger.info(`${loggerPrefix} DOWNGRADE END: ${migrationName}`)
+}
+
+/**
+ * Utility function to add an index to a table. If the index already exists, it logs a message and continues.
+ *
+ * @param {import('sequelize').QueryInterface} queryInterface
+ * @param {import ('../Logger')} logger
+ * @param {string} tableName
+ * @param {string[]} columns
+ */
+async function addIndex(queryInterface, logger, tableName, columns) {
+  try {
+    logger.info(`${loggerPrefix} adding index [${columns.join(', ')}] to table "${tableName}"`)
+    await queryInterface.addIndex(tableName, columns)
+    logger.info(`${loggerPrefix} added index [${columns.join(', ')}] to table "${tableName}"`)
+  } catch (error) {
+    if (error.name === 'SequelizeDatabaseError' && error.message.includes('already exists')) {
+      logger.info(`${loggerPrefix} index [${columns.join(', ')}] for table "${tableName}" already exists`)
+    } else {
+      throw error
+    }
+  }
+}
+
+/**
+ * Utility function to remove an index from a table.
+ * Sequelize implemets it using DROP INDEX IF EXISTS, so it won't throw an error if the index doesn't exist.
+ *
+ * @param {import('sequelize').QueryInterface} queryInterface
+ * @param {import ('../Logger')} logger
+ * @param {string} tableName
+ * @param {string[]} columns
+ */
+async function removeIndex(queryInterface, logger, tableName, columns) {
+  logger.info(`${loggerPrefix} removing index [${columns.join(', ')}] from table "${tableName}"`)
+  await queryInterface.removeIndex(tableName, columns)
+  logger.info(`${loggerPrefix} removed index [${columns.join(', ')}] from table "${tableName}"`)
+}
+
+module.exports = { up, down }
--- a/server/models/Book.js
+++ b/server/models/Book.js
@@ -321,10 +321,10 @@ class Book extends Model {
          // },
          {
            fields: ['publishedYear']
+          },
+          {
+            fields: ['duration']
          }
-          // {
-          //   fields: ['duration']
-          // }
        ]
      }
    )
--- a/server/models/Feed.js
+++ b/server/models/Feed.js
@@ -107,6 +107,9 @@ class Feed extends Model {
      entityUpdatedAt = libraryItem.media.podcastEpisodes.reduce((mostRecent, episode) => {
        return episode.updatedAt > mostRecent ? episode.updatedAt : mostRecent
      }, entityUpdatedAt)
+    } else if (libraryItem.media.updatedAt > entityUpdatedAt) {
+      // Book feeds will use Book.updatedAt if more recent
+      entityUpdatedAt = libraryItem.media.updatedAt
    }

    const feedObj = {
@@ -187,7 +190,8 @@ class Feed extends Model {
    const booksWithTracks = collectionExpanded.books.filter((book) => book.includedAudioFiles.length)

    const entityUpdatedAt = booksWithTracks.reduce((mostRecent, book) => {
-      return book.libraryItem.updatedAt > mostRecent ? book.libraryItem.updatedAt : mostRecent
+      const updatedAt = book.libraryItem.updatedAt > book.updatedAt ? book.libraryItem.updatedAt : book.updatedAt
+      return updatedAt > mostRecent ? updatedAt : mostRecent
    }, collectionExpanded.updatedAt)

    const firstBookWithCover = booksWithTracks.find((book) => book.coverPath)
@@ -275,7 +279,8 @@ class Feed extends Model {
  static getFeedObjForSeries(userId, seriesExpanded, slug, serverAddress, feedOptions = null) {
    const booksWithTracks = seriesExpanded.books.filter((book) => book.includedAudioFiles.length)
    const entityUpdatedAt = booksWithTracks.reduce((mostRecent, book) => {
-      return book.libraryItem.updatedAt > mostRecent ? book.libraryItem.updatedAt : mostRecent
+      const updatedAt = book.libraryItem.updatedAt > book.updatedAt ? book.libraryItem.updatedAt : book.updatedAt
+      return updatedAt > mostRecent ? updatedAt : mostRecent
    }, seriesExpanded.updatedAt)

    const firstBookWithCover = booksWithTracks.find((book) => book.coverPath)
@@ -516,17 +521,24 @@ class Feed extends Model {
    try {
      const updatedFeed = await this.update(feedObj, { transaction })

-      // Remove existing feed episodes
-      await feedEpisodeModel.destroy({
-        where: {
-          feedId: this.id
-        },
-        transaction
-      })
+      const existingFeedEpisodeIds = this.feedEpisodes.map((ep) => ep.id)

      // Create new feed episodes
      updatedFeed.feedEpisodes = await feedEpisodeCreateFunc(feedEpisodeCreateFuncEntity, updatedFeed, this.slug, transaction)

+      const newFeedEpisodeIds = updatedFeed.feedEpisodes.map((ep) => ep.id)
+      const feedEpisodeIdsToRemove = existingFeedEpisodeIds.filter((epid) => !newFeedEpisodeIds.includes(epid))
+
+      if (feedEpisodeIdsToRemove.length) {
+        Logger.info(`[Feed] Removing ${feedEpisodeIdsToRemove.length} episodes from feed ${this.id}`)
+        await feedEpisodeModel.destroy({
+          where: {
+            id: feedEpisodeIdsToRemove
+          },
+          transaction
+        })
+      }
+
      await transaction.commit()

      return updatedFeed
--- a/server/models/FeedEpisode.js
+++ b/server/models/FeedEpisode.js
@@ -53,9 +53,10 @@ class FeedEpisode extends Model {
   * @param {import('./Feed')} feed
   * @param {string} slug
   * @param {import('./PodcastEpisode')} episode
+   * @param {string} [existingEpisodeId]
   */
-  static getFeedEpisodeObjFromPodcastEpisode(libraryItemExpanded, feed, slug, episode) {
-    const episodeId = uuidv4()
+  static getFeedEpisodeObjFromPodcastEpisode(libraryItemExpanded, feed, slug, episode, existingEpisodeId = null) {
+    const episodeId = existingEpisodeId || uuidv4()
    return {
      id: episodeId,
      title: episode.title,
@@ -94,11 +95,18 @@ class FeedEpisode extends Model {
      libraryItemExpanded.media.podcastEpisodes.sort((a, b) => new Date(a.pubDate) - new Date(b.pubDate))
    }

+    let numExisting = 0
    for (const episode of libraryItemExpanded.media.podcastEpisodes) {
-      feedEpisodeObjs.push(this.getFeedEpisodeObjFromPodcastEpisode(libraryItemExpanded, feed, slug, episode))
+      // Check for existing episode by filepath
+      const existingEpisode = feed.feedEpisodes?.find((feedEpisode) => {
+        return feedEpisode.filePath === episode.audioFile.metadata.path
+      })
+      numExisting = existingEpisode ? numExisting + 1 : numExisting
+
+      feedEpisodeObjs.push(this.getFeedEpisodeObjFromPodcastEpisode(libraryItemExpanded, feed, slug, episode, existingEpisode?.id))
    }
-    Logger.info(`[FeedEpisode] Creating ${feedEpisodeObjs.length} episodes for feed ${feed.id}`)
-    return this.bulkCreate(feedEpisodeObjs, { transaction })
+    Logger.info(`[FeedEpisode] Upserting ${feedEpisodeObjs.length} episodes for feed ${feed.id} (${numExisting} existing)`)
+    return this.bulkCreate(feedEpisodeObjs, { transaction, updateOnDuplicate: ['title', 'author', 'description', 'siteURL', 'enclosureURL', 'enclosureType', 'enclosureSize', 'pubDate', 'season', 'episode', 'episodeType', 'duration', 'filePath', 'explicit'] })
  }

  /**
@@ -127,11 +135,12 @@ class FeedEpisode extends Model {
   * @param {string} slug
   * @param {import('./Book').AudioFileObject} audioTrack
   * @param {boolean} useChapterTitles
+   * @param {string} [existingEpisodeId]
   */
-  static getFeedEpisodeObjFromAudiobookTrack(book, pubDateStart, feed, slug, audioTrack, useChapterTitles) {
+  static getFeedEpisodeObjFromAudiobookTrack(book, pubDateStart, feed, slug, audioTrack, useChapterTitles, existingEpisodeId = null) {
    // Example: <pubDate>Fri, 04 Feb 2015 00:00:00 GMT</pubDate>
    let timeOffset = isNaN(audioTrack.index) ? 0 : Number(audioTrack.index) * 1000 // Offset pubdate to ensure correct order
-    let episodeId = uuidv4()
+    let episodeId = existingEpisodeId || uuidv4()

    // e.g. Track 1 will have a pub date before Track 2
    const audiobookPubDate = date.format(new Date(pubDateStart.valueOf() + timeOffset), 'ddd, DD MMM YYYY HH:mm:ss [GMT]')
@@ -179,11 +188,18 @@ class FeedEpisode extends Model {
    const useChapterTitles = this.checkUseChapterTitlesForEpisodes(libraryItemExpanded.media)

    const feedEpisodeObjs = []
+    let numExisting = 0
    for (const track of libraryItemExpanded.media.trackList) {
-      feedEpisodeObjs.push(this.getFeedEpisodeObjFromAudiobookTrack(libraryItemExpanded.media, libraryItemExpanded.createdAt, feed, slug, track, useChapterTitles))
+      // Check for existing episode by filepath
+      const existingEpisode = feed.feedEpisodes?.find((episode) => {
+        return episode.filePath === track.metadata.path
+      })
+      numExisting = existingEpisode ? numExisting + 1 : numExisting
+
+      feedEpisodeObjs.push(this.getFeedEpisodeObjFromAudiobookTrack(libraryItemExpanded.media, libraryItemExpanded.createdAt, feed, slug, track, useChapterTitles, existingEpisode?.id))
    }
-    Logger.info(`[FeedEpisode] Creating ${feedEpisodeObjs.length} episodes for feed ${feed.id}`)
-    return this.bulkCreate(feedEpisodeObjs, { transaction })
+    Logger.info(`[FeedEpisode] Upserting ${feedEpisodeObjs.length} episodes for feed ${feed.id} (${numExisting} existing)`)
+    return this.bulkCreate(feedEpisodeObjs, { transaction, updateOnDuplicate: ['title', 'author', 'description', 'siteURL', 'enclosureURL', 'enclosureType', 'enclosureSize', 'pubDate', 'season', 'episode', 'episodeType', 'duration', 'filePath', 'explicit'] })
  }

  /**
@@ -200,14 +216,21 @@ class FeedEpisode extends Model {
    }).libraryItem.createdAt

    const feedEpisodeObjs = []
+    let numExisting = 0
    for (const book of books) {
      const useChapterTitles = this.checkUseChapterTitlesForEpisodes(book)
      for (const track of book.trackList) {
-        feedEpisodeObjs.push(this.getFeedEpisodeObjFromAudiobookTrack(book, earliestLibraryItemCreatedAt, feed, slug, track, useChapterTitles))
+        // Check for existing episode by filepath
+        const existingEpisode = feed.feedEpisodes?.find((episode) => {
+          return episode.filePath === track.metadata.path
+        })
+        numExisting = existingEpisode ? numExisting + 1 : numExisting
+
+        feedEpisodeObjs.push(this.getFeedEpisodeObjFromAudiobookTrack(book, earliestLibraryItemCreatedAt, feed, slug, track, useChapterTitles, existingEpisode?.id))
      }
    }
-    Logger.info(`[FeedEpisode] Creating ${feedEpisodeObjs.length} episodes for feed ${feed.id}`)
-    return this.bulkCreate(feedEpisodeObjs, { transaction })
+    Logger.info(`[FeedEpisode] Upserting ${feedEpisodeObjs.length} episodes for feed ${feed.id} (${numExisting} existing)`)
+    return this.bulkCreate(feedEpisodeObjs, { transaction, updateOnDuplicate: ['title', 'author', 'description', 'siteURL', 'enclosureURL', 'enclosureType', 'enclosureSize', 'pubDate', 'season', 'episode', 'episodeType', 'duration', 'filePath', 'explicit'] })
  }

  /**
--- a/server/models/LibraryItem.js
+++ b/server/models/LibraryItem.js
@@ -1061,6 +1061,9 @@ class LibraryItem extends Model {
          {
            fields: ['libraryId', 'mediaType']
          },
+          {
+            fields: ['libraryId', 'mediaType', 'size']
+          },
          {
            fields: ['libraryId', 'mediaId', 'mediaType']
          },
--- a/server/models/Playlist.js
+++ b/server/models/Playlist.js
@@ -1,8 +1,6 @@
-const { DataTypes, Model, Op, literal } = require('sequelize')
+const { DataTypes, Model, Op } = require('sequelize')
 const Logger = require('../Logger')

-const oldPlaylist = require('../objects/Playlist')
-
 class Playlist extends Model {
  constructor(values, options) {
    super(values, options)
@@ -21,134 +19,23 @@ class Playlist extends Model {
    this.createdAt
    /** @type {Date} */
    this.updatedAt
-  }

-  static getOldPlaylist(playlistExpanded) {
-    const items = playlistExpanded.playlistMediaItems
-      .map((pmi) => {
-        const mediaItem = pmi.mediaItem || pmi.dataValues?.mediaItem
-        const libraryItemId = mediaItem?.podcast?.libraryItem?.id || mediaItem?.libraryItem?.id || null
-        if (!libraryItemId) {
-          Logger.error(`[Playlist] Invalid playlist media item - No library item id found`, JSON.stringify(pmi, null, 2))
-          return null
-        }
-        return {
-          episodeId: pmi.mediaItemType === 'podcastEpisode' ? pmi.mediaItemId : '',
-          libraryItemId
-        }
-      })
-      .filter((pmi) => pmi)
+    // Expanded properties

-    return new oldPlaylist({
-      id: playlistExpanded.id,
-      libraryId: playlistExpanded.libraryId,
-      userId: playlistExpanded.userId,
-      name: playlistExpanded.name,
-      description: playlistExpanded.description,
-      items,
-      lastUpdate: playlistExpanded.updatedAt.valueOf(),
-      createdAt: playlistExpanded.createdAt.valueOf()
-    })
+    /** @type {import('./PlaylistMediaItem')[]} - only set when expanded */
+    this.playlistMediaItems
  }

  /**
-   * Get old playlist toJSONExpanded
-   * @param {string[]} [include]
-   * @returns {Promise<oldPlaylist>} oldPlaylist.toJSONExpanded
-   */
-  async getOldJsonExpanded(include) {
-    this.playlistMediaItems =
-      (await this.getPlaylistMediaItems({
-        include: [
-          {
-            model: this.sequelize.models.book,
-            include: this.sequelize.models.libraryItem
-          },
-          {
-            model: this.sequelize.models.podcastEpisode,
-            include: {
-              model: this.sequelize.models.podcast,
-              include: this.sequelize.models.libraryItem
-            }
-          }
-        ],
-        order: [['order', 'ASC']]
-      })) || []
-
-    const oldPlaylist = this.sequelize.models.playlist.getOldPlaylist(this)
-    const libraryItemIds = oldPlaylist.items.map((i) => i.libraryItemId)
-
-    let libraryItems = await this.sequelize.models.libraryItem.getAllOldLibraryItems({
-      id: libraryItemIds
-    })
-
-    const playlistExpanded = oldPlaylist.toJSONExpanded(libraryItems)
-
-    return playlistExpanded
-  }
-
-  static createFromOld(oldPlaylist) {
-    const playlist = this.getFromOld(oldPlaylist)
-    return this.create(playlist)
-  }
-
-  static getFromOld(oldPlaylist) {
-    return {
-      id: oldPlaylist.id,
-      name: oldPlaylist.name,
-      description: oldPlaylist.description,
-      userId: oldPlaylist.userId,
-      libraryId: oldPlaylist.libraryId
-    }
-  }
-
-  static removeById(playlistId) {
-    return this.destroy({
-      where: {
-        id: playlistId
-      }
-    })
-  }
-
-  /**
-   * Get playlist by id
-   * @param {string} playlistId
-   * @returns {Promise<oldPlaylist|null>} returns null if not found
-   */
-  static async getById(playlistId) {
-    if (!playlistId) return null
-    const playlist = await this.findByPk(playlistId, {
-      include: {
-        model: this.sequelize.models.playlistMediaItem,
-        include: [
-          {
-            model: this.sequelize.models.book,
-            include: this.sequelize.models.libraryItem
-          },
-          {
-            model: this.sequelize.models.podcastEpisode,
-            include: {
-              model: this.sequelize.models.podcast,
-              include: this.sequelize.models.libraryItem
-            }
-          }
-        ]
-      },
-      order: [['playlistMediaItems', 'order', 'ASC']]
-    })
-    if (!playlist) return null
-    return this.getOldPlaylist(playlist)
-  }
-
-  /**
-   * Get old playlists for user and optionally for library
+   * Get old playlists for user and library
   *
   * @param {string} userId
-   * @param {string} [libraryId]
-   * @returns {Promise<oldPlaylist[]>}
+   * @param {string} libraryId
+   * @async
   */
-  static async getOldPlaylistsForUserAndLibrary(userId, libraryId = null) {
+  static async getOldPlaylistsForUserAndLibrary(userId, libraryId) {
    if (!userId && !libraryId) return []
+
    const whereQuery = {}
    if (userId) {
      whereQuery.userId = userId
@@ -163,7 +50,23 @@ class Playlist extends Model {
        include: [
          {
            model: this.sequelize.models.book,
-            include: this.sequelize.models.libraryItem
+            include: [
+              {
+                model: this.sequelize.models.libraryItem
+              },
+              {
+                model: this.sequelize.models.author,
+                through: {
+                  attributes: []
+                }
+              },
+              {
+                model: this.sequelize.models.series,
+                through: {
+                  attributes: ['sequence']
+                }
+              }
+            ]
          },
          {
            model: this.sequelize.models.podcastEpisode,
@@ -174,42 +77,13 @@ class Playlist extends Model {
          }
        ]
      },
-      order: [
-        [literal('name COLLATE NOCASE'), 'ASC'],
-        ['playlistMediaItems', 'order', 'ASC']
-      ]
+      order: [['playlistMediaItems', 'order', 'ASC']]
    })

-    const oldPlaylists = []
-    for (const playlistExpanded of playlistsExpanded) {
-      const oldPlaylist = this.getOldPlaylist(playlistExpanded)
-      const libraryItems = []
-      for (const pmi of playlistExpanded.playlistMediaItems) {
-        let mediaItem = pmi.mediaItem || pmi.dataValues.mediaItem
+    // Sort by name asc
+    playlistsExpanded.sort((a, b) => a.name.localeCompare(b.name))

-        if (!mediaItem) {
-          Logger.error(`[Playlist] Invalid playlist media item - No media item found`, JSON.stringify(mediaItem, null, 2))
-          continue
-        }
-        let libraryItem = mediaItem.libraryItem || mediaItem.podcast?.libraryItem
-
-        if (mediaItem.podcast) {
-          libraryItem.media = mediaItem.podcast
-          libraryItem.media.podcastEpisodes = [mediaItem]
-          delete mediaItem.podcast.libraryItem
-        } else {
-          libraryItem.media = mediaItem
-          delete mediaItem.libraryItem
-        }
-
-        const oldLibraryItem = this.sequelize.models.libraryItem.getOldLibraryItem(libraryItem)
-        libraryItems.push(oldLibraryItem)
-      }
-      const oldPlaylistJson = oldPlaylist.toJSONExpanded(libraryItems)
-      oldPlaylists.push(oldPlaylistJson)
-    }
-
-    return oldPlaylists
+    return playlistsExpanded.map((playlist) => playlist.toOldJSONExpanded())
  }

  /**
@@ -345,6 +219,117 @@ class Playlist extends Model {
      }
    })
  }
+
+  /**
+   * Get all media items in playlist expanded with library item
+   *
+   * @returns {Promise<import('./PlaylistMediaItem')[]>}
+   */
+  getMediaItemsExpandedWithLibraryItem() {
+    return this.getPlaylistMediaItems({
+      include: [
+        {
+          model: this.sequelize.models.book,
+          include: [
+            {
+              model: this.sequelize.models.libraryItem
+            },
+            {
+              model: this.sequelize.models.author,
+              through: {
+                attributes: []
+              }
+            },
+            {
+              model: this.sequelize.models.series,
+              through: {
+                attributes: ['sequence']
+              }
+            }
+          ]
+        },
+        {
+          model: this.sequelize.models.podcastEpisode,
+          include: [
+            {
+              model: this.sequelize.models.podcast,
+              include: this.sequelize.models.libraryItem
+            }
+          ]
+        }
+      ],
+      order: [['order', 'ASC']]
+    })
+  }
+
+  /**
+   * Get playlists toOldJSONExpanded
+   *
+   * @async
+   */
+  async getOldJsonExpanded() {
+    this.playlistMediaItems = await this.getMediaItemsExpandedWithLibraryItem()
+    return this.toOldJSONExpanded()
+  }
+
+  /**
+   * Old model used libraryItemId instead of bookId
+   *
+   * @param {string} libraryItemId
+   * @param {string} [episodeId]
+   */
+  checkHasMediaItem(libraryItemId, episodeId) {
+    if (!this.playlistMediaItems) {
+      throw new Error('playlistMediaItems are required to check Playlist')
+    }
+    if (episodeId) {
+      return this.playlistMediaItems.some((pmi) => pmi.mediaItemId === episodeId)
+    }
+    return this.playlistMediaItems.some((pmi) => pmi.mediaItem.libraryItem.id === libraryItemId)
+  }
+
+  toOldJSON() {
+    return {
+      id: this.id,
+      name: this.name,
+      libraryId: this.libraryId,
+      userId: this.userId,
+      description: this.description,
+      lastUpdate: this.updatedAt.valueOf(),
+      createdAt: this.createdAt.valueOf()
+    }
+  }
+
+  toOldJSONExpanded() {
+    if (!this.playlistMediaItems) {
+      throw new Error('playlistMediaItems are required to expand Playlist')
+    }
+
+    const json = this.toOldJSON()
+    json.items = this.playlistMediaItems.map((pmi) => {
+      if (pmi.mediaItemType === 'book') {
+        const libraryItem = pmi.mediaItem.libraryItem
+        delete pmi.mediaItem.libraryItem
+        libraryItem.media = pmi.mediaItem
+        return {
+          libraryItemId: libraryItem.id,
+          libraryItem: this.sequelize.models.libraryItem.getOldLibraryItem(libraryItem).toJSONExpanded()
+        }
+      }
+
+      const libraryItem = pmi.mediaItem.podcast.libraryItem
+      delete pmi.mediaItem.podcast.libraryItem
+      libraryItem.media = pmi.mediaItem.podcast
+      return {
+        episodeId: pmi.mediaItemId,
+        episode: pmi.mediaItem.toOldJSONExpanded(libraryItem.id),
+        libraryItemId: libraryItem.id,
+        libraryItem: this.sequelize.models.libraryItem.getOldLibraryItem(libraryItem).toJSONMinified()
+      }
+    })
+
+    return json
+  }
 }

 module.exports = Playlist
--- a/server/models/PlaylistMediaItem.js
+++ b/server/models/PlaylistMediaItem.js
@@ -16,15 +16,11 @@ class PlaylistMediaItem extends Model {
    this.playlistId
    /** @type {Date} */
    this.createdAt
-  }

-  static removeByIds(playlistId, mediaItemId) {
-    return this.destroy({
-      where: {
-        playlistId,
-        mediaItemId
-      }
-    })
+    // Expanded properties
+
+    /** @type {import('./Book')|import('./PodcastEpisode')} - only set when expanded */
+    this.mediaItem
  }

  getMediaItem(options) {
--- a/server/models/PodcastEpisode.js
+++ b/server/models/PodcastEpisode.js
@@ -170,6 +170,62 @@ class PodcastEpisode extends Model {
    })
    PodcastEpisode.belongsTo(podcast)
  }
+
+  /**
+   * AudioTrack object used in old model
+   *
+   * @returns {import('./Book').AudioFileObject|null}
+   */
+  get track() {
+    if (!this.audioFile) return null
+    const track = structuredClone(this.audioFile)
+    track.startOffset = 0
+    track.title = this.audioFile.metadata.title
+    return track
+  }
+
+  toOldJSON(libraryItemId) {
+    let enclosure = null
+    if (this.enclosureURL) {
+      enclosure = {
+        url: this.enclosureURL,
+        type: this.enclosureType,
+        length: this.enclosureSize !== null ? String(this.enclosureSize) : null
+      }
+    }
+
+    return {
+      libraryItemId: libraryItemId,
+      podcastId: this.podcastId,
+      id: this.id,
+      oldEpisodeId: this.extraData?.oldEpisodeId || null,
+      index: this.index,
+      season: this.season,
+      episode: this.episode,
+      episodeType: this.episodeType,
+      title: this.title,
+      subtitle: this.subtitle,
+      description: this.description,
+      enclosure,
+      guid: this.extraData?.guid || null,
+      pubDate: this.pubDate,
+      chapters: this.chapters?.map((ch) => ({ ...ch })) || [],
+      audioFile: this.audioFile || null,
+      publishedAt: this.publishedAt?.valueOf() || null,
+      addedAt: this.createdAt.valueOf(),
+      updatedAt: this.updatedAt.valueOf()
+    }
+  }
+
+  toOldJSONExpanded(libraryItemId) {
+    const json = this.toOldJSON(libraryItemId)
+
+    json.audioTrack = this.track
+    json.size = this.audioFile?.metadata.size || 0
+    json.duration = this.audioFile?.duration || 0
+
+    return json
+  }
 }

 module.exports = PodcastEpisode
--- a/server/objects/Playlist.js
+++ b/server/objects/Playlist.js
@@ -1,148 +0,0 @@
-const uuidv4 = require("uuid").v4
-
-class Playlist {
-  constructor(playlist) {
-    this.id = null
-    this.libraryId = null
-    this.userId = null
-
-    this.name = null
-    this.description = null
-
-    this.coverPath = null
-
-    // Array of objects like { libraryItemId: "", episodeId: "" } (episodeId optional)
-    this.items = []
-
-    this.lastUpdate = null
-    this.createdAt = null
-
-    if (playlist) {
-      this.construct(playlist)
-    }
-  }
-
-  toJSON() {
-    return {
-      id: this.id,
-      libraryId: this.libraryId,
-      userId: this.userId,
-      name: this.name,
-      description: this.description,
-      coverPath: this.coverPath,
-      items: [...this.items],
-      lastUpdate: this.lastUpdate,
-      createdAt: this.createdAt
-    }
-  }
-
-  // Expands the items array
-  toJSONExpanded(libraryItems) {
-    var json = this.toJSON()
-    json.items = json.items.map(item => {
-      const libraryItem = libraryItems.find(li => li.id === item.libraryItemId)
-      if (!libraryItem) {
-        // Not found
-        return null
-      }
-      if (item.episodeId) {
-        if (!libraryItem.isPodcast) {
-          // Invalid
-          return null
-        }
-        const episode = libraryItem.media.episodes.find(ep => ep.id === item.episodeId)
-        if (!episode) {
-          // Not found
-          return null
-        }
-
-        return {
-          ...item,
-          episode: episode.toJSONExpanded(),
-          libraryItem: libraryItem.toJSONMinified()
-        }
-      } else {
-        return {
-          ...item,
-          libraryItem: libraryItem.toJSONExpanded()
-        }
-      }
-    }).filter(i => i)
-    return json
-  }
-
-  construct(playlist) {
-    this.id = playlist.id
-    this.libraryId = playlist.libraryId
-    this.userId = playlist.userId
-    this.name = playlist.name
-    this.description = playlist.description || null
-    this.coverPath = playlist.coverPath || null
-    this.items = playlist.items ? playlist.items.map(i => ({ ...i })) : []
-    this.lastUpdate = playlist.lastUpdate || null
-    this.createdAt = playlist.createdAt || null
-  }
-
-  setData(data) {
-    if (!data.userId || !data.libraryId || !data.name) {
-      return false
-    }
-    this.id = uuidv4()
-    this.userId = data.userId
-    this.libraryId = data.libraryId
-    this.name = data.name
-    this.description = data.description || null
-    this.coverPath = data.coverPath || null
-    this.items = data.items ? data.items.map(i => ({ ...i })) : []
-    this.lastUpdate = Date.now()
-    this.createdAt = Date.now()
-    return true
-  }
-
-  addItem(libraryItemId, episodeId = null) {
-    this.items.push({
-      libraryItemId,
-      episodeId: episodeId || null
-    })
-    this.lastUpdate = Date.now()
-  }
-
-  removeItem(libraryItemId, episodeId = null) {
-    if (episodeId) this.items = this.items.filter(i => i.libraryItemId !== libraryItemId || i.episodeId !== episodeId)
-    else this.items = this.items.filter(i => i.libraryItemId !== libraryItemId)
-    this.lastUpdate = Date.now()
-  }
-
-  update(payload) {
-    let hasUpdates = false
-    for (const key in payload) {
-      if (key === 'items') {
-        if (payload.items && JSON.stringify(payload.items) !== JSON.stringify(this.items)) {
-          this.items = payload.items.map(i => ({ ...i }))
-          hasUpdates = true
-        }
-      } else if (this[key] !== undefined && this[key] !== payload[key]) {
-        hasUpdates = true
-        this[key] = payload[key]
-      }
-    }
-    if (hasUpdates) {
-      this.lastUpdate = Date.now()
-    }
-    return hasUpdates
-  }
-
-  containsItem(item) {
-    if (item.episodeId) return this.items.some(i => i.libraryItemId === item.libraryItemId && i.episodeId === item.episodeId)
-    return this.items.some(i => i.libraryItemId === item.libraryItemId)
-  }
-
-  hasItemsForLibraryItem(libraryItemId) {
-    return this.items.some(i => i.libraryItemId === libraryItemId)
-  }
-
-  removeItemsForLibraryItem(libraryItemId) {
-    this.items = this.items.filter(i => i.libraryItemId !== libraryItemId)
-  }
-}
-module.exports = Playlist
Author	SHA1	Message	Date
advplyr	ed17dd9b51	Fix user stats heatmap caption text to be accurate	2025-01-01 13:49:22 -06:00
advplyr	eb505a0be7	Merge pull request #3754 from maxlajoie99/feature/experimental-proxy-support Experimental proxy support by manually following redirects	2025-01-01 12:54:25 -06:00
advplyr	f3918a47e1	Auto formatting	2025-01-01 12:48:58 -06:00
advplyr	c8a05920dd	Merge pull request #3772 from advplyr/feed-episodes-upsert Feed episode IDs changing on refresh & several other refresh issues	2025-01-01 12:17:10 -06:00
advplyr	e7f7d1a573	Fix refresh feed when book is deleted and belonged to a series/collection	2025-01-01 12:06:01 -06:00
advplyr	5201625d38	Fix FeedEpisodes using a new ID when updating #3757	2025-01-01 11:32:39 -06:00
advplyr	8c4d0c503b	Merge pull request #3767 from mikiher/book-query-optimizations Book query optimizations	2025-01-01 10:10:51 -06:00
advplyr	d3bda898d4	Merge pull request #3769 from advplyr/share-media-player-media-session-api Use Media Session API in the Share audio player & pass chapterInfo to media sessions	2025-01-01 09:11:11 -06:00
advplyr	86809dcc62	Update audio player to pass chapterInfo to media session API	2025-01-01 09:02:31 -06:00
advplyr	9fa00a1904	Fix Share media player not using media session API #3768	2025-01-01 08:55:40 -06:00
mikiher	46247ecf78	Update migrations changelog	2025-01-01 08:41:27 +02:00
mikiher	0444829a9f	Add index on duration	2025-01-01 08:37:57 +02:00
mikiher	754c121168	Add libraryItem size index	2025-01-01 07:34:29 +02:00
advplyr	1c2ee09f18	Fix user stats heatmap to use range of currently showing data only	2024-12-31 17:41:09 -06:00
advplyr	ee310d967e	Merge pull request #3766 from advplyr/remove-old-playlist Remove old Playlist object + remove unnecessary toasts	2024-12-31 17:26:26 -06:00
advplyr	25b7f005c6	Remove unnecessary playlist toasts	2024-12-31 17:15:11 -06:00
advplyr	777c59458d	Fix find all playlist endpoint	2024-12-31 17:11:31 -06:00
advplyr	9785bc02ea	Update Playlist model & controller to remove usage of old Playlist object, remove old Playlist	2024-12-31 17:01:42 -06:00
advplyr	6780ef9b37	Merge pull request #3761 from advplyr/remove_old_collection_object Remove old Collection object	2024-12-30 17:14:07 -06:00
maxlajoie99	d7830f4bfc	Experimental proxy support by manually following redirects	2024-12-27 20:26:55 -05:00