Use new database models, fix function name and use optional path para…

…meter
advplyr · May 14, 2024 · 09e26a9 · 09e26a9
1 parent ef74919
commit 09e26a9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/server/controllers/MeController.js b/server/controllers/MeController.js
@@ -34,11 +34,11 @@ class MeController {
   }
 
   // GET: api/me/item/listening-sessions/:libraryItemId/:episodeId
-  async getListeningSessions(req, res) {
-    const libraryItem = await Database.libraryItemModel.getOldById(req.params.libraryItemId)
-    const episode = (req.params.episodeId && libraryItem && libraryItem.isPodcast) ? libraryItem.media.getEpisode(req.params.episodeId) : null
+  async getItemListeningSessions(req, res) {
+    const libraryItem = await Database.libraryItemModel.findByPk(req.params.libraryItemId)
+    const episode = await Database.podcastEpisodeModel.findByPk(req.params.episodeId)
 
-    if (!libraryItem || (libraryItem.isPodcast && !episode)) {
+    if (!libraryItem || (libraryItem.mediaType === "podcast" && !episode)) {
       Logger.error(`[PlaybackSessionManager] listening-sessions: Media item not found for library item id "${req.params.id}"`)
       return {
         success: false,

diff --git a/server/routers/ApiRouter.js b/server/routers/ApiRouter.js
@@ -166,8 +166,7 @@ class ApiRouter {
     //
     this.router.get('/me', MeController.getCurrentUser.bind(this))
     this.router.get('/me/listening-sessions', MeController.getListeningSessions.bind(this))
-    this.router.get('/me/item/listening-sessions/:libraryItemId', MeController.getListeningSessions.bind(this))
-    this.router.get('/me/item/listening-sessions/:libraryItemId/:episodeId', MeController.getListeningSessions.bind(this))
+    this.router.get('/me/item/listening-sessions/:libraryItemId/:episodeId?', MeController.getItemListeningSessions.bind(this))
     this.router.get('/me/listening-stats', MeController.getListeningStats.bind(this))
     this.router.get('/me/progress/:id/remove-from-continue-listening', MeController.removeItemFromContinueListening.bind(this))
     this.router.get('/me/progress/:id/:episodeId?', MeController.getMediaProgress.bind(this))