Merge branch 'master' into social

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

@@ -15,6 +15,7 @@ class User {
     this.createdAt = null
 
     this.mediaProgress = []
+    this.seriesHideFromContinueListening = [] // Series IDs that should not show on home page continue listening
     this.bookmarks = []
 
     this.settings = {}
@@ -93,6 +94,7 @@ class User {
       type: this.type,
       token: this.token,
       mediaProgress: this.mediaProgress ? this.mediaProgress.map(li => li.toJSON()) : [],
+      seriesHideFromContinueListening: [...this.seriesHideFromContinueListening],
       bookmarks: this.bookmarks ? this.bookmarks.map(b => b.toJSON()) : [],
       isActive: this.isActive,
       isLocked: this.isLocked,
@@ -112,6 +114,7 @@ class User {
       type: this.type,
       token: this.token,
       mediaProgress: this.mediaProgress ? this.mediaProgress.map(li => li.toJSON()) : [],
+      seriesHideFromContinueListening: [...this.seriesHideFromContinueListening],
       bookmarks: this.bookmarks ? this.bookmarks.map(b => b.toJSON()) : [],
       isActive: this.isActive,
       isLocked: this.isLocked,
@@ -128,8 +131,8 @@ class User {
   toJSONForPublic(sessions, libraryItems) {
     var userSession = sessions ? sessions.find(s => s.userId === this.id) : null
     var session = null
-    if (session) {
-      var libraryItem = libraryItems.find(li => li.id === session.libraryItemId)
+    if (userSession) {
+      var libraryItem = libraryItems.find(li => li.id === userSession.libraryItemId)
       if (libraryItem) {
         session = userSession.toJSONForClient(libraryItem)
       }
@@ -162,6 +165,9 @@ class User {
       this.bookmarks = user.bookmarks.filter(bm => typeof bm.libraryItemId == 'string').map(bm => new AudioBookmark(bm))
     }
 
+    this.seriesHideFromContinueListening = []
+    if (user.seriesHideFromContinueListening) this.seriesHideFromContinueListening = [...user.seriesHideFromContinueListening]
+
     this.isActive = (user.isActive === undefined || user.type === 'root') ? true : !!user.isActive
     this.isLocked = user.type === 'root' ? false : !!user.isLocked
     this.lastSeen = user.lastSeen || null
@@ -197,6 +203,13 @@ class User {
       }
     })
 
+    if (payload.seriesHideFromContinueListening && Array.isArray(payload.seriesHideFromContinueListening)) {
+      if (this.seriesHideFromContinueListening.join(',') !== payload.seriesHideFromContinueListening.join(',')) {
+        hasUpdates = true
+        this.seriesHideFromContinueListening = [...payload.seriesHideFromContinueListening]
+      }
+    }
+
     // And update permissions
     if (payload.permissions) {
       for (const key in payload.permissions) {
@@ -254,16 +267,42 @@ class User {
     return firstAccessibleLibrary.id
   }
 
+  // Returns most recent media progress w/ `media` object and optionally an `episode` object
   getMostRecentItemProgress(libraryItems) {
     if (!this.mediaProgress.length) return null
-    var lip = this.mediaProgress.map(lip => lip.toJSON())
-    lip.sort((a, b) => b.lastUpdate - a.lastUpdate)
-    var mostRecentWithLip = lip.find(li => libraryItems.find(_li => _li.id === li.id))
-    if (!mostRecentWithLip) return null
-    var libraryItem = libraryItems.find(li => li.id === mostRecentWithLip.id)
+    var mediaProgressObjects = this.mediaProgress.map(lip => lip.toJSON())
+    mediaProgressObjects.sort((a, b) => b.lastUpdate - a.lastUpdate)
+
+    var libraryItemMedia = null
+    var progressEpisode = null
+    // Find the most recent progress that still has a libraryItem and episode
+    var mostRecentProgress = mediaProgressObjects.find((progress) => {
+      const libraryItem = libraryItems.find(li => li.id === progress.libraryItemId)
+      if (!libraryItem) {
+        Logger.warn('[User] Library item not found for users progress ' + progress.libraryItemId)
+        return false
+      } else if (progress.episodeId) {
+        const episode = libraryItem.mediaType === 'podcast' ? libraryItem.media.getEpisode(progress.episodeId) : null
+        if (!episode) {
+          Logger.warn(`[User] Episode ${progress.episodeId} not found for user media progress, podcast: ${libraryItem.media.metadata.title}`)
+          return false
+        } else {
+          libraryItemMedia = libraryItem.media.toJSONExpanded()
+          progressEpisode = episode.toJSON()
+          return true
+        }
+      } else {
+        libraryItemMedia = libraryItem.media.toJSONExpanded()
+        return true
+      }
+    })
+
+    if (!mostRecentProgress) return null
+
     return {
-      ...mostRecentWithLip,
-      media: libraryItem.media.toJSONExpanded()
+      ...mostRecentProgress,
+      media: libraryItemMedia,
+      episode: progressEpisode
     }
   }
 
@@ -298,7 +337,13 @@ class User {
     return wasUpdated
   }
 
-  removeMediaProgress(libraryItemId) {
+  removeMediaProgress(id) {
+    if (!this.mediaProgress.some(mp => mp.id === id)) return false
+    this.mediaProgress = this.mediaProgress.filter(mp => mp.id !== id)
+    return true
+  }
+
+  removeMediaProgressForLibraryItem(libraryItemId) {
     if (!this.mediaProgress.some(lip => lip.libraryItemId == libraryItemId)) return false
     this.mediaProgress = this.mediaProgress.filter(lip => lip.libraryItemId != libraryItemId)
     return true
@@ -379,5 +424,27 @@ class User {
   removeBookmark(libraryItemId, time) {
     this.bookmarks = this.bookmarks.filter(bm => (bm.libraryItemId !== libraryItemId || bm.time !== time))
   }
+
+  checkShouldHideSeriesFromContinueListening(seriesId) {
+    return this.seriesHideFromContinueListening.includes(seriesId)
+  }
+
+  addSeriesToHideFromContinueListening(seriesId) {
+    if (this.seriesHideFromContinueListening.includes(seriesId)) return false
+    this.seriesHideFromContinueListening.push(seriesId)
+    return true
+  }
+
+  removeSeriesFromHideFromContinueListening(seriesId) {
+    if (!this.seriesHideFromContinueListening.includes(seriesId)) return false
+    this.seriesHideFromContinueListening = this.seriesHideFromContinueListening.filter(sid => sid !== seriesId)
+    return true
+  }
+
+  removeProgressFromContinueListening(progressId) {
+    const progress = this.mediaProgress.find(mp => mp.id === progressId)
+    if (!progress) return false
+    return progress.removeFromContinueListening()
+  }
 }
 module.exports = User