diff --git a/server/controllers/MeController.js b/server/controllers/MeController.js index 8003c1f1..cae844e2 100644 --- a/server/controllers/MeController.js +++ b/server/controllers/MeController.js @@ -190,6 +190,7 @@ class MeController { const updatedLocalMediaProgress = [] var numServerProgressUpdates = 0 var localMediaProgress = req.body.localMediaProgress || [] + localMediaProgress.forEach(localProgress => { if (!localProgress.libraryItemId) { Logger.error(`[MeController] syncLocalMediaProgress invalid local media progress object`, localProgress) @@ -216,7 +217,8 @@ class MeController { Logger.debug(`[MeController] syncLocalMediaProgress server progress is more recent by ${updateTimeDifference}ms - ${mediaProgress.id}`) for (const key in localProgress) { - if (mediaProgress[key] != undefined && localProgress[key] !== mediaProgress[key]) { + // Local media progress ID uses the local library item id and server media progress uses the library item id + if (key !== 'id' && mediaProgress[key] != undefined && localProgress[key] !== mediaProgress[key]) { // Logger.debug(`[MeController] syncLocalMediaProgress key ${key} changed from ${localProgress[key]} to ${mediaProgress[key]} - ${mediaProgress.id}`) localProgress[key] = mediaProgress[key] } diff --git a/server/objects/user/MediaProgress.js b/server/objects/user/MediaProgress.js index 3f13639d..169a9243 100644 --- a/server/objects/user/MediaProgress.js +++ b/server/objects/user/MediaProgress.js @@ -1,5 +1,3 @@ -const Logger = require('../../Logger') - class MediaProgress { constructor(progress) { this.id = null