Add:Remove item from continue listening shelf #919

server/controllers/MeController.js

@@ -277,11 +277,11 @@ class MeController {
     })
   }
 
-  // GET: api/me/series/:id/hide
-  async hideSeriesFromContinueListening(req, res) {
+  // GET: api/me/series/:id/remove-from-continue-listening
+  async removeSeriesFromContinueListening(req, res) {
     const series = this.db.series.find(se => se.id === req.params.id)
     if (!series) {
-      Logger.error(`[MeController] hideSeriesFromContinueListening: Series ${req.params.id} not found`)
+      Logger.error(`[MeController] removeSeriesFromContinueListening: Series ${req.params.id} not found`)
       return res.sendStatus(404)
     }
 
@@ -292,5 +292,15 @@ class MeController {
     }
     res.json(req.user.toJSONForBrowser())
   }
+
+  // GET: api/me/progress/:id/remove-from-continue-listening
+  async removeItemFromContinueListening(req, res) {
+    const hasUpdated = req.user.removeProgressFromContinueListening(req.params.id)
+    if (hasUpdated) {
+      await this.db.updateEntity('user', req.user)
+      this.clientEmitter(req.user.id, 'user_updated', req.user.toJSONForBrowser())
+    }
+    res.json(req.user.toJSONForBrowser())
+  }
 }
 module.exports = new MeController()

server/objects/user/MediaProgress.js

@@ -8,6 +8,7 @@ class MediaProgress {
     this.progress = null // 0 to 1
     this.currentTime = null // seconds
     this.isFinished = false
+    this.hideFromContinueListening = false
 
     this.lastUpdate = null
     this.startedAt = null
@@ -27,6 +28,7 @@ class MediaProgress {
       progress: this.progress,
       currentTime: this.currentTime,
       isFinished: this.isFinished,
+      hideFromContinueListening: this.hideFromContinueListening,
       lastUpdate: this.lastUpdate,
       startedAt: this.startedAt,
       finishedAt: this.finishedAt
@@ -41,6 +43,7 @@ class MediaProgress {
     this.progress = progress.progress
     this.currentTime = progress.currentTime
     this.isFinished = !!progress.isFinished
+    this.hideFromContinueListening = !!progress.hideFromContinueListening
     this.lastUpdate = progress.lastUpdate
     this.startedAt = progress.startedAt
     this.finishedAt = progress.finishedAt || null
@@ -58,6 +61,7 @@ class MediaProgress {
     this.progress = Math.min(1, (progress.progress || 0))
     this.currentTime = progress.currentTime || 0
     this.isFinished = !!progress.isFinished || this.progress == 1
+    this.hideFromContinueListening = !!progress.hideFromContinueListening
     this.lastUpdate = Date.now()
     this.startedAt = Date.now()
     this.finishedAt = null
@@ -102,9 +106,21 @@ class MediaProgress {
       this.startedAt = Date.now()
     }
     if (hasUpdates) {
+      if (payload.hideFromContinueListening === undefined) {
+        // Reset this flag when the media progress is updated
+        this.hideFromContinueListening = false
+      }
+
       this.lastUpdate = Date.now()
     }
     return hasUpdates
   }
+
+  removeFromContinueListening() {
+    if (this.hideFromContinueListening) return false
+
+    this.hideFromContinueListening = true
+    return true
+  }
 }
 module.exports = MediaProgress

server/objects/user/User.js

@@ -407,5 +407,11 @@ class User {
     this.seriesHideFromContinueListening.push(seriesId)
     return true
   }
+
+  removeProgressFromContinueListening(progressId) {
+    const progress = this.mediaProgress.find(mp => mp.id === progressId)
+    if (!progress) return false
+    return progress.removeFromContinueListening()
+  }
 }
 module.exports = User

server/routers/ApiRouter.js

@@ -138,6 +138,7 @@ class ApiRouter {
     //
     this.router.get('/me/listening-sessions', MeController.getListeningSessions.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))
     this.router.patch('/me/progress/batch/update', MeController.batchUpdateMediaProgress.bind(this))
     this.router.patch('/me/progress/:id', MeController.createUpdateMediaProgress.bind(this))
@@ -150,7 +151,7 @@ class ApiRouter {
     this.router.patch('/me/settings', MeController.updateSettings.bind(this))
     this.router.post('/me/sync-local-progress', MeController.syncLocalMediaProgress.bind(this))
     this.router.get('/me/items-in-progress', MeController.getAllLibraryItemsInProgress.bind(this))
-    this.router.post('/me/series/:id/hide', MeController.hideSeriesFromContinueListening.bind(this))
+    this.router.get('/me/series/:id/remove-from-continue-listening', MeController.removeSeriesFromContinueListening.bind(this))
 
     //
     // Backup Routes

server/utils/libraryHelpers.js

@@ -531,7 +531,7 @@ module.exports = {
               }
               categoryMap.recentlyFinished.biggest = categoryMap.recentlyFinished.items[0].finishedAt
             }
-          } else if (mediaProgress.inProgress) { // Handle most recently listened
+          } else if (mediaProgress.inProgress && !mediaProgress.hideFromContinueListening) { // Handle most recently listened
             if (mediaProgress.lastUpdate > categoryMap.recentlyListened.smallest) { // Item belongs on shelf
               const libraryItemObj = {
                 ...libraryItem.toJSONMinified(),