From aacef8908b53b52ef009031eef67188201fb4868 Mon Sep 17 00:00:00 2001
From: Untone <anton.rewin@gmail.com>
Date: Wed, 17 Jan 2024 15:46:14 +0300
Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=87=D0=B8=D0=B9-?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Article/AudioPlayer/AudioPlayer.module.scss      |  1 -
 .../Article/AudioPlayer/PlayerPlaylist.tsx           |  7 ++++++-
 src/utils/getImageUrl.ts                             | 12 +++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/Article/AudioPlayer/AudioPlayer.module.scss b/src/components/Article/AudioPlayer/AudioPlayer.module.scss
index 9c677393..09abe210 100644
--- a/src/components/Article/AudioPlayer/AudioPlayer.module.scss
+++ b/src/components/Article/AudioPlayer/AudioPlayer.module.scss
@@ -252,7 +252,6 @@ $vendors-thumb: ('::-webkit-slider-thumb', '::-moz-moz-range-thumb', '::-ms-thum
     @include font-size(1.6rem);
 
     overflow: hidden;
-    max-width: calc(50% - 16px);
     text-overflow: ellipsis;
     padding: 0;
     margin: 0;
diff --git a/src/components/Article/AudioPlayer/PlayerPlaylist.tsx b/src/components/Article/AudioPlayer/PlayerPlaylist.tsx
index e0780c16..5147e282 100644
--- a/src/components/Article/AudioPlayer/PlayerPlaylist.tsx
+++ b/src/components/Article/AudioPlayer/PlayerPlaylist.tsx
@@ -34,7 +34,12 @@ export const PlayerPlaylist = (props: Props) => {
   const handleMediaItemFieldChange = (field: keyof MediaItem, value: string) => {
     props.onMediaItemFieldChange(activeEditIndex(), field, value)
   }
-  const titleStyle = (mi: MediaItem) => ({ 'max-width': `calc(${mi.title ? 5 : 10}0% - 16px)` })
+  const titleStyle = (mi: MediaItem) => {
+    let portion = 0
+    if (mi.artist) portion += 5
+    if (mi.title) portion += 5
+    return { 'max-width': `calc(${portion}0% - 16px)` }
+  }
   return (
     <ul class={styles.playlist}>
       <For each={props.media}>
diff --git a/src/utils/getImageUrl.ts b/src/utils/getImageUrl.ts
index eb01be07..7805efa0 100644
--- a/src/utils/getImageUrl.ts
+++ b/src/utils/getImageUrl.ts
@@ -15,11 +15,13 @@ const getSizeUrlPart = (options: { width?: number; height?: number } = {}) => {
 
 export const getImageUrl = (src: string, options: { width?: number; height?: number } = {}) => {
   const sizeUrlPart = getSizeUrlPart(options)
-  const sourceUrl = src.replace(thumborUrl, '').replace('/unsafe', '')
-  return (
-    'https://' +
-    `${thumborUrl}/unsafe/${sizeUrlPart}${sourceUrl}`.replace('https://', '').replace('//', '/')
-  )
+
+  if (src.startsWith(thumborPrefix)) {
+    const thumborKey = src.replace(thumborPrefix, '')
+    return `${thumborUrl}/unsafe/${sizeUrlPart}${thumborKey}`
+  }
+
+  return `${thumborUrl}/unsafe/${sizeUrlPart}${src}`
 }
 
 export const getOpenGraphImageUrl = (