Merge branch 'cover_encodes_032024_1' into RFTW

theRealKLH · Feb 14, 2024 · a6bb070 · a6bb070
2 parents 3ddd735 + 0a45edd
commit a6bb070
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/ui/src/views/scenes/Details.vue b/ui/src/views/scenes/Details.vue
@@ -782,12 +782,12 @@ watch:{
         return u
       }
       try {
-        if (u.startsWith('http') || u.startsWith('https')) {
-          if (strpos(u, "%") !== false) {
-            return '/img/' + size + '/' + decodeURI(u)
-          }
-          return '/img/' + size + '/' + encodeURI(u)
-        } else {
+        if (u.startsWith('http')) {
+          if (u.search("%") == -1) {
+            return '/img/' + size + '/' + encodeURI(u)
+          } else {
+            return '/img/' + size + '/' + encodeURI(decodeURI(u))
+          } 
           return u
         }
       } catch {

diff --git a/ui/src/views/scenes/SceneCard.vue b/ui/src/views/scenes/SceneCard.vue
@@ -173,7 +173,14 @@ export default {
   },
   methods: {
     getImageURL (u) {
-        return '/img/700x/' + u
+        if (u.startsWith('http') == false) {
+        return u
+        }
+          if (u.search("%") == -1) {
+            return '/img/700x/' + encodeURI(u)
+          } else {
+            return '/img/700x/' + encodeURI(decodeURI(u))
+          } 
     },
     showDetails (scene) {
       // reRead is required when the SceneCard is clicked from the ActorDetails