From ee118abf59a0bb345e50dec007370f4658d11f34 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 3 Oct 2021 06:43:43 -0500
Subject: [PATCH] Update cover art urls

---
 .../main/java/com/audiobookshelf/app/MyNativeAudio.kt    | 1 -
 .../com/audiobookshelf/app/PlayerNotificationService.kt  | 3 ---
 components/app/StreamContainer.vue                       | 9 +++++++--
 components/cards/BookCover.vue                           | 7 ++++++-
 pages/audiobook/_id/index.vue                            | 7 ++++++-
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/android/app/src/main/java/com/audiobookshelf/app/MyNativeAudio.kt b/android/app/src/main/java/com/audiobookshelf/app/MyNativeAudio.kt
index 94919d5e..8cab491c 100644
--- a/android/app/src/main/java/com/audiobookshelf/app/MyNativeAudio.kt
+++ b/android/app/src/main/java/com/audiobookshelf/app/MyNativeAudio.kt
@@ -35,7 +35,6 @@ class MyNativeAudio : Plugin() {
           jsobj.put("playWhenReady", playWhenReady)
           notifyListeners("onPrepareMedia", jsobj)
         }
-        override fun onCar() {}
       })
     }
     mainActivity.pluginCallback = foregroundServiceReady
diff --git a/android/app/src/main/java/com/audiobookshelf/app/PlayerNotificationService.kt b/android/app/src/main/java/com/audiobookshelf/app/PlayerNotificationService.kt
index 5a085838..22fab7db 100644
--- a/android/app/src/main/java/com/audiobookshelf/app/PlayerNotificationService.kt
+++ b/android/app/src/main/java/com/audiobookshelf/app/PlayerNotificationService.kt
@@ -51,7 +51,6 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
     fun onPlayingUpdate(isPlaying: Boolean)
     fun onMetadata(metadata: JSObject)
     fun onPrepare(audiobookId:String, playWhenReady:Boolean)
-    fun onCar()
   }
 
   private val tag = "PlayerService"
@@ -547,8 +546,6 @@ class PlayerNotificationService : MediaBrowserServiceCompat()  {
       // No further calls will be made to other media browsing methods.
       null
     } else {
-      listener.onCar()
-
       val extras = Bundle()
       extras.putInt(
         MediaConstants.DESCRIPTION_EXTRAS_KEY_CONTENT_STYLE_BROWSABLE,
diff --git a/components/app/StreamContainer.vue b/components/app/StreamContainer.vue
index b768f753..05febdd2 100644
--- a/components/app/StreamContainer.vue
+++ b/components/app/StreamContainer.vue
@@ -47,6 +47,9 @@ export default {
     }
   },
   computed: {
+    userToken() {
+      return this.$store.getters['user/getToken']
+    },
     currentChapter() {
       if (!this.audiobook || !this.chapters.length) return null
       return this.chapters.find((ch) => ch.start <= this.currentTime && ch.end > this.currentTime)
@@ -112,7 +115,9 @@ export default {
       var _clean = this.cover.replace(/\\/g, '/')
       if (_clean.startsWith('/local')) {
         var _cover = process.env.NODE_ENV !== 'production' && process.env.PROD !== '1' ? _clean.replace('/local', '') : _clean
-        return `${this.$store.state.serverUrl}${_cover}`
+        return `${this.$store.state.serverUrl}${_cover}?token=${this.userToken}&ts=${Date.now()}`
+      } else if (_clean.startsWith('/metadata')) {
+        return `${this.$store.state.serverUrl}${_clean}?token=${this.userToken}&ts=${Date.now()}`
       }
       return _clean
     }
@@ -257,7 +262,7 @@ export default {
         cover: this.download.coverUrl || null,
         duration: String(Math.floor(this.duration * 1000)),
         series: this.seriesTxt,
-        token: this.$store.getters['user/getToken'],
+        token: this.userToken,
         contentUrl: this.playingDownload.contentUrl,
         isLocal: true
       }
diff --git a/components/cards/BookCover.vue b/components/cards/BookCover.vue
index 95fabcc4..0ddbc014 100644
--- a/components/cards/BookCover.vue
+++ b/components/cards/BookCover.vue
@@ -60,6 +60,9 @@ export default {
     }
   },
   computed: {
+    userToken() {
+      return this.$store.getters['user/getToken']
+    },
     book() {
       return this.audiobook.book || {}
     },
@@ -99,7 +102,9 @@ export default {
       var _clean = this.cover.replace(/\\/g, '/')
       if (_clean.startsWith('/local')) {
         var _cover = process.env.NODE_ENV !== 'production' && process.env.PROD !== '1' ? _clean.replace('/local', '') : _clean
-        return `${this.serverUrl}${_cover}`
+        return `${this.$store.state.serverUrl}${_cover}?token=${this.userToken}&ts=${Date.now()}`
+      } else if (_clean.startsWith('/metadata')) {
+        return `${this.$store.state.serverUrl}${_clean}?token=${this.userToken}&ts=${Date.now()}`
       }
       return _clean
     },
diff --git a/pages/audiobook/_id/index.vue b/pages/audiobook/_id/index.vue
index e1978e6c..bdbf4048 100644
--- a/pages/audiobook/_id/index.vue
+++ b/pages/audiobook/_id/index.vue
@@ -117,6 +117,9 @@ export default {
     userAudiobook() {
       return this.userAudiobooks[this.audiobookId] || null
     },
+    userToken() {
+      return this.$store.getters['user/getToken']
+    },
     localUserAudiobooks() {
       return this.$store.state.user.localUserAudiobooks || {}
     },
@@ -291,7 +294,9 @@ export default {
       var _clean = cover.replace(/\\/g, '/')
       if (_clean.startsWith('/local')) {
         var _cover = process.env.NODE_ENV !== 'production' && process.env.PROD !== '1' ? _clean.replace('/local', '') : _clean
-        return `${this.$store.state.serverUrl}${_cover}`
+        return `${this.$store.state.serverUrl}${_cover}?token=${this.userToken}&ts=${Date.now()}`
+      } else if (_clean.startsWith('/metadata')) {
+        return `${this.$store.state.serverUrl}${_clean}?token=${this.userToken}&ts=${Date.now()}`
       }
       return _clean
     },