chore(deps): update dependency sirv-cli to v1.0.14

Reviewed-on: #3

.gitignore

@@ -2,4 +2,5 @@
 .vscode
 node_modules
 public/build
-build-info.js
+build-info.js
+yarn.lock

README.md

@@ -1,5 +1,7 @@
 # ScoreSaber Reloaded
 
+Forked from: <https://github.com/motzel/scoresaber-reloaded>
+
 ## Users
 
 Just go to [ssr.fascinated.cc](https://ssr.fascinated.cc)
@@ -9,11 +11,11 @@ Just go to [ssr.fascinated.cc](https://ssr.fascinated.cc)
 ### Install the dependencies
 
 ```bash
-yarn install
+npm install
 ```
 
 ### Start the dev environment
 
 ```bash
-yarn dev
+npm run dev
 ```

package-lock.json

@@ -148,11 +148,10 @@
       }
     },
     "node_modules/@polka/url": {
-      "version": "1.0.0-next.12",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.12.tgz",
-      "integrity": "sha512-6RglhutqrGFMO1MNUXp95RBuYIuc8wTnMAV5MUhLmjTOy78ncwOw7RgeQ/HeymkKXRhZd0s2DNrM1rL7unk3MQ==",
-      "dev": true,
-      "license": "MIT"
+      "version": "1.0.0-next.23",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.23.tgz",
+      "integrity": "sha512-C16M+IYz0rgRhWZdCmK+h58JMv8vijAA61gmz2rspCSwKwzBebpdcsiUmwrtJRdphuY30i6BSLEOP8ppbNLyLg==",
+      "dev": true
     },
     "node_modules/@rollup/plugin-commonjs": {
       "version": "17.1.0",
@@ -707,11 +706,10 @@
       }
     },
     "node_modules/idb": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/idb/-/idb-6.1.2.tgz",
-      "integrity": "sha512-1DNDVu3yDhAZkFDlJf0t7r+GLZ248F5pTAtA7V0oVG3yjmV125qZOx3g0XpAEkGZVYQiFDAsSOnGet2bhugc3w==",
-      "dev": true,
-      "license": "ISC"
+      "version": "6.1.5",
+      "resolved": "https://registry.npmjs.org/idb/-/idb-6.1.5.tgz",
+      "integrity": "sha512-IJtugpKkiVXQn5Y+LteyBCNk1N8xpGV3wWZk9EVtZWH8DYkjBn0bX1XnGP9RkyZF0sAcywa6unHqSWKe7q4LGw==",
+      "dev": true
     },
     "node_modules/immer": {
       "version": "9.0.5",
@@ -995,19 +993,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/mime": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
-      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
     "node_modules/min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
@@ -1057,6 +1042,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/mrmime": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
+      "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/nano-time": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz",
@@ -1599,14 +1593,13 @@
       }
     },
     "node_modules/sirv": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.11.tgz",
-      "integrity": "sha512-SR36i3/LSWja7AJNRBz4fF/Xjpn7lQFI30tZ434dIy+bitLYSP+ZEenHg36i23V2SGEz+kqjksg0uOGZ5LPiqg==",
+      "version": "1.0.19",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz",
+      "integrity": "sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@polka/url": "^1.0.0-next.9",
-        "mime": "^2.3.1",
+        "@polka/url": "^1.0.0-next.20",
+        "mrmime": "^1.0.0",
         "totalist": "^1.0.0"
       },
       "engines": {
@@ -1614,11 +1607,10 @@
       }
     },
     "node_modules/sirv-cli": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/sirv-cli/-/sirv-cli-1.0.11.tgz",
-      "integrity": "sha512-L8NILoRSBd38VcfFcERYCaVCnWPBLo9G6u/a37UJ8Ysv4DfjizMbFBcM+SswNnndJienhR6qy8KFuAEaeL4g8Q==",
+      "version": "1.0.14",
+      "resolved": "https://registry.npmjs.org/sirv-cli/-/sirv-cli-1.0.14.tgz",
+      "integrity": "sha512-yyUTNr984ANKDloqepkYbBSqvx3buwYg2sQKPWjSU+IBia5loaoka2If8N9CMwt8AfP179cdEl7kYJ//iWJHjQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "console-clear": "^1.1.0",
         "get-port": "^3.2.0",
@@ -1626,7 +1618,7 @@
         "local-access": "^1.0.1",
         "sade": "^1.6.0",
         "semiver": "^1.0.0",
-        "sirv": "^1.0.11",
+        "sirv": "^1.0.13",
         "tinydate": "^1.0.0"
       },
       "bin": {

public/assets/theme/ss-bulma.css

@@ -9715,8 +9715,6 @@ label.panel-block:hover {
   padding: 3rem 1.5rem 6rem;
 }
 
-/*# sourceMappingURL=bulma.css.map */
-
 :root {
   --background: #222;
   --foreground: #252525;

public/assets/theme/ssr.css

@@ -51,6 +51,8 @@ select {
   max-width: 1200px;
   margin: 0 auto;
 
+  border-radius: 6px;
+
   position: relative;
   opacity: var(--transparency);
 }
@@ -76,7 +78,7 @@ select {
   height: 100%;
   background-size: cover;
   background-repeat: no-repeat;
-  background-image: url("./scoresaber-logo.svg");
+  background-image: url("/assets/scoresaber-logo.svg");
 }
 
 .beatsavior-icon {
@@ -92,7 +94,7 @@ select {
   height: 100%;
   background-size: cover;
   background-repeat: no-repeat;
-  background-image: url("./accsaber-logo.png");
+  background-image: url("/assets/accsaber-logo.png");
 }
 
 .grid-transition-helper {

public/index.html

@@ -6,18 +6,24 @@
 
     <title>ScoreSaber Reloaded</title>
 
+    <!-- Internal Assets -->
     <link rel="icon" type="image/png" href="/assets/favicon.png" />
-    <link rel="stylesheet" href="/assets/ss-bulma.css" />
-    <link
-      rel="stylesheet"
-      href="https://use.fontawesome.com/releases/v5.15.4/css/all.css"
-    />
-    <link rel="stylesheet" href="/assets/ssr.css?20210925" />
+    <link rel="stylesheet" href="/assets/theme/ss-bulma.css" />
+    <link rel="stylesheet" href="/assets/theme/ssr.css?20210925" />
     <link rel="stylesheet" href="/build/bundle.css" />
 
+    <!-- External Assets -->
+    <script
+      src="/assets/external/fontawesome/all.js"
+      data-auto-replace-svg="nest"
+    ></script>
+    <link rel="stylesheet" href="/assets/external/fontawesome/all.css" />
+
+    <!-- Scripts -->
     <script src="/assets/swiped-events.min.js"></script>
     <script defer src="/build/bundle.js"></script>
 
+    <!-- Embed Tags -->
     <meta content="Scoresaber Reloaded" property="og:site_name" />
     <meta content="SSR - Score Tracker" property="og:title" />
     <meta

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>Fascinated/renovate-config"
+  ]
+}

src/components/Common/Avatar.svelte

@@ -1,14 +1,22 @@
 <script>
-  import {opt} from '../../utils/js'
+  import { opt } from '../../utils/js';
 
   export let player;
 
-  $: avatar = opt(player, 'playerInfo.avatar')
+  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`
+  }
 </script>
 
-{#if avatar}
+{#if avatarr}
   <figure class="image is-24x24" on:click>
-    <img src={avatar} alt=""/>
+    <img src={avatarr} alt=""/>
   </figure>
 {/if}
 

src/components/Others/Settings.svelte

@@ -95,7 +95,16 @@
 
     showTwitchLinkBtn = !twitchToken || tokenExpireSoon;
 
-    twitchBtnLabel = !twitchToken || !tokenExpireSoon ? 'Link to Twitch' : 'Renew Twitch token'
+    if (!twitchToken) {
+      twitchBtnLabel = "Login with Twitch";
+    }
+    if (tokenExpireSoon) {
+      twitchBtnLabel = "Renew Twitch token"
+    }
+    if (twitchToken) {
+      twitchBtnLabel = "Already logged in"
+    }
+
     twitchBtnTitle = twitchToken && tokenExpireInDays > 0 ? `Days left: ${tokenExpireInDays}` : null;
     twitchBtnDisabled = !tokenExpireSoon;
   }
@@ -215,9 +224,9 @@
     </svelte:fragment>
 
     <svelte:fragment slot="footer-left">
-      <File iconFa="fas fa-file-export" title="Import SSR data from file" loading={isImporting} disabled={isImporting}
+      <File iconFa="fa-solid fa-file-import" title="Import SSR data from file" loading={isImporting} disabled={isImporting}
             accept="application/json" bind:this={importBtn} on:change={onImport}/>
-      <Button iconFa="fas fa-file-import" title="Export SSR data to file" on:click={onExport} loading={isExporting} disabled={isExporting}/>
+      <Button iconFa="fa-regular fa-floppy-disk" title="Export SSR data to file" on:click={onExport} loading={isExporting} disabled={isExporting}/>
     </svelte:fragment>
 
     <svelte:fragment slot="footer-right">

src/components/Player/Avatar.svelte

@@ -1,5 +1,6 @@
 <script>
-  import Spinner from '../Common/Spinner.svelte'
+  import { SS_CDN_HOST } from '../../network/queues/scoresaber/page-queue';
+  import Spinner from '../Common/Spinner.svelte';
 
   export let playerInfo;
   export let isLoading = false;
@@ -10,7 +11,8 @@
   <span class="no-image">?</span>
 
   {#if playerInfo && playerInfo.avatar}
-    <img src={playerInfo.avatar} class="avatar" alt="" />
+    <!-- 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="" />
   {/if}
   <span class="spinner">
     <Spinner width="100%" height="100%"/>

src/components/Player/ScoreFilters/GenericFilter.svelte

@@ -1,5 +1,5 @@
 <script>
-  import {createEventDispatcher} from 'svelte'
+  import { createEventDispatcher } from 'svelte';
 
   export let filter;
 
@@ -71,7 +71,6 @@
         right: 0;
         width: 1.75em;
         text-align: center;
-        padding: .4em;
         transition: all 300ms ease-out;
         background-color: var(--dimmed);
         z-index: 1;

src/network/queues/twitch/api-queue.js

@@ -1,8 +1,8 @@
-import { default as createQueue, PRIORITY } from "../http-queue";
 import ssrConfig from "../../../ssr-config";
 import { substituteVars } from "../../../utils/format";
+import { default as createQueue, PRIORITY } from "../http-queue";
 
-const CLIENT_ID = "u0swxz56n4iumc634at1osoqdk31qt";
+const CLIENT_ID = "r2phvaavwhzh2s19y72na3cq1x4a58";
 
 const TWITCH_AUTH_URL = "https://id.twitch.tv/oauth2";
 const AUTHORIZATION_URL =

src/services/twitch.js

@@ -1,11 +1,11 @@
-import queues from "../network/queues/queues";
 import keyValueRepository from "../db/repository/key-value";
 import twitchRepository from "../db/repository/twitch";
-import createPlayerService from "../services/scoresaber/player";
 import profileApiClient from "../network/clients/twitch/api-profile";
 import videosApiClient from "../network/clients/twitch/api-videos";
+import { PRIORITY } from "../network/queues/http-queue";
+import queues from "../network/queues/queues";
+import createPlayerService from "../services/scoresaber/player";
 import eventBus from "../utils/broadcast-channel-pubsub";
-import log from "../utils/logger";
 import {
   addToDate,
   dateFromString,
@@ -14,7 +14,7 @@ import {
   millisToDuration,
   MINUTE,
 } from "../utils/date";
-import { PRIORITY } from "../network/queues/http-queue";
+import log from "../utils/logger";
 import makePendingPromisePool from "../utils/pending-promises";
 
 const TWITCH_TOKEN_KEY = "twitchToken";