src/components/Common/Avatar.svelte

@@ -1,22 +1,14 @@
 <script>
-  import { opt } from '../../utils/js';
+  import {opt} from '../../utils/js'
 
   export let player;
 
-  const avatar = opt(player, 'playerInfo.avatar')
-
-  // TEMP WORKAROUND UNTIL I MIGRATE TO NEW SS API
-  export let avatarr;
-  if (avatar.includes("oculus")) {
-    avatarr = "https://cdn.scoresaber.com/avatars/oculus.png"
-  } else {
-    avatarr = `https://cdn.scoresaber.com/avatars/${player.playerId}.jpg`
-  }
+  $: avatar = opt(player, 'playerInfo.avatar')
 </script>
 
-{#if avatarr}
+{#if avatar}
   <figure class="image is-24x24" on:click>
-    <img src={avatarr} alt=""/>
+    <img src={avatar} alt=""/>
   </figure>
 {/if}
 

src/components/Player/Avatar.svelte

@@ -1,6 +1,5 @@
 <script>
-  import { SS_CDN_HOST } from '../../network/queues/scoresaber/page-queue';
-  import Spinner from '../Common/Spinner.svelte';
+  import Spinner from '../Common/Spinner.svelte'
 
   export let playerInfo;
   export let isLoading = false;
@@ -11,8 +10,7 @@
   <span class="no-image">?</span>
 
   {#if playerInfo && playerInfo.avatar}
-    <!-- TEMP WORKAROUND UNTIL I MIGRATE TO NEW SS API -->
-    <img src={playerInfo.avatar.replace("https://new.scoresaber.com/api/static", SS_CDN_HOST)} class="avatar" alt="" />
+    <img src={playerInfo.avatar} class="avatar" alt="" />
   {/if}
   <span class="spinner">
     <Spinner width="100%" height="100%"/>