From d7184ddc9e31890c8203731ed104b37b4b68e5fe Mon Sep 17 00:00:00 2001
From: Ilya Y <75578537+ilya-bkv@users.noreply.github.com>
Date: Sat, 15 Jul 2023 09:18:20 +0300
Subject: [PATCH] proxy audio (#121)

---
 src/components/Article/AudioHeader/AudioHeader.module.scss | 2 +-
 src/components/Article/AudioPlayer/AudioPlayer.tsx         | 3 ++-
 src/components/Article/AudioPlayer/PlayerPlaylist.tsx      | 2 +-
 src/components/Views/Edit.tsx                              | 4 +++-
 src/utils/imageProxy.ts                                    | 4 ++++
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/Article/AudioHeader/AudioHeader.module.scss b/src/components/Article/AudioHeader/AudioHeader.module.scss
index 51da7246..20502749 100644
--- a/src/components/Article/AudioHeader/AudioHeader.module.scss
+++ b/src/components/Article/AudioHeader/AudioHeader.module.scss
@@ -49,7 +49,7 @@
     width: 200px;
     height: 200px;
     transition: all 0.2s ease-in-out;
-    background: var(--placeholder-color-semi) url('icons/create-music.svg') no-repeat 50% 50%;
+    background: var(--placeholder-color-semi) url('../../icons/create-music.svg') no-repeat 50% 50%;
 
     .image {
       object-fit: cover;
diff --git a/src/components/Article/AudioPlayer/AudioPlayer.tsx b/src/components/Article/AudioPlayer/AudioPlayer.tsx
index b3444e25..63ae0e23 100644
--- a/src/components/Article/AudioPlayer/AudioPlayer.tsx
+++ b/src/components/Article/AudioPlayer/AudioPlayer.tsx
@@ -3,6 +3,7 @@ import { PlayerHeader } from './PlayerHeader'
 import { PlayerPlaylist } from './PlayerPlaylist'
 import styles from './AudioPlayer.module.scss'
 import { MediaItem } from '../../../pages/types'
+import { audioProxy } from '../../../utils/imageProxy'
 
 export type Audio = {
   pic?: string
@@ -22,6 +23,7 @@ type Props = {
 const prepareMedia = (media: Audio[]) =>
   media.map((item, index) => ({
     ...item,
+    url: audioProxy(item.url),
     index: index,
     isCurrent: false,
     isPlaying: false
@@ -67,7 +69,6 @@ export const AudioPlayer = (props: Props) => {
           isCurrent: index === 0
         }))
       )
-
       return tracks()[0]
     })()
 
diff --git a/src/components/Article/AudioPlayer/PlayerPlaylist.tsx b/src/components/Article/AudioPlayer/PlayerPlaylist.tsx
index 5c041f72..9281099a 100644
--- a/src/components/Article/AudioPlayer/PlayerPlaylist.tsx
+++ b/src/components/Article/AudioPlayer/PlayerPlaylist.tsx
@@ -1,4 +1,4 @@
-import { createEffect, createSignal, For, Show } from 'solid-js'
+import { createSignal, For, Show } from 'solid-js'
 import { SharePopup, getShareUrl } from '../SharePopup'
 import { getDescription } from '../../../utils/meta'
 import { useLocalize } from '../../../context/localize'
diff --git a/src/components/Views/Edit.tsx b/src/components/Views/Edit.tsx
index 2eec8189..22f01c06 100644
--- a/src/components/Views/Edit.tsx
+++ b/src/components/Views/Edit.tsx
@@ -230,18 +230,20 @@ export const EditView = (props: Props) => {
                             type="text"
                             placeholder={t('Artist...')}
                             class={styles.additionalInput}
-                            value={mediaItems()[0]?.artist || t('Artist')}
+                            value={mediaItems()[0]?.artist || ''}
                             onChange={(event) => handleBaseFieldsChange('artist', event.target.value)}
                           />
                           <input
                             class={styles.additionalInput}
                             placeholder={t('Release date...')}
+                            value={mediaItems()[0]?.date || ''}
                             onChange={(event) => handleBaseFieldsChange('date', event.target.value)}
                           />
                           <input
                             type="text"
                             placeholder={t('Genre...')}
                             class={styles.additionalInput}
+                            value={mediaItems()[0]?.genre || ''}
                             onChange={(event) => handleBaseFieldsChange('genre', event.target.value)}
                           />
                         </div>
diff --git a/src/utils/imageProxy.ts b/src/utils/imageProxy.ts
index 3e069019..c48530e6 100644
--- a/src/utils/imageProxy.ts
+++ b/src/utils/imageProxy.ts
@@ -2,3 +2,7 @@ import { isDev } from './config'
 export const imageProxy = (url: string) => {
   return `${isDev ? 'https://new.discours.io' : ''}/api/image?url=${encodeURI(url)}`
 }
+
+export const audioProxy = (url: string) => {
+  return `${isDev ? 'https://new.discours.io' : ''}/api/audio?url=${encodeURI(url)}`
+}