From 6eb69a8ef819d615c163b05db31978fcf727cb83 Mon Sep 17 00:00:00 2001
From: SrGooglo <srgooglo@ragestudio.net>
Date: Wed, 31 May 2023 01:37:35 +0000
Subject: [PATCH] use thumbnails as fallback

---
 packages/app/src/components/MusicTrack/index.jsx              | 2 +-
 packages/app/src/components/Player/MediaPlayer/index.jsx      | 2 +-
 packages/app/src/cores/player/index.js                        | 4 ++--
 packages/app/src/pages/music/components/feed/index.jsx        | 2 +-
 .../pages/music/creator/components/BasicInformation/index.jsx | 2 +-
 packages/app/src/pages/play/[play_id].jsx                     | 2 +-
 packages/music_server/src/models/playlist/index.js            | 4 ++++
 packages/music_server/src/models/track/index.js               | 4 ++++
 8 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/packages/app/src/components/MusicTrack/index.jsx b/packages/app/src/components/MusicTrack/index.jsx
index ede25cbf..06ecef34 100644
--- a/packages/app/src/components/MusicTrack/index.jsx
+++ b/packages/app/src/components/MusicTrack/index.jsx
@@ -50,7 +50,7 @@ export default (props) => {
             </div>
         </div>
         <div className="music-track_cover">
-            <ImageViewer src={props.track.thumbnail} />
+            <ImageViewer src={props.track.cover ?? props.track.thumbnail} />
         </div>
         <div className="music-track_details">
             <div className="music-track_title">
diff --git a/packages/app/src/components/Player/MediaPlayer/index.jsx b/packages/app/src/components/Player/MediaPlayer/index.jsx
index a4cb26fc..f4560a9e 100755
--- a/packages/app/src/components/Player/MediaPlayer/index.jsx
+++ b/packages/app/src/components/Player/MediaPlayer/index.jsx
@@ -129,7 +129,7 @@ export class AudioPlayer extends React.Component {
                 <div
                     className="cover"
                     style={{
-                        backgroundImage: `url(${(this.context.currentManifest?.thumbnail) ?? "/assets/no_song.png"})`,
+                        backgroundImage: `url(${(this.context.currentManifest?.cover ?? this.context.currentManifest?.thumbnail) ?? "/assets/no_song.png"})`,
                     }}
                 />
                 <div className="header">
diff --git a/packages/app/src/cores/player/index.js b/packages/app/src/cores/player/index.js
index 41873729..368f1c06 100755
--- a/packages/app/src/cores/player/index.js
+++ b/packages/app/src/cores/player/index.js
@@ -236,8 +236,8 @@ export default class Player extends Core {
                             if (change.object.currentAudioManifest) {
                                 // analyze cover color
 
-                                if (change.object.currentAudioManifest.thumbnail) {
-                                    this.fac.getColorAsync(change.object.currentAudioManifest.thumbnail)
+                                if (change.object.currentAudioManifest.cover || change.object.currentAudioManifest.thumbnail) {
+                                    this.fac.getColorAsync(change.object.currentAudioManifest.cover ?? change.object.currentAudioManifest.thumbnail)
                                         .then((color) => {
                                             this.state.coverColorAnalysis = color
                                         })
diff --git a/packages/app/src/pages/music/components/feed/index.jsx b/packages/app/src/pages/music/components/feed/index.jsx
index fcf36313..4fbc060a 100755
--- a/packages/app/src/pages/music/components/feed/index.jsx
+++ b/packages/app/src/pages/music/components/feed/index.jsx
@@ -173,7 +173,7 @@ const PlaylistItem = (props) => {
             </div>
 
             <ImageViewer
-                src={playlist.thumbnail ?? "/assets/no_song.png"}
+                src={playlist.cover ?? playlist.thumbnail ?? "/assets/no_song.png"}
             />
         </div>
 
diff --git a/packages/app/src/pages/music/creator/components/BasicInformation/index.jsx b/packages/app/src/pages/music/creator/components/BasicInformation/index.jsx
index 949cc540..45c34428 100644
--- a/packages/app/src/pages/music/creator/components/BasicInformation/index.jsx
+++ b/packages/app/src/pages/music/creator/components/BasicInformation/index.jsx
@@ -6,7 +6,7 @@ import UploadButton from "components/UploadButton"
 export default (props) => {
     const [playlistName, setPlaylistName] = React.useState(props.playlist.title)
     const [playlistDescription, setPlaylistDescription] = React.useState(props.playlist.description)
-    const [playlistThumbnail, setPlaylistThumbnail] = React.useState(props.playlist.thumbnail)
+    const [playlistThumbnail, setPlaylistThumbnail] = React.useState(props.playlist.cover ?? props.playlist.thumbnail)
     const [playlistVisibility, setPlaylistVisibility] = React.useState(props.playlist.visibility)
 
     const handleTitleOnChange = (event) => {
diff --git a/packages/app/src/pages/play/[play_id].jsx b/packages/app/src/pages/play/[play_id].jsx
index 95595240..7da1c3c4 100755
--- a/packages/app/src/pages/play/[play_id].jsx
+++ b/packages/app/src/pages/play/[play_id].jsx
@@ -63,7 +63,7 @@ export default (props) => {
         <div className="play_info_wrapper">
             <div className="play_info">
                 <div className="play_info_cover">
-                    <ImageViewer src={playlist?.thumbnail ?? "/assets/no_song.png"} />
+                    <ImageViewer src={playlist.cover ?? playlist?.thumbnail ?? "/assets/no_song.png"} />
                 </div>
 
                 <div className="play_info_details">
diff --git a/packages/music_server/src/models/playlist/index.js b/packages/music_server/src/models/playlist/index.js
index db51f78d..7b00593a 100755
--- a/packages/music_server/src/models/playlist/index.js
+++ b/packages/music_server/src/models/playlist/index.js
@@ -18,6 +18,10 @@ export default {
             default: [],
             required: true
         },
+        cover: {
+            type: String,
+            default: "https://storage.ragestudio.net/comty-static-assets/default_song.png"
+        },
         thumbnail: {
             type: String,
             default: "https://storage.ragestudio.net/comty-static-assets/default_song.png"
diff --git a/packages/music_server/src/models/track/index.js b/packages/music_server/src/models/track/index.js
index 583ce84e..576ddc3c 100755
--- a/packages/music_server/src/models/track/index.js
+++ b/packages/music_server/src/models/track/index.js
@@ -27,6 +27,10 @@ export default {
             type: Boolean,
             default: true,
         },
+        cover: {
+            type: String,
+            default: "https://storage.ragestudio.net/comty-static-assets/default_song.png"
+        },
         thumbnail: {
             type: String,
             default: "https://storage.ragestudio.net/comty-static-assets/default_song.png"