Merge branch 'jeffvli:development' into development

jeffvli · Feb 8, 2024 · 8e39da4 · 8e39da4
2 parents 4d4ee1b + 92478b5
commit 8e39da4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -11,10 +11,10 @@
     ],
     "typescript.tsserver.experimental.enableProjectDiagnostics": true,
     "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true,
-        "source.fixAll.stylelint": true,
-        "source.organizeImports": false,
-        "source.formatDocument": true
+        "source.fixAll.eslint": "explicit",
+        "source.fixAll.stylelint": "explicit",
+        "source.organizeImports": "never",
+        "source.formatDocument": "explicit"
     },
     "css.validate": true,
     "less.validate": false,

diff --git a/src/main/features/linux/mpris.ts b/src/main/features/linux/mpris.ts
@@ -70,6 +70,8 @@ mprisPlayer.on('volume', (vol: number) => {
     getMainWindow()?.webContents.send('request-volume', {
         volume,
     });
+
+    mprisPlayer.volume = volume / 100;
 });
 
 mprisPlayer.on('shuffle', (event: boolean) => {

diff --git a/src/renderer/api/jellyfin/jellyfin-controller.ts b/src/renderer/api/jellyfin/jellyfin-controller.ts
@@ -102,9 +102,9 @@ const authenticate = async (
             Username: body.username,
         },
         headers: {
-            'x-emby-authorization': `MediaBrowser Client="Feishin", Device="${getHostname()}", DeviceId="Feishin-${getHostname()}-${
-                body.username
-            }", Version="${packageJson.version}"`,
+            'x-emby-authorization': `MediaBrowser Client="Feishin", Device="${getHostname()}", DeviceId="Feishin-${getHostname()}-${encodeURIComponent(
+                body.username,
+            )}", Version="${packageJson.version}"`,
         },
     });
-Original file line number
+Diff line change
@@ Expand Up / @@ -70,6 +70,8 @@ mprisPlayer.on('volume', (vol: number) => { @@
         getMainWindow()?.webContents.send('request-volume', {
             volume,
         });
+        mprisPlayer.volume = volume / 100;
     });
     mprisPlayer.on('shuffle', (event: boolean) => {
@@ Expand Down @@