From cd8360851ff277ee8bb2ac2b46d493302c4f56aa Mon Sep 17 00:00:00 2001
From: Eclypsed <nicholas.tamassia@gmail.com>
Date: Mon, 25 Mar 2024 10:03:22 -0400
Subject: [PATCH] minor changes

---
 src/lib/server/connections.ts                |  4 +--
 src/lib/server/db.ts                         |  6 ++---
 src/lib/server/jellyfin.ts                   |  2 +-
 src/lib/services.json                        |  8 ++----
 src/lib/static/jellyfin-icon.svg             | 24 +++++++++++++++++
 src/lib/static/youtube-music-icon.svg        | 28 ++++++++++++++++++++
 src/routes/settings/connections/+page.svelte |  8 +++---
 7 files changed, 65 insertions(+), 15 deletions(-)
 create mode 100644 src/lib/static/jellyfin-icon.svg
 create mode 100644 src/lib/static/youtube-music-icon.svg

diff --git a/src/lib/server/connections.ts b/src/lib/server/connections.ts
index 869e515..cf1690e 100644
--- a/src/lib/server/connections.ts
+++ b/src/lib/server/connections.ts
@@ -1,8 +1,8 @@
-import { DB } from './db'
+import { DB, type DBConnectionInfo } from './db'
 import { Jellyfin } from './jellyfin'
 import { YouTubeMusic } from './youtube-music'
 
-const constructConnection = (connectionInfo: ConnectionInfo): Connection => {
+const constructConnection = (connectionInfo: DBConnectionInfo): Connection => {
     const { id, userId, type, serviceInfo, tokens } = connectionInfo
     switch (type) {
         case 'jellyfin':
diff --git a/src/lib/server/db.ts b/src/lib/server/db.ts
index a46e802..12e6362 100644
--- a/src/lib/server/db.ts
+++ b/src/lib/server/db.ts
@@ -22,13 +22,13 @@ type DBServiceInfo =
           tokens: YouTubeMusic.Tokens
       }
 
-type DBConnectionInfo = {
+export type DBConnectionInfo = {
     id: string
     userId: string
 } & DBServiceInfo
 
-export class Storage {
-    private database: Sqlite3DB
+class Storage {
+    private readonly database: Sqlite3DB
 
     constructor(database: Sqlite3DB) {
         this.database = database
diff --git a/src/lib/server/jellyfin.ts b/src/lib/server/jellyfin.ts
index 3a6bd1c..6d3e6cc 100644
--- a/src/lib/server/jellyfin.ts
+++ b/src/lib/server/jellyfin.ts
@@ -98,7 +98,7 @@ export class Jellyfin implements Connection {
         }
     }
 
-    static authenticateByName = async (username: string, password: string, serverUrl: URL, deviceId: string): Promise<JellyfinAPI.AuthData> => {
+    public static authenticateByName = async (username: string, password: string, serverUrl: URL, deviceId: string): Promise<JellyfinAPI.AuthData> => {
         const authUrl = new URL('/Users/AuthenticateByName', serverUrl.origin).toString()
         return fetch(authUrl, {
             method: 'POST',
diff --git a/src/lib/services.json b/src/lib/services.json
index c7b6d36..af3c1ce 100644
--- a/src/lib/services.json
+++ b/src/lib/services.json
@@ -1,14 +1,10 @@
 {
     "jellyfin": {
         "displayName": "Jellyfin",
-        "type": ["streaming"],
-        "icon": "https://raw.githubusercontent.com/jellyfin/jellyfin-ux/55616553b692b1a6c7d8e786eeb7d8216e9b50df/branding/SVG/icon-transparent.svg",
-        "primaryColor": "--jellyfin-blue"
+        "icon": "https://raw.githubusercontent.com/jellyfin/jellyfin-ux/55616553b692b1a6c7d8e786eeb7d8216e9b50df/branding/SVG/icon-transparent.svg"
     },
     "youtube-music": {
         "displayName": "YouTube Music",
-        "type": ["streaming"],
-        "icon": "https://upload.wikimedia.org/wikipedia/commons/6/6a/Youtube_Music_icon.svg",
-        "primaryColor": "--youtube-red"
+        "icon": "https://upload.wikimedia.org/wikipedia/commons/6/6a/Youtube_Music_icon.svg"
     }
 }
diff --git a/src/lib/static/jellyfin-icon.svg b/src/lib/static/jellyfin-icon.svg
new file mode 100644
index 0000000..d4d7f01
--- /dev/null
+++ b/src/lib/static/jellyfin-icon.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+  - Part of the Jellyfin project (https://jellyfin.media)
+  - 
+  - All copyright belongs to the Jellyfin contributors; a full list can
+  - be found in the file CONTRIBUTORS.md
+  - 
+  - This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.
+  - To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/.
+- ***** END LICENSE BLOCK ***** -->
+<svg version="1.1" id="icon-transparent" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 512 512">
+	<defs>
+		<linearGradient id="linear-gradient" gradientUnits="userSpaceOnUse" x1="110.25" y1="213.3" x2="496.14" y2="436.09">
+			<stop offset="0" style="stop-color:#AA5CC3"/>
+			<stop offset="1" style="stop-color:#00A4DC"/>
+		</linearGradient>
+	</defs>
+	<title>icon-transparent</title>
+	<g id="icon-transparent">
+		<path id="inner-shape" d="M256,201.6c-20.4,0-86.2,119.3-76.2,139.4s142.5,19.9,152.4,0S276.5,201.6,256,201.6z" fill="url(#linear-gradient)"/>
+		<path id="outer-shape" d="M256,23.3c-61.6,0-259.8,359.4-229.6,420.1s429.3,60,459.2,0S317.6,23.3,256,23.3z
+		M406.5,390.8c-19.6,39.3-281.1,39.8-300.9,0s110.1-275.3,150.4-275.3S426.1,351.4,406.5,390.8z" fill="url(#linear-gradient)"/>
+	</g>
+</svg>
diff --git a/src/lib/static/youtube-music-icon.svg b/src/lib/static/youtube-music-icon.svg
new file mode 100644
index 0000000..9dd9150
--- /dev/null
+++ b/src/lib/static/youtube-music-icon.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 176 176"
+	 enable-background="new 0 0 176 176" xml:space="preserve">
+<metadata>
+	<sfw  xmlns="&ns_sfw;">
+		<slices></slices>
+		<sliceSourceBounds  bottomLeftOrigin="true" height="176" width="176" x="8" y="-184"></sliceSourceBounds>
+	</sfw>
+</metadata>
+<g id="XMLID_167_">
+	<circle id="XMLID_791_" fill="#FF0000" cx="88" cy="88" r="88"/>
+	<path id="XMLID_42_" fill="#FFFFFF" d="M88,46c23.1,0,42,18.8,42,42s-18.8,42-42,42s-42-18.8-42-42S64.9,46,88,46 M88,42
+		c-25.4,0-46,20.6-46,46s20.6,46,46,46s46-20.6,46-46S113.4,42,88,42L88,42z"/>
+	<polygon id="XMLID_274_" fill="#FFFFFF" points="72,111 111,87 72,65 	"/>
+</g>
+</svg>
diff --git a/src/routes/settings/connections/+page.svelte b/src/routes/settings/connections/+page.svelte
index eaf87d6..fa00ace 100644
--- a/src/routes/settings/connections/+page.svelte
+++ b/src/routes/settings/connections/+page.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
     import Services from '$lib/services.json'
+    import JellyfinIcon from '$lib/static/jellyfin-icon.svg'
+    import YouTubeMusicIcon from '$lib/static/youtube-music-icon.svg'
     import JellyfinAuthBox from './jellyfinAuthBox.svelte'
     import { newestAlert } from '$lib/stores.js'
     import type { PageServerData } from './$types.js'
@@ -38,7 +40,7 @@
                 connections = [...connections, newConnection]
 
                 newConnectionModal = null
-                return ($newestAlert = ['success', `Added ${Services[newConnection.type].displayName}`])
+                return ($newestAlert = ['success', `Added Jellyfin`])
             }
         }
     }
@@ -99,11 +101,11 @@
         <h1 class="py-2 text-xl">Add Connection</h1>
         <div class="flex flex-wrap gap-2 pb-4">
             <button class="add-connection-button h-14 rounded-md" on:click={() => (newConnectionModal = JellyfinAuthBox)}>
-                <img src={Services.jellyfin.icon} alt="{Services.jellyfin.displayName} icon" class="aspect-square h-full p-2" />
+                <img src={JellyfinIcon} alt="Jellyfin icon" class="aspect-square h-full p-2" />
             </button>
             <form method="post" action="?/youtubeMusicLogin" use:enhance={authenticateYouTube}>
                 <button class="add-connection-button h-14 rounded-md">
-                    <img src={Services['youtube-music'].icon} alt="{Services['youtube-music'].displayName} icon" class="aspect-square h-full p-2" />
+                    <img src={YouTubeMusicIcon} alt="YouTube Music icon" class="aspect-square h-full p-2" />
                 </button>
             </form>
         </div>