Update translation files

Updated by "Remove blank strings" hook in Weblate. Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 99.8% (652 of 653 strings) Co-authored-by: ENDzZ <godzmichael@outlook.com> Co-authored-by: Hosted Weblate <hosted@weblate.org> Translate-URL: https://hosted.weblate.org/projects/feishin/translation/ Translate-URL: https://hosted.weblate.org/projects/feishin/translation/zh_Hans/ Translation: feishin/Translation
Translated using Weblate (Spanish)
2026-05-07 04:20:12 +02:00 · 2024-09-29 06:44:18 +02:00 · 2024-09-29 06:44:17 +02:00 · 2024-09-29 06:44:17 +02:00 · 2024-09-28 21:44:13 -07:00 · 2024-09-28 21:39:30 -07:00
127 changed files with 5924 additions and 4062 deletions
@@ -71,7 +71,9 @@ docker run --name feishin -p 9180:9180 feishin
 ```

 #### Docker Compose
+
 To install via Docker Compose use the following snippit. This also works on Portainer.
+
 ```
 version: '3'
 services:
@@ -92,7 +94,6 @@ services:
    restart: unless-stopped
 ```

-
 ### Configuration

 1. Upon startup you will be greeted with a prompt to select the path to your MPV binary. If you do not have MPV installed, you can download it [here](https://mpv.io/installation/) or install it using any package manager supported by your OS. After inputting the path, restart the app.
@@ -130,6 +131,8 @@ chmod 4755 chrome-sandbox
 sudo chown root:root chrome-sandbox
 ```

+Ubunutu 24.04 specifically introduced breaking changes that affect how namespaces work. Please see https://discourse.ubuntu.com/t/ubuntu-24-04-lts-noble-numbat-release-notes/39890#:~:text=security%20improvements%20 for possible fixes.
+
 ## Development

 Built and tested using Node `v16.15.0`.
@@ -1,12 +1,12 @@
 {
    "name": "feishin",
-    "version": "0.8.1",
+    "version": "0.10.1",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
        "": {
            "name": "feishin",
-            "version": "0.8.1",
+            "version": "0.10.1",
            "hasInstallScript": true,
            "license": "GPL-3.0",
            "dependencies": {
@@ -28,6 +28,7 @@
                "@tanstack/react-query-persist-client": "^4.32.1",
                "@ts-rest/core": "^3.23.0",
                "@xhayper/discord-rpc": "^1.0.24",
+                "audiomotion-analyzer": "^4.5.0",
                "auto-text-size": "^0.2.3",
                "axios": "^1.6.0",
                "clsx": "^2.0.0",
@@ -6740,6 +6741,16 @@
                "node": ">=10.12.0"
            }
        },
+        "node_modules/audiomotion-analyzer": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/audiomotion-analyzer/-/audiomotion-analyzer-4.5.0.tgz",
+            "integrity": "sha512-qnmB8TSbrxYkTbFgsQeeym0Z/suQx4c0jFg9Yh5+gaPw6J4AFLdfFpagdnDbtNEsj6K7BntgsC3bkdut5rxozg==",
+            "license": "AGPL-3.0-or-later",
+            "funding": {
+                "type": "Ko-fi",
+                "url": "https://ko-fi.com/hvianna"
+            }
+        },
        "node_modules/auto-text-size": {
            "version": "0.2.3",
            "resolved": "https://registry.npmjs.org/auto-text-size/-/auto-text-size-0.2.3.tgz",
@@ -7041,10 +7052,11 @@
            }
        },
        "node_modules/body-parser": {
-            "version": "1.20.2",
-            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
-            "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+            "version": "1.20.3",
+            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+            "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
            "dev": true,
+            "license": "MIT",
            "dependencies": {
                "bytes": "3.1.2",
                "content-type": "~1.0.5",
@@ -7054,7 +7066,7 @@
                "http-errors": "2.0.0",
                "iconv-lite": "0.4.24",
                "on-finished": "2.4.1",
-                "qs": "6.11.0",
+                "qs": "6.13.0",
                "raw-body": "2.5.2",
                "type-is": "~1.6.18",
                "unpipe": "1.0.0"
@@ -7069,6 +7081,7 @@
            "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
            "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
            "dev": true,
+            "license": "MIT",
            "engines": {
                "node": ">= 0.8"
            }
@@ -7078,6 +7091,7 @@
            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
            "dev": true,
+            "license": "MIT",
            "dependencies": {
                "ms": "2.0.0"
            }
@@ -7087,6 +7101,7 @@
            "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
            "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
            "dev": true,
+            "license": "MIT",
            "engines": {
                "node": ">= 0.8"
            }
@@ -7096,6 +7111,7 @@
            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
            "dev": true,
+            "license": "MIT",
            "dependencies": {
                "safer-buffer": ">= 2.1.2 < 3"
            },
@@ -7107,7 +7123,8 @@
            "version": "2.0.0",
            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
        },
        "node_modules/bonjour-service": {
            "version": "1.0.11",
@@ -8508,6 +8525,7 @@
            "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
            "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
            "dev": true,
+            "license": "MIT",
            "engines": {
                "node": ">= 0.6"
            }
@@ -9371,6 +9389,7 @@
            "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
            "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
            "dev": true,
+            "license": "MIT",
            "engines": {
                "node": ">= 0.8",
                "npm": "1.2.8000 || >= 1.4.16"
@@ -9745,8 +9764,9 @@
        "node_modules/ee-first": {
            "version": "1.1.1",
            "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-            "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-            "dev": true
+            "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+            "dev": true,
+            "license": "MIT"
        },
        "node_modules/ejs": {
            "version": "3.1.10",
@@ -10206,10 +10226,11 @@
            }
        },
        "node_modules/encodeurl": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-            "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+            "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
            "dev": true,
+            "license": "MIT",
            "engines": {
                "node": ">= 0.8"
            }
@@ -11873,8 +11894,9 @@
        "node_modules/etag": {
            "version": "1.8.1",
            "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-            "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+            "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
            "dev": true,
+            "license": "MIT",
            "engines": {
                "node": ">= 0.6"
            }
@@ -11961,37 +11983,38 @@
            "license": "Apache-2.0"
        },
        "node_modules/express": {
-            "version": "4.19.2",
-            "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
-            "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+            "version": "4.21.0",
+            "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",
+            "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==",
            "dev": true,
+            "license": "MIT",
            "dependencies": {
                "accepts": "~1.3.8",
                "array-flatten": "1.1.1",
-                "body-parser": "1.20.2",
+                "body-parser": "1.20.3",
                "content-disposition": "0.5.4",
                "content-type": "~1.0.4",
                "cookie": "0.6.0",
                "cookie-signature": "1.0.6",
                "debug": "2.6.9",
                "depd": "2.0.0",
-                "encodeurl": "~1.0.2",
+                "encodeurl": "~2.0.0",
                "escape-html": "~1.0.3",
                "etag": "~1.8.1",
-                "finalhandler": "1.2.0",
+                "finalhandler": "1.3.1",
                "fresh": "0.5.2",
                "http-errors": "2.0.0",
-                "merge-descriptors": "1.0.1",
+                "merge-descriptors": "1.0.3",
                "methods": "~1.1.2",
                "on-finished": "2.4.1",
                "parseurl": "~1.3.3",
-                "path-to-regexp": "0.1.7",
+                "path-to-regexp": "0.1.10",
                "proxy-addr": "~2.0.7",
-                "qs": "6.11.0",
+                "qs": "6.13.0",
                "range-parser": "~1.2.1",
                "safe-buffer": "5.2.1",
-                "send": "0.18.0",
-                "serve-static": "1.15.0",
+                "send": "0.19.0",
+                "serve-static": "1.16.2",
                "setprototypeof": "1.2.0",
                "statuses": "2.0.1",
                "type-is": "~1.6.18",
@@ -12282,13 +12305,14 @@
            }
        },
        "node_modules/finalhandler": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-            "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+            "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
            "dev": true,
+            "license": "MIT",
            "dependencies": {
                "debug": "2.6.9",
-                "encodeurl": "~1.0.2",
+                "encodeurl": "~2.0.0",
                "escape-html": "~1.0.3",
                "on-finished": "2.4.1",
                "parseurl": "~1.3.3",
@@ -12304,6 +12328,7 @@
            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
            "dev": true,
+            "license": "MIT",
            "dependencies": {
                "ms": "2.0.0"
            }
@@ -12311,14 +12336,16 @@
        "node_modules/finalhandler/node_modules/ms": {
            "version": "2.0.0",
            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-            "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-            "dev": true
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "dev": true,
+            "license": "MIT"
        },
        "node_modules/finalhandler/node_modules/statuses": {
            "version": "2.0.1",
            "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
            "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
            "dev": true,
+            "license": "MIT",
            "engines": {
                "node": ">= 0.8"
            }
@@ -12478,8 +12505,9 @@
        "node_modules/fresh": {
            "version": "0.5.2",
            "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-            "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+            "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
            "dev": true,
+            "license": "MIT",
            "engines": {
                "node": ">= 0.6"
            }
@@ -13357,6 +13385,7 @@
            "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
            "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
            "dev": true,
+            "license": "MIT",
            "dependencies": {
                "depd": "2.0.0",
                "inherits": "2.0.4",
@@ -13373,6 +13402,7 @@
            "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
            "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
            "dev": true,
+            "license": "MIT",
            "engines": {
                "node": ">= 0.8"
            }
@@ -13382,6 +13412,7 @@
            "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
            "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
            "dev": true,
+            "license": "MIT",
            "engines": {
                "node": ">= 0.8"
            }
@@ -16584,6 +16615,7 @@
            "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
            "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
            "dev": true,
+            "license": "MIT",
            "engines": {
                "node": ">= 0.6"
            }
@@ -16705,10 +16737,14 @@
            }
        },
        "node_modules/merge-descriptors": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-            "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-            "dev": true
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+            "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
        },
        "node_modules/merge-stream": {
            "version": "2.0.0",
@@ -17443,6 +17479,7 @@
            "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
            "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
            "dev": true,
+            "license": "MIT",
            "dependencies": {
                "ee-first": "1.1.1"
            },
@@ -17881,10 +17918,11 @@
            }
        },
        "node_modules/path-to-regexp": {
-            "version": "0.1.7",
-            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-            "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-            "dev": true
+            "version": "0.1.10",
+            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
+            "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==",
+            "dev": true,
+            "license": "MIT"
        },
        "node_modules/path-type": {
            "version": "4.0.0",
@@ -18888,12 +18926,13 @@
            }
        },
        "node_modules/qs": {
-            "version": "6.11.0",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-            "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+            "version": "6.13.0",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+            "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
            "dev": true,
+            "license": "BSD-3-Clause",
            "dependencies": {
-                "side-channel": "^1.0.4"
+                "side-channel": "^1.0.6"
            },
            "engines": {
                "node": ">=0.6"
@@ -18992,6 +19031,7 @@
            "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
            "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
            "dev": true,
+            "license": "MIT",
            "dependencies": {
                "bytes": "3.1.2",
                "http-errors": "2.0.0",
@@ -19007,6 +19047,7 @@
            "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
            "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
            "dev": true,
+            "license": "MIT",
            "engines": {
                "node": ">= 0.8"
            }
@@ -19016,6 +19057,7 @@
            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
            "dev": true,
+            "license": "MIT",
            "dependencies": {
                "safer-buffer": ">= 2.1.2 < 3"
            },
@@ -20123,10 +20165,11 @@
            "optional": true
        },
        "node_modules/send": {
-            "version": "0.18.0",
-            "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-            "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+            "version": "0.19.0",
+            "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+            "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
            "dev": true,
+            "license": "MIT",
            "dependencies": {
                "debug": "2.6.9",
                "depd": "2.0.0",
@@ -20151,6 +20194,7 @@
            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
            "dev": true,
+            "license": "MIT",
            "dependencies": {
                "ms": "2.0.0"
            }
@@ -20158,14 +20202,26 @@
        "node_modules/send/node_modules/debug/node_modules/ms": {
            "version": "2.0.0",
            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-            "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-            "dev": true
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "dev": true,
+            "license": "MIT"
        },
        "node_modules/send/node_modules/depd": {
            "version": "2.0.0",
            "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
            "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/send/node_modules/encodeurl": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+            "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+            "dev": true,
+            "license": "MIT",
            "engines": {
                "node": ">= 0.8"
            }
@@ -20175,6 +20231,7 @@
            "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
            "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
            "dev": true,
+            "license": "MIT",
            "bin": {
                "mime": "cli.js"
            },
@@ -20186,13 +20243,15 @@
            "version": "2.1.3",
            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
        },
        "node_modules/send/node_modules/statuses": {
            "version": "2.0.1",
            "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
            "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
            "dev": true,
+            "license": "MIT",
            "engines": {
                "node": ">= 0.8"
            }
@@ -20227,10 +20286,11 @@
            }
        },
        "node_modules/serialize-javascript": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
-            "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+            "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
            "dev": true,
+            "license": "BSD-3-Clause",
            "dependencies": {
                "randombytes": "^2.1.0"
            }
@@ -20296,15 +20356,16 @@
            "dev": true
        },
        "node_modules/serve-static": {
-            "version": "1.15.0",
-            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-            "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+            "version": "1.16.2",
+            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+            "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
            "dev": true,
+            "license": "MIT",
            "dependencies": {
-                "encodeurl": "~1.0.2",
+                "encodeurl": "~2.0.0",
                "escape-html": "~1.0.3",
                "parseurl": "~1.3.3",
-                "send": "0.18.0"
+                "send": "0.19.0"
            },
            "engines": {
                "node": ">= 0.8.0"
@@ -20363,7 +20424,8 @@
            "version": "1.2.0",
            "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
            "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-            "dev": true
+            "dev": true,
+            "license": "ISC"
        },
        "node_modules/shallow-clone": {
            "version": "3.0.1",
@@ -21972,6 +22034,7 @@
            "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
            "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
            "dev": true,
+            "license": "MIT",
            "engines": {
                "node": ">=0.6"
            }
@@ -22363,6 +22426,7 @@
            "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
            "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
            "dev": true,
+            "license": "MIT",
            "dependencies": {
                "media-typer": "0.3.0",
                "mime-types": "~2.1.24"
@@ -22621,8 +22685,9 @@
        "node_modules/unpipe": {
            "version": "1.0.0",
            "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-            "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+            "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
            "dev": true,
+            "license": "MIT",
            "engines": {
                "node": ">= 0.8"
            }
@@ -28672,6 +28737,11 @@
            "resolved": "https://registry.npmjs.org/atomically/-/atomically-1.7.0.tgz",
            "integrity": "sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w=="
        },
+        "audiomotion-analyzer": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/audiomotion-analyzer/-/audiomotion-analyzer-4.5.0.tgz",
+            "integrity": "sha512-qnmB8TSbrxYkTbFgsQeeym0Z/suQx4c0jFg9Yh5+gaPw6J4AFLdfFpagdnDbtNEsj6K7BntgsC3bkdut5rxozg=="
+        },
        "auto-text-size": {
            "version": "0.2.3",
            "resolved": "https://registry.npmjs.org/auto-text-size/-/auto-text-size-0.2.3.tgz",
@@ -28899,9 +28969,9 @@
            }
        },
        "body-parser": {
-            "version": "1.20.2",
-            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
-            "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+            "version": "1.20.3",
+            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+            "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
            "dev": true,
            "requires": {
                "bytes": "3.1.2",
@@ -28912,7 +28982,7 @@
                "http-errors": "2.0.0",
                "iconv-lite": "0.4.24",
                "on-finished": "2.4.1",
-                "qs": "6.11.0",
+                "qs": "6.13.0",
                "raw-body": "2.5.2",
                "type-is": "~1.6.18",
                "unpipe": "1.0.0"
@@ -30881,7 +30951,7 @@
        "ee-first": {
            "version": "1.1.1",
            "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-            "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+            "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
            "dev": true
        },
        "ejs": {
@@ -31251,9 +31321,9 @@
            "dev": true
        },
        "encodeurl": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-            "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+            "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
            "dev": true
        },
        "encoding": {
@@ -32409,7 +32479,7 @@
        "etag": {
            "version": "1.8.1",
            "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-            "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+            "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
            "dev": true
        },
        "eventemitter3": {
@@ -32474,37 +32544,37 @@
            "dev": true
        },
        "express": {
-            "version": "4.19.2",
-            "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
-            "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+            "version": "4.21.0",
+            "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",
+            "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==",
            "dev": true,
            "requires": {
                "accepts": "~1.3.8",
                "array-flatten": "1.1.1",
-                "body-parser": "1.20.2",
+                "body-parser": "1.20.3",
                "content-disposition": "0.5.4",
                "content-type": "~1.0.4",
                "cookie": "0.6.0",
                "cookie-signature": "1.0.6",
                "debug": "2.6.9",
                "depd": "2.0.0",
-                "encodeurl": "~1.0.2",
+                "encodeurl": "~2.0.0",
                "escape-html": "~1.0.3",
                "etag": "~1.8.1",
-                "finalhandler": "1.2.0",
+                "finalhandler": "1.3.1",
                "fresh": "0.5.2",
                "http-errors": "2.0.0",
-                "merge-descriptors": "1.0.1",
+                "merge-descriptors": "1.0.3",
                "methods": "~1.1.2",
                "on-finished": "2.4.1",
                "parseurl": "~1.3.3",
-                "path-to-regexp": "0.1.7",
+                "path-to-regexp": "0.1.10",
                "proxy-addr": "~2.0.7",
-                "qs": "6.11.0",
+                "qs": "6.13.0",
                "range-parser": "~1.2.1",
                "safe-buffer": "5.2.1",
-                "send": "0.18.0",
-                "serve-static": "1.15.0",
+                "send": "0.19.0",
+                "serve-static": "1.16.2",
                "setprototypeof": "1.2.0",
                "statuses": "2.0.1",
                "type-is": "~1.6.18",
@@ -32730,13 +32800,13 @@
            }
        },
        "finalhandler": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-            "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+            "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
            "dev": true,
            "requires": {
                "debug": "2.6.9",
-                "encodeurl": "~1.0.2",
+                "encodeurl": "~2.0.0",
                "escape-html": "~1.0.3",
                "on-finished": "2.4.1",
                "parseurl": "~1.3.3",
@@ -32756,7 +32826,7 @@
                "ms": {
                    "version": "2.0.0",
                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-                    "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+                    "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
                    "dev": true
                },
                "statuses": {
@@ -32863,7 +32933,7 @@
        "fresh": {
            "version": "0.5.2",
            "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-            "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+            "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
            "dev": true
        },
        "fs-extra": {
@@ -35822,9 +35892,9 @@
            }
        },
        "merge-descriptors": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-            "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+            "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
            "dev": true
        },
        "merge-stream": {
@@ -36668,9 +36738,9 @@
            }
        },
        "path-to-regexp": {
-            "version": "0.1.7",
-            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-            "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+            "version": "0.1.10",
+            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
+            "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==",
            "dev": true
        },
        "path-type": {
@@ -37330,12 +37400,12 @@
            "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
        },
        "qs": {
-            "version": "6.11.0",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-            "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+            "version": "6.13.0",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+            "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
            "dev": true,
            "requires": {
-                "side-channel": "^1.0.4"
+                "side-channel": "^1.0.6"
            }
        },
        "querystringify": {
@@ -38195,9 +38265,9 @@
            "optional": true
        },
        "send": {
-            "version": "0.18.0",
-            "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-            "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+            "version": "0.19.0",
+            "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+            "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
            "dev": true,
            "requires": {
                "debug": "2.6.9",
@@ -38227,7 +38297,7 @@
                        "ms": {
                            "version": "2.0.0",
                            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-                            "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+                            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
                            "dev": true
                        }
                    }
@@ -38238,6 +38308,12 @@
                    "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
                    "dev": true
                },
+                "encodeurl": {
+                    "version": "1.0.2",
+                    "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+                    "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+                    "dev": true
+                },
                "mime": {
                    "version": "1.6.0",
                    "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -38278,9 +38354,9 @@
            }
        },
        "serialize-javascript": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
-            "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+            "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
            "dev": true,
            "requires": {
                "randombytes": "^2.1.0"
@@ -38343,15 +38419,15 @@
            }
        },
        "serve-static": {
-            "version": "1.15.0",
-            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-            "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+            "version": "1.16.2",
+            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+            "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
            "dev": true,
            "requires": {
-                "encodeurl": "~1.0.2",
+                "encodeurl": "~2.0.0",
                "escape-html": "~1.0.3",
                "parseurl": "~1.3.3",
-                "send": "0.18.0"
+                "send": "0.19.0"
            }
        },
        "set-blocking": {
@@ -40061,7 +40137,7 @@
        "unpipe": {
            "version": "1.0.0",
            "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-            "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+            "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
            "dev": true
        },
        "unzip-crx-3": {
@@ -2,7 +2,7 @@
    "name": "feishin",
    "productName": "Feishin",
    "description": "Feishin music server",
-    "version": "0.8.1",
+    "version": "0.10.1",
    "scripts": {
        "build": "concurrently \"npm run build:main\" \"npm run build:renderer\" \"npm run build:remote\"",
        "build:main": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.prod.ts",
@@ -309,6 +309,7 @@
        "@tanstack/react-query-persist-client": "^4.32.1",
        "@ts-rest/core": "^3.23.0",
        "@xhayper/discord-rpc": "^1.0.24",
+        "audiomotion-analyzer": "^4.5.0",
        "auto-text-size": "^0.2.3",
        "axios": "^1.6.0",
        "clsx": "^2.0.0",
@@ -1,12 +1,12 @@
 {
    "name": "feishin",
-    "version": "0.8.1",
+    "version": "0.10.1",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
        "": {
            "name": "feishin",
-            "version": "0.8.1",
+            "version": "0.10.1",
            "hasInstallScript": true,
            "license": "GPL-3.0",
            "dependencies": {
@@ -1,6 +1,6 @@
 {
    "name": "feishin",
-    "version": "0.8.1",
+    "version": "0.10.1",
    "description": "",
    "main": "./dist/main/main.js",
    "author": {
@@ -11,7 +11,7 @@
        "skip_back": "přeskočit dozadu",
        "favorite": "oblíbené",
        "next": "další",
-        "shuffle": "náhodně",
+        "shuffle": "přehrát náhodně",
        "playbackFetchNoResults": "nenalezeny žádné skladby",
        "playbackFetchInProgress": "načítání skladeb…",
        "addNext": "přidat další",
@@ -29,7 +29,8 @@
        "addLast": "přidat poslední",
        "mute": "ztlumit",
        "skip_forward": "přeskočit dopředu",
-        "playSimilarSongs": "přehrát podobné skladby"
+        "playSimilarSongs": "přehrát podobné skladby",
+        "viewQueue": "zobrazit frontu"
    },
    "setting": {
        "crossfadeStyle_description": "vyberte způsob prolnutí u přehrávače zvuku",
@@ -224,11 +225,11 @@
        "discordListening_description": "zobrazit stav jako „Poslouchá“ namísto „Hraje“. tato funkce v současné době není kompatibilní s lištou s časem",
        "contextMenu": "nastavení kontextové nabídky (kliknutí pravým)",
        "contextMenu_description": "umožňuje skrýt položky, které se zobrazí v nabídce po kliknutí pravým tlačítkem myši na položku. položky, které nejsou zaškrtnuté, se skryjí",
-        "customCssEnable": "povolit vlastní css",
-        "customCssEnable_description": "povolti psaní vlastního css.",
+        "customCssEnable": "povolit vlastní CSS",
+        "customCssEnable_description": "povolit vlastní CSS.",
        "customCssNotice": "Varování: i když provádíme určitou sanitizaci (zakázáním url() a content:), může používání CSS stále představovat riziko změnami rozhraní.",
-        "customCss_description": "vlastní css obsah. Upozornění: vlastnosti content a vzdálené url jsou zakázané. Níže je zobrazen náhled vašeho obsahu. Další pole, která jste nenastavili, jsou přítomna z důvodu sanitizace.",
-        "customCss": "vlastní css",
+        "customCss_description": "vlastní CSS obsah. Upozornění: vlastnosti content a vzdálené url jsou zakázané. Níže je zobrazen náhled vašeho obsahu. Další pole, která jste nenastavili, jsou přítomna z důvodu sanitizace.",
+        "customCss": "vlastní CSS",
        "webAudio": "použít webový zvuk",
        "webAudio_description": "použít webový zvuk. tím povolíte pokročilé funkce jako replaygain. zakažte, pokud se objeví problémy",
        "transcodeNote": "projeví se po 1 (web) - 2 (mpv) skladbách",
@@ -245,7 +246,16 @@
        "playerbarOpenDrawer": "lišta přehrávače jako přepínač celé obrazovky",
        "playerbarOpenDrawer_description": "umožňuje kliknutí na lištu přehrávače pro otevření celoobrazovkového přehrávače",
        "artistConfiguration": "nastavení stránky umělce alba",
-        "artistConfiguration_description": "nastavit, které položky na stránce umělce alba budou zobrazeny a v jakém pořadí"
+        "artistConfiguration_description": "nastavit, které položky na stránce umělce alba budou zobrazeny a v jakém pořadí",
+        "playButtonBehavior_optionPlayShuffled": "$t(player.shuffle)",
+        "trayEnabled": "zobrazit v oznamovací oblasti",
+        "trayEnabled_description": "zobrazit/skrýt ikonu/nabídku v oznamovací oblasti. pokud je zakázáno, vypne také minimalizaci/ukončení do oznamovací oblasti",
+        "translationApiProvider": "poskytovatel api překladů",
+        "translationApiProvider_description": "poskytovatel api pro překlady",
+        "translationApiKey": "klíč api překladů",
+        "translationApiKey_description": "klíč api pro překlady (podporuje pouze koncový bod globální služby)",
+        "translationTargetLanguage": "cílový jazyk překladu",
+        "translationTargetLanguage_description": "cílový jazyk pro překlad"
    },
    "action": {
        "editPlaylist": "upravit $t(entity.playlist_one)",
@@ -361,7 +371,8 @@
        "share": "sdílet",
        "codec": "kodek",
        "trackPeak": "vrchol skladby",
-        "preview": "náhled"
+        "preview": "náhled",
+        "translation": "překlad"
    },
    "table": {
        "config": {
@@ -377,7 +388,8 @@
                "autoFitColumns": "automaticky přizpůsobit sloupce",
                "size": "$t(common.size)",
                "itemGap": "mezera mezi položkami (px)",
-                "itemSize": "velikost položek (px)"
+                "itemSize": "velikost položek (px)",
+                "followCurrentSong": "následovat aktuální skladbu"
            },
            "label": {
                "releaseDate": "datum vydání",
@@ -534,11 +546,14 @@
                "useImageAspectRatio": "použít poměr stran obrázku",
                "lyricGap": "mezera textů",
                "dynamicImageBlur": "velikost rozostření obrázku",
-                "dynamicIsImage": "povolit obrázek na pozadí"
+                "dynamicIsImage": "povolit obrázek na pozadí",
+                "lyricOffset": "posunutí textů (ms)"
            },
            "upNext": "další",
            "lyrics": "texty",
-            "related": "související"
+            "related": "související",
+            "visualizer": "vizualizér",
+            "noLyrics": "nenalezeny žádné texty"
        },
        "appMenu": {
            "selectServer": "vybrat server",
@@ -572,7 +587,8 @@
            "showDetails": "získat informace",
            "shareItem": "sdílet položku",
            "playSimilarSongs": "$t(player.playSimilarSongs)",
-            "download": "stáhnout"
+            "download": "stáhnout",
+            "playShuffled": "$t(player.shuffle)"
        },
        "home": {
            "mostPlayed": "nejpřehrávanější",
@@ -640,6 +656,14 @@
        },
        "playlist": {
            "reorder": "změna pořadí povolena pouze při řazení podle id"
+        },
+        "manageServers": {
+            "url": "URL",
+            "username": "uživatelské jméno",
+            "editServerDetailsTooltip": "upravit podrobnosti o serveru",
+            "removeServer": "odstranit server",
+            "serverDetails": "podrobnosti o serveru",
+            "title": "správa serverů"
        }
    },
    "form": {
@@ -751,6 +775,9 @@
        "trackWithCount_other": "{{count}} skladeb",
        "play_one": "{{count}} přehrání",
        "play_few": "{{count}} přehrání",
-        "play_other": "{{count}} přehrání"
+        "play_other": "{{count}} přehrání",
+        "song_one": " ",
+        "song_few": " ",
+        "song_other": " "
    }
 }
@@ -66,7 +66,7 @@
        "cancel": "Abbrechen",
        "forceRestartRequired": "Neustarten um die Änderungen zu übernehmen... Schließe die Benachrichtigung zum Neustarten",
        "setting": "Einstellungen",
-        "setting_one": "",
+        "setting_one": "Einstellung",
        "setting_other": "Einstellungen",
        "version": "Version",
        "title": "Titel",
@@ -106,7 +106,8 @@
        "preview": "Vorschau",
        "reload": "Neu Laden",
        "mbid": "MusicBrainz ID",
-        "close": "schliessen"
+        "close": "schliessen",
+        "share": "Teilen"
    },
    "error": {
        "remotePortWarning": "Starten Sie den Server neu, um den neuen Port anzuwenden",
@@ -218,7 +219,8 @@
            "input_optionMatchAny": "Treffer Einige"
        },
        "editPlaylist": {
-            "title": "Bearbeite $t(entity.playlist_one)"
+            "title": "Bearbeite $t(entity.playlist_one)",
+            "success": "$t(entity.playlist_one) erfolgreich aktualisiert"
        },
        "lyricSearch": {
            "title": "Songtext Suche",
@@ -226,7 +228,10 @@
            "input_artist": "$t(entity.artist_one)"
        },
        "shareItem": {
-            "description": "Beschreibung"
+            "description": "Beschreibung",
+            "setExpiration": "Ablaufdatum setzen",
+            "expireInvalid": "Ablaufdatum muss in der Zukunft liegen",
+            "allowDownloading": "Herunterladen zulassen"
        }
    },
    "entity": {
@@ -260,7 +265,9 @@
        "genreWithCount_other": "{{count}} Genres",
        "trackWithCount_one": "{{count}} Track",
        "trackWithCount_other": "{{count}} Tracks",
-        "smartPlaylist": "Smart $t(entity.playlist_one)"
+        "smartPlaylist": "Smart $t(entity.playlist_one)",
+        "play_one": "{{count}} Wiedergabe",
+        "play_other": "{{count}} Wiedergaben"
    },
    "table": {
        "config": {
@@ -429,6 +436,12 @@
        },
        "albumList": {
            "title": "$t(entity.album_other)"
+        },
+        "albumArtistDetail": {
+            "about": "Über {{artist}}",
+            "appearsOn": "erscheint auf",
+            "recentReleases": "Kürzliche Veröffentlichungen",
+            "viewDiscography": "Diskographie ansehen"
        }
    },
    "player": {
@@ -109,6 +109,7 @@
        "trackNumber": "track",
        "trackGain": "track gain",
        "trackPeak": "track peak",
+        "translation": "translation",
        "unknown": "unknown",
        "version": "version",
        "year": "year",
@@ -146,6 +147,8 @@
        "smartPlaylist": "smart $t(entity.playlist_one)",
        "track_one": "track",
        "track_other": "tracks",
+        "song_one": "",
+        "song_other": "",
        "trackWithCount_one": "{{count}} track",
        "trackWithCount_other": "{{count}} tracks"
    },
@@ -314,6 +317,14 @@
            "settings": "$t(common.setting_other)",
            "version": "version {{version}}"
        },
+        "manageServers": {
+            "title": "manage servers",
+            "serverDetails": "server details",
+            "url": "URL",
+            "username": "username",
+            "editServerDetailsTooltip": "edit server details",
+            "removeServer": "remove server"
+        },
        "contextMenu": {
            "addFavorite": "$t(action.addToFavorites)",
            "addLast": "$t(player.addLast)",
@@ -333,6 +344,7 @@
            "removeFromPlaylist": "$t(action.removeFromPlaylist)",
            "removeFromQueue": "$t(action.removeFromQueue)",
            "setRating": "$t(action.setRating)",
+            "playShuffled": "$t(player.shuffle)",
            "shareItem": "share item",
            "showDetails": "get info"
        },
@@ -343,6 +355,7 @@
                "dynamicIsImage": "enable background image",
                "followCurrentLyric": "follow current lyric",
                "lyricAlignment": "lyric alignment",
+                "lyricOffset": "lyrics offset (ms)",
                "lyricGap": "lyric gap",
                "lyricSize": "lyric size",
                "opacity": "opacity",
@@ -354,7 +367,9 @@
            },
            "lyrics": "lyrics",
            "related": "related",
-            "upNext": "up next"
+            "upNext": "up next",
+            "visualizer": "visualizer",
+            "noLyrics": "no lyrics found"
        },
        "genreList": {
            "showAlbums": "show $t(entity.genre_one) $t(entity.album_other)",
@@ -438,7 +453,7 @@
        "repeat_off": "repeat disabled",
        "repeat_one": "repeat one",
        "repeat_other": "",
-        "shuffle": "shuffle",
+        "shuffle": "play shuffled",
        "shuffle_off": "shuffle disabled",
        "skip": "skip",
        "skip_back": "skip backwards",
@@ -446,7 +461,8 @@
        "stop": "stop",
        "toggleFullscreenPlayer": "toggle fullscreen player",
        "unfavorite": "unfavorite",
-        "pause": "pause"
+        "pause": "pause",
+        "viewQueue": "view queue"
    },
    "setting": {
        "accentColor": "accent color",
@@ -591,6 +607,7 @@
        "playButtonBehavior_optionAddLast": "$t(player.addLast)",
        "playButtonBehavior_optionAddNext": "$t(player.addNext)",
        "playButtonBehavior_optionPlay": "$t(player.play)",
+        "playButtonBehavior_optionPlayShuffled": "$t(player.shuffle)",
        "playerAlbumArtResolution": "player album art resolution",
        "playerAlbumArtResolution_description": "the resolution for the large player's album art preview. larger makes it look more crisp, but may slow loading down. defaults to 0, meaning auto",
        "playerbarOpenDrawer": "playerbar fullscreen toggle",
@@ -651,6 +668,14 @@
        "transcodeBitrate_description": "selects the bitrate to transcode. 0 means let the server pick",
        "transcodeFormat": "format to transcode",
        "transcodeFormat_description": "selects the format to transcode. leave empty to let the server decide",
+        "translationApiProvider": "translation api provider",
+        "translationApiProvider_description": "api provider for translation",
+        "translationApiKey": "translation api key",
+        "translationApiKey_description": "api key for translation (Support global service endpoint only)",
+        "translationTargetLanguage": "translation target language",
+        "translationTargetLanguage_description": "target language for translation",
+        "trayEnabled": "show tray",
+        "trayEnabled_description": "show/hide tray icon/menu. if disabled, also disables minimize/exit to tray",
        "useSystemTheme": "use system theme",
        "useSystemTheme_description": "follow the system-defined light or dark preference",
        "volumeWheelStep": "volume wheel step",
@@ -694,6 +719,7 @@
        "config": {
            "general": {
                "autoFitColumns": "auto fit columns",
+                "followCurrentSong": "follow current song",
                "displayType": "display type",
                "gap": "$t(common.gap)",
                "itemGap": "item gap (px)",
@@ -11,7 +11,7 @@
        "skip_back": "retroceder",
        "favorite": "favorito",
        "next": "siguiente",
-        "shuffle": "mezclar",
+        "shuffle": "Reproducir aleatoriamente",
        "playbackFetchNoResults": "ninguna canción encontrada",
        "playbackFetchInProgress": "cargando canciones…",
        "addNext": "añadir siguiente",
@@ -29,7 +29,8 @@
        "mute": "silencio",
        "skip_forward": "saltar hacia delante",
        "pause": "pausa",
-        "playSimilarSongs": "Reproducir canciones similares"
+        "playSimilarSongs": "Reproducir canciones similares",
+        "viewQueue": "ver cola"
    },
    "setting": {
        "crossfadeStyle_description": "selecciona el estilo de crossfade a usar por el reproductor de audio",
@@ -245,7 +246,16 @@
        "playerbarOpenDrawer": "Cambiar la barra del reproductor a pantalla completa",
        "playerbarOpenDrawer_description": "Permitir hacer clic en la barra del reproductor para abrir el reproductor en pantalla completa",
        "artistConfiguration": "Configuración de la página del artista del álbum",
-        "artistConfiguration_description": "Configurar qué elementos se muestran y en qué orden en la página del artista del álbum"
+        "artistConfiguration_description": "Configurar qué elementos se muestran y en qué orden en la página del artista del álbum",
+        "playButtonBehavior_optionPlayShuffled": "$t(player.shuffle)",
+        "trayEnabled": "Mostrar en el área de notificación",
+        "trayEnabled_description": "mostrar/ocultar el icono/menú del área de notificación. si está deshabilitado, también deshabilita minimizar/salir a la bandeja",
+        "translationApiProvider": "Proveedor de API de traducción",
+        "translationApiProvider_description": "Proveedor de API para traducción",
+        "translationApiKey": "clave api de traducción",
+        "translationApiKey_description": "Clave API para la traducción (solo para el punto final del servicio global)",
+        "translationTargetLanguage": "idioma final de la traducción",
+        "translationTargetLanguage_description": "lengua de destino de la traducción"
    },
    "action": {
        "editPlaylist": "editar $t(entity.playlist_one)",
@@ -361,7 +371,8 @@
        "reload": "Recargar",
        "share": "Compartir",
        "trackGain": "Ganancia de pista",
-        "preview": "Vista previa"
+        "preview": "Vista previa",
+        "translation": "traducción"
    },
    "error": {
        "remotePortWarning": "reiniciar el servidor para aplicar el nuevo puerto",
@@ -478,7 +489,8 @@
            "shareItem": "Compartir elemento",
            "showDetails": "Obtener información",
            "playSimilarSongs": "$t(player.playSimilarSongs)",
-            "download": "descargar"
+            "download": "descargar",
+            "playShuffled": "$t(player.shuffle)"
        },
        "home": {
            "mostPlayed": "más reproducidos",
@@ -502,10 +514,13 @@
                "showLyricMatch": "mostrar coincidencia de letras",
                "lyricGap": "desfase de letra",
                "dynamicImageBlur": "tamaño de desenfoque de imagen",
-                "dynamicIsImage": "habilitar imagen de fondo"
+                "dynamicIsImage": "habilitar imagen de fondo",
+                "lyricOffset": "compensación de letras (ms)"
            },
            "lyrics": "letras",
-            "related": "relacionado"
+            "related": "relacionado",
+            "visualizer": "visualizador",
+            "noLyrics": "sin letras"
        },
        "albumDetail": {
            "moreFromArtist": "más de este $t(entity.artist_one)",
@@ -566,6 +581,14 @@
        },
        "playlist": {
            "reorder": "la reordenación solo se activa al ordenar por id"
+        },
+        "manageServers": {
+            "removeServer": "eliminar servidor",
+            "title": "administrar servidores",
+            "serverDetails": "detalles del servidor",
+            "username": "nombre de usuario",
+            "editServerDetailsTooltip": "editar detalles del servidor",
+            "url": "URL"
        }
    },
    "form": {
@@ -693,7 +716,8 @@
                "size": "$t(common.size)",
                "displayType": "tipo de visualización",
                "itemGap": "espacio entre elementos (px)",
-                "itemSize": "tamaño del elemento (px)"
+                "itemSize": "tamaño del elemento (px)",
+                "followCurrentSong": "seguir la canción actual"
            },
            "view": {
                "card": "tarjeta",
@@ -145,7 +145,8 @@
        "reload": "recharger",
        "trackGain": "gain de la piste",
        "trackPeak": "crête de la piste",
-        "codec": "codec"
+        "codec": "codec",
+        "translation": "traduction"
    },
    "error": {
        "remotePortWarning": "redémarrer le serveur pour appliquer le nouveau port",
@@ -248,7 +249,8 @@
            },
            "upNext": "à suivre",
            "lyrics": "paroles",
-            "related": "similaire"
+            "related": "similaire",
+            "visualizer": "visualisateur"
        },
        "appMenu": {
            "selectServer": "sélectionner le serveur",
@@ -277,7 +279,8 @@
            "generalTab": "général",
            "hotkeysTab": "raccourcis",
            "windowTab": "fenêtre",
-            "playbackTab": "lecteur"
+            "playbackTab": "lecteur",
+            "advanced": "avancé"
        },
        "globalSearch": {
            "commands": {
@@ -306,7 +309,8 @@
            "removeFromQueue": "$t(action.removeFromQueue)",
            "shareItem": "partager un élément",
            "playSimilarSongs": "$t(player.playSimilarSongs)",
-            "showDetails": "obtenir des informations"
+            "showDetails": "obtenir des informations",
+            "download": "télécharger"
        },
        "albumArtistList": {
            "title": "$t(entity.albumArtist_other)"
@@ -344,6 +348,9 @@
            "copyPath": "copier le chemin dans le presse-papiers",
            "openFile": "afficher la piste dans le gestionnaire de fichiers",
            "copiedPath": "chemin copié avec succès"
+        },
+        "playlist": {
+            "reorder": "le tri n'est possible que lorsque l'on trie par identifiant"
        }
    },
    "setting": {
@@ -530,7 +537,29 @@
        "playerAlbumArtResolution_description": "la résolution pour l'aperçu de la pochette d'album agrandie du lecteur. plus grand le rend plus net, mais peut ralentir le chargement. la valeur par défaut est 0 (automatique)",
        "homeConfiguration_description": "configurer quels éléments sont affichés sur la page d'accueil, et dans quel ordre",
        "startMinimized": "démarrer l'application en mode réduit",
-        "genreBehavior_description": "détermine si cliquer sur un genre ouvre par défaut la liste des pistes ou des albums"
+        "genreBehavior_description": "détermine si cliquer sur un genre ouvre par défaut la liste des pistes ou des albums",
+        "transcode": "activer le transcodage",
+        "transcode_description": "permet le transcodage vers différents formats",
+        "transcodeBitrate_description": "sélectionne le débit du transcodage. 0 signifie que le serveur choisit",
+        "transcodeFormat_description": "sélectionne le format du transcodage. laisser vide pour laisser le serveur décider",
+        "volumeWidth": "largeur de la barre de volume",
+        "volumeWidth_description": "la largeur de la barre de volume",
+        "customCssEnable": "activer le css personnalisé",
+        "customCssEnable_description": "permet d'écrire du css personnalisé.",
+        "customCssNotice": "Attention : bien qu'il y ait un certain assainissement (blocage de url() et de content :), l'utilisation de CSS personnalisé peut toujours présenter des risques en modifiant l'interface.",
+        "customCss": "css personnalisé",
+        "webAudio": "utiliser l'audio web",
+        "transcodeBitrate": "débit binaire du transcodage",
+        "transcodeFormat": "format de transcodage",
+        "webAudio_description": "utiliser l'audio web. cela permet d'utiliser des fonctions avancées comme le replaygain. désactivez si vous rencontrez d'autres problèmes",
+        "artistConfiguration": "page de configuration de l'artiste de l'album",
+        "artistConfiguration_description": "configurer les éléments et l'ordre à afficher, sur la page de l'artiste de l'album",
+        "doubleClickBehavior": "mettre en file d'attente toutes les pistes recherchées lors d'un double clic",
+        "contextMenu": "configuration du menu contexte (clic droit)",
+        "contextMenu_description": "permet de masquer les éléments qui s'affichent dans le menu lorsque vous cliquez avec le bouton droit de la souris sur un élément. les éléments qui ne sont pas cochés seront masqués",
+        "albumBackground": "image d'arrière-plan de l'album",
+        "albumBackground_description": "ajoute une image d'arrière-plan pour les pages de l'album contenant les illustrations de l'album",
+        "albumBackgroundBlur_description": "ajuste le niveau de flou appliqué à l'image d'arrière-plan de l'album"
    },
    "form": {
        "deletePlaylist": {
@@ -574,7 +603,8 @@
            "input_optionMatchAny": "correspondre à n'importe quel"
        },
        "editPlaylist": {
-            "title": "modifier $t(entity.playlist_one)"
+            "title": "modifier $t(entity.playlist_one)",
+            "publicJellyfinNote": "Jellyfin n'indique pas si une playlist est publique ou non. Si vous souhaitez que cette playlist reste publique, veuillez sélectionner l'entrée suivante"
        },
        "lyricSearch": {
            "title": "rechercher parole",
@@ -7,8 +7,8 @@
        "addToFavorites": "добавить в $t(entity.favorite_other)",
        "addToPlaylist": "добавить в $t(entity.playlist_one)",
        "createPlaylist": "создать $t(entity.playlist_one)",
-        "removeFromPlaylist": "удалить из $t(entity.playlist_one)",
-        "viewPlaylists": "просмотреть $t(entity.playlist_other)",
+        "removeFromPlaylist": "удалить из $t(entity.playlist_few)",
+        "viewPlaylists": "показать $t(entity.playlist_other)",
        "refresh": "$t(common.refresh)",
        "deletePlaylist": "удалить $t(entity.playlist_one)",
        "removeFromQueue": "удалить из очереди",
@@ -16,7 +16,7 @@
        "moveToBottom": "вниз",
        "setRating": "оценить",
        "toggleSmartPlaylistEditor": "вкл./откл. редактор $t(entity.smartPlaylist)",
-        "removeFromFavorites": "удалить из $t(entity.favorite_other)",
+        "removeFromFavorites": "удалить из $t(entity.favorite_few)",
        "openIn": {
            "lastfm": "открыть на Last.fm",
            "musicbrainz": "открыть на MusicBrainz"
@@ -38,15 +38,15 @@
        "currentSong": "текущий $t(entity.track_one)",
        "collapse": "закрыть",
        "trackNumber": "трек",
-        "descending": "убывание",
+        "descending": "по убыванию",
        "add": "добавить",
        "gap": "промежуток",
-        "ascending": "возрастанию",
+        "ascending": "по возрастанию",
        "dismiss": "отклонить",
        "year": "год",
-        "manage": "управлять",
+        "manage": "управление",
        "limit": "ограничение",
-        "minimize": "минимизировать",
+        "minimize": "свернуть",
        "modified": "изменено",
        "duration": "длительность",
        "name": "имя",
@@ -66,6 +66,8 @@
        "cancel": "отменить",
        "forceRestartRequired": "перезапустите приложение, чтобы применить изменения... закройте уведомление для перезапуска",
        "setting": "настройка",
+        "setting_one": "настройка",
+        "setting_other": "настройки",
        "version": "версия",
        "title": "название",
        "filter_one": "фильтр",
@@ -78,11 +80,11 @@
        "action_one": "действие",
        "action_few": "действия",
        "action_many": "действий",
-        "playerMustBePaused": "воспроизведение должно быть остановлено",
+        "playerMustBePaused": "необходимо остановить воспроизведение",
        "confirm": "подтвердить",
-        "resetToDefault": "по умолчанию",
-        "home": "главная страница",
-        "comingSoon": "скоро будет…",
+        "resetToDefault": "сбросить настройки",
+        "home": "главная",
+        "comingSoon": "скоро...",
        "reset": "сбросить",
        "channel_one": "канал",
        "channel_few": "канала",
@@ -92,14 +94,14 @@
        "menu": "меню",
        "restartRequired": "необходим перезапуск приложения",
        "previousSong": "предыдущий $t(entity.track_one)",
-        "noResultsFromQuery": "нет результатов",
+        "noResultsFromQuery": "ничего не найдено",
        "quit": "выйти",
-        "expand": "расширить",
+        "expand": "раскрыть",
        "search": "поиск",
        "saveAs": "сохранить как",
        "disc": "диск",
        "yes": "да",
-        "random": "случайный",
+        "random": "случайно",
        "size": "размер",
        "biography": "биография",
        "note": "заметка",
@@ -114,9 +116,11 @@
    "entity": {
        "album_one": "альбом",
        "album_few": "альбома",
+        "album_other": "альбомы",
        "album_many": "альбомов",
        "genre_one": "жанр",
        "genre_few": "жанра",
+        "genre_other": "жанры",
        "genre_many": "жанров",
        "playlistWithCount_one": "{{count}} плейлист",
        "playlistWithCount_few": "{{count}} плейлиста",
@@ -124,18 +128,26 @@
        "playlist_one": "плейлист",
        "playlist_few": "плейлиста",
        "playlist_many": "плейлистов",
+        "playlist_other": "плейлисты",
+        "play": "{{count}} прослушиваний",
+        "play_one": "{{count}} прослушивание",
+        "play_other": "{{count}} прослушиваний",
        "artist_one": "автор",
        "artist_few": "автора",
-        "artist_many": "авторов",
+        "artist_other": "исполнители",
+        "artist_many": "исполнителей",
        "folderWithCount_one": "{{count}} папка",
        "folderWithCount_few": "{{count}} папки",
        "folderWithCount_many": "{{count}} папок",
-        "albumArtist_one": "автор альбома",
-        "albumArtist_few": "автора альбома",
-        "albumArtist_many": "авторов альбома",
+        "albumArtist_one": "исполнитель альбома",
+        "albumArtist_few": "исполнители альбома",
+        "albumArtist_other": "исполнители альбомов",
+        "albumArtist_many": "исполнителей альбома",
        "track_one": "трек",
        "track_few": "трека",
        "track_many": "треков",
+        "track_other": "треки",
+        "song_many": "{{ count }} композиций",
        "albumArtistCount_one": "{{count}} автор альбома",
        "albumArtistCount_few": "{{count}} автора альбома",
        "albumArtistCount_many": "{{count}} авторов альбома",
@@ -145,24 +157,27 @@
        "favorite_one": "любимый",
        "favorite_few": "любимых",
        "favorite_many": "любимые",
+        "favorite_other": "любимые",
        "artistWithCount_one": "{{count}} автор",
        "artistWithCount_few": "{{count}} автора",
        "artistWithCount_many": "{{count}} авторов",
        "folder_one": "папка",
        "folder_few": "папки",
        "folder_many": "папок",
+        "folder_other": "папки",
        "smartPlaylist": "умный $t(entity.playlist_one)",
        "genreWithCount_one": "{{count}} жанр",
        "genreWithCount_few": "{{count}} жанра",
        "genreWithCount_many": "{{count}} жанров",
        "trackWithCount_one": "{{count}} трек",
        "trackWithCount_few": "{{count}} трека",
-        "trackWithCount_many": "{{count}} треков"
+        "trackWithCount_many": "{{count}} треков",
+        "trackWithCount_other": "{{count}} треков"
    },
    "table": {
        "config": {
            "view": {
-                "card": "карта",
+                "card": "карточки",
                "table": "таблица",
                "poster": "постер"
            },
@@ -171,8 +186,9 @@
                "gap": "$t(common.gap)",
                "tableColumns": "столбцы таблицы",
                "autoFitColumns": "автоматически расставить столбцы",
+                "followCurrentSong": "следовать за исполняемым треком",
                "size": "$t(common.size)",
-                "itemSize": "рамер элементов (px)",
+                "itemSize": "размер элементов (px)",
                "itemGap": "отступ между элементами (px)"
            },
            "label": {
@@ -185,7 +201,7 @@
                "bpm": "$t(common.bpm)",
                "lastPlayed": "последний",
                "trackNumber": "номер трека",
-                "rowIndex": "индекс ряда",
+                "rowIndex": "номер строки",
                "rating": "$t(common.rating)",
                "artist": "$t(entity.artist_one)",
                "album": "$t(entity.album_one)",
@@ -234,25 +250,25 @@
        }
    },
    "error": {
-        "remotePortWarning": "перезапустить сервер для применения нового порта",
+        "remotePortWarning": "необходимо перезапустить сервер для применения нового порта",
        "systemFontError": "произошла ошибка при попытке получить системные шрифты",
-        "playbackError": "произошла ошибка при попытке проиграть медиа",
+        "playbackError": "произошла ошибка при попытке проигрывания медиа",
        "endpointNotImplementedError": "запрос {{endpoint}} не реализован для {{serverType}}",
        "remotePortError": "произошла ошибка при попытке установить порт удаленного сервера",
-        "serverRequired": "необходим сервер",
-        "authenticationFailed": "авторизация завершилась с ошибкой",
+        "serverRequired": "сервер не выбран",
+        "authenticationFailed": "не удалось авторизироваться",
        "apiRouteError": "невозможно выполнить запрос",
        "genericError": "произошла ошибка",
-        "credentialsRequired": "необходимы учётные данные",
+        "credentialsRequired": "введите данные для входа",
        "sessionExpiredError": "ваш сеанс истёк",
-        "remoteEnableError": "ошибка произошла при попытке $t(common.enable) удалённый сервер",
+        "remoteEnableError": "произошла ошибка при попытке $t(common.enable) удалённый сервер",
        "localFontAccessDenied": "не получилось получить доступ к шрифтам",
        "serverNotSelectedError": "не выбран сервер",
-        "remoteDisableError": "ошибка произошла при попытке $t(common.disable) удалённый сервер",
+        "remoteDisableError": "произошла ошибка при попытке $t(common.disable) удалённый сервер",
        "mpvRequired": "необходим MPV",
        "audioDeviceFetchError": "произошла ошибка с аудиоустройством",
        "invalidServer": "недействительный сервер",
-        "loginRateError": "слишком много попыток входа, пожалуйста, попробуйте ещё раз через несколько секунд",
+        "loginRateError": "превышено максимальное количество попыток входа, пожалуйста, попробуйте ещё раз через несколько секунд",
        "openError": "не удалось открыть файл",
        "badAlbum": "вы видите эту страницу из-за того, что эта песня не входит в альбом. скорее всего, вы видите эту ошибку, так как песня находится в корневой директории папки с музыкой. jellyfin группирует треки только по папкам.",
        "networkError": "возникла ошибка сети"
@@ -265,48 +281,49 @@
        "communityRating": "рейтинг сообщества",
        "favorited": "любимый",
        "albumArtist": "$t(entity.albumArtist_one)",
-        "isFavorited": "любимый",
+        "isFavorited": "любимые",
        "bpm": "уд./мин.",
        "disc": "диск",
        "biography": "биография",
        "artist": "$t(entity.artist_one)",
        "duration": "длительность",
-        "fromYear": "из года",
+        "fromYear": "год",
        "criticRating": "рейтинг критиков",
-        "mostPlayed": "самое воспроизводимое",
+        "mostPlayed": "слушают чаще всего",
        "comment": "комментировать",
-        "playCount": "кол-во воспроизведений",
-        "recentlyUpdated": "недавно обновлено",
+        "playCount": "количество воспроизведений",
+        "recentlyUpdated": "обновленные недавно",
        "channels": "$t(common.channel_other)",
-        "recentlyPlayed": "недавно проиграно",
+        "recentlyPlayed": "проигрывались недавно",
        "owner": "$t(common.owner)",
        "title": "название",
        "rating": "рейтинг",
        "search": "поиск",
        "genre": "$t(entity.genre_one)",
-        "recentlyAdded": "недавно добавлено",
+        "recentlyAdded": "недавно добавленные",
        "note": "заметка",
        "name": "название",
        "releaseDate": "дата выхода",
-        "albumCount": "кол-во $t(entity.album_other)",
+        "albumCount": "количество $t(entity.album_many)",
        "path": "путь",
-        "isRecentlyPlayed": "недавно проигрывалась",
+        "isRecentlyPlayed": "недавно проигрывался",
        "releaseYear": "год выхода",
        "id": "№",
-        "songCount": "кол-во песен",
+        "songCount": "количество песен",
        "isPublic": "публичный",
-        "random": "случайный",
+        "random": "случайно",
        "lastPlayed": "последний раз проигрывалась",
        "toYear": "до года",
        "album": "$t(entity.album_one)",
        "trackNumber": "трек"
    },
    "player": {
-        "repeat_all": "повтор всех",
+        "repeat_all": "повторять все",
        "stop": "остановить",
-        "repeat": "повтор",
+        "repeat": "повторять текущий",
        "queue_remove": "удалить выбранное",
-        "playRandom": "случайные песни",
+        "playRandom": "играть случайные песни",
+        "playSimilarSongs": "играть похожие песни",
        "skip": "пропустить",
        "previous": "предыдущий",
        "toggleFullscreenPlayer": "включить полноэкранный режим",
@@ -316,10 +333,10 @@
        "shuffle": "перемешать",
        "playbackFetchNoResults": "песни не найдены",
        "playbackFetchInProgress": "загрузка песен..",
-        "addNext": "добавить следующий",
+        "addNext": "воспроизвести следующим",
        "playbackSpeed": "скорость воспроизведения",
-        "playbackFetchCancel": "это занимает некоторое время... закрыть уведомление для отмены",
-        "play": "прослушать",
+        "playbackFetchCancel": "пожалуйста, подождите немного... закройте уведомление для отмены",
+        "play": "играть",
        "repeat_off": "повтор выключен",
        "pause": "пауза",
        "queue_clear": "очистить очередь",
@@ -328,13 +345,14 @@
        "queue_moveToTop": "переместить выделенное вниз",
        "queue_moveToBottom": "переместить выделенное вверх",
        "shuffle_off": "перемешивание выключено",
-        "addLast": "добавить последний",
+        "addLast": "воспроизвести после всех",
        "mute": "отключить звук",
-        "skip_forward": "вперёд"
+        "skip_forward": "вперёд",
+        "viewQueue": "показать очередь"
    },
    "page": {
        "sidebar": {
-            "nowPlaying": "Cейчас проигрывается",
+            "nowPlaying": "сейчас играет",
            "playlists": "$t(entity.playlist_other)",
            "search": "$t(common.search)",
            "tracks": "$t(entity.track_other)",
@@ -354,30 +372,41 @@
                "followCurrentLyric": "следовать за текущими словами песни",
                "opacity": "непрозрачность",
                "lyricSize": "размер слов",
-                "showLyricProvider": "показать провайдера слов",
-                "unsynchronized": "несинхронизировано",
+                "showLyricProvider": "показать источник слов",
+                "unsynchronized": "не синхронизировано",
                "lyricAlignment": "выравнивание слов песни",
+                "lyricOffset": "задержка слов (мсек)",
                "useImageAspectRatio": "использовать соотношение сторон изображения",
                "lyricGap": "пробел между словами",
                "dynamicIsImage": "включить фоновое изображение",
                "dynamicImageBlur": "сила размытия изображения"
            },
-            "upNext": "следующее",
-            "lyrics": "слова песни",
-            "related": "схожие"
+            "upNext": "играет",
+            "lyrics": "слова",
+            "related": "похожие",
+            "visualizer": "визуализатор",
+            "noLyrics": "слова для песни не найдены"
        },
        "appMenu": {
-            "selectServer": "выбрать сервер",
+            "selectServer": "список серверов",
            "version": "версия {{version}}",
            "settings": "$t(common.setting_other)",
-            "manageServers": "настроить список серверов",
-            "expandSidebar": "развернуть",
+            "manageServers": "редактировать список серверов",
+            "expandSidebar": "развернуть боковую панель",
            "collapseSidebar": "Скрыть боковую панель",
            "openBrowserDevtools": "открыть инструменты разработчика",
            "quit": "$t(common.quit)",
            "goBack": "назад",
            "goForward": "вперёд"
        },
+        "manageServers": {
+            "title": "сервера",
+            "serverDetails": "информация о сервере",
+            "url": "адрес",
+            "username": "пользователь",
+            "editServerDetailsTooltip": "изменить настройки сервера",
+            "removeServer": "удалить сервер"
+        },
        "contextMenu": {
            "addToPlaylist": "$t(action.addToPlaylist)",
            "addToFavorites": "$t(action.addToFavorites)",
@@ -390,6 +419,7 @@
            "removeFromFavorites": "$t(action.removeFromFavorites)",
            "addNext": "$t(player.addNext)",
            "deselectAll": "$t(action.deselectAll)",
+            "download": "скачать",
            "addLast": "$t(player.addLast)",
            "addFavorite": "$t(action.addToFavorites)",
            "play": "$t(player.play)",
@@ -399,11 +429,11 @@
            "shareItem": "поделиться"
        },
        "home": {
-            "mostPlayed": "наибольшее кол-во воспроизведений",
+            "mostPlayed": "слушают чаще всего",
            "newlyAdded": "недавно добавленные релизы",
            "title": "$t(common.home)",
-            "explore": "изучите вашу медиатеку",
-            "recentlyPlayed": "недавно прослушано"
+            "explore": "откройте новое",
+            "recentlyPlayed": "игралось недавно"
        },
        "albumDetail": {
            "moreFromArtist": "больше от $t(entity.artist_one)",
@@ -420,8 +450,8 @@
        },
        "genreList": {
            "title": "$t(entity.genre_other)",
-            "showAlbums": "показать $t(entity.genre_one) $t(entity.album_other)",
-            "showTracks": "показать $t(entity.genre_one) $t(entity.track_other)"
+            "showAlbums": "показать $t(entity.genre_one) $t(entity.album_many)",
+            "showTracks": "показать $t(entity.genre_one) $t(entity.track_many)"
        },
        "trackList": {
            "title": "$t(entity.track_other)",
@@ -435,6 +465,9 @@
            },
            "title": "комманды"
        },
+        "playlist": {
+            "reorder": "сортировка доступна только по ID"
+        },
        "playlistList": {
            "title": "$t(entity.playlist_other)"
        },
@@ -448,7 +481,7 @@
            "viewAll": "посмотреть всё",
            "appearsOn": "появляется в",
            "viewDiscography": "посмотреть дискографию",
-            "relatedArtists": "похож на $t(entity.artist_other)",
+            "relatedArtists": "похож на $t(entity.artist_many)",
            "viewAllTracks": "посмотреть все $t(entity.track_other)",
            "recentReleases": "недавние релизы",
            "about": "О {{artist}}",
@@ -464,7 +497,7 @@
        "deletePlaylist": {
            "title": "удалить $t(entity.playlist_one)",
            "success": "$t(entity.playlist_one) успешно удалён",
-            "input_confirm": "напишите название $t(entity.playlist_one)а для подтверждения"
+            "input_confirm": "напишите название $t(entity.playlist_few) для подтверждения"
        },
        "createPlaylist": {
            "input_description": "$t(common.description)",
@@ -477,24 +510,24 @@
        "addServer": {
            "title": "добавить сервер",
            "input_username": "пользователь",
-            "input_url": "url",
+            "input_url": "адрес",
            "input_password": "пароль",
            "input_legacyAuthentication": "включить старую авторизацию",
            "input_name": "название сервера",
-            "success": "сервер добавлен успешно",
+            "success": "сервер успешно добавлен",
            "input_savePassword": "сохранить пароль",
-            "ignoreSsl": "игнорирование ssl ($t(common.restartRequired))",
-            "ignoreCors": "игнорирование корсетов ($t(common.restartRequired))",
-            "error_savePassword": "произошла ошибка во время попытки сохранения пароля"
+            "ignoreSsl": "игнорировать ssl ($t(common.restartRequired))",
+            "ignoreCors": "игнорировать CORS ($t(common.restartRequired))",
+            "error_savePassword": "произошла ошибка при сохранении пароля"
        },
        "addToPlaylist": {
            "success": "добавлено: $t(entity.trackWithCount, {\"count\": {{message}} }) в $t(entity.playlistWithCount, {\"count\": {{numOfPlaylists}} })",
            "title": "добавить в $t(entity.playlist_one)",
-            "input_skipDuplicates": "пропустить дубликаты",
+            "input_skipDuplicates": "не добавлять дубликаты",
            "input_playlists": "$t(entity.playlist_other)"
        },
        "updateServer": {
-            "title": "обновить сервер",
+            "title": "обновление сервера",
            "success": "сервер успешно обновлён"
        },
        "queryEditor": {
@@ -512,7 +545,7 @@
        "shareItem": {
            "success": "ссылка скопирована в буфер обмена (нажмите здесь, чтобы открыть)",
            "expireInvalid": "время истечения срока действия должно быть в будущем",
-            "createFailed": "не удалось создать ссылку для общего доступа (общий доступ включён?)",
+            "createFailed": "не удалось создать ссылку для общего доступа (проверьте, включен ли общий доступ?)",
            "allowDownloading": "разрешить скачивание",
            "setExpiration": "установить срок действия",
            "description": "описание"
@@ -521,16 +554,22 @@
    "setting": {
        "accentColor": "цвет акцента",
        "accentColor_description": "устанавливает цвет акцента для приложения",
+        "albumBackground": "фоновое изображение альбомов",
+        "albumBackground_description": "добавляет фоновое изображение для страниц альбомов, содержащих обложку",
+        "albumBackgroundBlur": "размытие фонового изображения альбома",
+        "albumBackgroundBlur_description": "определяет степень размытия фонового изображения на странице альбомов",
        "applicationHotkeys": "горячие клавиши приложения",
        "crossfadeStyle_description": "выберите вид эффекта crossfade для аудиоплеера",
+        "customCssEnable": "использовать кастомные css",
+        "customCssEnable_description": "разрешить использование кастомных css.",
        "enableRemote_description": "включает сервер удалённого управления для управления воспроизведением с помощью других устройств",
        "fontType_optionSystem": "системный",
        "mpvExecutablePath_description": "укажите папку, в которой находится исполняющий файл аудиоплеера MPV. если оставить пустым, будет использоваться путь по умолчанию",
-        "crossfadeStyle": "Вид эффекта crossfade",
+        "crossfadeStyle": "вид эффекта crossfade",
        "fontType_optionBuiltIn": "встроенный",
-        "disableLibraryUpdateOnStartup": "Отключить проверку новых версий при запуске приложения",
-        "minimizeToTray_description": "Сворачивать приложение в панель уведомлений",
-        "audioPlayer_description": "Укажите - какой аудиоплеер использовать для воспроизведения",
+        "disableLibraryUpdateOnStartup": "отключить проверку новых версий при запуске приложения",
+        "minimizeToTray_description": "сворачивать приложение в панель уведомлений",
+        "audioPlayer_description": "укажите, какой аудиоплеер использовать для воспроизведения",
        "disableAutomaticUpdates": "отключить проверку обновлений",
        "exitToTray_description": "При закрытии приложения - оно останется в панели уведомлений",
        "fontType_optionCustom": "пользовательский",
@@ -544,7 +583,7 @@
        "crossfadeDuration": "Длительность эффекта crossfade",
        "audioPlayer": "Аудиоплеер",
        "minimizeToTray": "сворачивать в панель уведомлений",
-        "font_description": "Выберите - какой шрифт использовать в приложении",
+        "font_description": "Выберите, какой шрифт использовать в приложении",
        "remoteUsername": "имя пользователя для доступа к серверу удалённого управления",
        "buttonSize_description": "размер кнопок в панели управления воспроизведением",
        "clearCache": "очистить кэш браузера",
@@ -554,11 +593,11 @@
        "buttonSize": "размер кнопок панели управления воспроизведением",
        "hotkey_volumeDown": "уменьшить громкость",
        "playButtonBehavior_optionAddLast": "$t(player.addLast)",
-        "theme_description": "устанавливает тему, которая будет использоваться приложением",
+        "theme_description": "устанавливает тему, которая будет использоваться в приложении",
        "passwordStore": "хранилище паролей/секретов",
        "sidebarPlaylistList": "список плейлистов в боковой панели",
        "windowBarStyle_description": "выберите стиль заголовка окна",
-        "followLyric": "следовать тексту трека",
+        "followLyric": "следовать за текстом трека",
        "volumeWheelStep": "шаг регулировки громкости колёсиком мыши",
        "windowBarStyle": "стиль заголовка окна",
        "hotkey_zoomOut": "уменьшить масштаб",
@@ -567,7 +606,7 @@
        "replayGainMode_optionAlbum": "$t(entity.album_one)",
        "replayGainMode_optionNone": "$t(common.none)",
        "replayGainMode_optionTrack": "$t(entity.track_one)",
-        "clearQueryCache_description": "\"мягкая очистка\" feishin. при выполнении обновляются плейлисты, метаданные треков, но сохранённые тексты треков сбрасываются. настройки, учётные данные и кэшированные изображения сохраняются",
+        "clearQueryCache_description": "так называемая \"мягкая очистка\" feishin: обновляются плейлисты, метаданные треков, но сохранённые тексты треков сбрасываются. настройки, учётные данные и кэшированные изображения сохраняются",
        "hotkey_favoriteCurrentSong": "добавить $t(common.currentSong) в избранное",
        "genreBehavior": "поведения страницы жанров",
        "globalMediaHotkeys": "глобальные мультимедийные горячие клавиши",
@@ -576,11 +615,11 @@
        "hotkey_globalSearch": "глобальный поиск",
        "hotkey_playbackNext": "следующий трек",
        "hotkey_playbackPause": "пауза",
-        "hotkey_playbackPlay": "прослушать",
-        "hotkey_playbackPlayPause": "прослушать / пауза",
+        "hotkey_playbackPlay": "играть",
+        "hotkey_playbackPlayPause": "играть / пауза",
        "hotkey_playbackPrevious": "предыдущий трек",
        "hotkey_playbackStop": "остановить",
-        "hotkey_rate0": "очистить оценку",
+        "hotkey_rate0": "убрать оценку",
        "hotkey_rate1": "оценить в 1 звезду",
        "hotkey_rate2": "оценить в 2 звезды",
        "hotkey_rate3": "оценить в 3 звезды",
@@ -609,6 +648,8 @@
        "playButtonBehavior_optionAddNext": "$t(player.addNext)",
        "playButtonBehavior_optionPlay": "$t(player.play)",
        "playerAlbumArtResolution_description": "разрешение большой версии обложки альбома в проигрывателе. при большем разрешении она выглядит более четкой, но может замедлить загрузку. по умолчанию равно 0 - устанавливает разрешение автоматически",
+        "playerbarOpenDrawer": "полноэкранный переключатель по панели проигрывателя",
+        "playerbarOpenDrawer_description": "позволяет перейти в полноэкранный режим воспроизведения нажатием на панель проигрывателя",
        "remotePort": "порт сервера удалённого управления",
        "remotePort_description": "устанавливает порт для сервера удалённого управления",
        "replayGainClipping": "{{ReplayGain}} клиппинг",
@@ -622,11 +663,21 @@
        "showSkipButtons": "показывать кнопки перемотки",
        "showSkipButtons_description": "показывать или скрывать кнопки перемотки на панели управления воспроизведением",
        "sidebarPlaylistList_description": "показать или скрыть список плейлистов на боковой панели",
+        "sidePlayQueueStyle": "вид отображения боковой очереди",
+        "sidePlayQueueStyle_description": "определяет вид отображения боковой очереди",
+        "sidePlayQueueStyle_optionAttached": "закрепленная",
+        "sidePlayQueueStyle_optionDetached": "плавающая",
        "skipDuration": "время перемотки",
        "skipDuration_description": "задает время перемотки при использовании кнопок перемотки на панели проигрывателя",
        "useSystemTheme": "использовать тему системы",
        "themeLight": "тема (светлая)",
        "themeLight_description": "устанавливает светлую тему приложения",
+        "transcodeNote": "эффект применяется после 1 (для веб) - 2 (для mpv) песни",
+        "transcode": "включить транскодинг",
+        "transcode_description": "активирует транскодинг в другие форматы",
+        "transcodeBitrate": "битрейт транскодинга",
+        "transcodeBitrate_description": "выберите битрейт транскодинга. 0 - автоматическое определение сервером",
+        "transcodeFormat": "формат транкодинга",
        "useSystemTheme_description": "использует тему, заданную в системе (светлую/тёмную)",
        "zoom": "процент масштабирования",
        "zoom_description": "устанавливает процент масштабирования приложения",
@@ -634,13 +685,15 @@
        "genreBehavior_description": "определяет, что отобразится при открытии на жанр — список треков или альбомов",
        "globalMediaHotkeys_description": "включить или отключить использование системных мультимедийных горячих клавиш для управления воспроизведением",
        "homeConfiguration_description": "позволяет настроить видимость и порядок элементов на домашней странице",
+        "homeFeature": "улучшенная карусель на главной",
+        "homeFeature_description": "определяет, показывать ли улучшенную карусель на главной странице",
        "hotkey_toggleQueue": "показать/скрыть очередь воспроизведения",
        "imageAspectRatio": "использовать оригинальное соотношение сторон обложки",
        "imageAspectRatio_description": "если эта опция включена, обложки будут отображаться в соответствии с их собственным соотношением сторон. для обложек не 1:1 оставшееся пространство будет пустым",
        "minimumScrobblePercentage": "минимальное время для скробблинга (в процентах)",
        "playbackStyle": "стиль воспроизведения",
        "playerAlbumArtResolution": "разрешение обложки альбома",
-        "remotePassword_description": "задает пароль для сервера удалённого управления. По умолчанию эти учетные данные передаются небезопасным способом, поэтому следует использовать уникальный пароль, который вам не важен",
+        "remotePassword_description": "задает пароль для сервера удалённого управления. По умолчанию эти учетные данные передаются небезопасным способом, поэтому следует использовать уникальный пароль, который вам неважен",
        "replayGainClipping_description": "Предотвращение клиппинга, вызванного {{ReplayGain}}, путём автоматического снижения усиления",
        "replayGainFallback_description": "усиление в db для применения, если у файла нет тегов {{ReplayGain}}",
        "replayGainMode_description": "регулировать усиление громкости в соответствии со значениями {{ReplayGain}}, хранящимися в метаданных файла",
@@ -658,8 +711,10 @@
        "startMinimized": "запуск в свёрнутом режиме",
        "themeDark_description": "устанавливает тёмную тему приложения",
        "hotkey_volumeMute": "отключить звук",
-        "clearCache_description": "\"жесткая очистка\" feishin. кроме очистки кэша feishin, также очищает кэш браузера (сохранённые картинки и другие ресурсы). учётные данные и настройки сохраняются",
+        "clearCache_description": "\"жесткая очистка\" feishin: кроме очистки кэша feishin, также очищает кэш браузера (сохранённые картинки и другие ресурсы). учётные данные и настройки сохраняются",
        "clearCacheSuccess": "кэш успешно удалён",
+        "contextMenu": "конфигурация контекстного меню (нажатие правой кнопкой мыши)",
+        "contextMenu_description": "позволяет скрыть элементы, отображаемые в меню, появляющемся при нажатии правой кнопки мыши на элемент. все, что не отмечено, будет скрыто",
        "customFontPath": "путь к пользовательскому шрифту",
        "customFontPath_description": "укажите путь к пользовательскому шрифту, который будет использоваться в приложении",
        "externalLinks_description": "включает отображение внешних ссылок (Last.fm, MusicBrainz) на страницах альбомов и артистов",
@@ -681,6 +736,10 @@
        "scrobble_description": "скробблинг треков на вашем медиасервере",
        "startMinimized_description": "запуск приложения в области уведомлений",
        "volumeWheelStep_description": "количество громкости, изменяемое при прокрутке колёсика мыши над ползунком громкости",
+        "volumeWidth": "ширина слайдера звука",
+        "volumeWidth_description": "ширина слайдера звука (в px)",
+        "webAudio": "использовать веб аудио",
+        "webAudio_description": "использование веб аудио. включение активирует продвинутые возможности (например, replaygain). отключите, если вам это не нужно",
        "discordRichPresence": "состояние профиля {{discord}}",
        "discordApplicationId": "{{discord}} application id",
        "discordApplicationId_description": "application id приложения {{discord}} которое будет отображаться в статусе профиля (по умолчанию {{defaultId}})",
@@ -688,9 +747,13 @@
        "discordIdleStatus_description": "если включено, то обновляет статус, когда пользователь бездействует",
        "discordUpdateInterval": "интервал обновления статуса профиля {{discord}}",
        "discordUpdateInterval_description": "время в секундах между каждым обновлением (минимум 15 секунд)",
+        "doubleClickBehavior": "добавить в очередь все найденные треки при двойном клике",
+        "doubleClickBehavior_description": "есть включено: все найденные в поиске треки будут добавлены в очередь при двойном клике (иначе - только выбранный)",
        "lyricOffset_description": "Смещение появления текста треков на указанное количество миллисекунд",
-        "skipPlaylistPage": "пропустить страницу плейлиста",
-        "applicationHotkeys_description": "настройка горячих клавиш приложения. включите чекбокс, чтобы сделать горячую клавишу глобальной (только для ПК)",
+        "skipPlaylistPage": "пропускать страницу плейлиста",
+        "applicationHotkeys_description": "настройка горячих клавиш приложения. поставьте галочку, чтобы сделать горячую клавишу глобальной (только для ПК)",
+        "artistConfiguration": "конфигурация страницы альбомов исполнителей",
+        "artistConfiguration_description": "позволяет настроить видимость и порядок элементов на странице альбомов исполнителей",
        "fontType_description": "встроенный позволяет выбрать один из шрифтов, предоставляемых Feishin. системный позволяет выбрать любой шрифт, предоставляемый вашей операционной системой. пользовательский позволяет выбрать свой собственный шрифт",
        "discordRichPresence_description": "включить статус воспроизведения в статус профиля в {{discord}}. Ключи изображений: {{icon}}, {{playing}} и {{paused}} ",
        "lyricOffset": "синхронизация текста треков (мс)"
@@ -107,7 +107,8 @@
        "albumGain": "专辑增益",
        "codec": "编解码器",
        "share": "分享",
-        "preview": "预览"
+        "preview": "预览",
+        "translation": "翻译"
    },
    "entity": {
        "albumArtist_other": "专辑艺术家",
@@ -140,7 +141,7 @@
        "skip_back": "向后跳过",
        "favorite": "收藏",
        "next": "下一首",
-        "shuffle": "随机",
+        "shuffle": "随机播放",
        "playbackFetchNoResults": "未找到歌曲",
        "playbackFetchInProgress": "正在加载歌曲…",
        "addNext": "添加为播放列表下一首",
@@ -152,13 +153,14 @@
        "unfavorite": "取消收藏",
        "queue_moveToTop": "将所选项移至底部",
        "queue_moveToBottom": "将所选项移至顶部",
-        "shuffle_off": "随机关闭",
+        "shuffle_off": "禁用随机播放",
        "addLast": "添加至播放列表末尾",
        "mute": "静音",
        "skip_forward": "向前跳过",
        "playbackSpeed": "播放速度",
        "pause": "暂停",
-        "playSimilarSongs": "播放类似的曲目"
+        "playSimilarSongs": "播放类似的曲目",
+        "viewQueue": "查看播放队列"
    },
    "setting": {
        "crossfadeStyle_description": "选择用于音频播放器的淡入淡出风格",
@@ -374,7 +376,16 @@
        "webAudio_description": "使用 web 音频。这将启用重播增益等高级功能。如果您遇到其他情况，请禁用",
        "artistConfiguration_description": "配置专辑艺术家页面上显示的项目及其显示顺序",
        "webAudio": "使用 web 音频",
-        "artistConfiguration": "专辑艺术家页面配置"
+        "artistConfiguration": "专辑艺术家页面配置",
+        "playButtonBehavior_optionPlayShuffled": "$t(player.shuffle)",
+        "trayEnabled_description": "显示/隐藏托盘图标/菜单。如果禁用，也会禁用最小化/退出到托盘",
+        "trayEnabled": "显示托盘",
+        "translationApiProvider": "翻译api提供商",
+        "translationApiProvider_description": "翻译api提供商",
+        "translationApiKey": "翻译api密钥",
+        "translationApiKey_description": "翻译api密钥（仅支持全球服务节点）",
+        "translationTargetLanguage": "目标翻译语言",
+        "translationTargetLanguage_description": "目标翻译语言"
    },
    "error": {
        "remotePortWarning": "重启服务器使新端口生效",
@@ -473,11 +484,14 @@
                "lyricGap": "歌词间距",
                "followCurrentLyric": "跟随当前歌词",
                "dynamicImageBlur": "图像模糊大小",
-                "dynamicIsImage": "启用背景图像"
+                "dynamicIsImage": "启用背景图像",
+                "lyricOffset": "歌词延迟补偿（毫秒）"
            },
            "lyrics": "歌词",
            "related": "相关",
-            "upNext": "即将播放"
+            "upNext": "即将播放",
+            "visualizer": "可视化",
+            "noLyrics": "未找到歌词"
        },
        "appMenu": {
            "selectServer": "选择服务器",
@@ -538,7 +552,8 @@
            "showDetails": "获取信息",
            "shareItem": "分享项目",
            "playSimilarSongs": "$t(player.playSimilarSongs)",
-            "download": "下载"
+            "download": "下载",
+            "playShuffled": "$t(player.shuffle)"
        },
        "trackList": {
            "title": "$t(entity.track_other)",
@@ -579,6 +594,14 @@
        },
        "playlist": {
            "reorder": "仅在按 ID 排序时启用重排序"
+        },
+        "manageServers": {
+            "url": "URL",
+            "title": "管理服务器",
+            "serverDetails": "服务器详细信息",
+            "username": "用户名",
+            "editServerDetailsTooltip": "编辑服务器详细信息",
+            "removeServer": "移除服务器"
        }
    },
    "form": {
@@ -650,7 +673,8 @@
                "autoFitColumns": "列宽自适应",
                "size": "$t(common.size)",
                "itemGap": "项目间隙（px）",
-                "itemSize": "项目大小 (px)"
+                "itemSize": "项目大小 (px)",
+                "followCurrentSong": "关注当前播放的歌曲"
            },
            "view": {
                "table": "表格",
@@ -647,7 +647,9 @@ if (!singleInstance) {
            });

            createWindow();
-            createTray();
+            if (store.get('window_enable_tray', true)) {
+                createTray();
+            }
            app.on('activate', () => {
                // On macOS it's common to re-create a window in the app when the
                // dock icon is clicked and there are no other windows open.
@@ -48,7 +48,7 @@ export default class MenuBuilder {
            label: 'Electron',
            submenu: [
                {
-                    label: 'About ElectronReact',
+                    label: 'About Feishin',
                    selector: 'orderFrontStandardAboutPanel:',
                },
                { type: 'separator' },
@@ -56,7 +56,7 @@ export default class MenuBuilder {
                { type: 'separator' },
                {
                    accelerator: 'Command+H',
-                    label: 'Hide ElectronReact',
+                    label: 'Hide Feishin',
                    selector: 'hide:',
                },
                {
@@ -147,27 +147,27 @@ export default class MenuBuilder {
            submenu: [
                {
                    click() {
-                        shell.openExternal('https://electronjs.org');
+                        shell.openExternal('https://github.com/jeffvli/feishin');
                    },
                    label: 'Learn More',
                },
                {
                    click() {
                        shell.openExternal(
-                            'https://github.com/electron/electron/tree/main/docs#readme',
+                            'https://github.com/jeffvli/feishin?tab=readme-ov-file#getting-started',
                        );
                    },
                    label: 'Documentation',
                },
                {
                    click() {
-                        shell.openExternal('https://www.electronjs.org/community');
+                        shell.openExternal('https://github.com/jeffvli/feishin/discussions');
                    },
                    label: 'Community Discussions',
                },
                {
                    click() {
-                        shell.openExternal('https://github.com/electron/electron/issues');
+                        shell.openExternal('https://github.com/jeffvli/feishin/issues');
                    },
                    label: 'Search Issues',
                },
@@ -246,27 +246,27 @@ export default class MenuBuilder {
                submenu: [
                    {
                        click() {
-                            shell.openExternal('https://electronjs.org');
+                            shell.openExternal('https://github.com/jeffvli/feishin');
                        },
                        label: 'Learn More',
                    },
                    {
                        click() {
                            shell.openExternal(
-                                'https://github.com/electron/electron/tree/main/docs#readme',
+                                'https://github.com/jeffvli/feishin?tab=readme-ov-file#getting-started',
                            );
                        },
                        label: 'Documentation',
                    },
                    {
                        click() {
-                            shell.openExternal('https://www.electronjs.org/community');
+                            shell.openExternal('https://github.com/jeffvli/feishin/discussions');
                        },
                        label: 'Community Discussions',
                    },
                    {
                        click() {
-                            shell.openExternal('https://github.com/electron/electron/issues');
+                            shell.openExternal('https://github.com/jeffvli/feishin/issues');
                        },
                        label: 'Search Issues',
                    },
@@ -1,119 +1,11 @@
 import { useAuthStore } from '/@/renderer/store';
 import { toast } from '/@/renderer/components/toast/index';
-import type {
-    AlbumDetailArgs,
-    AlbumListArgs,
-    SongListArgs,
-    SongDetailArgs,
-    AlbumArtistDetailArgs,
-    AlbumArtistListArgs,
-    SetRatingArgs,
-    ShareItemArgs,
-    GenreListArgs,
-    CreatePlaylistArgs,
-    DeletePlaylistArgs,
-    PlaylistDetailArgs,
-    PlaylistListArgs,
-    MusicFolderListArgs,
-    PlaylistSongListArgs,
-    ArtistListArgs,
-    UpdatePlaylistArgs,
-    UserListArgs,
-    FavoriteArgs,
-    TopSongListArgs,
-    AddToPlaylistArgs,
-    AddToPlaylistResponse,
-    RemoveFromPlaylistArgs,
-    RemoveFromPlaylistResponse,
-    ScrobbleArgs,
-    ScrobbleResponse,
-    AlbumArtistDetailResponse,
-    FavoriteResponse,
-    CreatePlaylistResponse,
-    AlbumArtistListResponse,
-    AlbumDetailResponse,
-    AlbumListResponse,
-    ArtistListResponse,
-    GenreListResponse,
-    MusicFolderListResponse,
-    PlaylistDetailResponse,
-    PlaylistListResponse,
-    RatingResponse,
-    SongDetailResponse,
-    SongListResponse,
-    TopSongListResponse,
-    UpdatePlaylistResponse,
-    UserListResponse,
-    AuthenticationResponse,
-    SearchArgs,
-    SearchResponse,
-    LyricsArgs,
-    LyricsResponse,
-    ServerInfo,
-    ServerInfoArgs,
-    StructuredLyricsArgs,
-    StructuredLyric,
-    SimilarSongsArgs,
-    Song,
-    ServerType,
-    ShareItemResponse,
-    MoveItemArgs,
-    DownloadArgs,
-    TranscodingArgs,
-} from '/@/renderer/api/types';
-import { DeletePlaylistResponse, RandomSongListArgs } from './types';
-import { ndController } from '/@/renderer/api/navidrome/navidrome-controller';
-import { ssController } from '/@/renderer/api/subsonic/subsonic-controller';
-import { jfController } from '/@/renderer/api/jellyfin/jellyfin-controller';
+import type { ServerType, ControllerEndpoint, AuthenticationResponse } from '/@/renderer/api/types';
+import { NavidromeController } from '/@/renderer/api/navidrome/navidrome-controller';
+import { SubsonicController } from '/@/renderer/api/subsonic/subsonic-controller';
+import { JellyfinController } from '/@/renderer/api/jellyfin/jellyfin-controller';
 import i18n from '/@/i18n/i18n';

-export type ControllerEndpoint = Partial<{
-    addToPlaylist: (args: AddToPlaylistArgs) => Promise<AddToPlaylistResponse>;
-    authenticate: (
-        url: string,
-        body: { password: string; username: string },
-    ) => Promise<AuthenticationResponse>;
-    clearPlaylist: () => void;
-    createFavorite: (args: FavoriteArgs) => Promise<FavoriteResponse>;
-    createPlaylist: (args: CreatePlaylistArgs) => Promise<CreatePlaylistResponse>;
-    deleteFavorite: (args: FavoriteArgs) => Promise<FavoriteResponse>;
-    deletePlaylist: (args: DeletePlaylistArgs) => Promise<DeletePlaylistResponse>;
-    getAlbumArtistDetail: (args: AlbumArtistDetailArgs) => Promise<AlbumArtistDetailResponse>;
-    getAlbumArtistList: (args: AlbumArtistListArgs) => Promise<AlbumArtistListResponse>;
-    getAlbumDetail: (args: AlbumDetailArgs) => Promise<AlbumDetailResponse>;
-    getAlbumList: (args: AlbumListArgs) => Promise<AlbumListResponse>;
-    getArtistDetail: () => void;
-    getArtistInfo: (args: any) => void;
-    getArtistList: (args: ArtistListArgs) => Promise<ArtistListResponse>;
-    getDownloadUrl: (args: DownloadArgs) => string;
-    getFavoritesList: () => void;
-    getFolderItemList: () => void;
-    getFolderList: () => void;
-    getFolderSongs: () => void;
-    getGenreList: (args: GenreListArgs) => Promise<GenreListResponse>;
-    getLyrics: (args: LyricsArgs) => Promise<LyricsResponse>;
-    getMusicFolderList: (args: MusicFolderListArgs) => Promise<MusicFolderListResponse>;
-    getPlaylistDetail: (args: PlaylistDetailArgs) => Promise<PlaylistDetailResponse>;
-    getPlaylistList: (args: PlaylistListArgs) => Promise<PlaylistListResponse>;
-    getPlaylistSongList: (args: PlaylistSongListArgs) => Promise<SongListResponse>;
-    getRandomSongList: (args: RandomSongListArgs) => Promise<SongListResponse>;
-    getServerInfo: (args: ServerInfoArgs) => Promise<ServerInfo>;
-    getSimilarSongs: (args: SimilarSongsArgs) => Promise<Song[]>;
-    getSongDetail: (args: SongDetailArgs) => Promise<SongDetailResponse>;
-    getSongList: (args: SongListArgs) => Promise<SongListResponse>;
-    getStructuredLyrics: (args: StructuredLyricsArgs) => Promise<StructuredLyric[]>;
-    getTopSongs: (args: TopSongListArgs) => Promise<TopSongListResponse>;
-    getTranscodingUrl: (args: TranscodingArgs) => string;
-    getUserList: (args: UserListArgs) => Promise<UserListResponse>;
-    movePlaylistItem: (args: MoveItemArgs) => Promise<void>;
-    removeFromPlaylist: (args: RemoveFromPlaylistArgs) => Promise<RemoveFromPlaylistResponse>;
-    scrobble: (args: ScrobbleArgs) => Promise<ScrobbleResponse>;
-    search: (args: SearchArgs) => Promise<SearchResponse>;
-    setRating: (args: SetRatingArgs) => Promise<RatingResponse>;
-    shareItem: (args: ShareItemArgs) => Promise<ShareItemResponse>;
-    updatePlaylist: (args: UpdatePlaylistArgs) => Promise<UpdatePlaylistResponse>;
-}>;
-
 type ApiController = {
    jellyfin: ControllerEndpoint;
    navidrome: ControllerEndpoint;
@@ -121,133 +13,15 @@ type ApiController = {
 };

 const endpoints: ApiController = {
-    jellyfin: {
-        addToPlaylist: jfController.addToPlaylist,
-        authenticate: jfController.authenticate,
-        clearPlaylist: undefined,
-        createFavorite: jfController.createFavorite,
-        createPlaylist: jfController.createPlaylist,
-        deleteFavorite: jfController.deleteFavorite,
-        deletePlaylist: jfController.deletePlaylist,
-        getAlbumArtistDetail: jfController.getAlbumArtistDetail,
-        getAlbumArtistList: jfController.getAlbumArtistList,
-        getAlbumDetail: jfController.getAlbumDetail,
-        getAlbumList: jfController.getAlbumList,
-        getArtistDetail: undefined,
-        getArtistInfo: undefined,
-        getArtistList: undefined,
-        getDownloadUrl: jfController.getDownloadUrl,
-        getFavoritesList: undefined,
-        getFolderItemList: undefined,
-        getFolderList: undefined,
-        getFolderSongs: undefined,
-        getGenreList: jfController.getGenreList,
-        getLyrics: jfController.getLyrics,
-        getMusicFolderList: jfController.getMusicFolderList,
-        getPlaylistDetail: jfController.getPlaylistDetail,
-        getPlaylistList: jfController.getPlaylistList,
-        getPlaylistSongList: jfController.getPlaylistSongList,
-        getRandomSongList: jfController.getRandomSongList,
-        getServerInfo: jfController.getServerInfo,
-        getSimilarSongs: jfController.getSimilarSongs,
-        getSongDetail: jfController.getSongDetail,
-        getSongList: jfController.getSongList,
-        getStructuredLyrics: undefined,
-        getTopSongs: jfController.getTopSongList,
-        getTranscodingUrl: jfController.getTranscodingUrl,
-        getUserList: undefined,
-        movePlaylistItem: jfController.movePlaylistItem,
-        removeFromPlaylist: jfController.removeFromPlaylist,
-        scrobble: jfController.scrobble,
-        search: jfController.search,
-        setRating: undefined,
-        shareItem: undefined,
-        updatePlaylist: jfController.updatePlaylist,
-    },
-    navidrome: {
-        addToPlaylist: ndController.addToPlaylist,
-        authenticate: ndController.authenticate,
-        clearPlaylist: undefined,
-        createFavorite: ssController.createFavorite,
-        createPlaylist: ndController.createPlaylist,
-        deleteFavorite: ssController.removeFavorite,
-        deletePlaylist: ndController.deletePlaylist,
-        getAlbumArtistDetail: ndController.getAlbumArtistDetail,
-        getAlbumArtistList: ndController.getAlbumArtistList,
-        getAlbumDetail: ndController.getAlbumDetail,
-        getAlbumList: ndController.getAlbumList,
-        getArtistDetail: undefined,
-        getArtistInfo: undefined,
-        getArtistList: undefined,
-        getDownloadUrl: ssController.getDownloadUrl,
-        getFavoritesList: undefined,
-        getFolderItemList: undefined,
-        getFolderList: undefined,
-        getFolderSongs: undefined,
-        getGenreList: ndController.getGenreList,
-        getLyrics: undefined,
-        getMusicFolderList: ssController.getMusicFolderList,
-        getPlaylistDetail: ndController.getPlaylistDetail,
-        getPlaylistList: ndController.getPlaylistList,
-        getPlaylistSongList: ndController.getPlaylistSongList,
-        getRandomSongList: ssController.getRandomSongList,
-        getServerInfo: ndController.getServerInfo,
-        getSimilarSongs: ndController.getSimilarSongs,
-        getSongDetail: ndController.getSongDetail,
-        getSongList: ndController.getSongList,
-        getStructuredLyrics: ssController.getStructuredLyrics,
-        getTopSongs: ssController.getTopSongList,
-        getTranscodingUrl: ssController.getTranscodingUrl,
-        getUserList: ndController.getUserList,
-        movePlaylistItem: ndController.movePlaylistItem,
-        removeFromPlaylist: ndController.removeFromPlaylist,
-        scrobble: ssController.scrobble,
-        search: ssController.search3,
-        setRating: ssController.setRating,
-        shareItem: ndController.shareItem,
-        updatePlaylist: ndController.updatePlaylist,
-    },
-    subsonic: {
-        authenticate: ssController.authenticate,
-        clearPlaylist: undefined,
-        createFavorite: ssController.createFavorite,
-        createPlaylist: undefined,
-        deleteFavorite: ssController.removeFavorite,
-        deletePlaylist: undefined,
-        getAlbumArtistDetail: undefined,
-        getAlbumArtistList: undefined,
-        getAlbumDetail: undefined,
-        getAlbumList: undefined,
-        getArtistDetail: undefined,
-        getArtistInfo: undefined,
-        getArtistList: undefined,
-        getDownloadUrl: ssController.getDownloadUrl,
-        getFavoritesList: undefined,
-        getFolderItemList: undefined,
-        getFolderList: undefined,
-        getFolderSongs: undefined,
-        getGenreList: undefined,
-        getLyrics: undefined,
-        getMusicFolderList: ssController.getMusicFolderList,
-        getPlaylistDetail: undefined,
-        getPlaylistList: undefined,
-        getServerInfo: ssController.getServerInfo,
-        getSimilarSongs: ssController.getSimilarSongs,
-        getSongDetail: undefined,
-        getSongList: undefined,
-        getStructuredLyrics: ssController.getStructuredLyrics,
-        getTopSongs: ssController.getTopSongList,
-        getTranscodingUrl: ssController.getTranscodingUrl,
-        getUserList: undefined,
-        scrobble: ssController.scrobble,
-        search: ssController.search3,
-        setRating: undefined,
-        shareItem: undefined,
-        updatePlaylist: undefined,
-    },
+    jellyfin: JellyfinController,
+    navidrome: NavidromeController,
+    subsonic: SubsonicController,
 };

-const apiController = (endpoint: keyof ControllerEndpoint, type?: ServerType) => {
+const apiController = <K extends keyof ControllerEndpoint>(
+    endpoint: K,
+    type?: ServerType,
+): NonNullable<ControllerEndpoint[K]> => {
    const serverType = type || useAuthStore.getState().currentServer?.type;

    if (!serverType) {
@@ -277,344 +51,127 @@ const apiController = (endpoint: keyof ControllerEndpoint, type?: ServerType) =>
        );
    }

-    return endpoints[serverType][endpoint];
+    return controllerFn;
 };

-const authenticate = async (
-    url: string,
-    body: { legacy?: boolean; password: string; username: string },
-    type: ServerType,
-) => {
-    return (apiController('authenticate', type) as ControllerEndpoint['authenticate'])?.(url, body);
-};
+export interface GeneralController extends Omit<Required<ControllerEndpoint>, 'authenticate'> {
+    authenticate: (
+        url: string,
+        body: { legacy?: boolean; password: string; username: string },
+        type: ServerType,
+    ) => Promise<AuthenticationResponse>;
+}

-const getAlbumList = async (args: AlbumListArgs) => {
-    return (
-        apiController(
-            'getAlbumList',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getAlbumList']
-    )?.(args);
-};
-
-const getAlbumDetail = async (args: AlbumDetailArgs) => {
-    return (
-        apiController(
-            'getAlbumDetail',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getAlbumDetail']
-    )?.(args);
-};
-
-const getSongList = async (args: SongListArgs) => {
-    return (
-        apiController(
-            'getSongList',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getSongList']
-    )?.(args);
-};
-
-const getSongDetail = async (args: SongDetailArgs) => {
-    return (
-        apiController(
-            'getSongDetail',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getSongDetail']
-    )?.(args);
-};
-
-const getMusicFolderList = async (args: MusicFolderListArgs) => {
-    return (
-        apiController(
-            'getMusicFolderList',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getMusicFolderList']
-    )?.(args);
-};
-
-const getGenreList = async (args: GenreListArgs) => {
-    return (
-        apiController(
-            'getGenreList',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getGenreList']
-    )?.(args);
-};
-
-const getAlbumArtistDetail = async (args: AlbumArtistDetailArgs) => {
-    return (
-        apiController(
-            'getAlbumArtistDetail',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getAlbumArtistDetail']
-    )?.(args);
-};
-
-const getAlbumArtistList = async (args: AlbumArtistListArgs) => {
-    return (
-        apiController(
-            'getAlbumArtistList',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getAlbumArtistList']
-    )?.(args);
-};
-
-const getArtistList = async (args: ArtistListArgs) => {
-    return (
-        apiController(
-            'getArtistList',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getArtistList']
-    )?.(args);
-};
-
-const getPlaylistList = async (args: PlaylistListArgs) => {
-    return (
-        apiController(
-            'getPlaylistList',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getPlaylistList']
-    )?.(args);
-};
-
-const createPlaylist = async (args: CreatePlaylistArgs) => {
-    return (
-        apiController(
-            'createPlaylist',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['createPlaylist']
-    )?.(args);
-};
-
-const updatePlaylist = async (args: UpdatePlaylistArgs) => {
-    return (
-        apiController(
-            'updatePlaylist',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['updatePlaylist']
-    )?.(args);
-};
-
-const deletePlaylist = async (args: DeletePlaylistArgs) => {
-    return (
-        apiController(
-            'deletePlaylist',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['deletePlaylist']
-    )?.(args);
-};
-
-const addToPlaylist = async (args: AddToPlaylistArgs) => {
-    return (
-        apiController(
-            'addToPlaylist',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['addToPlaylist']
-    )?.(args);
-};
-
-const removeFromPlaylist = async (args: RemoveFromPlaylistArgs) => {
-    return (
-        apiController(
-            'removeFromPlaylist',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['removeFromPlaylist']
-    )?.(args);
-};
-
-const getPlaylistDetail = async (args: PlaylistDetailArgs) => {
-    return (
-        apiController(
-            'getPlaylistDetail',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getPlaylistDetail']
-    )?.(args);
-};
-
-const getPlaylistSongList = async (args: PlaylistSongListArgs) => {
-    return (
-        apiController(
-            'getPlaylistSongList',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getPlaylistSongList']
-    )?.(args);
-};
-
-const getUserList = async (args: UserListArgs) => {
-    return (
-        apiController(
-            'getUserList',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getUserList']
-    )?.(args);
-};
-
-const createFavorite = async (args: FavoriteArgs) => {
-    return (
-        apiController(
-            'createFavorite',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['createFavorite']
-    )?.(args);
-};
-
-const deleteFavorite = async (args: FavoriteArgs) => {
-    return (
-        apiController(
-            'deleteFavorite',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['deleteFavorite']
-    )?.(args);
-};
-
-const updateRating = async (args: SetRatingArgs) => {
-    return (
-        apiController(
-            'setRating',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['setRating']
-    )?.(args);
-};
-
-const shareItem = async (args: ShareItemArgs) => {
-    return (
-        apiController(
-            'shareItem',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['shareItem']
-    )?.(args);
-};
-
-const getTopSongList = async (args: TopSongListArgs) => {
-    return (
-        apiController(
-            'getTopSongs',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getTopSongs']
-    )?.(args);
-};
-
-const scrobble = async (args: ScrobbleArgs) => {
-    return (
-        apiController(
-            'scrobble',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['scrobble']
-    )?.(args);
-};
-
-const search = async (args: SearchArgs) => {
-    return (
-        apiController('search', args.apiClientProps.server?.type) as ControllerEndpoint['search']
-    )?.(args);
-};
-
-const getRandomSongList = async (args: RandomSongListArgs) => {
-    return (
-        apiController(
-            'getRandomSongList',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getRandomSongList']
-    )?.(args);
-};
-
-const getLyrics = async (args: LyricsArgs) => {
-    return (
-        apiController(
-            'getLyrics',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getLyrics']
-    )?.(args);
-};
-
-const getServerInfo = async (args: ServerInfoArgs) => {
-    return (
-        apiController(
-            'getServerInfo',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getServerInfo']
-    )?.(args);
-};
-
-const getStructuredLyrics = async (args: StructuredLyricsArgs) => {
-    return (
-        apiController(
-            'getStructuredLyrics',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getStructuredLyrics']
-    )?.(args);
-};
-
-const getSimilarSongs = async (args: SimilarSongsArgs) => {
-    return (
-        apiController(
-            'getSimilarSongs',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getSimilarSongs']
-    )?.(args);
-};
-
-const movePlaylistItem = async (args: MoveItemArgs) => {
-    return (
-        apiController(
-            'movePlaylistItem',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['movePlaylistItem']
-    )?.(args);
-};
-
-const getDownloadUrl = (args: DownloadArgs) => {
-    return (
-        apiController(
-            'getDownloadUrl',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getDownloadUrl']
-    )?.(args);
-};
-
-const getTranscodingUrl = (args: TranscodingArgs) => {
-    return (
-        apiController(
-            'getTranscodingUrl',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getTranscodingUrl']
-    )?.(args);
-};
-
-export const controller = {
-    addToPlaylist,
-    authenticate,
-    createFavorite,
-    createPlaylist,
-    deleteFavorite,
-    deletePlaylist,
-    getAlbumArtistDetail,
-    getAlbumArtistList,
-    getAlbumDetail,
-    getAlbumList,
-    getArtistList,
-    getDownloadUrl,
-    getGenreList,
-    getLyrics,
-    getMusicFolderList,
-    getPlaylistDetail,
-    getPlaylistList,
-    getPlaylistSongList,
-    getRandomSongList,
-    getServerInfo,
-    getSimilarSongs,
-    getSongDetail,
-    getSongList,
-    getStructuredLyrics,
-    getTopSongList,
-    getTranscodingUrl,
-    getUserList,
-    movePlaylistItem,
-    removeFromPlaylist,
-    scrobble,
-    search,
-    shareItem,
-    updatePlaylist,
-    updateRating,
+export const controller: GeneralController = {
+    addToPlaylist(args) {
+        return apiController('addToPlaylist', args.apiClientProps.server?.type)?.(args);
+    },
+    authenticate(url, body, type) {
+        return apiController('authenticate', type)(url, body);
+    },
+    createFavorite(args) {
+        return apiController('createFavorite', args.apiClientProps.server?.type)?.(args);
+    },
+    createPlaylist(args) {
+        return apiController('createPlaylist', args.apiClientProps.server?.type)?.(args);
+    },
+    deleteFavorite(args) {
+        return apiController('deleteFavorite', args.apiClientProps.server?.type)?.(args);
+    },
+    deletePlaylist(args) {
+        return apiController('deletePlaylist', args.apiClientProps.server?.type)?.(args);
+    },
+    getAlbumArtistDetail(args) {
+        return apiController('getAlbumArtistDetail', args.apiClientProps.server?.type)?.(args);
+    },
+    getAlbumArtistList(args) {
+        return apiController('getAlbumArtistList', args.apiClientProps.server?.type)?.(args);
+    },
+    getAlbumArtistListCount(args) {
+        return apiController('getAlbumArtistListCount', args.apiClientProps.server?.type)?.(args);
+    },
+    getAlbumDetail(args) {
+        return apiController('getAlbumDetail', args.apiClientProps.server?.type)?.(args);
+    },
+    getAlbumList(args) {
+        return apiController('getAlbumList', args.apiClientProps.server?.type)?.(args);
+    },
+    getAlbumListCount(args) {
+        return apiController('getAlbumListCount', args.apiClientProps.server?.type)?.(args);
+    },
+    getDownloadUrl(args) {
+        return apiController('getDownloadUrl', args.apiClientProps.server?.type)?.(args);
+    },
+    getGenreList(args) {
+        return apiController('getGenreList', args.apiClientProps.server?.type)?.(args);
+    },
+    getLyrics(args) {
+        return apiController('getLyrics', args.apiClientProps.server?.type)?.(args);
+    },
+    getMusicFolderList(args) {
+        return apiController('getMusicFolderList', args.apiClientProps.server?.type)?.(args);
+    },
+    getPlaylistDetail(args) {
+        return apiController('getPlaylistDetail', args.apiClientProps.server?.type)?.(args);
+    },
+    getPlaylistList(args) {
+        return apiController('getPlaylistList', args.apiClientProps.server?.type)?.(args);
+    },
+    getPlaylistListCount(args) {
+        return apiController('getPlaylistListCount', args.apiClientProps.server?.type)?.(args);
+    },
+    getPlaylistSongList(args) {
+        return apiController('getPlaylistSongList', args.apiClientProps.server?.type)?.(args);
+    },
+    getRandomSongList(args) {
+        return apiController('getRandomSongList', args.apiClientProps.server?.type)?.(args);
+    },
+    getServerInfo(args) {
+        return apiController('getServerInfo', args.apiClientProps.server?.type)?.(args);
+    },
+    getSimilarSongs(args) {
+        return apiController('getSimilarSongs', args.apiClientProps.server?.type)?.(args);
+    },
+    getSongDetail(args) {
+        return apiController('getSongDetail', args.apiClientProps.server?.type)?.(args);
+    },
+    getSongList(args) {
+        return apiController('getSongList', args.apiClientProps.server?.type)?.(args);
+    },
+    getSongListCount(args) {
+        return apiController('getSongListCount', args.apiClientProps.server?.type)?.(args);
+    },
+    getStructuredLyrics(args) {
+        return apiController('getStructuredLyrics', args.apiClientProps.server?.type)?.(args);
+    },
+    getTopSongs(args) {
+        return apiController('getTopSongs', args.apiClientProps.server?.type)?.(args);
+    },
+    getTranscodingUrl(args) {
+        return apiController('getTranscodingUrl', args.apiClientProps.server?.type)?.(args);
+    },
+    getUserList(args) {
+        return apiController('getUserList', args.apiClientProps.server?.type)?.(args);
+    },
+    movePlaylistItem(args) {
+        return apiController('movePlaylistItem', args.apiClientProps.server?.type)?.(args);
+    },
+    removeFromPlaylist(args) {
+        return apiController('removeFromPlaylist', args.apiClientProps.server?.type)?.(args);
+    },
+    scrobble(args) {
+        return apiController('scrobble', args.apiClientProps.server?.type)?.(args);
+    },
+    search(args) {
+        return apiController('search', args.apiClientProps.server?.type)?.(args);
+    },
+    setRating(args) {
+        return apiController('setRating', args.apiClientProps.server?.type)?.(args);
+    },
+    shareItem(args) {
+        return apiController('shareItem', args.apiClientProps.server?.type)?.(args);
+    },
+    updatePlaylist(args) {
+        return apiController('updatePlaylist', args.apiClientProps.server?.type)?.(args);
+    },
 };
@@ -574,7 +574,7 @@ export enum JFSongListSort {
    ARTIST = 'Artist,Album,SortName',
    COMMUNITY_RATING = 'CommunityRating,SortName',
    DURATION = 'Runtime,AlbumArtist,Album,SortName',
-    NAME = 'SortName,Name',
+    NAME = 'Name',
    PLAY_COUNT = 'PlayCount,SortName',
    RANDOM = 'Random,SortName',
    RECENTLY_ADDED = 'DateCreated,SortName',
@@ -53,7 +53,7 @@ const getAlbumArtistCoverArtUrl = (args: {
        `${args.baseUrl}/Items` +
        `/${args.item.Id}` +
        '/Images/Primary' +
-        `?width=${size}&` +
+        `?width=${size}` +
        '&quality=96'
    );
 };
@@ -69,7 +69,7 @@ const getAlbumCoverArtUrl = (args: { baseUrl: string; item: JFAlbum; size: numbe
        `${args.baseUrl}/Items` +
        `/${args.item.Id}` +
        '/Images/Primary' +
-        `?width=${size}&height=${size}` +
+        `?width=${size}` +
        '&quality=96'
    );
 };
@@ -86,7 +86,7 @@ const getSongCoverArtUrl = (args: {
            `${args.baseUrl}/Items` +
            `/${args.item.Id}` +
            '/Images/Primary' +
-            `?width=${size}&height=${size}` +
+            `?width=${size}` +
            '&quality=96'
        );
    }
@@ -97,7 +97,7 @@ const getSongCoverArtUrl = (args: {
            `${args.baseUrl}/Items` +
            `/${args.item?.AlbumId}` +
            '/Images/Primary' +
-            `?width=${size}&height=${size}` +
+            `?width=${size}` +
            '&quality=96'
        );
    }
@@ -116,7 +116,7 @@ const getPlaylistCoverArtUrl = (args: { baseUrl: string; item: JFPlaylist; size:
        `${args.baseUrl}/Items` +
        `/${args.item.Id}` +
        '/Images/Primary' +
-        `?width=${size}&height=${size}` +
+        `?width=${size}` +
        '&quality=96'
    );
 };
@@ -153,11 +153,16 @@ const normalizeSong = (
        discNumber: (item.ParentIndexNumber && item.ParentIndexNumber) || 1,
        discSubtitle: null,
        duration: item.RunTimeTicks / 10000,
-        gain: item.LUFS
-            ? {
-                  track: -18 - item.LUFS,
-              }
-            : null,
+        gain:
+            item.NormalizationGain !== undefined
+                ? {
+                      track: item.NormalizationGain,
+                  }
+                : item.LUFS
+                  ? {
+                        track: -18 - item.LUFS,
+                    }
+                  : null,
        genres: item.GenreItems?.map((entry) => ({
            id: entry.Id,
            imageUrl: null,
@@ -388,7 +393,7 @@ const getGenreCoverArtUrl = (args: {
        `${args.baseUrl}/Items` +
        `/${args.item.Id}` +
        '/Images/Primary' +
-        `?width=${size}&height=${size}` +
+        `?width=${size}` +
        '&quality=96'
    );
 };
@@ -413,6 +413,7 @@ const song = z.object({
    MediaSources: z.array(mediaSources),
    MediaType: z.string(),
    Name: z.string(),
+    NormalizationGain: z.number().optional(),
    ParentIndexNumber: z.number(),
    PlaylistItemId: z.string().optional(),
    PremiereDate: z.string().optional(),
@@ -544,7 +545,7 @@ const songListSort = {
    ARTIST: 'Artist,Album,SortName',
    COMMUNITY_RATING: 'CommunityRating,SortName',
    DURATION: 'Runtime,AlbumArtist,Album,SortName',
-    NAME: 'SortName,Name',
+    NAME: 'Name',
    PLAY_COUNT: 'PlayCount,SortName',
    RANDOM: 'Random,SortName',
    RECENTLY_ADDED: 'DateCreated,SortName',
@@ -199,17 +199,17 @@ export type NDGenreListParams = {
    NDOrder;

 export enum NDAlbumListSort {
-    ALBUM_ARTIST = 'albumArtist',
+    ALBUM_ARTIST = 'album_artist',
    ARTIST = 'artist',
    DURATION = 'duration',
    NAME = 'name',
-    PLAY_COUNT = 'playCount',
+    PLAY_COUNT = 'play_count',
    PLAY_DATE = 'play_date',
    RANDOM = 'random',
    RATING = 'rating',
    RECENTLY_ADDED = 'recently_added',
    SONG_COUNT = 'songCount',
-    STARRED = 'starred',
+    STARRED = 'starred_at',
    YEAR = 'max_year',
 }

@@ -229,15 +229,15 @@ export type NDAlbumListParams = {
    NDOrder;

 export enum NDSongListSort {
-    ALBUM = 'album, order_album_artist_name, disc_number, track_number, title',
-    ALBUM_ARTIST = 'order_album_artist_name, album, disc_number, track_number, title',
-    ALBUM_SONGS = 'album, discNumber, trackNumber',
+    ALBUM = 'album',
+    ALBUM_ARTIST = 'order_album_artist_name',
+    ALBUM_SONGS = 'album',
    ARTIST = 'artist',
    BPM = 'bpm',
    CHANNELS = 'channels',
    COMMENT = 'comment',
    DURATION = 'duration',
-    FAVORITED = 'starred ASC, starredAt ASC',
+    FAVORITED = 'starred_at',
    GENRE = 'genre',
    ID = 'id',
    PLAY_COUNT = 'playCount',
@@ -247,7 +247,7 @@ export enum NDSongListSort {
    RECENTLY_ADDED = 'createdAt',
    TITLE = 'title',
    TRACK = 'track',
-    YEAR = 'year, album, discNumber, trackNumber',
+    YEAR = 'year',
 }

 export type NDSongListParams = {
@@ -261,7 +261,7 @@ export type NDSongListParams = {

 export enum NDAlbumArtistListSort {
    ALBUM_COUNT = 'albumCount',
-    FAVORITED = 'starred ASC, starredAt ASC',
+    FAVORITED = 'starred_at',
    NAME = 'name',
    PLAY_COUNT = 'playCount',
    RATING = 'rating',
@@ -353,7 +353,7 @@ export type NDPlaylistListResponse = NDPlaylist[];
 export enum NDPlaylistListSort {
    DURATION = 'duration',
    NAME = 'name',
-    OWNER = 'ownerName',
+    OWNER = 'owner_name',
    PUBLIC = 'public',
    SONG_COUNT = 'songCount',
    UPDATED_AT = 'updatedAt',
@@ -99,7 +99,7 @@ const normalizeSong = (
            item.rgAlbumGain || item.rgTrackGain
                ? { album: item.rgAlbumGain, track: item.rgTrackGain }
                : null,
-        genres: item.genres?.map((genre) => ({
+        genres: (item.genres || []).map((genre) => ({
            id: genre.id,
            imageUrl: null,
            itemType: LibraryItem.GENRE,
@@ -162,7 +162,7 @@ const normalizeAlbum = (
        comment: item.comment || null,
        createdAt: item.createdAt.split('T')[0],
        duration: item.duration * 1000 || null,
-        genres: item.genres?.map((genre) => ({
+        genres: (item.genres || []).map((genre) => ({
            id: genre.id,
            imageUrl: null,
            itemType: LibraryItem.GENRE,
@@ -221,7 +221,7 @@ const normalizeAlbumArtist = (
        backgroundImageUrl: null,
        biography: item.biography || null,
        duration: null,
-        genres: item.genres?.map((genre) => ({
+        genres: (item.genres || []).map((genre) => ({
            id: genre.id,
            imageUrl: null,
            itemType: LibraryItem.GENRE,
@@ -1,4 +1,10 @@
 import { z } from 'zod';
+import {
+    NDAlbumArtistListSort,
+    NDAlbumListSort,
+    NDPlaylistListSort,
+    NDSongListSort,
+} from '/@/renderer/api/navidrome.types';

 const sortOrderValues = ['ASC', 'DESC'] as const;

@@ -70,7 +76,7 @@ const albumArtist = z.object({
    externalInfoUpdatedAt: z.string(),
    externalUrl: z.string(),
    fullText: z.string(),
-    genres: z.array(genre),
+    genres: z.array(genre).nullable(),
    id: z.string(),
    largeImageUrl: z.string().optional(),
    mbzArtistId: z.string().optional(),
@@ -89,17 +95,8 @@ const albumArtist = z.object({

 const albumArtistList = z.array(albumArtist);

-const ndAlbumArtistListSort = {
-    ALBUM_COUNT: 'albumCount',
-    FAVORITED: 'starred ASC, starredAt ASC',
-    NAME: 'name',
-    PLAY_COUNT: 'playCount',
-    RATING: 'rating',
-    SONG_COUNT: 'songCount',
-} as const;
-
 const albumArtistListParameters = paginationParameters.extend({
-    _sort: z.nativeEnum(ndAlbumArtistListSort).optional(),
+    _sort: z.nativeEnum(NDAlbumArtistListSort).optional(),
    genre_id: z.string().optional(),
    name: z.string().optional(),
    starred: z.boolean().optional(),
@@ -119,7 +116,7 @@ const album = z.object({
    duration: z.number(),
    fullText: z.string(),
    genre: z.string(),
-    genres: z.array(genre),
+    genres: z.array(genre).nullable(),
    id: z.string(),
    maxYear: z.number(),
    mbzAlbumArtistId: z.string().optional(),
@@ -145,23 +142,8 @@ const album = z.object({

 const albumList = z.array(album);

-const ndAlbumListSort = {
-    ALBUM_ARTIST: 'albumArtist',
-    ARTIST: 'artist',
-    DURATION: 'duration',
-    NAME: 'name',
-    PLAY_COUNT: 'playCount',
-    PLAY_DATE: 'play_date',
-    RANDOM: 'random',
-    RATING: 'rating',
-    RECENTLY_ADDED: 'recently_added',
-    SONG_COUNT: 'songCount',
-    STARRED: 'starred',
-    YEAR: 'max_year',
-} as const;
-
 const albumListParameters = paginationParameters.extend({
-    _sort: z.nativeEnum(ndAlbumListSort).optional(),
+    _sort: z.nativeEnum(NDAlbumListSort).optional(),
    album_id: z.string().optional(),
    artist_id: z.string().optional(),
    compilation: z.boolean().optional(),
@@ -198,7 +180,7 @@ const song = z.object({
    externalUrl: z.string().optional(),
    fullText: z.string(),
    genre: z.string(),
-    genres: z.array(genre),
+    genres: z.array(genre).nullable(),
    hasCoverArt: z.boolean(),
    id: z.string(),
    imageFiles: z.string().optional(),
@@ -237,33 +219,12 @@ const song = z.object({

 const songList = z.array(song);

-const ndSongListSort = {
-    ALBUM: 'album, order_album_artist_name, disc_number, track_number, title',
-    ALBUM_ARTIST: 'order_album_artist_name, album, disc_number, track_number, title',
-    ALBUM_SONGS: 'album, discNumber, trackNumber',
-    ARTIST: 'artist',
-    BPM: 'bpm',
-    CHANNELS: 'channels',
-    COMMENT: 'comment',
-    DURATION: 'duration',
-    FAVORITED: 'starred ASC, starredAt ASC',
-    GENRE: 'genre',
-    ID: 'id',
-    PLAY_COUNT: 'playCount',
-    PLAY_DATE: 'playDate',
-    RATING: 'rating',
-    RECENTLY_ADDED: 'createdAt',
-    TITLE: 'title',
-    TRACK: 'track',
-    YEAR: 'year, album, discNumber, trackNumber',
-};
-
 const songListParameters = paginationParameters.extend({
-    _sort: z.nativeEnum(ndSongListSort).optional(),
+    _sort: z.nativeEnum(NDSongListSort).optional(),
    album_artist_id: z.array(z.string()).optional(),
    album_id: z.array(z.string()).optional(),
    artist_id: z.array(z.string()).optional(),
-    genre_id: z.string().optional(),
+    genre_id: z.array(z.string()).optional(),
    path: z.string().optional(),
    starred: z.boolean().optional(),
    title: z.string().optional(),
@@ -290,17 +251,8 @@ const playlist = z.object({

 const playlistList = z.array(playlist);

-const ndPlaylistListSort = {
-    DURATION: 'duration',
-    NAME: 'name',
-    OWNER: 'ownerName',
-    PUBLIC: 'public',
-    SONG_COUNT: 'songCount',
-    UPDATED_AT: 'updatedAt',
-} as const;
-
 const playlistListParameters = paginationParameters.extend({
-    _sort: z.nativeEnum(ndPlaylistListSort).optional(),
+    _sort: z.nativeEnum(NDPlaylistListSort).optional(),
    owner_id: z.string().optional(),
    q: z.string().optional(),
    smart: z.boolean().optional(),
@@ -367,11 +319,11 @@ const moveItem = z.null();

 export const ndType = {
    _enum: {
-        albumArtistList: ndAlbumArtistListSort,
-        albumList: ndAlbumListSort,
+        albumArtistList: NDAlbumArtistListSort,
+        albumList: NDAlbumListSort,
        genreList: genreListSort,
-        playlistList: ndPlaylistListSort,
-        songList: ndSongListSort,
+        playlistList: NDPlaylistListSort,
+        songList: NDSongListSort,
        userList: ndUserListSort,
    },
    _parameters: {
@@ -50,6 +50,19 @@ export const queryKeys: Record<
    Record<string, (...props: any) => QueryFunctionContext['queryKey']>
 > = {
    albumArtists: {
+        count: (serverId: string, query?: AlbumArtistListQuery) => {
+            const { pagination, filter } = splitPaginatedQuery(query);
+
+            if (query && pagination) {
+                return [serverId, 'albumArtists', 'count', filter, pagination] as const;
+            }
+
+            if (query) {
+                return [serverId, 'albumArtists', 'count', filter] as const;
+            }
+
+            return [serverId, 'albumArtists', 'count'] as const;
+        },
        detail: (serverId: string, query?: AlbumArtistDetailQuery) => {
            if (query) return [serverId, 'albumArtists', 'detail', query] as const;
            return [serverId, 'albumArtists', 'detail'] as const;
@@ -73,6 +86,27 @@ export const queryKeys: Record<
        },
    },
    albums: {
+        count: (serverId: string, query?: AlbumListQuery, artistId?: string) => {
+            const { pagination, filter } = splitPaginatedQuery(query);
+
+            if (query && pagination && artistId) {
+                return [serverId, 'albums', 'count', artistId, filter, pagination] as const;
+            }
+
+            if (query && pagination) {
+                return [serverId, 'albums', 'count', filter, pagination] as const;
+            }
+
+            if (query && artistId) {
+                return [serverId, 'albums', 'count', artistId, filter] as const;
+            }
+
+            if (query) {
+                return [serverId, 'albums', 'count', filter] as const;
+            }
+
+            return [serverId, 'albums', 'count'] as const;
+        },
        detail: (serverId: string, query?: AlbumDetailQuery) =>
            [serverId, 'albums', 'detail', query] as const,
        list: (serverId: string, query?: AlbumListQuery, artistId?: string) => {
@@ -208,6 +242,18 @@ export const queryKeys: Record<
        root: (serverId: string) => [serverId] as const,
    },
    songs: {
+        count: (serverId: string, query?: SongListQuery) => {
+            const { pagination, filter } = splitPaginatedQuery(query);
+            if (query && pagination) {
+                return [serverId, 'songs', 'count', filter, pagination] as const;
+            }
+
+            if (query) {
+                return [serverId, 'songs', 'count', filter] as const;
+            }
+
+            return [serverId, 'songs', 'count'] as const;
+        },
        detail: (serverId: string, query?: SongDetailQuery) => {
            if (query) return [serverId, 'songs', 'detail', query] as const;
            return [serverId, 'songs', 'detail'] as const;
@@ -27,6 +27,46 @@ export const contract = c.router({
            200: ssType._response.createFavorite,
        },
    },
+    createPlaylist: {
+        method: 'GET',
+        path: 'createPlaylist.view',
+        query: ssType._parameters.createPlaylist,
+        responses: {
+            200: ssType._response.createPlaylist,
+        },
+    },
+    deletePlaylist: {
+        method: 'GET',
+        path: 'deletePlaylist.view',
+        query: ssType._parameters.deletePlaylist,
+        responses: {
+            200: ssType._response.baseResponse,
+        },
+    },
+    getAlbum: {
+        method: 'GET',
+        path: 'getAlbum.view',
+        query: ssType._parameters.getAlbum,
+        responses: {
+            200: ssType._response.getAlbum,
+        },
+    },
+    getAlbumList2: {
+        method: 'GET',
+        path: 'getAlbumList2.view',
+        query: ssType._parameters.getAlbumList2,
+        responses: {
+            200: ssType._response.getAlbumList2,
+        },
+    },
+    getArtist: {
+        method: 'GET',
+        path: 'getArtist.view',
+        query: ssType._parameters.getArtist,
+        responses: {
+            200: ssType._response.getArtist,
+        },
+    },
    getArtistInfo: {
        method: 'GET',
        path: 'getArtistInfo.view',
@@ -35,6 +75,22 @@ export const contract = c.router({
            200: ssType._response.artistInfo,
        },
    },
+    getArtists: {
+        method: 'GET',
+        path: 'getArtists.view',
+        query: ssType._parameters.getArtists,
+        responses: {
+            200: ssType._response.getArtists,
+        },
+    },
+    getGenres: {
+        method: 'GET',
+        path: 'getGenres.view',
+        query: ssType._parameters.getGenres,
+        responses: {
+            200: ssType._response.getGenres,
+        },
+    },
    getMusicFolderList: {
        method: 'GET',
        path: 'getMusicFolders.view',
@@ -42,6 +98,22 @@ export const contract = c.router({
            200: ssType._response.musicFolderList,
        },
    },
+    getPlaylist: {
+        method: 'GET',
+        path: 'getPlaylist.view',
+        query: ssType._parameters.getPlaylist,
+        responses: {
+            200: ssType._response.getPlaylist,
+        },
+    },
+    getPlaylists: {
+        method: 'GET',
+        path: 'getPlaylists.view',
+        query: ssType._parameters.getPlaylists,
+        responses: {
+            200: ssType._response.getPlaylists,
+        },
+    },
    getRandomSongList: {
        method: 'GET',
        path: 'getRandomSongs.view',
@@ -65,6 +137,30 @@ export const contract = c.router({
            200: ssType._response.similarSongs,
        },
    },
+    getSong: {
+        method: 'GET',
+        path: 'getSong.view',
+        query: ssType._parameters.getSong,
+        responses: {
+            200: ssType._response.getSong,
+        },
+    },
+    getSongsByGenre: {
+        method: 'GET',
+        path: 'getSongsByGenre.view',
+        query: ssType._parameters.getSongsByGenre,
+        responses: {
+            200: ssType._response.getSongsByGenre,
+        },
+    },
+    getStarred: {
+        method: 'GET',
+        path: 'getStarred.view',
+        query: ssType._parameters.getStarred,
+        responses: {
+            200: ssType._response.getStarred,
+        },
+    },
    getStructuredLyrics: {
        method: 'GET',
        path: 'getLyricsBySongId.view',
@@ -120,6 +216,14 @@ export const contract = c.router({
            200: ssType._response.setRating,
        },
    },
+    updatePlaylist: {
+        method: 'GET',
+        path: 'updatePlaylist.view',
+        query: ssType._parameters.updatePlaylist,
+        responses: {
+            200: ssType._response.baseResponse,
+        },
+    },
 });

 const axiosClient = axios.create({});
@@ -242,7 +346,7 @@ export const ssApiClient = (args: {

                    return {
                        body: response?.data,
-                        headers: response.headers as any,
+                        headers: response?.headers as any,
                        status: response?.status,
                    };
                }
@@ -8,6 +8,8 @@ import {
    Album,
    ServerListItem,
    ServerType,
+    Playlist,
+    Genre,
 } from '/@/renderer/api/types';

 const getCoverArtUrl = (args: {
@@ -36,13 +38,14 @@ const normalizeSong = (
    item: z.infer<typeof ssType._response.song>,
    server: ServerListItem | null,
    deviceId: string,
+    size?: number,
 ): QueueSong => {
    const imageUrl =
        getCoverArtUrl({
            baseUrl: server?.url,
            coverArtId: item.coverArt,
            credential: server?.credential,
-            size: 100,
+            size: size || 300,
        }) || null;

    const streamUrl = `${server?.url}/rest/stream.view?id=${item.id}&v=1.13.0&c=feishin_${deviceId}&${server?.credential}`;
@@ -66,7 +69,7 @@ const normalizeSong = (
            },
        ],
        bitRate: item.bitRate || 0,
-        bpm: null,
+        bpm: item.bpm || null,
        channels: null,
        comment: null,
        compilation: null,
@@ -123,15 +126,18 @@ const normalizeSong = (
 };

 const normalizeAlbumArtist = (
-    item: z.infer<typeof ssType._response.albumArtist>,
+    item:
+        | z.infer<typeof ssType._response.albumArtist>
+        | z.infer<typeof ssType._response.artistListEntry>,
    server: ServerListItem | null,
+    imageSize?: number,
 ): AlbumArtist => {
    const imageUrl =
        getCoverArtUrl({
            baseUrl: server?.url,
            coverArtId: item.coverArt,
            credential: server?.credential,
-            size: 100,
+            size: imageSize || 100,
        }) || null;

    return {
@@ -157,15 +163,16 @@ const normalizeAlbumArtist = (
 };

 const normalizeAlbum = (
-    item: z.infer<typeof ssType._response.album>,
+    item: z.infer<typeof ssType._response.album> | z.infer<typeof ssType._response.albumListEntry>,
    server: ServerListItem | null,
+    imageSize?: number,
 ): Album => {
    const imageUrl =
        getCoverArtUrl({
            baseUrl: server?.url,
            coverArtId: item.coverArt,
            credential: server?.credential,
-            size: 300,
+            size: imageSize || 300,
        }) || null;

    return {
@@ -177,7 +184,7 @@ const normalizeAlbum = (
        backdropImageUrl: null,
        comment: null,
        createdAt: item.created,
-        duration: item.duration,
+        duration: item.duration * 1000,
        genres: item.genre
            ? [
                  {
@@ -204,7 +211,10 @@ const normalizeAlbum = (
        serverType: ServerType.SUBSONIC,
        size: null,
        songCount: item.songCount,
-        songs: [],
+        songs:
+            (item as z.infer<typeof ssType._response.album>).song?.map((song) =>
+                normalizeSong(song, server, ''),
+            ) || [],
        uniqueId: nanoid(),
        updatedAt: item.created,
        userFavorite: item.starred || false,
@@ -212,8 +222,51 @@ const normalizeAlbum = (
    };
 };

+const normalizePlaylist = (
+    item:
+        | z.infer<typeof ssType._response.playlist>
+        | z.infer<typeof ssType._response.playlistListEntry>,
+    server: ServerListItem | null,
+): Playlist => {
+    return {
+        description: item.comment || null,
+        duration: item.duration,
+        genres: [],
+        id: item.id,
+        imagePlaceholderUrl: null,
+        imageUrl: getCoverArtUrl({
+            baseUrl: server?.url,
+            coverArtId: item.coverArt,
+            credential: server?.credential,
+            size: 300,
+        }),
+        itemType: LibraryItem.PLAYLIST,
+        name: item.name,
+        owner: item.owner,
+        ownerId: item.owner,
+        public: item.public,
+        serverId: server?.id || 'unknown',
+        serverType: ServerType.SUBSONIC,
+        size: null,
+        songCount: item.songCount,
+    };
+};
+
+const normalizeGenre = (item: z.infer<typeof ssType._response.genre>): Genre => {
+    return {
+        albumCount: item.albumCount,
+        id: item.value,
+        imageUrl: null,
+        itemType: LibraryItem.GENRE,
+        name: item.value,
+        songCount: item.songCount,
+    };
+};
+
 export const ssNormalize = {
    album: normalizeAlbum,
    albumArtist: normalizeAlbumArtist,
+    genre: normalizeGenre,
+    playlist: normalizePlaylist,
    song: normalizeSong,
 };
@@ -60,6 +60,10 @@ const songGain = z.object({
    trackPeak: z.number().optional(),
 });

+const genreItem = z.object({
+    name: z.string(),
+});
+
 const song = z.object({
    album: z.string().optional(),
    albumId: z.string().optional(),
@@ -67,15 +71,18 @@ const song = z.object({
    artistId: z.string().optional(),
    averageRating: z.number().optional(),
    bitRate: z.number().optional(),
+    bpm: z.number().optional(),
    contentType: z.string(),
    coverArt: z.string().optional(),
    created: z.string(),
    discNumber: z.number(),
    duration: z.number().optional(),
    genre: z.string().optional(),
+    genres: z.array(genreItem).optional(),
    id: z.string(),
    isDir: z.boolean(),
    isVideo: z.boolean(),
+    musicBrainzId: z.string().optional(),
    parent: z.string(),
    path: z.string(),
    playCount: z.number().optional(),
@@ -99,6 +106,7 @@ const album = z.object({
    duration: z.number(),
    genre: z.string().optional(),
    id: z.string(),
+    isCompilation: z.boolean().optional(),
    isDir: z.boolean(),
    isVideo: z.boolean(),
    name: z.string(),
@@ -111,6 +119,10 @@ const album = z.object({
    year: z.number().optional(),
 });

+const albumListEntry = album.omit({
+    song: true,
+});
+
 const albumListParameters = z.object({
    fromYear: z.number().optional(),
    genre: z.string().optional(),
@@ -124,11 +136,13 @@ const albumListParameters = z.object({
 const albumList = z.array(album.omit({ song: true }));

 const albumArtist = z.object({
+    album: z.array(album),
    albumCount: z.string(),
    artistImageUrl: z.string().optional(),
    coverArt: z.string().optional(),
    id: z.string(),
    name: z.string(),
+    starred: z.string().optional(),
 });

 const albumArtistList = z.object({
@@ -136,6 +150,14 @@ const albumArtistList = z.object({
    name: z.string(),
 });

+const artistListEntry = albumArtist.pick({
+    albumCount: true,
+    coverArt: true,
+    id: true,
+    name: true,
+    starred: true,
+});
+
 const artistInfoParameters = z.object({
    count: z.number().optional(),
    id: z.string(),
@@ -168,9 +190,11 @@ const topSongsListParameters = z.object({
 });

 const topSongsList = z.object({
-    topSongs: z.object({
-        song: z.array(song),
-    }),
+    topSongs: z
+        .object({
+            song: z.array(song),
+        })
+        .optional(),
 });

 const scrobbleParameters = z.object({
@@ -182,11 +206,13 @@ const scrobbleParameters = z.object({
 const scrobble = z.null();

 const search3 = z.object({
-    searchResult3: z.object({
-        album: z.array(album),
-        artist: z.array(albumArtist),
-        song: z.array(song),
-    }),
+    searchResult3: z
+        .object({
+            album: z.array(album).optional(),
+            artist: z.array(albumArtist).optional(),
+            song: z.array(song).optional(),
+        })
+        .optional(),
 });

 const search3Parameters = z.object({
@@ -209,9 +235,11 @@ const randomSongListParameters = z.object({
 });

 const randomSongList = z.object({
-    randomSongs: z.object({
-        song: z.array(song),
-    }),
+    randomSongs: z
+        .object({
+            song: z.array(song),
+        })
+        .optional(),
 });

 const ping = z.object({
@@ -274,12 +302,223 @@ export enum SubsonicExtensions {
    TRANSCODE_OFFSET = 'transcodeOffset',
 }

+const updatePlaylistParameters = z.object({
+    comment: z.string().optional(),
+    name: z.string().optional(),
+    playlistId: z.string(),
+    public: z.boolean().optional(),
+    songIdToAdd: z.array(z.string()).optional(),
+    songIndexToRemove: z.array(z.string()).optional(),
+});
+
+const getStarredParameters = z.object({
+    musicFolderId: z.string().optional(),
+});
+
+const getStarred = z.object({
+    starred: z
+        .object({
+            album: z.array(albumListEntry),
+            artist: z.array(artistListEntry),
+            song: z.array(song),
+        })
+        .optional(),
+});
+
+const getSongsByGenreParameters = z.object({
+    count: z.number().optional(),
+    genre: z.string(),
+    musicFolderId: z.string().optional(),
+    offset: z.number().optional(),
+});
+
+const getSongsByGenre = z.object({
+    songsByGenre: z
+        .object({
+            song: z.array(song),
+        })
+        .optional(),
+});
+
+const getAlbumParameters = z.object({
+    id: z.string(),
+    musicFolderId: z.string().optional(),
+});
+
+const getAlbum = z.object({
+    album,
+});
+
+const getArtistParameters = z.object({
+    id: z.string(),
+});
+
+const getArtist = z.object({
+    artist: albumArtist,
+});
+
+const getSongParameters = z.object({
+    id: z.string(),
+});
+
+const getSong = z.object({
+    song,
+});
+
+const getArtistsParameters = z.object({
+    musicFolderId: z.string().optional(),
+});
+
+const getArtists = z.object({
+    artists: z.object({
+        ignoredArticles: z.string(),
+        index: z.array(
+            z.object({
+                artist: z.array(artistListEntry),
+                name: z.string(),
+            }),
+        ),
+    }),
+});
+
+const deletePlaylistParameters = z.object({
+    id: z.string(),
+});
+
+const createPlaylistParameters = z.object({
+    name: z.string(),
+    playlistId: z.string().optional(),
+    songId: z.array(z.string()).optional(),
+});
+
+const playlist = z.object({
+    changed: z.string().optional(),
+    comment: z.string().optional(),
+    coverArt: z.string().optional(),
+    created: z.string(),
+    duration: z.number(),
+    entry: z.array(song).optional(),
+    id: z.string(),
+    name: z.string(),
+    owner: z.string(),
+    public: z.boolean(),
+    songCount: z.number(),
+});
+
+const createPlaylist = z.object({
+    playlist,
+});
+
+const getPlaylistsParameters = z.object({
+    username: z.string().optional(),
+});
+
+const playlistListEntry = playlist.omit({
+    entry: true,
+});
+
+const getPlaylists = z.object({
+    playlists: z
+        .object({
+            playlist: z.array(playlistListEntry),
+        })
+        .optional(),
+});
+
+const getPlaylistParameters = z.object({
+    id: z.string(),
+});
+
+const getPlaylist = z.object({
+    playlist,
+});
+
+const genre = z.object({
+    albumCount: z.number(),
+    songCount: z.number(),
+    value: z.string(),
+});
+
+const getGenresParameters = z.object({});
+
+const getGenres = z.object({
+    genres: z
+        .object({
+            genre: z.array(genre),
+        })
+        .optional(),
+});
+
+export enum AlbumListSortType {
+    ALPHABETICAL_BY_ARTIST = 'alphabeticalByArtist',
+    ALPHABETICAL_BY_NAME = 'alphabeticalByName',
+    BY_GENRE = 'byGenre',
+    BY_YEAR = 'byYear',
+    FREQUENT = 'frequent',
+    NEWEST = 'newest',
+    RANDOM = 'random',
+    RECENT = 'recent',
+    STARRED = 'starred',
+}
+
+const getAlbumList2Parameters = z
+    .object({
+        fromYear: z.number().optional(),
+        genre: z.string().optional(),
+        musicFolderId: z.string().optional(),
+        offset: z.number().optional(),
+        size: z.number().optional(),
+        toYear: z.number().optional(),
+        type: z.nativeEnum(AlbumListSortType),
+    })
+    .refine(
+        (val) => {
+            if (val.type === AlbumListSortType.BY_YEAR) {
+                return val.fromYear !== undefined && val.toYear !== undefined;
+            }
+
+            return true;
+        },
+        {
+            message: 'Parameters "fromYear" and "toYear" are required when using sort "byYear"',
+        },
+    )
+    .refine(
+        (val) => {
+            if (val.type === AlbumListSortType.BY_GENRE) {
+                return val.genre !== undefined;
+            }
+
+            return true;
+        },
+        { message: 'Parameter "genre" is required when using sort "byGenre"' },
+    );
+
+const getAlbumList2 = z.object({
+    albumList2: z.object({
+        album: z.array(albumListEntry),
+    }),
+});
+
 export const ssType = {
    _parameters: {
        albumList: albumListParameters,
        artistInfo: artistInfoParameters,
        authenticate: authenticateParameters,
        createFavorite: createFavoriteParameters,
+        createPlaylist: createPlaylistParameters,
+        deletePlaylist: deletePlaylistParameters,
+        getAlbum: getAlbumParameters,
+        getAlbumList2: getAlbumList2Parameters,
+        getArtist: getArtistParameters,
+        getArtists: getArtistsParameters,
+        getGenre: getGenresParameters,
+        getGenres: getGenresParameters,
+        getPlaylist: getPlaylistParameters,
+        getPlaylists: getPlaylistsParameters,
+        getSong: getSongParameters,
+        getSongsByGenre: getSongsByGenreParameters,
+        getStarred: getStarredParameters,
        randomSongList: randomSongListParameters,
        removeFavorite: removeFavoriteParameters,
        scrobble: scrobbleParameters,
@@ -288,18 +527,35 @@ export const ssType = {
        similarSongs: similarSongsParameters,
        structuredLyrics: structuredLyricsParameters,
        topSongsList: topSongsListParameters,
+        updatePlaylist: updatePlaylistParameters,
    },
    _response: {
        album,
        albumArtist,
        albumArtistList,
        albumList,
+        albumListEntry,
        artistInfo,
+        artistListEntry,
        authenticate,
        baseResponse,
        createFavorite,
+        createPlaylist,
+        genre,
+        getAlbum,
+        getAlbumList2,
+        getArtist,
+        getArtists,
+        getGenres,
+        getPlaylist,
+        getPlaylists,
+        getSong,
+        getSongsByGenre,
+        getStarred,
        musicFolderList,
        ping,
+        playlist,
+        playlistListEntry,
        randomSongList,
        removeFavorite,
        scrobble,
@@ -1,3 +1,6 @@
+import orderBy from 'lodash/orderBy';
+import reverse from 'lodash/reverse';
+import shuffle from 'lodash/shuffle';
 import { z } from 'zod';
 import { ServerFeatures } from './features-types';
 import { jfType } from './jellyfin/jellyfin-types';
@@ -128,7 +131,7 @@ export interface BasePaginatedResponse<T> {
    error?: string | any;
    items: T;
    startIndex: number;
-    totalRecordCount: number;
+    totalRecordCount: number | null;
 }

 export type AuthenticationResponse = {
@@ -309,6 +312,11 @@ type BaseEndpointArgs = {
    };
 };

+export interface BaseQuery<T> {
+    sortBy: T;
+    sortOrder: SortOrder;
+}
+
 // Genre List
 export type GenreListResponse = BasePaginatedResponse<Genre[]> | null | undefined;

@@ -318,7 +326,7 @@ export enum GenreListSort {
    NAME = 'name',
 }

-export type GenreListQuery = {
+export interface GenreListQuery extends BaseQuery<GenreListSort> {
    _custom?: {
        jellyfin?: null;
        navidrome?: null;
@@ -326,10 +334,8 @@ export type GenreListQuery = {
    limit?: number;
    musicFolderId?: string;
    searchTerm?: string;
-    sortBy: GenreListSort;
-    sortOrder: SortOrder;
    startIndex: number;
-};
+}

 type GenreListSortMap = {
    jellyfin: Record<GenreListSort, JFGenreListSort | undefined>;
@@ -370,22 +376,22 @@ export enum AlbumListSort {
    YEAR = 'year',
 }

-export type AlbumListQuery = {
+export interface AlbumListQuery extends BaseQuery<AlbumListSort> {
    _custom?: {
-        jellyfin?: Partial<z.infer<typeof jfType._parameters.albumList>> & {
-            maxYear?: number;
-            minYear?: number;
-        };
+        jellyfin?: Partial<z.infer<typeof jfType._parameters.albumList>>;
        navidrome?: Partial<z.infer<typeof ndType._parameters.albumList>>;
    };
    artistIds?: string[];
+    compilation?: boolean;
+    favorite?: boolean;
+    genres?: string[];
    limit?: number;
+    maxYear?: number;
+    minYear?: number;
    musicFolderId?: string;
    searchTerm?: string;
-    sortBy: AlbumListSort;
-    sortOrder: SortOrder;
    startIndex: number;
-};
+}

 export type AlbumListArgs = { query: AlbumListQuery } & BaseEndpointArgs;

@@ -481,24 +487,23 @@ export enum SongListSort {
    YEAR = 'year',
 }

-export type SongListQuery = {
+export interface SongListQuery extends BaseQuery<SongListSort> {
    _custom?: {
-        jellyfin?: Partial<z.infer<typeof jfType._parameters.songList>> & {
-            maxYear?: number;
-            minYear?: number;
-        };
+        jellyfin?: Partial<z.infer<typeof jfType._parameters.songList>>;
        navidrome?: Partial<z.infer<typeof ndType._parameters.songList>>;
    };
    albumIds?: string[];
    artistIds?: string[];
+    favorite?: boolean;
+    genreIds?: string[];
    imageSize?: number;
    limit?: number;
+    maxYear?: number;
+    minYear?: number;
    musicFolderId?: string;
    searchTerm?: string;
-    sortBy: SongListSort;
-    sortOrder: SortOrder;
    startIndex: number;
-};
+}

 export type SongListArgs = { query: SongListQuery } & BaseEndpointArgs;

@@ -595,7 +600,7 @@ export enum AlbumArtistListSort {
    SONG_COUNT = 'songCount',
 }

-export type AlbumArtistListQuery = {
+export interface AlbumArtistListQuery extends BaseQuery<AlbumArtistListSort> {
    _custom?: {
        jellyfin?: Partial<z.infer<typeof jfType._parameters.albumArtistList>>;
        navidrome?: Partial<z.infer<typeof ndType._parameters.albumArtistList>>;
@@ -603,10 +608,8 @@ export type AlbumArtistListQuery = {
    limit?: number;
    musicFolderId?: string;
    searchTerm?: string;
-    sortBy: AlbumArtistListSort;
-    sortOrder: SortOrder;
    startIndex: number;
-};
+}

 export type AlbumArtistListArgs = { query: AlbumArtistListQuery } & BaseEndpointArgs;

@@ -683,17 +686,15 @@ export enum ArtistListSort {
    SONG_COUNT = 'songCount',
 }

-export type ArtistListQuery = {
+export interface ArtistListQuery extends BaseQuery<ArtistListSort> {
    _custom?: {
        jellyfin?: Partial<z.infer<typeof jfType._parameters.albumArtistList>>;
        navidrome?: Partial<z.infer<typeof ndType._parameters.albumArtistList>>;
    };
    limit?: number;
    musicFolderId?: string;
-    sortBy: ArtistListSort;
-    sortOrder: SortOrder;
    startIndex: number;
-};
+}

 export type ArtistListArgs = { query: ArtistListQuery } & BaseEndpointArgs;

@@ -879,17 +880,15 @@ export enum PlaylistListSort {
    UPDATED_AT = 'updatedAt',
 }

-export type PlaylistListQuery = {
+export interface PlaylistListQuery extends BaseQuery<PlaylistListSort> {
    _custom?: {
        jellyfin?: Partial<z.infer<typeof jfType._parameters.playlistList>>;
        navidrome?: Partial<z.infer<typeof ndType._parameters.playlistList>>;
    };
    limit?: number;
    searchTerm?: string;
-    sortBy: PlaylistListSort;
-    sortOrder: SortOrder;
    startIndex: number;
-};
+}

 export type PlaylistListArgs = { query: PlaylistListQuery } & BaseEndpointArgs;

@@ -963,7 +962,7 @@ export enum UserListSort {
    NAME = 'name',
 }

-export type UserListQuery = {
+export interface UserListQuery extends BaseQuery<UserListSort> {
    _custom?: {
        navidrome?: {
            owner_id?: string;
@@ -971,10 +970,8 @@ export type UserListQuery = {
    };
    limit?: number;
    searchTerm?: string;
-    sortBy: UserListSort;
-    sortOrder: SortOrder;
    startIndex: number;
-};
+}

 export type UserListArgs = { query: UserListQuery } & BaseEndpointArgs;

@@ -1228,3 +1225,223 @@ export type TranscodingQuery = {
 export type TranscodingArgs = {
    query: TranscodingQuery;
 } & BaseEndpointArgs;
+
+export type ControllerEndpoint = {
+    addToPlaylist: (args: AddToPlaylistArgs) => Promise<AddToPlaylistResponse>;
+    authenticate: (
+        url: string,
+        body: { legacy?: boolean; password: string; username: string },
+    ) => Promise<AuthenticationResponse>;
+    createFavorite: (args: FavoriteArgs) => Promise<FavoriteResponse>;
+    createPlaylist: (args: CreatePlaylistArgs) => Promise<CreatePlaylistResponse>;
+    deleteFavorite: (args: FavoriteArgs) => Promise<FavoriteResponse>;
+    deletePlaylist: (args: DeletePlaylistArgs) => Promise<DeletePlaylistResponse>;
+    getAlbumArtistDetail: (args: AlbumArtistDetailArgs) => Promise<AlbumArtistDetailResponse>;
+    getAlbumArtistList: (args: AlbumArtistListArgs) => Promise<AlbumArtistListResponse>;
+    getAlbumArtistListCount: (args: AlbumArtistListArgs) => Promise<number>;
+    getAlbumDetail: (args: AlbumDetailArgs) => Promise<AlbumDetailResponse>;
+    getAlbumList: (args: AlbumListArgs) => Promise<AlbumListResponse>;
+    getAlbumListCount: (args: AlbumListArgs) => Promise<number>;
+    // getArtistInfo?: (args: any) => void;
+    // getArtistList?: (args: ArtistListArgs) => Promise<ArtistListResponse>;
+    getDownloadUrl: (args: DownloadArgs) => string;
+    getGenreList: (args: GenreListArgs) => Promise<GenreListResponse>;
+    getLyrics?: (args: LyricsArgs) => Promise<LyricsResponse>;
+    getMusicFolderList: (args: MusicFolderListArgs) => Promise<MusicFolderListResponse>;
+    getPlaylistDetail: (args: PlaylistDetailArgs) => Promise<PlaylistDetailResponse>;
+    getPlaylistList: (args: PlaylistListArgs) => Promise<PlaylistListResponse>;
+    getPlaylistListCount: (args: PlaylistListArgs) => Promise<number>;
+    getPlaylistSongList: (args: PlaylistSongListArgs) => Promise<SongListResponse>;
+    getRandomSongList: (args: RandomSongListArgs) => Promise<SongListResponse>;
+    getServerInfo: (args: ServerInfoArgs) => Promise<ServerInfo>;
+    getSimilarSongs: (args: SimilarSongsArgs) => Promise<Song[]>;
+    getSongDetail: (args: SongDetailArgs) => Promise<SongDetailResponse>;
+    getSongList: (args: SongListArgs) => Promise<SongListResponse>;
+    getSongListCount: (args: SongListArgs) => Promise<number>;
+    getStructuredLyrics?: (args: StructuredLyricsArgs) => Promise<StructuredLyric[]>;
+    getTopSongs: (args: TopSongListArgs) => Promise<TopSongListResponse>;
+    getTranscodingUrl: (args: TranscodingArgs) => string;
+    getUserList?: (args: UserListArgs) => Promise<UserListResponse>;
+    movePlaylistItem?: (args: MoveItemArgs) => Promise<void>;
+    removeFromPlaylist: (args: RemoveFromPlaylistArgs) => Promise<RemoveFromPlaylistResponse>;
+    scrobble: (args: ScrobbleArgs) => Promise<ScrobbleResponse>;
+    search: (args: SearchArgs) => Promise<SearchResponse>;
+    setRating?: (args: SetRatingArgs) => Promise<RatingResponse>;
+    shareItem?: (args: ShareItemArgs) => Promise<ShareItemResponse>;
+    updatePlaylist: (args: UpdatePlaylistArgs) => Promise<UpdatePlaylistResponse>;
+};
+
+export const sortAlbumList = (albums: Album[], sortBy: AlbumListSort, sortOrder: SortOrder) => {
+    let results = albums;
+
+    const order = sortOrder === SortOrder.ASC ? 'asc' : 'desc';
+
+    switch (sortBy) {
+        case AlbumListSort.ALBUM_ARTIST:
+            results = orderBy(
+                results,
+                ['albumArtist', (v) => v.name.toLowerCase()],
+                [order, 'asc'],
+            );
+            break;
+        case AlbumListSort.DURATION:
+            results = orderBy(results, ['duration'], [order]);
+            break;
+        case AlbumListSort.FAVORITED:
+            results = orderBy(results, ['starred'], [order]);
+            break;
+        case AlbumListSort.NAME:
+            results = orderBy(results, [(v) => v.name.toLowerCase()], [order]);
+            break;
+        case AlbumListSort.PLAY_COUNT:
+            results = orderBy(results, ['playCount'], [order]);
+            break;
+        case AlbumListSort.RANDOM:
+            results = shuffle(results);
+            break;
+        case AlbumListSort.RECENTLY_ADDED:
+            results = orderBy(results, ['createdAt'], [order]);
+            break;
+        case AlbumListSort.RECENTLY_PLAYED:
+            results = orderBy(results, ['lastPlayedAt'], [order]);
+            break;
+        case AlbumListSort.RATING:
+            results = orderBy(results, ['userRating'], [order]);
+            break;
+        case AlbumListSort.YEAR:
+            results = orderBy(results, ['releaseYear'], [order]);
+            break;
+        case AlbumListSort.SONG_COUNT:
+            results = orderBy(results, ['songCount'], [order]);
+            break;
+        default:
+            break;
+    }
+
+    return results;
+};
+
+export const sortSongList = (songs: QueueSong[], sortBy: SongListSort, sortOrder: SortOrder) => {
+    let results = songs;
+
+    const order = sortOrder === SortOrder.ASC ? 'asc' : 'desc';
+
+    switch (sortBy) {
+        case SongListSort.ALBUM:
+            results = orderBy(
+                results,
+                [(v) => v.album?.toLowerCase(), 'discNumber', 'trackNumber'],
+                [order, 'asc', 'asc'],
+            );
+            break;
+
+        case SongListSort.ALBUM_ARTIST:
+            results = orderBy(
+                results,
+                ['albumArtist', (v) => v.album?.toLowerCase(), 'discNumber', 'trackNumber'],
+                [order, order, 'asc', 'asc'],
+            );
+            break;
+
+        case SongListSort.ARTIST:
+            results = orderBy(
+                results,
+                ['artist', (v) => v.album?.toLowerCase(), 'discNumber', 'trackNumber'],
+                [order, order, 'asc', 'asc'],
+            );
+            break;
+
+        case SongListSort.DURATION:
+            results = orderBy(results, ['duration'], [order]);
+            break;
+
+        case SongListSort.FAVORITED:
+            results = orderBy(results, ['userFavorite', (v) => v.name.toLowerCase()], [order]);
+            break;
+
+        case SongListSort.GENRE:
+            results = orderBy(
+                results,
+                [
+                    (v) => v.genres?.[0].name.toLowerCase(),
+                    (v) => v.album?.toLowerCase(),
+                    'discNumber',
+                    'trackNumber',
+                ],
+                [order, order, 'asc', 'asc'],
+            );
+            break;
+
+        case SongListSort.ID:
+            if (order === 'desc') {
+                results = reverse(results);
+            }
+            break;
+
+        case SongListSort.NAME:
+            results = orderBy(results, [(v) => v.name.toLowerCase()], [order]);
+            break;
+
+        case SongListSort.PLAY_COUNT:
+            results = orderBy(results, ['playCount'], [order]);
+            break;
+
+        case SongListSort.RANDOM:
+            results = shuffle(results);
+            break;
+
+        case SongListSort.RATING:
+            results = orderBy(results, ['userRating', (v) => v.name.toLowerCase()], [order]);
+            break;
+
+        case SongListSort.RECENTLY_ADDED:
+            results = orderBy(results, ['created'], [order]);
+            break;
+
+        case SongListSort.YEAR:
+            results = orderBy(
+                results,
+                ['year', (v) => v.album?.toLowerCase(), 'discNumber', 'track'],
+                [order, 'asc', 'asc', 'asc'],
+            );
+            break;
+
+        default:
+            break;
+    }
+
+    return results;
+};
+
+export const sortAlbumArtistList = (
+    artists: AlbumArtist[],
+    sortBy: AlbumArtistListSort,
+    sortOrder: SortOrder,
+) => {
+    const order = sortOrder === SortOrder.ASC ? 'asc' : 'desc';
+
+    let results = artists;
+
+    switch (sortBy) {
+        case AlbumArtistListSort.ALBUM_COUNT:
+            results = orderBy(artists, ['albumCount', (v) => v.name.toLowerCase()], [order, 'asc']);
+            break;
+
+        case AlbumArtistListSort.NAME:
+            results = orderBy(artists, [(v) => v.name.toLowerCase()], [order]);
+            break;
+
+        case AlbumArtistListSort.FAVORITED:
+            results = orderBy(artists, ['starred'], [order]);
+            break;
+
+        case AlbumArtistListSort.RATING:
+            results = orderBy(artists, ['userRating'], [order]);
+            break;
+
+        default:
+            break;
+    }
+
+    return results;
+};
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useRef } from 'react';
+import { useEffect, useMemo, useState, useRef } from 'react';
 import { ClientSideRowModelModule } from '@ag-grid-community/client-side-row-model';
 import { ModuleRegistry } from '@ag-grid-community/core';
 import { InfiniteRowModelModule } from '@ag-grid-community/infinite-row-model';
@@ -21,8 +21,9 @@ import { useHandlePlayQueueAdd } from '/@/renderer/features/player/hooks/use-han
 import { PlayQueueHandlerContext } from '/@/renderer/features/player';
 import { getMpvProperties } from '/@/renderer/features/settings/components/playback/mpv-settings';
 import { PlayerState, useCssSettings, usePlayerStore, useQueueControls } from '/@/renderer/store';
-import { FontType, PlaybackType, PlayerStatus } from '/@/renderer/types';
+import { FontType, PlaybackType, PlayerStatus, WebAudio } from '/@/renderer/types';
 import '@ag-grid-community/styles/ag-grid.css';
+import { WebAudioContext } from '/@/renderer/features/player/context/webaudio-context';
 import { useDiscordRpc } from '/@/renderer/features/discord-rpc/use-discord-rpc';
 import i18n from '/@/i18n/i18n';
 import { useServerVersion } from '/@/renderer/hooks/use-server-version';
@@ -91,6 +92,8 @@ export const App = () => {
        }
    }, [builtIn, custom, system, type]);

+    const [webAudio, setWebAudio] = useState<WebAudio>();
+
    useEffect(() => {
        if (enabled && content) {
            // Yes, CSS is sanitized here as well. Prevent a suer from changing the
@@ -125,6 +128,10 @@ export const App = () => {
        return { handlePlayQueueAdd };
    }, [handlePlayQueueAdd]);

+    const webAudioProvider = useMemo(() => {
+        return { setWebAudio, webAudio };
+    }, [webAudio]);
+
    // Start the mpv instance on startup
    useEffect(() => {
        const initializeMpv = async () => {
@@ -278,7 +285,9 @@ export const App = () => {
        >
            <PlayQueueHandlerContext.Provider value={providerValue}>
                <ContextMenuProvider>
-                    <AppRouter />
+                    <WebAudioContext.Provider value={webAudioProvider}>
+                        <AppRouter />
+                    </WebAudioContext.Provider>{' '}
                </ContextMenuProvider>
            </PlayQueueHandlerContext.Provider>
            <IsUpdatedDialog />
@@ -18,6 +18,7 @@ import {
 import { useSettingsStore, useSettingsStoreActions } from '/@/renderer/store/settings.store';
 import type { CrossfadeStyle } from '/@/renderer/types';
 import { PlaybackStyle, PlayerStatus } from '/@/renderer/types';
+import { useWebAudio } from '/@/renderer/features/player/hooks/use-webaudio';
 import { getServerById, TranscodingConfig, usePlaybackSettings, useSpeed } from '/@/renderer/store';
 import { toast } from '/@/renderer/components/toast';
 import { api } from '/@/renderer/api';
@@ -44,11 +45,6 @@ const getDuration = (ref: any) => {
    return ref.current?.player?.player?.player?.duration;
 };

-type WebAudio = {
-    context: AudioContext;
-    gain: GainNode;
-};
-
 // Credits: https://gist.github.com/novwhisky/8a1a0168b94f3b6abfaa?permalink_comment_id=1551393#gistcomment-1551393
 // This is used so that the player will always have an <audio> element. This means that
 // player1Source and player2Source are connected BEFORE the user presses play for
@@ -116,7 +112,7 @@ export const AudioPlayer = forwardRef(
        const [isTransitioning, setIsTransitioning] = useState(false);
        const audioDeviceId = useSettingsStore((state) => state.playback.audioDeviceId);
        const playback = useSettingsStore((state) => state.playback.mpvProperties);
-        const useWebAudio = useSettingsStore((state) => state.playback.webAudio);
+        const shouldUseWebAudio = useSettingsStore((state) => state.playback.webAudio);
        const { resetSampleRate } = useSettingsStoreActions();
        const playbackSpeed = useSpeed();
        const { transcode } = usePlaybackSettings();
@@ -124,7 +120,7 @@ export const AudioPlayer = forwardRef(
        const stream1 = useSongUrl(transcode, currentPlayer === 1, player1);
        const stream2 = useSongUrl(transcode, currentPlayer === 2, player2);

-        const [webAudio, setWebAudio] = useState<WebAudio | null>(null);
+        const { webAudio, setWebAudio } = useWebAudio();
        const [player1Source, setPlayer1Source] = useState<MediaElementAudioSourceNode | null>(
            null,
        );
@@ -181,7 +177,7 @@ export const AudioPlayer = forwardRef(
        );

        useEffect(() => {
-            if (useWebAudio && 'AudioContext' in window) {
+            if (shouldUseWebAudio && 'AudioContext' in window) {
                let context: AudioContext;

                try {
@@ -200,7 +196,7 @@ export const AudioPlayer = forwardRef(
                const gain = context.createGain();
                gain.connect(context.destination);

-                setWebAudio({ context, gain });
+                setWebAudio!({ context, gain });

                return () => {
                    return context.close();
@@ -294,7 +294,7 @@ export const PLAYLIST_CARD_ROWS: { [key: string]: CardRow<Playlist> } = {
    name: {
        property: 'name',
        route: {
-            route: AppRoute.PLAYLISTS_DETAIL,
+            route: AppRoute.PLAYLISTS_DETAIL_SONGS,
            slugs: [{ idProperty: 'id', slugProperty: 'playlistId' }],
        },
    },
@@ -207,7 +207,11 @@ export const FeatureCarousel = ({ data }: FeatureCarouselProps) => {
                                            </Badge>
                                        ))}
                                        <Badge size="lg">{currentItem?.releaseYear}</Badge>
-                                        <Badge size="lg">{currentItem?.songCount} tracks</Badge>
+                                        <Badge size="lg">
+                                            {t('entity.trackWithCount', {
+                                                count: currentItem?.songCount || 0,
+                                            })}
+                                        </Badge>
                                    </Group>
                                    <Group position="apart">
                                        <Button
@@ -28,7 +28,7 @@ export const Spoiler = ({ maxHeight, defaultOpened, children, ...props }: Spoile
            ref={ref}
            className={spoilerClassNames}
            role="button"
-            style={{ maxHeight: maxHeight ?? '100px' }}
+            style={{ maxHeight: maxHeight ?? '100px', whiteSpace: 'pre-wrap' }}
            tabIndex={-1}
            onClick={handleToggleExpand}
            {...props}
@@ -7,7 +7,6 @@ import {
    IDatasource,
    PaginationChangedEvent,
    RowDoubleClickedEvent,
-    RowModelType,
 } from '@ag-grid-community/core';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
 import { QueryKey, useQueryClient } from '@tanstack/react-query';
@@ -16,7 +15,12 @@ import orderBy from 'lodash/orderBy';
 import { generatePath, useNavigate } from 'react-router';
 import { api } from '/@/renderer/api';
 import { QueryPagination, queryKeys } from '/@/renderer/api/query-keys';
-import { BasePaginatedResponse, LibraryItem, ServerListItem } from '/@/renderer/api/types';
+import {
+    BasePaginatedResponse,
+    BaseQuery,
+    LibraryItem,
+    ServerListItem,
+} from '/@/renderer/api/types';
 import { getColumnDefs, VirtualTableProps } from '/@/renderer/components/virtual-table';
 import { SetContextMenuItems, useHandleTableContextMenu } from '/@/renderer/features/context-menu';
 import { AppRoute } from '/@/renderer/router/routes';
@@ -34,6 +38,7 @@ interface UseAgGridProps<TFilter> {
    columnType?: 'albumDetail' | 'generic';
    contextMenu: SetContextMenuItems;
    customFilters?: Partial<TFilter>;
+    isClientSide?: boolean;
    isClientSideSort?: boolean;
    isSearchParams?: boolean;
    itemCount?: number;
@@ -43,7 +48,9 @@ interface UseAgGridProps<TFilter> {
    tableRef: MutableRefObject<AgGridReactType | null>;
 }

-export const useVirtualTable = <TFilter>({
+const BLOCK_SIZE = 500;
+
+export const useVirtualTable = <TFilter extends BaseQuery<any>>({
    server,
    tableRef,
    pageKey,
@@ -52,13 +59,14 @@ export const useVirtualTable = <TFilter>({
    itemCount,
    customFilters,
    isSearchParams,
+    isClientSide,
    isClientSideSort,
    columnType,
 }: UseAgGridProps<TFilter>) => {
    const queryClient = useQueryClient();
    const navigate = useNavigate();
    const { setTable, setTablePagination } = useListStoreActions();
-    const properties = useListStoreByKey({ filter: customFilters, key: pageKey });
+    const properties = useListStoreByKey<TFilter>({ filter: customFilters, key: pageKey });
    const [searchParams, setSearchParams] = useSearchParams();

    const scrollOffset = searchParams.get('scrollOffset');
@@ -182,6 +190,19 @@ export const useVirtualTable = <TFilter>({
                        return;
                    }

+                    if (results.totalRecordCount === null) {
+                        const hasMoreRows = results?.items?.length === BLOCK_SIZE;
+                        const lastRowIndex = hasMoreRows
+                            ? undefined
+                            : params.startRow + results.items.length;
+
+                        params.successCallback(
+                            results?.items || [],
+                            hasMoreRows ? undefined : lastRowIndex,
+                        );
+                        return;
+                    }
+
                    params.successCallback(results?.items || [], results?.totalRecordCount || 0);
                },
                rowCount: undefined,
@@ -321,6 +342,7 @@ export const useVirtualTable = <TFilter>({
            alwaysShowHorizontalScroll: true,
            autoFitColumns: properties.table.autoFit,
            blockLoadDebounceMillis: 200,
+            cacheBlockSize: BLOCK_SIZE,
            getRowId: (data: GetRowIdParams<any>) => data.data.id,
            infiniteInitialRowCount: itemCount || 100,
            pagination: isPaginationEnabled,
@@ -335,10 +357,11 @@ export const useVirtualTable = <TFilter>({
                : undefined,
            rowBuffer: 20,
            rowHeight: properties.table.rowHeight || 40,
-            rowModelType: 'infinite' as RowModelType,
+            rowModelType: isClientSide ? 'clientSide' : 'infinite',
            suppressRowDrag: true,
        };
    }, [
+        isClientSide,
        isPaginationEnabled,
        isSearchParams,
        itemCount,
@@ -370,7 +393,9 @@ export const useVirtualTable = <TFilter>({
                    );
                    break;
                case LibraryItem.PLAYLIST:
-                    navigate(generatePath(AppRoute.PLAYLISTS_DETAIL, { playlistId: e.data.id }));
+                    navigate(
+                        generatePath(AppRoute.PLAYLISTS_DETAIL_SONGS, { playlistId: e.data.id }),
+                    );
                    break;
                default:
                    break;
@@ -41,7 +41,12 @@ import { useFixedTableHeader } from '/@/renderer/components/virtual-table/hooks/
 import { NoteCell } from '/@/renderer/components/virtual-table/cells/note-cell';
 import { RowIndexCell } from '/@/renderer/components/virtual-table/cells/row-index-cell';
 import i18n from '/@/i18n/i18n';
-import { formatDateAbsolute, formatDateRelative, formatSizeString } from '/@/renderer/utils/format';
+import {
+    formatDateAbsolute,
+    formatDateAbsoluteUTC,
+    formatDateRelative,
+    formatSizeString,
+} from '/@/renderer/utils/format';
 import { useTableChange } from '/@/renderer/hooks/use-song-change';

 export * from './table-config-dropdown';
@@ -253,7 +258,7 @@ const tableColumns: { [key: string]: ColDef } = {
            GenericTableHeader(params, { position: 'center' }),
        headerName: i18n.t('table.column.releaseDate'),
        suppressSizeToFit: true,
-        valueFormatter: (params: ValueFormatterParams) => formatDateAbsolute(params.value),
+        valueFormatter: (params: ValueFormatterParams) => formatDateAbsoluteUTC(params.value),
        valueGetter: (params: ValueGetterParams) =>
            params.data ? params.data.releaseDate : undefined,
        width: 130,
@@ -6,6 +6,7 @@ import { useSettingsStoreActions, useSettingsStore } from '/@/renderer/store/set
 import { TableColumn, TableType } from '/@/renderer/types';
 import { Option } from '/@/renderer/components/option';
 import i18n from '/@/i18n/i18n';
+import { useTranslation } from 'react-i18next';

 export const SONG_TABLE_COLUMNS = [
    {
@@ -285,6 +286,7 @@ interface TableConfigDropdownProps {
 }

 export const TableConfigDropdown = ({ type }: TableConfigDropdownProps) => {
+    const { t } = useTranslation();
    const { setSettings } = useSettingsStoreActions();
    const tableConfig = useSettingsStore((state) => state.tables);

@@ -374,7 +376,9 @@ export const TableConfigDropdown = ({ type }: TableConfigDropdownProps) => {
    return (
        <>
            <Option>
-                <Option.Label>Auto-fit Columns</Option.Label>
+                <Option.Label>
+                    {t('table.config.general.autoFitColumns', { postProcess: 'sentenceCase' })}
+                </Option.Label>
                <Option.Control>
                    <Switch
                        defaultChecked={tableConfig[type]?.autoFit}
@@ -384,7 +388,11 @@ export const TableConfigDropdown = ({ type }: TableConfigDropdownProps) => {
            </Option>
            {type !== 'albumDetail' && (
                <Option>
-                    <Option.Label>Follow current song</Option.Label>
+                    <Option.Label>
+                        {t('table.config.general.followCurrentSong', {
+                            postProcess: 'sentenceCase',
+                        })}
+                    </Option.Label>
                    <Option.Control>
                        <Switch
                            defaultChecked={tableConfig[type]?.followCurrentSong}
@@ -37,7 +37,7 @@ const ActionRequiredRoute = () => {
    const handleManageServersModal = () => {
        openModal({
            children: <ServerList />,
-            title: 'Manage Servers',
+            title: t('page.appMenu.manageServers', { postProcess: 'sentenceCase' }),
        });
    };

@@ -11,7 +11,13 @@ import { generatePath, useParams } from 'react-router';
 import { Link } from 'react-router-dom';
 import styled from 'styled-components';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { AlbumListSort, LibraryItem, QueueSong, SortOrder } from '/@/renderer/api/types';
+import {
+    AlbumListQuery,
+    AlbumListSort,
+    LibraryItem,
+    QueueSong,
+    SortOrder,
+} from '/@/renderer/api/types';
 import { Button, Popover, Spoiler } from '/@/renderer/components';
 import { MemoizedSwiperGridCarousel } from '/@/renderer/components/grid-carousel';
 import {
@@ -164,13 +170,12 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
        query: {
            _custom: {
                jellyfin: {
-                    AlbumArtistIds: detailQuery?.data?.albumArtists[0]?.id,
                    ExcludeItemIds: detailQuery?.data?.id,
                },
-                navidrome: {
-                    artist_id: detailQuery?.data?.albumArtists[0]?.id,
-                },
            },
+            artistIds: detailQuery?.data?.albumArtists.length
+                ? [detailQuery?.data?.albumArtists[0].id]
+                : undefined,
            limit: 15,
            sortBy: AlbumListSort.YEAR,
            sortOrder: SortOrder.DESC,
@@ -179,15 +184,8 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
        serverId: server?.id,
    });

-    const relatedAlbumGenresRequest = {
-        _custom: {
-            jellyfin: {
-                GenreIds: detailQuery?.data?.genres?.[0]?.id,
-            },
-            navidrome: {
-                genre_id: detailQuery?.data?.genres?.[0]?.id,
-            },
-        },
+    const relatedAlbumGenresRequest: AlbumListQuery = {
+        genres: detailQuery.data?.genres.length ? [detailQuery.data.genres[0].id] : undefined,
        limit: 15,
        sortBy: AlbumListSort.RANDOM,
        sortOrder: SortOrder.ASC,
@@ -1,16 +1,19 @@
-import { forwardRef, Fragment, Ref } from 'react';
+import { forwardRef, Fragment, Ref, useCallback, useMemo } from 'react';
 import { Group, Stack } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 import { generatePath, useParams } from 'react-router';
 import { Link } from 'react-router-dom';
-import { LibraryItem, ServerType } from '/@/renderer/api/types';
+import { AlbumDetailResponse, LibraryItem, ServerType } from '/@/renderer/api/types';
 import { Rating, Text } from '/@/renderer/components';
 import { useAlbumDetail } from '/@/renderer/features/albums/queries/album-detail-query';
 import { LibraryHeader, useSetRating } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
 import { AppRoute } from '/@/renderer/router/routes';
 import { useCurrentServer } from '/@/renderer/store';
-import { formatDateAbsolute, formatDurationString } from '/@/renderer/utils';
+import { formatDateAbsoluteUTC, formatDurationString } from '/@/renderer/utils';
+import { useSongChange } from '/@/renderer/hooks/use-song-change';
+import { queryKeys } from '/@/renderer/api/query-keys';
+import { queryClient } from '/@/renderer/lib/react-query';

 interface AlbumDetailHeaderProps {
    background: {
@@ -37,16 +40,48 @@ export const AlbumDetailHeader = forwardRef(
            ? t('page.albumDetail.released', { postProcess: 'sentenceCase' })
            : '♫';

+        const songIds = useMemo(() => {
+            return new Set(detailQuery.data?.songs?.map((song) => song.id));
+        }, [detailQuery.data?.songs]);
+
+        const handleSongChange = useCallback(
+            (id: string) => {
+                if (songIds.has(id)) {
+                    const queryKey = queryKeys.albums.detail(server?.id, { id: albumId });
+                    queryClient.setQueryData<AlbumDetailResponse | undefined>(
+                        queryKey,
+                        (previous) => {
+                            if (!previous) return undefined;
+
+                            return {
+                                ...previous,
+                                playCount: previous.playCount ? previous.playCount + 1 : 1,
+                            };
+                        },
+                    );
+                }
+            },
+            [albumId, server?.id, songIds],
+        );
+
+        useSongChange((ids, event) => {
+            if (event.event === 'play') {
+                handleSongChange(ids[0]);
+            }
+        }, detailQuery.data !== undefined);
+
        const metadataItems = [
            {
                id: 'releaseDate',
                value:
                    detailQuery?.data?.releaseDate &&
-                    `${releasePrefix} ${formatDateAbsolute(detailQuery?.data?.releaseDate)}`,
+                    `${releasePrefix} ${formatDateAbsoluteUTC(detailQuery?.data?.releaseDate)}`,
            },
            {
                id: 'songCount',
-                value: `${detailQuery?.data?.songCount} songs`,
+                value: `${detailQuery?.data?.songCount} ${t('entity.track_other', {
+                    count: detailQuery?.data?.songCount as number,
+                })}`,
            },
            {
                id: 'duration',
@@ -62,7 +97,7 @@ export const AlbumDetailHeader = forwardRef(
        ];

        if (originalDifferentFromRelease) {
-            const formatted = `♫ ${formatDateAbsolute(detailQuery!.data!.originalDate)}`;
+            const formatted = `♫ ${formatDateAbsoluteUTC(detailQuery!.data!.originalDate)}`;
            metadataItems.splice(0, 0, {
                id: 'originalDate',
                value: formatted,
@@ -29,7 +29,7 @@ export const AlbumListGridView = ({ gridRef, itemCount }: any) => {
    const server = useCurrentServer();
    const handlePlayQueueAdd = usePlayQueueAdd();
    const { pageKey, customFilters, id } = useListContext();
-    const { grid, display, filter } = useListStoreByKey({ key: pageKey });
+    const { grid, display, filter } = useListStoreByKey<AlbumListQuery>({ key: pageKey });
    const { setGrid } = useListStoreActions();

    const [searchParams, setSearchParams] = useSearchParams();
@@ -162,9 +162,9 @@ export const AlbumListGridView = ({ gridRef, itemCount }: any) => {

            const query: AlbumListQuery = {
                limit: take,
-                startIndex: skip,
                ...filter,
                ...customFilters,
+                startIndex: skip,
            };

            const queryKey = queryKeys.albums.list(server?.id || '', query, id);
@@ -15,13 +15,20 @@ import {
    RiSettings3Fill,
 } from 'react-icons/ri';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { AlbumListSort, LibraryItem, ServerType, SortOrder } from '/@/renderer/api/types';
+import {
+    AlbumListQuery,
+    AlbumListSort,
+    LibraryItem,
+    ServerType,
+    SortOrder,
+} from '/@/renderer/api/types';
 import { Button, DropdownMenu, MultiSelect, Slider, Switch, Text } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { ALBUM_TABLE_COLUMNS } from '/@/renderer/components/virtual-table';
 import { useListContext } from '/@/renderer/context/list-context';
 import { JellyfinAlbumFilters } from '/@/renderer/features/albums/components/jellyfin-album-filters';
 import { NavidromeAlbumFilters } from '/@/renderer/features/albums/components/navidrome-album-filters';
+import { SubsonicAlbumFilters } from '/@/renderer/features/albums/components/subsonic-album-filters';
 import { OrderToggleButton, useMusicFolders } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
 import { useListFilterRefresh } from '/@/renderer/hooks/use-list-filter-refresh';
@@ -139,26 +146,74 @@ const FILTERS = {
            value: AlbumListSort.YEAR,
        },
    ],
+    subsonic: [
+        {
+            defaultOrder: SortOrder.ASC,
+            name: i18n.t('filter.albumArtist', { postProcess: 'titleCase' }),
+            value: AlbumListSort.ALBUM_ARTIST,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.mostPlayed', { postProcess: 'titleCase' }),
+            value: AlbumListSort.PLAY_COUNT,
+        },
+        {
+            defaultOrder: SortOrder.ASC,
+            name: i18n.t('filter.name', { postProcess: 'titleCase' }),
+            value: AlbumListSort.NAME,
+        },
+        {
+            defaultOrder: SortOrder.ASC,
+            name: i18n.t('filter.random', { postProcess: 'titleCase' }),
+            value: AlbumListSort.RANDOM,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.recentlyAdded', { postProcess: 'titleCase' }),
+            value: AlbumListSort.RECENTLY_ADDED,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.recentlyPlayed', { postProcess: 'titleCase' }),
+            value: AlbumListSort.RECENTLY_PLAYED,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.favorited', { postProcess: 'titleCase' }),
+            value: AlbumListSort.FAVORITED,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.releaseYear', { postProcess: 'titleCase' }),
+            value: AlbumListSort.YEAR,
+        },
+    ],
 };

 interface AlbumListHeaderFiltersProps {
    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    itemCount: number | undefined;
    tableRef: MutableRefObject<AgGridReactType | null>;
 }

-export const AlbumListHeaderFilters = ({ gridRef, tableRef }: AlbumListHeaderFiltersProps) => {
+export const AlbumListHeaderFilters = ({
+    gridRef,
+    itemCount,
+    tableRef,
+}: AlbumListHeaderFiltersProps) => {
    const { t } = useTranslation();
    const queryClient = useQueryClient();
    const { pageKey, customFilters, handlePlay } = useListContext();
    const server = useCurrentServer();
    const { setFilter, setTable, setGrid, setDisplayType } = useListStoreActions();
-    const { display, filter, table, grid } = useListStoreByKey({
+    const { display, filter, table, grid } = useListStoreByKey<AlbumListQuery>({
        filter: customFilters,
        key: pageKey,
    });
    const cq = useContainerQuery();

    const { handleRefreshTable, handleRefreshGrid } = useListFilterRefresh({
+        itemCount,
        itemType: LibraryItem.ALBUM,
        server,
    });
@@ -191,27 +246,35 @@ export const AlbumListHeaderFilters = ({ gridRef, tableRef }: AlbumListHeaderFil
    );

    const handleOpenFiltersModal = () => {
+        let FilterComponent;
+
+        switch (server?.type) {
+            case ServerType.NAVIDROME:
+                FilterComponent = NavidromeAlbumFilters;
+                break;
+            case ServerType.JELLYFIN:
+                FilterComponent = JellyfinAlbumFilters;
+                break;
+            case ServerType.SUBSONIC:
+                FilterComponent = SubsonicAlbumFilters;
+                break;
+            default:
+                break;
+        }
+
+        if (!FilterComponent) {
+            return;
+        }
+
        openModal({
            children: (
-                <>
-                    {server?.type === ServerType.NAVIDROME ? (
-                        <NavidromeAlbumFilters
-                            customFilters={customFilters}
-                            disableArtistFilter={!!customFilters}
-                            pageKey={pageKey}
-                            serverId={server?.id}
-                            onFilterChange={onFilterChange}
-                        />
-                    ) : (
-                        <JellyfinAlbumFilters
-                            customFilters={customFilters}
-                            disableArtistFilter={!!customFilters}
-                            pageKey={pageKey}
-                            serverId={server?.id}
-                            onFilterChange={onFilterChange}
-                        />
-                    )}
-                </>
+                <FilterComponent
+                    customFilters={customFilters}
+                    disableArtistFilter={!!customFilters}
+                    pageKey={pageKey}
+                    serverId={server?.id}
+                    onFilterChange={onFilterChange}
+                />
            ),
            title: 'Album Filters',
        });
@@ -347,8 +410,20 @@ export const AlbumListHeaderFilters = ({ gridRef, tableRef }: AlbumListHeaderFil
            filter?._custom?.jellyfin &&
            Object.values(filter?._custom?.jellyfin).some((value) => value !== undefined);

-        return isNavidromeFilterApplied || isJellyfinFilterApplied;
-    }, [filter?._custom?.jellyfin, filter?._custom?.navidrome, server?.type]);
+        const isSubsonicFilterApplied =
+            server?.type === ServerType.SUBSONIC &&
+            (filter.maxYear || filter.minYear || filter.genres?.length || filter.favorite);
+
+        return isNavidromeFilterApplied || isJellyfinFilterApplied || isSubsonicFilterApplied;
+    }, [
+        filter?._custom?.jellyfin,
+        filter?._custom?.navidrome,
+        filter.favorite,
+        filter.genres?.length,
+        filter.maxYear,
+        filter.minYear,
+        server?.type,
+    ]);

    const isFolderFilterApplied = useMemo(() => {
        return filter.musicFolderId !== undefined;
@@ -436,7 +511,7 @@ export const AlbumListHeaderFilters = ({ gridRef, tableRef }: AlbumListHeaderFil
                        },
                    }}
                    tooltip={{
-                        label: t('common.filter', { count: 2, postProcess: 'sentenceCase' }),
+                        label: t('common.filters', { count: 2, postProcess: 'sentenceCase' }),
                    }}
                    variant="subtle"
                    onClick={handleOpenFiltersModal}
@@ -514,7 +589,9 @@ export const AlbumListHeaderFilters = ({ gridRef, tableRef }: AlbumListHeaderFil
                        </Button>
                    </DropdownMenu.Target>
                    <DropdownMenu.Dropdown>
-                        <DropdownMenu.Label>Display type</DropdownMenu.Label>
+                        <DropdownMenu.Label>
+                            {t('table.config.general.displayType', { postProcess: 'sentenceCase' })}
+                        </DropdownMenu.Label>
                        <DropdownMenu.Item
                            $isActive={display === ListDisplayType.CARD}
                            value={ListDisplayType.CARD}
@@ -3,7 +3,7 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li
 import { Flex, Group, Stack } from '@mantine/core';
 import debounce from 'lodash/debounce';
 import { useTranslation } from 'react-i18next';
-import { LibraryItem } from '/@/renderer/api/types';
+import { AlbumListQuery, LibraryItem } from '/@/renderer/api/types';
 import { PageHeader, SearchInput } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { AlbumListHeaderFilters } from '/@/renderer/features/albums/components/album-list-header-filters';
@@ -33,8 +33,9 @@ export const AlbumListHeader = ({
    const cq = useContainerQuery();
    const playButtonBehavior = usePlayButtonBehavior();
    const genreRef = useRef<string>();
-    const { filter, handlePlay, refresh, search } = useDisplayRefresh({
+    const { filter, handlePlay, refresh, search } = useDisplayRefresh<AlbumListQuery>({
        gridRef,
+        itemCount,
        itemType: LibraryItem.ALBUM,
        server,
        tableRef,
@@ -90,6 +91,7 @@ export const AlbumListHeader = ({
            <FilterBar>
                <AlbumListHeaderFilters
                    gridRef={gridRef}
+                    itemCount={itemCount}
                    tableRef={tableRef}
                />
            </FilterBar>
@@ -3,7 +3,13 @@ import { Divider, Group, Stack } from '@mantine/core';
 import debounce from 'lodash/debounce';
 import { useTranslation } from 'react-i18next';
 import { useListFilterByKey } from '../../../store/list.store';
-import { AlbumArtistListSort, GenreListSort, LibraryItem, SortOrder } from '/@/renderer/api/types';
+import {
+    AlbumArtistListSort,
+    AlbumListQuery,
+    GenreListSort,
+    LibraryItem,
+    SortOrder,
+} from '/@/renderer/api/types';
 import { MultiSelect, NumberInput, SpinnerIcon, Switch, Text } from '/@/renderer/components';
 import { useAlbumArtistList } from '/@/renderer/features/artists/queries/album-artist-list-query';
 import { useGenreList } from '/@/renderer/features/genres';
@@ -25,7 +31,7 @@ export const JellyfinAlbumFilters = ({
    serverId,
 }: JellyfinAlbumFiltersProps) => {
    const { t } = useTranslation();
-    const filter = useListFilterByKey({ key: pageKey });
+    const filter = useListFilterByKey<AlbumListQuery>({ key: pageKey });
    const { setFilter } = useListStoreActions();

    // TODO - eventually replace with /items/filters endpoint to fetch genres and tags specific to the selected library
@@ -47,10 +53,6 @@ export const JellyfinAlbumFilters = ({
        }));
    }, [genreListQuery.data]);

-    const selectedGenres = useMemo(() => {
-        return filter?._custom?.jellyfin?.GenreIds?.split(',');
-    }, [filter?._custom?.jellyfin?.GenreIds]);
-
    const toggleFilters = [
        {
            label: t('filter.isFavorited', { postProcess: 'sentenceCase' }),
@@ -58,20 +60,15 @@ export const JellyfinAlbumFilters = ({
                const updatedFilters = setFilter({
                    customFilters,
                    data: {
-                        _custom: {
-                            ...filter?._custom,
-                            jellyfin: {
-                                ...filter?._custom?.jellyfin,
-                                IsFavorite: e.currentTarget.checked ? true : undefined,
-                            },
-                        },
+                        _custom: filter?._custom,
+                        favorite: e.currentTarget.checked ? true : undefined,
                    },
                    itemType: LibraryItem.ALBUM,
                    key: pageKey,
                }) as AlbumListFilter;
                onFilterChange(updatedFilters);
            },
-            value: filter?._custom?.jellyfin?.IsFavorite,
+            value: filter?.favorite,
        },
    ];

@@ -80,13 +77,8 @@ export const JellyfinAlbumFilters = ({
        const updatedFilters = setFilter({
            customFilters,
            data: {
-                _custom: {
-                    ...filter?._custom,
-                    jellyfin: {
-                        ...filter?._custom?.jellyfin,
-                        minYear: e === '' ? undefined : (e as number),
-                    },
-                },
+                _custom: filter?._custom,
+                minYear: e === '' ? undefined : (e as number),
            },
            itemType: LibraryItem.ALBUM,
            key: pageKey,
@@ -99,13 +91,8 @@ export const JellyfinAlbumFilters = ({
        const updatedFilters = setFilter({
            customFilters,
            data: {
-                _custom: {
-                    ...filter?._custom,
-                    jellyfin: {
-                        ...filter?._custom?.jellyfin,
-                        maxYear: e === '' ? undefined : (e as number),
-                    },
-                },
+                _custom: filter?._custom,
+                maxYear: e === '' ? undefined : (e as number),
            },
            itemType: LibraryItem.ALBUM,
            key: pageKey,
@@ -114,17 +101,11 @@ export const JellyfinAlbumFilters = ({
    }, 500);

    const handleGenresFilter = debounce((e: string[] | undefined) => {
-        const genreFilterString = e?.length ? e.join(',') : undefined;
        const updatedFilters = setFilter({
            customFilters,
            data: {
-                _custom: {
-                    ...filter?._custom,
-                    jellyfin: {
-                        ...filter?._custom?.jellyfin,
-                        GenreIds: genreFilterString,
-                    },
-                },
+                _custom: filter?._custom,
+                genres: e,
            },
            itemType: LibraryItem.ALBUM,
            key: pageKey,
@@ -157,17 +138,11 @@ export const JellyfinAlbumFilters = ({
    }, [albumArtistListQuery?.data?.items]);

    const handleAlbumArtistFilter = (e: string[] | null) => {
-        const albumArtistFilterString = e?.length ? e.join(',') : undefined;
        const updatedFilters = setFilter({
            customFilters,
            data: {
-                _custom: {
-                    ...filter?._custom,
-                    jellyfin: {
-                        ...filter?._custom?.jellyfin,
-                        AlbumArtistIds: albumArtistFilterString,
-                    },
-                },
+                _custom: filter?._custom,
+                artistIds: e || undefined,
            },
            itemType: LibraryItem.ALBUM,
            key: pageKey,
@@ -193,21 +168,21 @@ export const JellyfinAlbumFilters = ({
            <Divider my="0.5rem" />
            <Group grow>
                <NumberInput
-                    defaultValue={filter?._custom?.jellyfin?.minYear}
+                    defaultValue={filter?.minYear}
                    hideControls={false}
                    label={t('filter.fromYear', { postProcess: 'sentenceCase' })}
                    max={2300}
                    min={1700}
-                    required={!!filter?._custom?.jellyfin?.maxYear}
+                    required={!!filter?.maxYear}
                    onChange={(e) => handleMinYearFilter(e)}
                />
                <NumberInput
-                    defaultValue={filter?._custom?.jellyfin?.maxYear}
+                    defaultValue={filter?.maxYear}
                    hideControls={false}
                    label={t('filter.toYear', { postProcess: 'sentenceCase' })}
                    max={2300}
                    min={1700}
-                    required={!!filter?._custom?.jellyfin?.minYear}
+                    required={!!filter?.minYear}
                    onChange={(e) => handleMaxYearFilter(e)}
                />
            </Group>
@@ -216,7 +191,7 @@ export const JellyfinAlbumFilters = ({
                    clearable
                    searchable
                    data={genreList}
-                    defaultValue={selectedGenres}
+                    defaultValue={filter.genres}
                    label={t('entity.genre', { count: 2, postProcess: 'sentenceCase' })}
                    onChange={handleGenresFilter}
                />
@@ -5,7 +5,13 @@ import { AlbumListFilter, useListStoreActions, useListStoreByKey } from '/@/rend
 import debounce from 'lodash/debounce';
 import { useGenreList } from '/@/renderer/features/genres';
 import { useAlbumArtistList } from '/@/renderer/features/artists/queries/album-artist-list-query';
-import { AlbumArtistListSort, GenreListSort, LibraryItem, SortOrder } from '/@/renderer/api/types';
+import {
+    AlbumArtistListSort,
+    AlbumListQuery,
+    GenreListSort,
+    LibraryItem,
+    SortOrder,
+} from '/@/renderer/api/types';
 import { useTranslation } from 'react-i18next';

 interface NavidromeAlbumFiltersProps {
@@ -24,7 +30,7 @@ export const NavidromeAlbumFilters = ({
    serverId,
 }: NavidromeAlbumFiltersProps) => {
    const { t } = useTranslation();
-    const { filter } = useListStoreByKey({ key: pageKey });
+    const { filter } = useListStoreByKey<AlbumListQuery>({ key: pageKey });
    const { setFilter } = useListStoreActions();

    const genreListQuery = useGenreList({
@@ -48,13 +54,8 @@ export const NavidromeAlbumFilters = ({
        const updatedFilters = setFilter({
            customFilters,
            data: {
-                _custom: {
-                    ...filter._custom,
-                    navidrome: {
-                        ...filter._custom?.navidrome,
-                        genre_id: e || undefined,
-                    },
-                },
+                _custom: filter._custom,
+                genres: e ? [e] : undefined,
            },
            itemType: LibraryItem.ALBUM,
            key: pageKey,
@@ -90,20 +91,15 @@ export const NavidromeAlbumFilters = ({
                const updatedFilters = setFilter({
                    customFilters,
                    data: {
-                        _custom: {
-                            ...filter._custom,
-                            navidrome: {
-                                ...filter._custom?.navidrome,
-                                starred: e.currentTarget.checked ? true : undefined,
-                            },
-                        },
+                        _custom: filter._custom,
+                        favorite: e.currentTarget.checked ? true : undefined,
                    },
                    itemType: LibraryItem.ALBUM,
                    key: pageKey,
                }) as AlbumListFilter;
                onFilterChange(updatedFilters);
            },
-            value: filter._custom?.navidrome?.starred,
+            value: filter.favorite,
        },
        {
            label: t('filter.isCompilation', { postProcess: 'sentenceCase' }),
@@ -111,20 +107,15 @@ export const NavidromeAlbumFilters = ({
                const updatedFilters = setFilter({
                    customFilters,
                    data: {
-                        _custom: {
-                            ...filter._custom,
-                            navidrome: {
-                                ...filter._custom?.navidrome,
-                                compilation: e.currentTarget.checked ? true : undefined,
-                            },
-                        },
+                        _custom: filter._custom,
+                        compilation: e.currentTarget.checked ? true : undefined,
                    },
                    itemType: LibraryItem.ALBUM,
                    key: pageKey,
                }) as AlbumListFilter;
                onFilterChange(updatedFilters);
            },
-            value: filter._custom?.navidrome?.compilation,
+            value: filter.compilation,
        },
        {
            label: t('filter.isRecentlyPlayed', { postProcess: 'sentenceCase' }),
@@ -0,0 +1,141 @@
+import { Divider, Group, Stack } from '@mantine/core';
+import debounce from 'lodash/debounce';
+import { ChangeEvent, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { AlbumListQuery, GenreListSort, LibraryItem, SortOrder } from '/@/renderer/api/types';
+import { NumberInput, Select, Switch, Text } from '/@/renderer/components';
+import { useGenreList } from '/@/renderer/features/genres';
+import { AlbumListFilter, useListStoreActions, useListStoreByKey } from '/@/renderer/store';
+
+interface SubsonicAlbumFiltersProps {
+    onFilterChange: (filters: AlbumListFilter) => void;
+    pageKey: string;
+    serverId?: string;
+}
+
+export const SubsonicAlbumFilters = ({
+    onFilterChange,
+    pageKey,
+    serverId,
+}: SubsonicAlbumFiltersProps) => {
+    const { t } = useTranslation();
+    const { filter } = useListStoreByKey<AlbumListQuery>({ key: pageKey });
+    const { setFilter } = useListStoreActions();
+
+    const genreListQuery = useGenreList({
+        query: {
+            sortBy: GenreListSort.NAME,
+            sortOrder: SortOrder.ASC,
+            startIndex: 0,
+        },
+        serverId,
+    });
+
+    const genreList = useMemo(() => {
+        if (!genreListQuery?.data) return [];
+        return genreListQuery.data.items.map((genre) => ({
+            label: genre.name,
+            value: genre.id,
+        }));
+    }, [genreListQuery.data]);
+
+    const handleGenresFilter = debounce((e: string | null) => {
+        const updatedFilters = setFilter({
+            data: {
+                genres: e ? [e] : undefined,
+            },
+            itemType: LibraryItem.ALBUM,
+            key: pageKey,
+        }) as AlbumListFilter;
+
+        onFilterChange(updatedFilters);
+    }, 250);
+
+    const toggleFilters = [
+        {
+            label: t('filter.isFavorited', { postProcess: 'sentenceCase' }),
+            onChange: (e: ChangeEvent<HTMLInputElement>) => {
+                const updatedFilters = setFilter({
+                    data: {
+                        favorite: e.target.checked ? true : undefined,
+                    },
+                    itemType: LibraryItem.ALBUM,
+                    key: pageKey,
+                }) as AlbumListFilter;
+                onFilterChange(updatedFilters);
+            },
+            value: filter.favorite,
+        },
+    ];
+
+    const handleYearFilter = debounce((e: number | string, type: 'min' | 'max') => {
+        let data: Partial<AlbumListQuery> = {};
+
+        if (type === 'min') {
+            data = {
+                minYear: e ? Number(e) : undefined,
+            };
+        } else {
+            data = {
+                maxYear: e ? Number(e) : undefined,
+            };
+        }
+
+        const updatedFilters = setFilter({
+            data,
+            itemType: LibraryItem.ALBUM,
+            key: pageKey,
+        }) as AlbumListFilter;
+
+        onFilterChange(updatedFilters);
+    }, 500);
+
+    return (
+        <Stack p="0.8rem">
+            {toggleFilters.map((filter) => (
+                <Group
+                    key={`nd-filter-${filter.label}`}
+                    position="apart"
+                >
+                    <Text>{filter.label}</Text>
+                    <Switch
+                        checked={filter?.value || false}
+                        onChange={filter.onChange}
+                    />
+                </Group>
+            ))}
+            <Divider my="0.5rem" />
+            <Group grow>
+                <NumberInput
+                    defaultValue={filter.minYear}
+                    disabled={filter.genres?.length !== undefined}
+                    hideControls={false}
+                    label={t('filter.fromYear', { postProcess: 'sentenceCase' })}
+                    max={5000}
+                    min={0}
+                    onChange={(e) => handleYearFilter(e, 'min')}
+                />
+                <NumberInput
+                    defaultValue={filter.maxYear}
+                    disabled={filter.genres?.length !== undefined}
+                    hideControls={false}
+                    label={t('filter.toYear', { postProcess: 'sentenceCase' })}
+                    max={5000}
+                    min={0}
+                    onChange={(e) => handleYearFilter(e, 'max')}
+                />
+            </Group>
+            <Group grow>
+                <Select
+                    clearable
+                    searchable
+                    data={genreList}
+                    defaultValue={filter.genres?.length ? filter.genres[0] : undefined}
+                    disabled={Boolean(filter.minYear || filter.maxYear)}
+                    label={t('entity.genre', { count: 1, postProcess: 'titleCase' })}
+                    onChange={handleGenresFilter}
+                />
+            </Group>
+        </Stack>
+    );
+};
@@ -0,0 +1,30 @@
+import { useQuery } from '@tanstack/react-query';
+import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
+import type { AlbumListQuery } from '/@/renderer/api/types';
+import type { QueryHookArgs } from '/@/renderer/lib/react-query';
+import { getServerById } from '/@/renderer/store';
+
+export const useAlbumListCount = (args: QueryHookArgs<AlbumListQuery>) => {
+    const { options, query, serverId } = args;
+    const server = getServerById(serverId);
+
+    return useQuery({
+        enabled: !!serverId,
+        queryFn: ({ signal }) => {
+            if (!server) throw new Error('Server not found');
+            return api.controller.getAlbumListCount({
+                apiClientProps: {
+                    server,
+                    signal,
+                },
+                query,
+            });
+        },
+        queryKey: queryKeys.albums.count(
+            serverId || '',
+            Object.keys(query).length === 0 ? undefined : query,
+        ),
+        ...options,
+    });
+};
@@ -5,12 +5,11 @@ import { useTranslation } from 'react-i18next';
 import { useParams, useSearchParams } from 'react-router-dom';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { GenreListSort, LibraryItem, SortOrder } from '/@/renderer/api/types';
+import { AlbumListQuery, GenreListSort, LibraryItem, SortOrder } from '/@/renderer/api/types';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { ListContext } from '/@/renderer/context/list-context';
 import { AlbumListContent } from '/@/renderer/features/albums/components/album-list-content';
 import { AlbumListHeader } from '/@/renderer/features/albums/components/album-list-header';
-import { useAlbumList } from '/@/renderer/features/albums/queries/album-list-query';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
 import { AnimatedPage } from '/@/renderer/features/shared';
 import { queryClient } from '/@/renderer/lib/react-query';
@@ -18,6 +17,7 @@ import { useCurrentServer, useListFilterByKey } from '/@/renderer/store';
 import { Play } from '/@/renderer/types';
 import { useGenreList } from '/@/renderer/features/genres';
 import { titleCase } from '/@/renderer/utils';
+import { useAlbumListCount } from '/@/renderer/features/albums/queries/album-list-count-query';

 const AlbumListRoute = () => {
    const { t } = useTranslation();
@@ -33,14 +33,7 @@ const AlbumListRoute = () => {
        const value = {
            ...(albumArtistId && { artistIds: [albumArtistId] }),
            ...(genreId && {
-                _custom: {
-                    jellyfin: {
-                        GenreIds: genreId,
-                    },
-                    navidrome: {
-                        genre_id: genreId,
-                    },
-                },
+                genres: [genreId],
            }),
        };

@@ -51,7 +44,7 @@ const AlbumListRoute = () => {
        return value;
    }, [albumArtistId, genreId]);

-    const albumListFilter = useListFilterByKey({
+    const albumListFilter = useListFilterByKey<AlbumListQuery>({
        filter: customFilters,
        key: pageKey,
    });
@@ -78,32 +71,27 @@ const AlbumListRoute = () => {
        return genre?.name;
    }, [genreId, genreList.data]);

-    const itemCountCheck = useAlbumList({
+    const itemCountCheck = useAlbumListCount({
        options: {
            cacheTime: 1000 * 60,
            staleTime: 1000 * 60,
        },
        query: {
-            limit: 1,
-            startIndex: 0,
            ...albumListFilter,
        },
        serverId: server?.id,
    });

-    const itemCount =
-        itemCountCheck.data?.totalRecordCount === null
-            ? undefined
-            : itemCountCheck.data?.totalRecordCount;
+    const itemCount = itemCountCheck.data === null ? undefined : itemCountCheck.data;

    const handlePlay = useCallback(
        async (args: { initialSongId?: string; playType: Play }) => {
            if (!itemCount || itemCount === 0) return;
            const { playType } = args;
            const query = {
-                startIndex: 0,
                ...albumListFilter,
                ...customFilters,
+                startIndex: 0,
            };
            const queryKey = queryKeys.albums.list(server?.id || '', query);

@@ -111,18 +111,7 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
            enabled: enabledItem.recentAlbums,
        },
        query: {
-            _custom: {
-                jellyfin: {
-                    ...(server?.type === ServerType.JELLYFIN
-                        ? { AlbumArtistIds: albumArtistId }
-                        : undefined),
-                },
-                navidrome: {
-                    ...(server?.type === ServerType.NAVIDROME
-                        ? { artist_id: albumArtistId, compilation: false }
-                        : undefined),
-                },
-            },
+            artistIds: [albumArtistId],
            limit: 15,
            sortBy: AlbumListSort.RELEASE_DATE,
            sortOrder: SortOrder.DESC,
@@ -133,21 +122,11 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten

    const compilationAlbumsQuery = useAlbumList({
        options: {
-            enabled: enabledItem.compilations,
+            enabled: enabledItem.compilations && server?.type !== ServerType.SUBSONIC,
        },
        query: {
-            _custom: {
-                jellyfin: {
-                    ...(server?.type === ServerType.JELLYFIN
-                        ? { ContributingArtistIds: albumArtistId }
-                        : undefined),
-                },
-                navidrome: {
-                    ...(server?.type === ServerType.NAVIDROME
-                        ? { artist_id: albumArtistId, compilation: true }
-                        : undefined),
-                },
-            },
+            artistIds: [albumArtistId],
+            compilation: true,
            limit: 15,
            sortBy: AlbumListSort.RELEASE_DATE,
            sortOrder: SortOrder.DESC,
@@ -254,7 +233,10 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
            },
            {
                data: compilationAlbumsQuery?.data?.items,
-                isHidden: !compilationAlbumsQuery?.data?.items?.length || !enabledItem.compilations,
+                isHidden:
+                    !compilationAlbumsQuery?.data?.items?.length ||
+                    !enabledItem.compilations ||
+                    server?.type === ServerType.SUBSONIC,
                itemType: LibraryItem.ALBUM,
                loading: compilationAlbumsQuery?.isLoading || compilationAlbumsQuery.isFetching,
                order: itemOrder.compilations,
@@ -301,6 +283,7 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
        recentAlbumsQuery?.data?.items,
        recentAlbumsQuery.isFetching,
        recentAlbumsQuery?.isLoading,
+        server?.type,
        t,
    ]);

@@ -568,7 +551,7 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                                    suppressRowDrag
                                    columnDefs={topSongsColumnDefs}
                                    enableCellChangeFlash={false}
-                                    getRowId={(data) => data.data.id}
+                                    getRowId={(data) => data.data.uniqueId}
                                    rowData={topSongs}
                                    rowHeight={60}
                                    rowSelection="multiple"
@@ -26,16 +26,19 @@ export const AlbumArtistDetailHeader = forwardRef(

        const metadataItems = [
            {
+                enabled: detailQuery?.data?.albumCount,
                id: 'albumCount',
                secondary: false,
                value: t('entity.albumWithCount', { count: detailQuery?.data?.albumCount || 0 }),
            },
            {
+                enabled: detailQuery?.data?.songCount,
                id: 'songCount',
                secondary: false,
                value: t('entity.trackWithCount', { count: detailQuery?.data?.songCount || 0 }),
            },
            {
+                enabled: detailQuery.data?.duration,
                id: 'duration',
                secondary: true,
                value:
@@ -70,7 +73,7 @@ export const AlbumArtistDetailHeader = forwardRef(
                <Stack>
                    <Group>
                        {metadataItems
-                            .filter((i) => i.value)
+                            .filter((i) => i.enabled)
                            .map((item, index) => (
                                <Fragment key={`item-${item.id}-${index}`}>
                                    {index > 0 && <Text $noSelect>•</Text>}
@@ -66,7 +66,7 @@ export const AlbumArtistDetailTopSongsListContent = ({
                    ref={tableRef}
                    shouldUpdateSong
                    {...tableProps}
-                    getRowId={(data) => data.data.id}
+                    getRowId={(data) => data.data.uniqueId}
                    rowClassRules={rowClassRules}
                    rowData={data}
                    rowModelType="clientSide"
@@ -11,7 +11,6 @@ import {
    AlbumArtistListQuery,
    AlbumArtistListResponse,
    AlbumArtistListSort,
-    ArtistListQuery,
    LibraryItem,
 } from '/@/renderer/api/types';
 import { ALBUMARTIST_CARD_ROWS } from '/@/renderer/components';
@@ -34,7 +33,7 @@ export const AlbumArtistListGridView = ({ itemCount, gridRef }: AlbumArtistListG
    const handlePlayQueueAdd = usePlayQueueAdd();

    const { pageKey } = useListContext();
-    const { grid, display, filter } = useListStoreByKey({ key: pageKey });
+    const { grid, display, filter } = useListStoreByKey<AlbumArtistListQuery>({ key: pageKey });
    const { setGrid } = useListStoreActions();
    const handleFavorite = useHandleFavorite({ gridRef, server });

@@ -73,7 +72,7 @@ export const AlbumArtistListGridView = ({ itemCount, gridRef }: AlbumArtistListG

    const fetch = useCallback(
        async ({ skip: startIndex, take: limit }: { skip: number; take: number }) => {
-            const query: ArtistListQuery = {
+            const query: AlbumArtistListQuery = {
                ...filter,
                limit,
                startIndex,
@@ -91,7 +90,6 @@ export const AlbumArtistListGridView = ({ itemCount, gridRef }: AlbumArtistListG
                        },
                        query: {
                            limit,
-                            startIndex,
                            ...filter,
                        },
                    }),
@@ -9,7 +9,13 @@ import { RiFolder2Line, RiMoreFill, RiRefreshLine, RiSettings3Fill } from 'react
 import { useListContext } from '../../../context/list-context';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { AlbumArtistListSort, LibraryItem, ServerType, SortOrder } from '/@/renderer/api/types';
+import {
+    AlbumArtistListQuery,
+    AlbumArtistListSort,
+    LibraryItem,
+    ServerType,
+    SortOrder,
+} from '/@/renderer/api/types';
 import { Button, DropdownMenu, MultiSelect, Slider, Switch, Text } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { ALBUMARTIST_TABLE_COLUMNS } from '/@/renderer/components/virtual-table';
@@ -85,6 +91,28 @@ const FILTERS = {
            value: AlbumArtistListSort.SONG_COUNT,
        },
    ],
+    subsonic: [
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.albumCount', { postProcess: 'titleCase' }),
+            value: AlbumArtistListSort.ALBUM_COUNT,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.isFavorited', { postProcess: 'titleCase' }),
+            value: AlbumArtistListSort.FAVORITED,
+        },
+        {
+            defaultOrder: SortOrder.ASC,
+            name: i18n.t('filter.name', { postProcess: 'titleCase' }),
+            value: AlbumArtistListSort.NAME,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.rating', { postProcess: 'titleCase' }),
+            value: AlbumArtistListSort.RATING,
+        },
+    ],
 };

 interface AlbumArtistListHeaderFiltersProps {
@@ -100,7 +128,9 @@ export const AlbumArtistListHeaderFilters = ({
    const queryClient = useQueryClient();
    const server = useCurrentServer();
    const { pageKey } = useListContext();
-    const { display, table, grid, filter } = useListStoreByKey({ key: pageKey });
+    const { display, table, grid, filter } = useListStoreByKey<AlbumArtistListQuery>({
+        key: pageKey,
+    });
    const { setFilter, setTable, setTablePagination, setDisplayType, setGrid } =
        useListStoreActions();
    const cq = useContainerQuery();
@@ -416,7 +446,9 @@ export const AlbumArtistListHeaderFilters = ({
                            icon={<RiRefreshLine />}
                            onClick={handleRefresh}
                        >
-                            Refresh
+                            {t('common.refresh', {
+                                postProcess: 'titleCase',
+                            })}
                        </DropdownMenu.Item>
                    </DropdownMenu.Dropdown>
                </DropdownMenu>
@@ -436,7 +468,9 @@ export const AlbumArtistListHeaderFilters = ({
                        </Button>
                    </DropdownMenu.Target>
                    <DropdownMenu.Dropdown>
-                        <DropdownMenu.Label>Display type</DropdownMenu.Label>
+                        <DropdownMenu.Label>
+                            {t('table.config.general.displayType', { postProcess: 'sentenceCase' })}
+                        </DropdownMenu.Label>
                        <DropdownMenu.Item
                            $isActive={display === ListDisplayType.CARD}
                            value={ListDisplayType.CARD}
@@ -4,7 +4,7 @@ import { Flex, Group, Stack } from '@mantine/core';
 import debounce from 'lodash/debounce';
 import { useTranslation } from 'react-i18next';
 import { FilterBar } from '../../shared/components/filter-bar';
-import { LibraryItem } from '/@/renderer/api/types';
+import { AlbumArtistListQuery, LibraryItem } from '/@/renderer/api/types';
 import { PageHeader, SearchInput } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { AlbumArtistListHeaderFilters } from '/@/renderer/features/artists/components/album-artist-list-header-filters';
@@ -28,8 +28,9 @@ export const AlbumArtistListHeader = ({
    const server = useCurrentServer();
    const cq = useContainerQuery();

-    const { filter, refresh, search } = useDisplayRefresh({
+    const { filter, refresh, search } = useDisplayRefresh<AlbumArtistListQuery>({
        gridRef,
+        itemCount,
        itemType: LibraryItem.ALBUM_ARTIST,
        server,
        tableRef,
@@ -0,0 +1,30 @@
+import { useQuery } from '@tanstack/react-query';
+import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
+import { AlbumArtistListQuery } from '/@/renderer/api/types';
+import { QueryHookArgs } from '/@/renderer/lib/react-query';
+import { getServerById } from '/@/renderer/store';
+
+export const useAlbumArtistListCount = (args: QueryHookArgs<AlbumArtistListQuery>) => {
+    const { options, query, serverId } = args;
+    const server = getServerById(serverId);
+
+    return useQuery({
+        enabled: !!serverId,
+        queryFn: ({ signal }) => {
+            if (!server) throw new Error('Server not found');
+            return api.controller.getAlbumArtistListCount({
+                apiClientProps: {
+                    server,
+                    signal,
+                },
+                query,
+            });
+        },
+        queryKey: queryKeys.albumArtists.count(
+            serverId || '',
+            Object.keys(query).length === 0 ? undefined : query,
+        ),
+        ...options,
+    });
+};
@@ -13,7 +13,7 @@ export const useTopSongsList = (args: QueryHookArgs<TopSongListQuery>) => {
        enabled: !!server?.id,
        queryFn: ({ signal }) => {
            if (!server) throw new Error('Server not found');
-            return api.controller.getTopSongList({ apiClientProps: { server, signal }, query });
+            return api.controller.getTopSongs({ apiClientProps: { server, signal }, query });
        },
        queryKey: queryKeys.albumArtists.topSongs(server?.id || '', query),
        ...options,
@@ -2,13 +2,13 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li
 import { useMemo, useRef } from 'react';
 import { useCurrentServer } from '../../../store/auth.store';
 import { useListFilterByKey } from '../../../store/list.store';
-import { LibraryItem } from '/@/renderer/api/types';
+import { AlbumArtistListQuery, LibraryItem } from '/@/renderer/api/types';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { ListContext } from '/@/renderer/context/list-context';
 import { AlbumArtistListContent } from '/@/renderer/features/artists/components/album-artist-list-content';
 import { AlbumArtistListHeader } from '/@/renderer/features/artists/components/album-artist-list-header';
-import { useAlbumArtistList } from '/@/renderer/features/artists/queries/album-artist-list-query';
 import { AnimatedPage } from '/@/renderer/features/shared';
+import { useAlbumArtistListCount } from '/@/renderer/features/artists/queries/album-artist-list-count-query';

 const AlbumArtistListRoute = () => {
    const gridRef = useRef<VirtualInfiniteGridRef | null>(null);
@@ -16,25 +16,18 @@ const AlbumArtistListRoute = () => {
    const pageKey = LibraryItem.ALBUM_ARTIST;
    const server = useCurrentServer();

-    const albumArtistListFilter = useListFilterByKey({ key: pageKey });
+    const albumArtistListFilter = useListFilterByKey<AlbumArtistListQuery>({ key: pageKey });

-    const itemCountCheck = useAlbumArtistList({
+    const itemCountCheck = useAlbumArtistListCount({
        options: {
            cacheTime: 1000 * 60,
            staleTime: 1000 * 60,
        },
-        query: {
-            limit: 1,
-            startIndex: 0,
-            ...albumArtistListFilter,
-        },
+        query: albumArtistListFilter,
        serverId: server?.id,
    });

-    const itemCount =
-        itemCountCheck.data?.totalRecordCount === null
-            ? undefined
-            : itemCountCheck.data?.totalRecordCount;
+    const itemCount = itemCountCheck.data === null ? undefined : itemCountCheck.data;

    const providerValue = useMemo(() => {
        return {
@@ -18,6 +18,7 @@ export const SONG_CONTEXT_MENU_ITEMS: SetContextMenuItems = [
    { id: 'play' },
    { id: 'playLast' },
    { id: 'playNext' },
+    { id: 'playShuffled' },
    { divider: true, id: 'playSimilarSongs' },
    { divider: true, id: 'addToPlaylist' },
    { id: 'addToFavorites' },
@@ -31,7 +32,8 @@ export const SONG_CONTEXT_MENU_ITEMS: SetContextMenuItems = [
 export const SONG_ALBUM_PAGE: SetContextMenuItems = [
    { id: 'play' },
    { id: 'playLast' },
-    { divider: true, id: 'playNext' },
+    { id: 'playNext' },
+    { divider: true, id: 'playShuffled' },
    { divider: true, id: 'addToPlaylist' },
 ];

@@ -39,6 +41,7 @@ export const PLAYLIST_SONG_CONTEXT_MENU_ITEMS: SetContextMenuItems = [
    { id: 'play' },
    { id: 'playLast' },
    { id: 'playNext' },
+    { id: 'playShuffled' },
    { divider: true, id: 'playSimilarSongs' },
    { id: 'addToPlaylist' },
    { divider: true, id: 'removeFromPlaylist' },
@@ -54,6 +57,7 @@ export const SMART_PLAYLIST_SONG_CONTEXT_MENU_ITEMS: SetContextMenuItems = [
    { id: 'play' },
    { id: 'playLast' },
    { id: 'playNext' },
+    { divider: true, id: 'playShuffled' },
    { divider: true, id: 'playSimilarSongs' },
    { divider: true, id: 'addToPlaylist' },
    { id: 'addToFavorites' },
@@ -67,7 +71,8 @@ export const SMART_PLAYLIST_SONG_CONTEXT_MENU_ITEMS: SetContextMenuItems = [
 export const ALBUM_CONTEXT_MENU_ITEMS: SetContextMenuItems = [
    { id: 'play' },
    { id: 'playLast' },
-    { divider: true, id: 'playNext' },
+    { id: 'playNext' },
+    { divider: true, id: 'playShuffled' },
    { divider: true, id: 'addToPlaylist' },
    { id: 'addToFavorites' },
    { id: 'removeFromFavorites' },
@@ -79,14 +84,16 @@ export const ALBUM_CONTEXT_MENU_ITEMS: SetContextMenuItems = [
 export const GENRE_CONTEXT_MENU_ITEMS: SetContextMenuItems = [
    { id: 'play' },
    { id: 'playLast' },
-    { divider: true, id: 'playNext' },
+    { id: 'playNext' },
+    { divider: true, id: 'playShuffled' },
    { divider: true, id: 'addToPlaylist' },
 ];

 export const ARTIST_CONTEXT_MENU_ITEMS: SetContextMenuItems = [
    { id: 'play' },
    { id: 'playLast' },
-    { divider: true, id: 'playNext' },
+    { id: 'playNext' },
+    { divider: true, id: 'playShuffled' },
    { divider: true, id: 'addToPlaylist' },
    { id: 'addToFavorites' },
    { divider: true, id: 'removeFromFavorites' },
@@ -98,7 +105,8 @@ export const ARTIST_CONTEXT_MENU_ITEMS: SetContextMenuItems = [
 export const PLAYLIST_CONTEXT_MENU_ITEMS: SetContextMenuItems = [
    { id: 'play' },
    { id: 'playLast' },
-    { divider: true, id: 'playNext' },
+    { id: 'playNext' },
+    { divider: true, id: 'playShuffled' },
    { divider: true, id: 'shareItem' },
    { id: 'deletePlaylist' },
 ];
@@ -31,6 +31,7 @@ import {
    RiInformationFill,
    RiRadio2Fill,
    RiDownload2Line,
+    RiShuffleFill,
 } from 'react-icons/ri';
 import { AnyLibraryItems, LibraryItem, ServerType, AnyLibraryItem } from '/@/renderer/api/types';
 import {
@@ -493,17 +494,24 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
    const removeFromPlaylistMutation = useRemoveFromPlaylist();

    const handleRemoveFromPlaylist = useCallback(() => {
-        const songId =
-            (serverType === ServerType.NAVIDROME || ServerType.JELLYFIN
-                ? ctx.dataNodes?.map((node) => node.data.playlistItemId)
-                : ctx.dataNodes?.map((node) => node.data.id)) || [];
+        let songId: string[] | undefined;
+
+        switch (serverType) {
+            case ServerType.NAVIDROME:
+            case ServerType.JELLYFIN:
+                songId = ctx.dataNodes?.map((node) => node.data.playlistItemId);
+                break;
+            case ServerType.SUBSONIC:
+                songId = ctx.dataNodes?.map((node) => node.rowIndex!.toString());
+                break;
+        }

        const confirm = () => {
            removeFromPlaylistMutation.mutate(
                {
                    query: {
                        id: ctx.context.playlistId,
-                        songId,
+                        songId: songId || [],
                    },
                    serverId: ctx.data?.[0]?.serverId,
                },
@@ -774,6 +782,12 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
                leftIcon: <RiAddCircleFill size="1.1rem" />,
                onClick: () => handlePlay(Play.NEXT),
            },
+            playShuffled: {
+                id: 'playShuffled',
+                label: t('page.contextMenu.playShuffled', { postProcess: 'sentenceCase' }),
+                leftIcon: <RiShuffleFill size="1.1rem" />,
+                onClick: () => handlePlay(Play.SHUFFLE),
+            },
            playSimilarSongs: {
                id: 'playSimilarSongs',
                label: t('page.contextMenu.playSimilarSongs', { postProcess: 'sentenceCase' }),
@@ -862,7 +876,7 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
                    },
                ],
                id: 'setRating',
-                label: 'Set rating',
+                label: t('action.setRating', { postProcess: 'sentenceCase' }),
                leftIcon: <RiStarFill size="1.1rem" />,
                onClick: () => {},
                rightIcon: <RiArrowRightSFill size="1.2rem" />,
@@ -23,6 +23,7 @@ export type ContextMenuItemType =
    | 'play'
    | 'playLast'
    | 'playNext'
+    | 'playShuffled'
    | 'addToPlaylist'
    | 'removeFromPlaylist'
    | 'addToFavorites'
@@ -45,6 +46,7 @@ export const CONFIGURABLE_CONTEXT_MENU_ITEMS: ContextMenuItemType[] = [
    'play',
    'playLast',
    'playNext',
+    'playShuffled',
    'playSimilarSongs',
    'addToPlaylist',
    'removeFromPlaylist',
@@ -22,7 +22,7 @@ export const GenreListGridView = ({ gridRef, itemCount }: any) => {
    const server = useCurrentServer();
    const handlePlayQueueAdd = usePlayQueueAdd();
    const { pageKey, id } = useListContext();
-    const { grid, display, filter } = useListStoreByKey({ key: pageKey });
+    const { grid, display, filter } = useListStoreByKey<GenreListQuery>({ key: pageKey });
    const { setGrid } = useListStoreActions();
    const genrePath = useGenreRoute();

@@ -12,7 +12,13 @@ import {
    RiSettings3Fill,
 } from 'react-icons/ri';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { GenreListSort, LibraryItem, ServerType, SortOrder } from '/@/renderer/api/types';
+import {
+    GenreListQuery,
+    GenreListSort,
+    LibraryItem,
+    ServerType,
+    SortOrder,
+} from '/@/renderer/api/types';
 import { Button, DropdownMenu, MultiSelect, Slider, Switch, Text } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { GENRE_TABLE_COLUMNS } from '/@/renderer/components/virtual-table';
@@ -47,25 +53,38 @@ const FILTERS = {
            value: GenreListSort.NAME,
        },
    ],
+    subsonic: [
+        {
+            defaultOrder: SortOrder.ASC,
+            name: i18n.t('filter.name', { postProcess: 'titleCase' }),
+            value: GenreListSort.NAME,
+        },
+    ],
 };

 interface GenreListHeaderFiltersProps {
    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    itemCount: number | undefined;
    tableRef: MutableRefObject<AgGridReactType | null>;
 }

-export const GenreListHeaderFilters = ({ gridRef, tableRef }: GenreListHeaderFiltersProps) => {
+export const GenreListHeaderFilters = ({
+    gridRef,
+    itemCount,
+    tableRef,
+}: GenreListHeaderFiltersProps) => {
    const { t } = useTranslation();
    const queryClient = useQueryClient();
    const { pageKey, customFilters } = useListContext();
    const server = useCurrentServer();
    const { setFilter, setTable, setGrid, setDisplayType } = useListStoreActions();
-    const { display, filter, table, grid } = useListStoreByKey({ key: pageKey });
+    const { display, filter, table, grid } = useListStoreByKey<GenreListQuery>({ key: pageKey });
    const cq = useContainerQuery();
    const { genreTarget } = useGeneralSettings();
    const { setGenreBehavior } = useSettingsStoreActions();

    const { handleRefreshTable, handleRefreshGrid } = useListFilterRefresh({
+        itemCount,
        itemType: LibraryItem.GENRE,
        server,
    });
@@ -367,7 +386,7 @@ export const GenreListHeaderFilters = ({ gridRef, tableRef }: GenreListHeaderFil
                    </DropdownMenu.Target>
                    <DropdownMenu.Dropdown>
                        <DropdownMenu.Label>
-                            {t('table.config.general.displayType', { postProcess: 'titleCase' })}
+                            {t('table.config.general.displayType', { postProcess: 'sentenceCase' })}
                        </DropdownMenu.Label>
                        <DropdownMenu.Item
                            $isActive={display === ListDisplayType.CARD}
@@ -404,7 +423,11 @@ export const GenreListHeaderFilters = ({ gridRef, tableRef }: GenreListHeaderFil
                        </DropdownMenu.Item>
                        {isGrid && (
                            <>
-                                <DropdownMenu.Label>Item gap</DropdownMenu.Label>
+                                <DropdownMenu.Label>
+                                    {t('table.config.general.itemGap', {
+                                        postProcess: 'sentenceCase',
+                                    })}
+                                </DropdownMenu.Label>
                                <DropdownMenu.Item closeMenuOnClick={false}>
                                    <Slider
                                        defaultValue={grid?.itemGap || 0}
@@ -2,7 +2,7 @@ import { ChangeEvent, MutableRefObject } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
 import { Flex, Group, Stack } from '@mantine/core';
 import debounce from 'lodash/debounce';
-import { LibraryItem } from '/@/renderer/api/types';
+import { GenreListQuery, LibraryItem } from '/@/renderer/api/types';
 import { PageHeader, SearchInput } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { GenreListHeaderFilters } from '/@/renderer/features/genres/components/genre-list-header-filters';
@@ -22,7 +22,7 @@ export const GenreListHeader = ({ itemCount, gridRef, tableRef }: GenreListHeade
    const { t } = useTranslation();
    const cq = useContainerQuery();
    const server = useCurrentServer();
-    const { filter, refresh, search } = useDisplayRefresh({
+    const { filter, refresh, search } = useDisplayRefresh<GenreListQuery>({
        gridRef,
        itemType: LibraryItem.GENRE,
        server,
@@ -66,6 +66,7 @@ export const GenreListHeader = ({ itemCount, gridRef, tableRef }: GenreListHeade
            <FilterBar>
                <GenreListHeaderFilters
                    gridRef={gridRef}
+                    itemCount={itemCount}
                    tableRef={tableRef}
                />
            </FilterBar>
@@ -8,19 +8,20 @@ import { useGenreList } from '/@/renderer/features/genres/queries/genre-list-que
 import { AnimatedPage } from '/@/renderer/features/shared';
 import { useCurrentServer } from '/@/renderer/store';
 import { useListStoreByKey } from '../../../store/list.store';
+import { GenreListQuery } from '/@/renderer/api/types';

 const GenreListRoute = () => {
    const gridRef = useRef<VirtualInfiniteGridRef | null>(null);
    const tableRef = useRef<AgGridReactType | null>(null);
    const server = useCurrentServer();
    const pageKey = 'genre';
-    const { filter } = useListStoreByKey({ key: pageKey });
+    const { filter } = useListStoreByKey<GenreListQuery>({ key: pageKey });

    const itemCountCheck = useGenreList({
        query: {
+            ...filter,
            limit: 1,
            startIndex: 0,
-            ...filter,
        },
        serverId: server?.id,
    });
@@ -19,6 +19,7 @@ interface LyricsActionsProps {
    onRemoveLyric: () => void;
    onResetLyric: () => void;
    onSearchOverride: (params: LyricsOverride) => void;
+    onTranslateLyric: () => void;
    setIndex: (idx: number) => void;
 }

@@ -28,6 +29,7 @@ export const LyricsActions = ({
    onRemoveLyric,
    onResetLyric,
    onSearchOverride,
+    onTranslateLyric,
    setIndex,
 }: LyricsActionsProps) => {
    const { t } = useTranslation();
@@ -120,7 +122,6 @@ export const LyricsActions = ({
                {isDesktop && sources.length ? (
                    <Button
                        uppercase
-                        color="red"
                        disabled={isActionsDisabled}
                        variant="subtle"
                        onClick={onRemoveLyric}
@@ -129,6 +130,19 @@ export const LyricsActions = ({
                    </Button>
                ) : null}
            </Box>
+
+            <Box style={{ position: 'absolute', right: 0, top: -50 }}>
+                {isDesktop && sources.length ? (
+                    <Button
+                        uppercase
+                        disabled={isActionsDisabled}
+                        variant="subtle"
+                        onClick={onTranslateLyric}
+                    >
+                        {t('common.translation', { postProcess: 'sentenceCase' })}
+                    </Button>
+                ) : null}
+            </Box>
        </Box>
    );
 };
@@ -2,9 +2,11 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { Center, Group } from '@mantine/core';
 import { AnimatePresence, motion } from 'framer-motion';
 import { ErrorBoundary } from 'react-error-boundary';
+import { useTranslation } from 'react-i18next';
 import { RiInformationFill } from 'react-icons/ri';
 import styled from 'styled-components';
 import { useSongLyricsByRemoteId, useSongLyricsBySong } from './queries/lyric-query';
+import { translateLyrics } from './queries/lyric-translate';
 import { SynchronizedLyrics, SynchronizedLyricsProps } from './synchronized-lyrics';
 import { Spinner, TextTitle } from '/@/renderer/components';
 import { ErrorFallback } from '/@/renderer/features/action-required';
@@ -12,7 +14,7 @@ import {
    UnsynchronizedLyrics,
    UnsynchronizedLyricsProps,
 } from '/@/renderer/features/lyrics/unsynchronized-lyrics';
-import { useCurrentSong, usePlayerStore } from '/@/renderer/store';
+import { useCurrentSong, usePlayerStore, useLyricsSettings } from '/@/renderer/store';
 import { FullLyricsMetadata, LyricSource, LyricsOverride } from '/@/renderer/api/types';
 import { LyricsActions } from '/@/renderer/features/lyrics/lyrics-actions';
 import { queryKeys } from '/@/renderer/api/query-keys';
@@ -84,7 +86,11 @@ const ScrollContainer = styled(motion.div)`

 export const Lyrics = () => {
    const currentSong = useCurrentSong();
+    const lyricsSettings = useLyricsSettings();
+    const { t } = useTranslation();
    const [index, setIndex] = useState(0);
+    const [translatedLyrics, setTranslatedLyrics] = useState<string | null>(null);
+    const [showTranslation, setShowTranslation] = useState(false);

    const { data, isInitialLoading } = useSongLyricsBySong(
        {
@@ -96,6 +102,19 @@ export const Lyrics = () => {

    const [override, setOverride] = useState<LyricsOverride | undefined>(undefined);

+    const [lyrics, synced] = useMemo(() => {
+        if (Array.isArray(data)) {
+            if (data.length > 0) {
+                const selectedLyric = data[Math.min(index, data.length)];
+                return [selectedLyric, selectedLyric.synced];
+            }
+        } else if (data?.lyrics) {
+            return [data, Array.isArray(data.lyrics)];
+        }
+
+        return [undefined, false];
+    }, [data, index]);
+
    const handleOnSearchOverride = useCallback((params: LyricsOverride) => {
        setOverride(params);
    }, []);
@@ -123,6 +142,27 @@ export const Lyrics = () => {
        );
    }, [currentSong?.id, currentSong?.serverId]);

+    const handleOnTranslateLyric = useCallback(async () => {
+        if (translatedLyrics) {
+            setShowTranslation(!showTranslation);
+            return;
+        }
+        if (!lyrics) return;
+        const originalLyrics = Array.isArray(lyrics.lyrics)
+            ? lyrics.lyrics.map(([, line]) => line).join('\n')
+            : lyrics.lyrics;
+        const { translationApiKey, translationApiProvider, translationTargetLanguage } =
+            lyricsSettings;
+        const TranslatedText: string | null = await translateLyrics(
+            originalLyrics,
+            translationApiKey,
+            translationApiProvider,
+            translationTargetLanguage,
+        );
+        setTranslatedLyrics(TranslatedText);
+        setShowTranslation(true);
+    }, [lyrics, lyricsSettings, translatedLyrics, showTranslation]);
+
    const { isInitialLoading: isOverrideLoading } = useSongLyricsByRemoteId({
        options: {
            enabled: !!override,
@@ -150,19 +190,6 @@ export const Lyrics = () => {
        };
    }, []);

-    const [lyrics, synced] = useMemo(() => {
-        if (Array.isArray(data)) {
-            if (data.length > 0) {
-                const selectedLyric = data[Math.min(index, data.length)];
-                return [selectedLyric, selectedLyric.synced];
-            }
-        } else if (data?.lyrics) {
-            return [data, Array.isArray(data.lyrics)];
-        }
-
-        return [undefined, false];
-    }, [data, index]);
-
    const languages = useMemo(() => {
        if (Array.isArray(data)) {
            return data.map((lyric, idx) => ({ label: lyric.lang, value: idx.toString() }));
@@ -192,7 +219,9 @@ export const Lyrics = () => {
                                        order={3}
                                        weight={700}
                                    >
-                                        No lyrics found
+                                        {t('page.fullscreenPlayer.noLyrics', {
+                                            postProcess: 'sentenceCase',
+                                        })}
                                    </TextTitle>
                                </Group>
                            </Center>
@@ -203,10 +232,14 @@ export const Lyrics = () => {
                                transition={{ duration: 0.5 }}
                            >
                                {synced ? (
-                                    <SynchronizedLyrics {...(lyrics as SynchronizedLyricsProps)} />
+                                    <SynchronizedLyrics
+                                        {...(lyrics as SynchronizedLyricsProps)}
+                                        translatedLyrics={showTranslation ? translatedLyrics : null}
+                                    />
                                ) : (
                                    <UnsynchronizedLyrics
                                        {...(lyrics as UnsynchronizedLyricsProps)}
+                                        translatedLyrics={showTranslation ? translatedLyrics : null}
                                    />
                                )}
                            </ScrollContainer>
@@ -221,6 +254,7 @@ export const Lyrics = () => {
                        onRemoveLyric={handleOnRemoveLyric}
                        onResetLyric={handleOnResetLyric}
                        onSearchOverride={handleOnSearchOverride}
+                        onTranslateLyric={handleOnTranslateLyric}
                    />
                </ActionsContainer>
            </LyricsContainer>
@@ -0,0 +1,50 @@
+import axios from 'axios';
+
+export const translateLyrics = async (
+    originalLyrics: string,
+    translationApiKey: string,
+    translationApiProvider: string | null,
+    translationTargetLanguage: string | null,
+) => {
+    let TranslatedText = '';
+    if (translationApiProvider === 'Microsoft Azure') {
+        try {
+            const response = await axios({
+                data: [
+                    {
+                        Text: originalLyrics,
+                    },
+                ],
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Ocp-Apim-Subscription-Key': translationApiKey,
+                },
+                method: 'post',
+                url: `https://api.cognitive.microsofttranslator.com/translate?api-version=3.0&to=${translationTargetLanguage as string}`,
+            });
+            TranslatedText = response.data[0].translations[0].text;
+        } catch (e) {
+            console.error('Microsoft Azure translate request got an error!', e);
+            return null;
+        }
+    } else if (translationApiProvider === 'Google Cloud') {
+        try {
+            const response = await axios({
+                data: {
+                    format: 'text',
+                    q: originalLyrics,
+                },
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                method: 'post',
+                url: `https://translation.googleapis.com/language/translate/v2?target=${translationTargetLanguage as string}&key=${translationApiKey}`,
+            });
+            TranslatedText = response.data.data.translations[0].translatedText;
+        } catch (e) {
+            console.error('Google Cloud translate request got an error!', e);
+            return null;
+        }
+    }
+    return TranslatedText;
+};
@@ -55,6 +55,7 @@ const SynchronizedLyricsContainer = styled.div<{ $gap: number }>`

 export interface SynchronizedLyricsProps extends Omit<FullLyricsMetadata, 'lyrics'> {
    lyrics: SynchronizedLyricsArray;
+    translatedLyrics?: string | null;
 }

 export const SynchronizedLyrics = ({
@@ -63,6 +64,7 @@ export const SynchronizedLyrics = ({
    name,
    remote,
    source,
+    translatedLyrics,
 }: SynchronizedLyricsProps) => {
    const playersRef = PlayersRef;
    const status = useCurrentStatus();
@@ -364,15 +366,25 @@ export const SynchronizedLyrics = ({
                />
            )}
            {lyrics.map(([time, text], idx) => (
-                <LyricLine
-                    key={idx}
-                    alignment={settings.alignment}
-                    className="lyric-line synchronized"
-                    fontSize={settings.fontSize}
-                    id={`lyric-${idx}`}
-                    text={text}
-                    onClick={() => handleSeek(time / 1000)}
-                />
+                <div key={idx}>
+                    <LyricLine
+                        alignment={settings.alignment}
+                        className="lyric-line synchronized"
+                        fontSize={settings.fontSize}
+                        id={`lyric-${idx}`}
+                        text={text}
+                        onClick={() => handleSeek(time / 1000)}
+                    />
+                    {translatedLyrics && (
+                        <LyricLine
+                            alignment={settings.alignment}
+                            className="lyric-line synchronized translation"
+                            fontSize={settings.fontSize * 0.8}
+                            text={translatedLyrics.split('\n')[idx]}
+                            onClick={() => handleSeek(time / 1000)}
+                        />
+                    )}
+                </div>
            ))}
        </SynchronizedLyricsContainer>
    );
@@ -6,6 +6,7 @@ import { useLyricsSettings } from '/@/renderer/store';

 export interface UnsynchronizedLyricsProps extends Omit<FullLyricsMetadata, 'lyrics'> {
    lyrics: string;
+    translatedLyrics?: string | null;
 }

 const UnsynchronizedLyricsContainer = styled.div<{ $gap: number }>`
@@ -45,12 +46,17 @@ export const UnsynchronizedLyrics = ({
    name,
    remote,
    source,
+    translatedLyrics,
 }: UnsynchronizedLyricsProps) => {
    const settings = useLyricsSettings();
    const lines = useMemo(() => {
        return lyrics.split('\n');
    }, [lyrics]);

+    const translatedLines = useMemo(() => {
+        return translatedLyrics ? translatedLyrics.split('\n') : [];
+    }, [translatedLyrics]);
+
    return (
        <UnsynchronizedLyricsContainer
            $gap={settings.gapUnsync}
@@ -73,14 +79,23 @@ export const UnsynchronizedLyrics = ({
                />
            )}
            {lines.map((text, idx) => (
-                <LyricLine
-                    key={idx}
-                    alignment={settings.alignment}
-                    className="lyric-line unsynchronized"
-                    fontSize={settings.fontSizeUnsync}
-                    id={`lyric-${idx}`}
-                    text={text}
-                />
+                <div key={idx}>
+                    <LyricLine
+                        alignment={settings.alignment}
+                        className="lyric-line unsynchronized"
+                        fontSize={settings.fontSizeUnsync}
+                        id={`lyric-${idx}`}
+                        text={text}
+                    />
+                    {translatedLines[idx] && (
+                        <LyricLine
+                            alignment={settings.alignment}
+                            className="lyric-line unsynchronized translation"
+                            fontSize={settings.fontSizeUnsync * 0.8}
+                            text={translatedLines[idx]}
+                        />
+                    )}
+                </div>
            ))}
        </UnsynchronizedLyricsContainer>
    );
@@ -11,8 +11,17 @@ import {
    useFullScreenPlayerStoreActions,
 } from '/@/renderer/store/full-screen-player.store';
 import { Lyrics } from '/@/renderer/features/lyrics/lyrics';
+import { lazy, Suspense, useMemo } from 'react';
+import { usePlaybackSettings } from '/@/renderer/store';
+import { PlaybackType } from '/@/renderer/types';
 import { FullScreenSimilarSongs } from '/@/renderer/features/player/components/full-screen-similar-songs';

+const Visualizer = lazy(() =>
+    import('/@/renderer/features/player/components/visualizer').then((module) => ({
+        default: module.Visualizer,
+    })),
+);
+
 const QueueContainer = styled.div`
    position: relative;
    display: flex;
@@ -61,27 +70,41 @@ export const FullScreenPlayerQueue = () => {
    const { t } = useTranslation();
    const { activeTab, opacity } = useFullScreenPlayerStore();
    const { setStore } = useFullScreenPlayerStoreActions();
+    const { type, webAudio } = usePlaybackSettings();

-    const headerItems = [
-        {
-            active: activeTab === 'queue',
-            icon: <RiFileMusicLine size="1.5rem" />,
-            label: t('page.fullscreenPlayer.upNext'),
-            onClick: () => setStore({ activeTab: 'queue' }),
-        },
-        {
-            active: activeTab === 'related',
-            icon: <HiOutlineQueueList size="1.5rem" />,
-            label: t('page.fullscreenPlayer.related'),
-            onClick: () => setStore({ activeTab: 'related' }),
-        },
-        {
-            active: activeTab === 'lyrics',
-            icon: <RiFileTextLine size="1.5rem" />,
-            label: t('page.fullscreenPlayer.lyrics'),
-            onClick: () => setStore({ activeTab: 'lyrics' }),
-        },
-    ];
+    const headerItems = useMemo(() => {
+        const items = [
+            {
+                active: activeTab === 'queue',
+                icon: <RiFileMusicLine size="1.5rem" />,
+                label: t('page.fullscreenPlayer.upNext'),
+                onClick: () => setStore({ activeTab: 'queue' }),
+            },
+            {
+                active: activeTab === 'related',
+                icon: <HiOutlineQueueList size="1.5rem" />,
+                label: t('page.fullscreenPlayer.related'),
+                onClick: () => setStore({ activeTab: 'related' }),
+            },
+            {
+                active: activeTab === 'lyrics',
+                icon: <RiFileTextLine size="1.5rem" />,
+                label: t('page.fullscreenPlayer.lyrics'),
+                onClick: () => setStore({ activeTab: 'lyrics' }),
+            },
+        ];
+
+        if (type === PlaybackType.WEB && webAudio) {
+            items.push({
+                active: activeTab === 'visualizer',
+                icon: <RiFileTextLine size="1.5rem" />,
+                label: t('page.fullscreenPlayer.visualizer', { postProcess: 'titleCase' }),
+                onClick: () => setStore({ activeTab: 'visualizer' }),
+            });
+        }
+
+        return items;
+    }, [activeTab, setStore, t, type, webAudio]);

    return (
        <GridContainer
@@ -91,6 +114,7 @@ export const FullScreenPlayerQueue = () => {
            <Group
                grow
                align="center"
+                className="full-screen-player-queue-header"
                position="center"
            >
                {headerItems.map((item) => (
@@ -127,6 +151,10 @@ export const FullScreenPlayerQueue = () => {
                </QueueContainer>
            ) : activeTab === 'lyrics' ? (
                <Lyrics />
+            ) : activeTab === 'visualizer' && type === PlaybackType.WEB && webAudio ? (
+                <Suspense fallback={<></>}>
+                    <Visualizer />
+                </Suspense>
            ) : null}
        </GridContainer>
    );
@@ -382,7 +382,11 @@ const Controls = () => {
                        </Option.Control>
                    </Option>
                    <Option>
-                        <Option.Label>Lyrics offset (ms)</Option.Label>
+                        <Option.Label>
+                            {t('page.fullscreenPlayer.config.lyricOffset', {
+                                postProcess: 'sentenceCase',
+                            })}
+                        </Option.Label>
                        <Option.Control>
                            <NumberInput
                                defaultValue={lyricConfig.delayMs}
@@ -244,8 +244,8 @@ export const LeftControls = () => {
                            <React.Fragment key={`bar-${artist.id}`}>
                                {index > 0 && <Separator />}
                                <Text
-                                    $link
-                                    component={Link}
+                                    $link={artist.id !== ''}
+                                    component={artist.id ? Link : undefined}
                                    overflow="hidden"
                                    size="md"
                                    to={
@@ -253,7 +253,7 @@ export const LeftControls = () => {
                                            ? generatePath(AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL, {
                                                  albumArtistId: artist.id,
                                              })
-                                            : ''
+                                            : undefined
                                    }
                                    weight={500}
                                >
@@ -293,7 +293,10 @@ export const RightControls = () => {
                {!isMinWidth ? (
                    <PlayerButton
                        icon={<HiOutlineQueueList size="1.1rem" />}
-                        tooltip={{ label: 'View queue', openDelay: 500 }}
+                        tooltip={{
+                            label: t('player.viewQueue', { postProcess: 'titleCase' }),
+                            openDelay: 500,
+                        }}
                        variant="secondary"
                        onClick={handleToggleQueue}
                    />
@@ -145,7 +145,7 @@ export const ShuffleAllModal = ({
                max={500}
                min={1}
                value={limit}
-                onChange={(e) => setStore({ limit: e ? Number(e) : 0 })}
+                onChange={(e) => setStore({ limit: e ? Number(e) : 500 })}
            />
            <Group grow>
                <NumberInput
@@ -208,6 +208,7 @@ export const ShuffleAllModal = ({
            <Divider />
            <Group grow>
                <Button
+                    disabled={!limit}
                    leftIcon={<RiAddBoxFill size="1rem" />}
                    type="submit"
                    variant="default"
@@ -216,6 +217,7 @@ export const ShuffleAllModal = ({
                    Add
                </Button>
                <Button
+                    disabled={!limit}
                    leftIcon={<RiAddCircleFill size="1rem" />}
                    type="submit"
                    variant="default"
@@ -225,6 +227,7 @@ export const ShuffleAllModal = ({
                </Button>
            </Group>
            <Button
+                disabled={!limit}
                leftIcon={<RiPlayFill size="1rem" />}
                type="submit"
                variant="filled"
@@ -0,0 +1,72 @@
+import { createRef, useCallback, useEffect, useState } from 'react';
+import { useWebAudio } from '/@/renderer/features/player/hooks/use-webaudio';
+import AudioMotionAnalyzer from 'audiomotion-analyzer';
+import styled from 'styled-components';
+import { useSettingsStore } from '/@/renderer/store';
+
+const StyledContainer = styled.div`
+    max-width: 100%;
+    margin: auto;
+
+    canvas {
+        width: 100%;
+        margin: auto;
+    }
+`;
+
+export const Visualizer = () => {
+    const { webAudio } = useWebAudio();
+    const canvasRef = createRef<HTMLDivElement>();
+    const accent = useSettingsStore((store) => store.general.accent);
+    const [motion, setMotion] = useState<AudioMotionAnalyzer>();
+
+    const [length, setLength] = useState(500);
+
+    useEffect(() => {
+        const { context, gain } = webAudio || {};
+        if (gain && context && canvasRef.current && !motion) {
+            const audioMotion = new AudioMotionAnalyzer(canvasRef.current, {
+                ansiBands: true,
+                audioCtx: context,
+                connectSpeakers: false,
+                gradient: 'prism',
+                mode: 4,
+                showPeaks: false,
+                smoothing: 0.8,
+            });
+            setMotion(audioMotion);
+            audioMotion.connectInput(gain);
+        }
+
+        return () => {};
+    }, [accent, canvasRef, motion, webAudio]);
+
+    const resize = useCallback(() => {
+        const body = document.querySelector('.full-screen-player-queue-container');
+        const header = document.querySelector('.full-screen-player-queue-header');
+
+        if (body && header) {
+            const width = body.clientWidth - 30;
+            const height = body.clientHeight - header.clientHeight - 30;
+
+            setLength(Math.min(width, height));
+        }
+    }, []);
+
+    useEffect(() => {
+        resize();
+
+        window.addEventListener('resize', resize);
+
+        return () => {
+            window.removeEventListener('resize', resize);
+        };
+    }, [resize]);
+
+    return (
+        <StyledContainer
+            ref={canvasRef}
+            style={{ height: length, width: length }}
+        />
+    );
+};
@@ -0,0 +1,7 @@
+import { createContext } from 'react';
+import { WebAudio } from '/@/renderer/types';
+
+export const WebAudioContext = createContext<{
+    setWebAudio?: (audio: WebAudio) => void;
+    webAudio?: WebAudio;
+}>({});
@@ -176,10 +176,12 @@ export const useHandlePlayQueueAdd = () => {

            updateSong(playerData.current.song);

+            const replacesQueue = playType === Play.NOW || playType === Play.SHUFFLE;
+
            if (playbackType === PlaybackType.LOCAL) {
                mpvPlayer!.volume(usePlayerStore.getState().volume);

-                if (playType === Play.NOW || !hadSong) {
+                if (replacesQueue || !hadSong) {
                    mpvPlayer!.pause();
                    setQueue(playerData, false);
                } else {
@@ -191,14 +193,14 @@ export const useHandlePlayQueueAdd = () => {
                        ? PlayersRef.current?.player1
                        : PlayersRef.current?.player2;
                const underlying = player?.getInternalPlayer();
-                if (underlying && playType === Play.NOW) {
+                if (underlying && replacesQueue) {
                    underlying.currentTime = 0;
                }
            }

            // We should only play if the queue was empty, or we are doing play NOW
            // (override the queue).
-            if (playType === Play.NOW || !hadSong) {
+            if (replacesQueue || !hadSong) {
                play();
            }

@@ -0,0 +1,7 @@
+import { useContext } from 'react';
+import { WebAudioContext } from '/@/renderer/features/player/context/webaudio-context';
+
+export const useWebAudio = () => {
+    const { webAudio, setWebAudio } = useContext(WebAudioContext);
+    return { setWebAudio, webAudio };
+};
@@ -25,7 +25,7 @@ export const useSendScrobble = (options?: MutationOptions) => {
            // Manually increment the play count for the song in the queue if scrobble was submitted
            if (variables.query.submission) {
                incrementPlayCount([variables.query.id]);
-                sendPlayEvent([variables.query.id]);
+                sendPlayEvent(variables.query.id);
            }
        },
        ...options,
@@ -9,7 +9,6 @@ import {
    SongListSort,
    SortOrder,
    ServerListItem,
-    ServerType,
 } from '/@/renderer/api/types';

 export const getPlaylistSongsById = async (args: {
@@ -103,18 +102,7 @@ export const getGenreSongsById = async (args: {
    };
    for (const genreId of id) {
        const queryFilter: SongListQuery = {
-            _custom: {
-                ...(server?.type === ServerType.JELLYFIN && {
-                    jellyfin: {
-                        GenreIds: genreId,
-                    },
-                }),
-                ...(server?.type === ServerType.NAVIDROME && {
-                    navidrome: {
-                        genre_id: genreId,
-                    },
-                }),
-            },
+            genreIds: [genreId],
            sortBy: SongListSort.GENRE,
            sortOrder: SortOrder.ASC,
            startIndex: 0,
@@ -140,7 +128,9 @@ export const getGenreSongsById = async (args: {
        );

        data.items.push(...res!.items);
-        data.totalRecordCount += res!.totalRecordCount;
+        if (data.totalRecordCount) {
+            data.totalRecordCount += res!.totalRecordCount || 0;
+        }
    }

    return data;
@@ -202,14 +192,15 @@ export const getSongsByQuery = async (args: {

    const res = await queryClient.fetchQuery(
        queryKey,
-        async ({ signal }) =>
-            api.controller.getSongList({
+        async ({ signal }) => {
+            return api.controller.getSongList({
                apiClientProps: {
                    server,
                    signal,
                },
                query: queryFilter,
-            }),
+            });
+        },
        {
            cacheTime: 1000 * 60,
            staleTime: 1000 * 60,
@@ -151,7 +151,12 @@ export const AddToPlaylistContextModal = ({
                            server,
                            signal,
                        },
-                        query: { id: playlistId, startIndex: 0 },
+                        query: {
+                            id: playlistId,
+                            sortBy: SongListSort.ID,
+                            sortOrder: SortOrder.ASC,
+                            startIndex: 0,
+                        },
                    });
                });

@@ -1,252 +0,0 @@
-import { MutableRefObject, useMemo, useRef } from 'react';
-import { ColDef, RowDoubleClickedEvent } from '@ag-grid-community/core';
-import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
-import { Box, Group } from '@mantine/core';
-import { closeAllModals, openModal } from '@mantine/modals';
-import { useTranslation } from 'react-i18next';
-import { RiMoreFill } from 'react-icons/ri';
-import { generatePath, useNavigate, useParams } from 'react-router';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-import { useListStoreByKey } from '../../../store/list.store';
-import { LibraryItem, QueueSong } from '/@/renderer/api/types';
-import { Button, ConfirmModal, DropdownMenu, MotionGroup, toast } from '/@/renderer/components';
-import { getColumnDefs, VirtualTable } from '/@/renderer/components/virtual-table';
-import { useCurrentSongRowStyles } from '/@/renderer/components/virtual-table/hooks/use-current-song-row-styles';
-import { useHandleTableContextMenu } from '/@/renderer/features/context-menu';
-import {
-    PLAYLIST_SONG_CONTEXT_MENU_ITEMS,
-    SMART_PLAYLIST_SONG_CONTEXT_MENU_ITEMS,
-} from '/@/renderer/features/context-menu/context-menu-items';
-import { usePlayQueueAdd } from '/@/renderer/features/player';
-import { openUpdatePlaylistModal } from '/@/renderer/features/playlists/components/update-playlist-form';
-import { useDeletePlaylist } from '/@/renderer/features/playlists/mutations/delete-playlist-mutation';
-import { usePlaylistDetail } from '/@/renderer/features/playlists/queries/playlist-detail-query';
-import { usePlaylistSongListInfinite } from '/@/renderer/features/playlists/queries/playlist-song-list-query';
-import { PlayButton, PLAY_TYPES } from '/@/renderer/features/shared';
-import { AppRoute } from '/@/renderer/router/routes';
-import { useCurrentServer } from '/@/renderer/store';
-import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
-import { Play } from '/@/renderer/types';
-
-const ContentContainer = styled.div`
-    position: relative;
-    display: flex;
-    flex-direction: column;
-    padding: 1rem 2rem 5rem;
-    overflow: hidden;
-
-    .ag-theme-alpine-dark {
-        --ag-header-background-color: rgb(0 0 0 / 0%) !important;
-    }
-`;
-
-interface PlaylistDetailContentProps {
-    tableRef: MutableRefObject<AgGridReactType | null>;
-}
-
-export const PlaylistDetailContent = ({ tableRef }: PlaylistDetailContentProps) => {
-    const { t } = useTranslation();
-    const navigate = useNavigate();
-    const { playlistId } = useParams() as { playlistId: string };
-    const { table } = useListStoreByKey({ key: LibraryItem.SONG });
-    const handlePlayQueueAdd = usePlayQueueAdd();
-    const server = useCurrentServer();
-    const detailQuery = usePlaylistDetail({ query: { id: playlistId }, serverId: server?.id });
-    const playButtonBehavior = usePlayButtonBehavior();
-
-    const playlistSongsQueryInfinite = usePlaylistSongListInfinite({
-        options: {
-            cacheTime: 0,
-            keepPreviousData: false,
-        },
-        query: {
-            id: playlistId,
-            limit: 50,
-            startIndex: 0,
-        },
-        serverId: server?.id,
-    });
-
-    const handleLoadMore = () => {
-        playlistSongsQueryInfinite.fetchNextPage();
-    };
-
-    const columnDefs: ColDef[] = useMemo(
-        () =>
-            getColumnDefs(table.columns).filter((c) => c.colId !== 'album' && c.colId !== 'artist'),
-        [table.columns],
-    );
-
-    const contextMenuItems = useMemo(() => {
-        if (detailQuery?.data?.rules) {
-            return SMART_PLAYLIST_SONG_CONTEXT_MENU_ITEMS;
-        }
-
-        return PLAYLIST_SONG_CONTEXT_MENU_ITEMS;
-    }, [detailQuery?.data?.rules]);
-
-    const handleContextMenu = useHandleTableContextMenu(LibraryItem.SONG, contextMenuItems, {
-        playlistId,
-    });
-
-    const playlistSongData = useMemo(
-        () => playlistSongsQueryInfinite.data?.pages.flatMap((p) => p?.items),
-        [playlistSongsQueryInfinite.data?.pages],
-    );
-
-    const deletePlaylistMutation = useDeletePlaylist({});
-
-    const handleDeletePlaylist = () => {
-        deletePlaylistMutation.mutate(
-            { query: { id: playlistId }, serverId: server?.id },
-            {
-                onError: (err) => {
-                    toast.error({
-                        message: err.message,
-                        title: t('error.genericError', { postProcess: 'sentenceCase' }),
-                    });
-                },
-                onSuccess: () => {
-                    closeAllModals();
-                    navigate(AppRoute.PLAYLISTS);
-                },
-            },
-        );
-    };
-
-    const openDeletePlaylist = () => {
-        openModal({
-            children: (
-                <ConfirmModal
-                    loading={deletePlaylistMutation.isLoading}
-                    onConfirm={handleDeletePlaylist}
-                >
-                    Are you sure you want to delete this playlist?
-                </ConfirmModal>
-            ),
-            title: t('form.deletePlaylist.title', { postProcess: 'sentenceCase' }),
-        });
-    };
-
-    const handlePlay = (playType?: Play) => {
-        handlePlayQueueAdd?.({
-            byItemType: {
-                id: [playlistId],
-                type: LibraryItem.PLAYLIST,
-            },
-            playType: playType || playButtonBehavior,
-        });
-    };
-
-    const handleRowDoubleClick = (e: RowDoubleClickedEvent<QueueSong>) => {
-        if (!e.data) return;
-
-        handlePlayQueueAdd?.({
-            byItemType: {
-                id: [playlistId],
-                type: LibraryItem.PLAYLIST,
-            },
-            initialSongId: e.data.id,
-            playType: playButtonBehavior,
-        });
-    };
-
-    const { rowClassRules } = useCurrentSongRowStyles({ tableRef });
-
-    const loadMoreRef = useRef<HTMLButtonElement | null>(null);
-
-    return (
-        <ContentContainer>
-            <Group
-                p="1rem"
-                position="apart"
-            >
-                <Group>
-                    <PlayButton onClick={() => handlePlay()} />
-                    <DropdownMenu position="bottom-start">
-                        <DropdownMenu.Target>
-                            <Button
-                                compact
-                                variant="subtle"
-                            >
-                                <RiMoreFill size={20} />
-                            </Button>
-                        </DropdownMenu.Target>
-                        <DropdownMenu.Dropdown>
-                            {PLAY_TYPES.filter((type) => type.play !== playButtonBehavior).map(
-                                (type) => (
-                                    <DropdownMenu.Item
-                                        key={`playtype-${type.play}`}
-                                        onClick={() => handlePlay(type.play)}
-                                    >
-                                        {type.label}
-                                    </DropdownMenu.Item>
-                                ),
-                            )}
-                            <DropdownMenu.Divider />
-                            <DropdownMenu.Item
-                                onClick={() => {
-                                    if (!detailQuery.data || !server) return;
-                                    openUpdatePlaylistModal({ playlist: detailQuery.data, server });
-                                }}
-                            >
-                                Edit playlist
-                            </DropdownMenu.Item>
-                            <DropdownMenu.Item onClick={openDeletePlaylist}>
-                                Delete playlist
-                            </DropdownMenu.Item>
-                        </DropdownMenu.Dropdown>
-                    </DropdownMenu>
-                    <Button
-                        compact
-                        uppercase
-                        component={Link}
-                        to={generatePath(AppRoute.PLAYLISTS_DETAIL_SONGS, { playlistId })}
-                        variant="subtle"
-                    >
-                        View full playlist
-                    </Button>
-                </Group>
-            </Group>
-            <Box>
-                <VirtualTable
-                    ref={tableRef}
-                    autoFitColumns
-                    autoHeight
-                    deselectOnClickOutside
-                    shouldUpdateSong
-                    stickyHeader
-                    suppressCellFocus
-                    suppressHorizontalScroll
-                    suppressLoadingOverlay
-                    suppressRowDrag
-                    columnDefs={columnDefs}
-                    getRowId={(data) => `${data.data.id}-${data.data.pageIndex}`}
-                    rowClassRules={rowClassRules}
-                    rowData={playlistSongData}
-                    rowHeight={60}
-                    rowSelection="multiple"
-                    onCellContextMenu={handleContextMenu}
-                    onRowDoubleClicked={handleRowDoubleClick}
-                />
-            </Box>
-            <MotionGroup
-                p="2rem"
-                position="center"
-                onViewportEnter={handleLoadMore}
-            >
-                <Button
-                    ref={loadMoreRef}
-                    compact
-                    disabled={!playlistSongsQueryInfinite.hasNextPage}
-                    loading={playlistSongsQueryInfinite.isFetchingNextPage}
-                    variant="subtle"
-                    onClick={handleLoadMore}
-                >
-                    {playlistSongsQueryInfinite.hasNextPage ? 'Load more' : 'End of playlist'}
-                </Button>
-            </MotionGroup>
-        </ContentContainer>
-    );
-};
@@ -1,79 +0,0 @@
-import { forwardRef, Fragment, Ref } from 'react';
-import { Group, Stack } from '@mantine/core';
-import { useParams } from 'react-router';
-import { Badge, Text } from '/@/renderer/components';
-import { usePlaylistDetail } from '/@/renderer/features/playlists/queries/playlist-detail-query';
-import { LibraryHeader } from '/@/renderer/features/shared';
-import { AppRoute } from '/@/renderer/router/routes';
-import { formatDurationString } from '/@/renderer/utils';
-import { LibraryItem } from '/@/renderer/api/types';
-import { useCurrentServer } from '../../../store/auth.store';
-
-interface PlaylistDetailHeaderProps {
-    background: string;
-    imagePlaceholderUrl?: string | null;
-    imageUrl?: string | null;
-}
-
-export const PlaylistDetailHeader = forwardRef(
-    (
-        { background, imageUrl, imagePlaceholderUrl }: PlaylistDetailHeaderProps,
-        ref: Ref<HTMLDivElement>,
-    ) => {
-        const { playlistId } = useParams() as { playlistId: string };
-        const server = useCurrentServer();
-        const detailQuery = usePlaylistDetail({ query: { id: playlistId }, serverId: server?.id });
-
-        const metadataItems = [
-            {
-                id: 'songCount',
-                secondary: false,
-                value: `${detailQuery?.data?.songCount || 0} songs`,
-            },
-            {
-                id: 'duration',
-                secondary: true,
-                value:
-                    detailQuery?.data?.duration && formatDurationString(detailQuery.data.duration),
-            },
-        ];
-
-        const isSmartPlaylist = detailQuery?.data?.rules;
-
-        return (
-            <Stack>
-                <LibraryHeader
-                    ref={ref}
-                    background={background}
-                    imagePlaceholderUrl={imagePlaceholderUrl}
-                    imageUrl={imageUrl}
-                    item={{ route: AppRoute.PLAYLISTS, type: LibraryItem.PLAYLIST }}
-                    title={detailQuery?.data?.name || ''}
-                >
-                    <Stack>
-                        <Group spacing="sm">
-                            {metadataItems.map((item, index) => (
-                                <Fragment key={`item-${item.id}-${index}`}>
-                                    {index > 0 && <Text $noSelect>•</Text>}
-                                    <Text $secondary={item.secondary}>{item.value}</Text>
-                                </Fragment>
-                            ))}
-                            {isSmartPlaylist && (
-                                <>
-                                    <Text $noSelect>•</Text>
-                                    <Badge
-                                        radius="sm"
-                                        size="md"
-                                    >
-                                        Smart Playlist
-                                    </Badge>
-                                </>
-                            )}
-                        </Group>
-                        <Text lineClamp={3}>{detailQuery?.data?.description}</Text>
-                    </Stack>
-                </LibraryHeader>
-            </Stack>
-        );
-    },
-);
@@ -44,15 +44,16 @@ import {
    useSetPlaylistDetailTablePagination,
 } from '/@/renderer/store';
 import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
-import { ListDisplayType } from '/@/renderer/types';
+import { ListDisplayType, ServerType } from '/@/renderer/types';
 import { useAppFocus } from '/@/renderer/hooks';
 import { toast } from '/@/renderer/components';

 interface PlaylistDetailContentProps {
+    songs?: Song[];
    tableRef: MutableRefObject<AgGridReactType | null>;
 }

-export const PlaylistDetailSongListContent = ({ tableRef }: PlaylistDetailContentProps) => {
+export const PlaylistDetailSongListContent = ({ songs, tableRef }: PlaylistDetailContentProps) => {
    const { playlistId } = useParams() as { playlistId: string };
    const queryClient = useQueryClient();
    const status = useCurrentStatus();
@@ -85,7 +86,12 @@ export const PlaylistDetailSongListContent = ({ tableRef }: PlaylistDetailConten

    const isPaginationEnabled = page.display === ListDisplayType.TABLE_PAGINATED;

+    const iSClientSide = server?.type === ServerType.SUBSONIC;
+
    const checkPlaylistList = usePlaylistSongList({
+        options: {
+            enabled: !iSClientSide,
+        },
        query: {
            id: playlistId,
            limit: 1,
@@ -101,44 +107,51 @@ export const PlaylistDetailSongListContent = ({ tableRef }: PlaylistDetailConten

    const onGridReady = useCallback(
        (params: GridReadyEvent) => {
-            const dataSource: IDatasource = {
-                getRows: async (params) => {
-                    const limit = params.endRow - params.startRow;
-                    const startIndex = params.startRow;
+            if (!iSClientSide) {
+                const dataSource: IDatasource = {
+                    getRows: async (params) => {
+                        const limit = params.endRow - params.startRow;
+                        const startIndex = params.startRow;

-                    const query: PlaylistSongListQuery = {
-                        id: playlistId,
-                        limit,
-                        startIndex,
-                        ...filters,
-                    };
+                        const query: PlaylistSongListQuery = {
+                            id: playlistId,
+                            limit,
+                            startIndex,
+                            ...filters,
+                        };

-                    const queryKey = queryKeys.playlists.songList(
-                        server?.id || '',
-                        playlistId,
-                        query,
-                    );
-
-                    if (!server) return;
-
-                    const songsRes = await queryClient.fetchQuery(queryKey, async ({ signal }) =>
-                        api.controller.getPlaylistSongList({
-                            apiClientProps: {
-                                server,
-                                signal,
-                            },
+                        const queryKey = queryKeys.playlists.songList(
+                            server?.id || '',
+                            playlistId,
                            query,
-                        }),
-                    );
+                        );

-                    params.successCallback(songsRes?.items || [], songsRes?.totalRecordCount || 0);
-                },
-                rowCount: undefined,
-            };
-            params.api.setDatasource(dataSource);
+                        if (!server) return;
+
+                        const songsRes = await queryClient.fetchQuery(
+                            queryKey,
+                            async ({ signal }) =>
+                                api.controller.getPlaylistSongList({
+                                    apiClientProps: {
+                                        server,
+                                        signal,
+                                    },
+                                    query,
+                                }),
+                        );
+
+                        params.successCallback(
+                            songsRes?.items || [],
+                            songsRes?.totalRecordCount || 0,
+                        );
+                    },
+                    rowCount: undefined,
+                };
+                params.api.setDatasource(dataSource);
+            }
            params.api?.ensureIndexVisible(pagination.scrollOffset, 'top');
        },
-        [filters, pagination.scrollOffset, playlistId, queryClient, server],
+        [filters, iSClientSide, pagination.scrollOffset, playlistId, queryClient, server],
    );

    const handleDragEnd = useCallback(
@@ -270,6 +283,9 @@ export const PlaylistDetailSongListContent = ({ tableRef }: PlaylistDetailConten

    const { rowClassRules } = useCurrentSongRowStyles({ tableRef });

+    const canDrag =
+        filters.sortBy === SongListSort.ID && !detailQuery?.data?.rules && !iSClientSide;
+
    return (
        <>
            <VirtualGridAutoSizerContainer>
@@ -289,16 +305,17 @@ export const PlaylistDetailSongListContent = ({ tableRef }: PlaylistDetailConten
                        status,
                    }}
                    getRowId={(data) => data.data.uniqueId}
-                    infiniteInitialRowCount={checkPlaylistList.data?.totalRecordCount || 100}
+                    infiniteInitialRowCount={
+                        iSClientSide ? undefined : checkPlaylistList.data?.totalRecordCount || 100
+                    }
                    pagination={isPaginationEnabled}
                    paginationAutoPageSize={isPaginationEnabled}
                    paginationPageSize={pagination.itemsPerPage || 100}
                    rowClassRules={rowClassRules}
-                    rowDragEntireRow={
-                        filters.sortBy === SongListSort.ID && !detailQuery?.data?.rules
-                    }
+                    rowData={songs}
+                    rowDragEntireRow={canDrag}
                    rowHeight={page.table.rowHeight || 40}
-                    rowModelType="infinite"
+                    rowModelType={iSClientSide ? 'clientSide' : 'infinite'}
                    onBodyScrollEnd={handleScroll}
                    onCellContextMenu={handleContextMenu}
                    onColumnMoved={handleColumnChange}
@@ -195,6 +195,68 @@ const FILTERS = {
            value: SongListSort.YEAR,
        },
    ],
+    subsonic: [
+        {
+            defaultOrder: SortOrder.ASC,
+            name: i18n.t('filter.id', { postProcess: 'titleCase' }),
+            value: SongListSort.ID,
+        },
+        {
+            defaultOrder: SortOrder.ASC,
+            name: i18n.t('filter.album', { postProcess: 'titleCase' }),
+            value: SongListSort.ALBUM,
+        },
+        {
+            defaultOrder: SortOrder.ASC,
+            name: i18n.t('filter.albumArtist', { postProcess: 'titleCase' }),
+            value: SongListSort.ALBUM_ARTIST,
+        },
+        {
+            defaultOrder: SortOrder.ASC,
+            name: i18n.t('filter.artist', { postProcess: 'titleCase' }),
+            value: SongListSort.ARTIST,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.duration', { postProcess: 'titleCase' }),
+            value: SongListSort.DURATION,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.isFavorited', { postProcess: 'titleCase' }),
+            value: SongListSort.FAVORITED,
+        },
+        {
+            defaultOrder: SortOrder.ASC,
+            name: i18n.t('filter.genre', { postProcess: 'titleCase' }),
+            value: SongListSort.GENRE,
+        },
+        {
+            defaultOrder: SortOrder.ASC,
+            name: i18n.t('filter.name', { postProcess: 'titleCase' }),
+            value: SongListSort.NAME,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.rating', { postProcess: 'titleCase' }),
+            value: SongListSort.RATING,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.recentlyAdded', { postProcess: 'titleCase' }),
+            value: SongListSort.RECENTLY_ADDED,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.recentlyPlayed', { postProcess: 'titleCase' }),
+            value: SongListSort.RECENTLY_PLAYED,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.releaseYear', { postProcess: 'titleCase' }),
+            value: SongListSort.YEAR,
+        },
+    ],
 };

 interface PlaylistDetailSongListHeaderFiltersProps {
@@ -241,43 +303,55 @@ export const PlaylistDetailSongListHeaderFilters = ({

    const handleFilterChange = useCallback(
        async (filters: SongListFilter) => {
-            const dataSource: IDatasource = {
-                getRows: async (params) => {
-                    const limit = params.endRow - params.startRow;
-                    const startIndex = params.startRow;
+            if (server?.type !== ServerType.SUBSONIC) {
+                const dataSource: IDatasource = {
+                    getRows: async (params) => {
+                        const limit = params.endRow - params.startRow;
+                        const startIndex = params.startRow;

-                    const queryKey = queryKeys.playlists.songList(server?.id || '', playlistId, {
-                        id: playlistId,
-                        limit,
-                        startIndex,
-                        ...filters,
-                    });
+                        const queryKey = queryKeys.playlists.songList(
+                            server?.id || '',
+                            playlistId,
+                            {
+                                id: playlistId,
+                                limit,
+                                startIndex,
+                                ...filters,
+                            },
+                        );

-                    const songsRes = await queryClient.fetchQuery(
-                        queryKey,
-                        async ({ signal }) =>
-                            api.controller.getPlaylistSongList({
-                                apiClientProps: {
-                                    server,
-                                    signal,
-                                },
-                                query: {
-                                    id: playlistId,
-                                    limit,
-                                    startIndex,
-                                    ...filters,
-                                },
-                            }),
-                        { cacheTime: 1000 * 60 * 1 },
-                    );
+                        const songsRes = await queryClient.fetchQuery(
+                            queryKey,
+                            async ({ signal }) =>
+                                api.controller.getPlaylistSongList({
+                                    apiClientProps: {
+                                        server,
+                                        signal,
+                                    },
+                                    query: {
+                                        id: playlistId,
+                                        limit,
+                                        startIndex,
+                                        ...filters,
+                                    },
+                                }),
+                            { cacheTime: 1000 * 60 * 1 },
+                        );

-                    params.successCallback(songsRes?.items || [], songsRes?.totalRecordCount || 0);
-                },
-                rowCount: undefined,
-            };
-            tableRef.current?.api.setDatasource(dataSource);
-            tableRef.current?.api.purgeInfiniteCache();
-            tableRef.current?.api.ensureIndexVisible(0, 'top');
+                        params.successCallback(
+                            songsRes?.items || [],
+                            songsRes?.totalRecordCount || 0,
+                        );
+                    },
+                    rowCount: undefined,
+                };
+                tableRef.current?.api.setDatasource(dataSource);
+                tableRef.current?.api.purgeInfiniteCache();
+                tableRef.current?.api.ensureIndexVisible(0, 'top');
+            } else {
+                tableRef.current?.api.redrawRows();
+                tableRef.current?.api.ensureIndexVisible(0, 'top');
+            }

            if (page.display === ListDisplayType.TABLE_PAGINATED) {
                setPagination({ data: { currentPage: 0 } });
@@ -522,7 +596,9 @@ export const PlaylistDetailSongListHeaderFilters = ({
                        </Button>
                    </DropdownMenu.Target>
                    <DropdownMenu.Dropdown>
-                        <DropdownMenu.Label>Display type</DropdownMenu.Label>
+                        <DropdownMenu.Label>
+                            {t('table.config.general.displayType', { postProcess: 'sentenceCase' })}
+                        </DropdownMenu.Label>
                        <DropdownMenu.Item
                            $isActive={page.display === ListDisplayType.TABLE}
                            value={ListDisplayType.TABLE}
@@ -21,7 +21,7 @@ import {
 } from '/@/renderer/components/virtual-grid';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
 import { AppRoute } from '/@/renderer/router/routes';
-import { useCurrentServer, useGeneralSettings, useListStoreByKey } from '/@/renderer/store';
+import { useCurrentServer, useListStoreByKey } from '/@/renderer/store';
 import { CardRow, ListDisplayType } from '/@/renderer/types';
 import { useHandleFavorite } from '/@/renderer/features/shared/hooks/use-handle-favorite';

@@ -35,15 +35,12 @@ export const PlaylistListGridView = ({ gridRef, itemCount }: PlaylistListGridVie
    const queryClient = useQueryClient();
    const server = useCurrentServer();
    const handlePlayQueueAdd = usePlayQueueAdd();
-    const { display, grid, filter } = useListStoreByKey({ key: pageKey });
+    const { display, grid, filter } = useListStoreByKey<PlaylistListQuery>({ key: pageKey });
    const { setGrid } = useListStoreActions();
-    const { defaultFullPlaylist } = useGeneralSettings();
    const handleFavorite = useHandleFavorite({ gridRef, server });

    const cardRows = useMemo(() => {
-        const rows: CardRow<Playlist>[] = defaultFullPlaylist
-            ? [PLAYLIST_CARD_ROWS.nameFull]
-            : [PLAYLIST_CARD_ROWS.name];
+        const rows: CardRow<Playlist>[] = [PLAYLIST_CARD_ROWS.nameFull];

        switch (filter.sortBy) {
            case PlaylistListSort.DURATION:
@@ -66,7 +63,7 @@ export const PlaylistListGridView = ({ gridRef, itemCount }: PlaylistListGridVie
        }

        return rows;
-    }, [defaultFullPlaylist, filter.sortBy]);
+    }, [filter.sortBy]);

    const handleGridScroll = useCallback(
        (e: ListOnScrollProps) => {
@@ -116,9 +113,9 @@ export const PlaylistListGridView = ({ gridRef, itemCount }: PlaylistListGridVie

            const query: PlaylistListQuery = {
                limit: take,
-                startIndex: skip,
                ...filter,
                _custom: {},
+                startIndex: skip,
            };

            const queryKey = queryKeys.playlists.list(server?.id || '', query);
@@ -160,9 +157,7 @@ export const PlaylistListGridView = ({ gridRef, itemCount }: PlaylistListGridVie
                        loading={itemCount === undefined || itemCount === null}
                        minimumBatchSize={40}
                        route={{
-                            route: defaultFullPlaylist
-                                ? AppRoute.PLAYLISTS_DETAIL_SONGS
-                                : AppRoute.PLAYLISTS_DETAIL,
+                            route: AppRoute.PLAYLISTS_DETAIL_SONGS,
                            slugs: [{ idProperty: 'id', slugProperty: 'playlistId' }],
                        }}
                        width={width}
@@ -69,6 +69,38 @@ const FILTERS = {
            value: PlaylistListSort.UPDATED_AT,
        },
    ],
+    subsonic: [
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.duration', { postProcess: 'titleCase' }),
+            value: PlaylistListSort.DURATION,
+        },
+        {
+            defaultOrder: SortOrder.ASC,
+            name: i18n.t('filter.name', { postProcess: 'titleCase' }),
+            value: PlaylistListSort.NAME,
+        },
+        {
+            defaultOrder: SortOrder.ASC,
+            name: i18n.t('filter.owner', { postProcess: 'titleCase' }),
+            value: PlaylistListSort.OWNER,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.isPublic', { postProcess: 'titleCase' }),
+            value: PlaylistListSort.PUBLIC,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.songCount', { postProcess: 'titleCase' }),
+            value: PlaylistListSort.SONG_COUNT,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.recentlyUpdated', { postProcess: 'titleCase' }),
+            value: PlaylistListSort.UPDATED_AT,
+        },
+    ],
 };

 interface PlaylistListHeaderFiltersProps {
@@ -86,7 +118,7 @@ export const PlaylistListHeaderFilters = ({
    const server = useCurrentServer();
    const { setFilter, setTable, setTablePagination, setGrid, setDisplayType } =
        useListStoreActions();
-    const { display, filter, table, grid } = useListStoreByKey({ key: pageKey });
+    const { display, filter, table, grid } = useListStoreByKey<PlaylistListQuery>({ key: pageKey });
    const cq = useContainerQuery();

    const isGrid = display === ListDisplayType.CARD || display === ListDisplayType.POSTER;
@@ -368,7 +400,7 @@ export const PlaylistListHeaderFilters = ({
                    </DropdownMenu.Target>
                    <DropdownMenu.Dropdown>
                        <DropdownMenu.Label>
-                            {t('table.config.general.displayType', { postProcess: 'titleCase' })}
+                            {t('table.config.general.displayType', { postProcess: 'sentenceCase' })}
                        </DropdownMenu.Label>
                        <DropdownMenu.Item
                            $isActive={display === ListDisplayType.CARD}
@@ -12,7 +12,7 @@ import { PlaylistListFilter, useCurrentServer } from '/@/renderer/store';
 import debounce from 'lodash/debounce';
 import { useTranslation } from 'react-i18next';
 import { RiFileAddFill } from 'react-icons/ri';
-import { LibraryItem, ServerType } from '/@/renderer/api/types';
+import { LibraryItem, PlaylistListQuery, ServerType } from '/@/renderer/api/types';
 import { useDisplayRefresh } from '/@/renderer/hooks/use-display-refresh';

 interface PlaylistListHeaderProps {
@@ -37,8 +37,9 @@ export const PlaylistListHeader = ({ itemCount, tableRef, gridRef }: PlaylistLis
        });
    };

-    const { filter, refresh, search } = useDisplayRefresh({
+    const { filter, refresh, search } = useDisplayRefresh<PlaylistListQuery>({
        gridRef,
+        itemCount,
        itemType: LibraryItem.PLAYLIST,
        server,
        tableRef,
@@ -8,7 +8,7 @@ import { VirtualTable } from '/@/renderer/components/virtual-table';
 import { useVirtualTable } from '/@/renderer/components/virtual-table/hooks/use-virtual-table';
 import { PLAYLIST_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items';
 import { AppRoute } from '/@/renderer/router/routes';
-import { useCurrentServer, useGeneralSettings } from '/@/renderer/store';
+import { useCurrentServer } from '/@/renderer/store';

 interface PlaylistListTableViewProps {
    itemCount?: number;
@@ -18,16 +18,11 @@ interface PlaylistListTableViewProps {
 export const PlaylistListTableView = ({ tableRef, itemCount }: PlaylistListTableViewProps) => {
    const navigate = useNavigate();
    const server = useCurrentServer();
-    const { defaultFullPlaylist } = useGeneralSettings();
    const pageKey = 'playlist';

    const handleRowDoubleClick = (e: RowDoubleClickedEvent) => {
        if (!e.data) return;
-        if (defaultFullPlaylist) {
-            navigate(generatePath(AppRoute.PLAYLISTS_DETAIL_SONGS, { playlistId: e.data.id }));
-        } else {
-            navigate(generatePath(AppRoute.PLAYLISTS_DETAIL, { playlistId: e.data.id }));
-        }
+        navigate(generatePath(AppRoute.PLAYLISTS_DETAIL_SONGS, { playlistId: e.data.id }));
    };

    const tableProps = useVirtualTable({
@@ -467,11 +467,11 @@ export const PlaylistQueryBuilder = forwardRef(
                        <Select
                            data={[
                                {
-                                    label: t('common.ascending', { postProcess: 'titleCase' }),
+                                    label: t('common.ascending', { postProcess: 'sentenceCase' }),
                                    value: 'asc',
                                },
                                {
-                                    label: t('common.descending', { postProcess: 'titleCase' }),
+                                    label: t('common.descending', { postProcess: 'sentenceCase' }),
                                    value: 'desc',
                                },
                            ]}
@@ -1,6 +1,6 @@
-import { useQuery, useInfiniteQuery } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import type { PlaylistSongListQuery, PlaylistSongListResponse } from '/@/renderer/api/types';
+import type { PlaylistSongListQuery } from '/@/renderer/api/types';
 import type { QueryHookArgs } from '/@/renderer/lib/react-query';
 import { getServerById } from '/@/renderer/store';
 import { api } from '/@/renderer/api';
@@ -22,32 +22,3 @@ export const usePlaylistSongList = (args: QueryHookArgs<PlaylistSongListQuery>)
        ...options,
    });
 };
-
-export const usePlaylistSongListInfinite = (args: QueryHookArgs<PlaylistSongListQuery>) => {
-    const { options, query, serverId } = args || {};
-    const server = getServerById(serverId);
-
-    return useInfiniteQuery({
-        enabled: !!server,
-        getNextPageParam: (lastPage: PlaylistSongListResponse | undefined, pages) => {
-            if (!lastPage?.items) return undefined;
-            if (lastPage?.items?.length >= (query?.limit || 50)) {
-                return pages?.length;
-            }
-
-            return undefined;
-        },
-        queryFn: ({ pageParam = 0, signal }) => {
-            return api.controller.getPlaylistSongList({
-                apiClientProps: { server, signal },
-                query: {
-                    ...query,
-                    limit: query.limit || 50,
-                    startIndex: pageParam * (query.limit || 50),
-                },
-            });
-        },
-        queryKey: queryKeys.playlists.detailSongList(server?.id || '', query.id, query),
-        ...options,
-    });
-};
@@ -1,77 +0,0 @@
-import { useRef } from 'react';
-import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
-import { useParams } from 'react-router';
-import { LibraryItem } from '/@/renderer/api/types';
-import { NativeScrollArea, Spinner } from '/@/renderer/components';
-import { usePlayQueueAdd } from '/@/renderer/features/player';
-import { PlaylistDetailContent } from '/@/renderer/features/playlists/components/playlist-detail-content';
-import { PlaylistDetailHeader } from '/@/renderer/features/playlists/components/playlist-detail-header';
-import { usePlaylistDetail } from '/@/renderer/features/playlists/queries/playlist-detail-query';
-import { AnimatedPage, LibraryHeaderBar } from '/@/renderer/features/shared';
-import { useFastAverageColor } from '/@/renderer/hooks';
-import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
-import { useCurrentServer } from '../../../store/auth.store';
-
-const PlaylistDetailRoute = () => {
-    const tableRef = useRef<AgGridReactType | null>(null);
-    const scrollAreaRef = useRef<HTMLDivElement>(null);
-    const headerRef = useRef<HTMLDivElement>(null);
-    const { playlistId } = useParams() as { playlistId: string };
-    const server = useCurrentServer();
-
-    const detailQuery = usePlaylistDetail({ query: { id: playlistId }, serverId: server?.id });
-    const { color: background, colorId } = useFastAverageColor({
-        algorithm: 'sqrt',
-        id: playlistId,
-        src: detailQuery?.data?.imageUrl,
-        srcLoaded: !detailQuery?.isLoading,
-    });
-
-    const handlePlayQueueAdd = usePlayQueueAdd();
-    const playButtonBehavior = usePlayButtonBehavior();
-
-    const handlePlay = () => {
-        handlePlayQueueAdd?.({
-            byItemType: {
-                id: [playlistId],
-                type: LibraryItem.PLAYLIST,
-            },
-            playType: playButtonBehavior,
-        });
-    };
-
-    if (!background || colorId !== playlistId) {
-        return <Spinner container />;
-    }
-
-    return (
-        <AnimatedPage key={`playlist-detail-${playlistId}`}>
-            <NativeScrollArea
-                ref={scrollAreaRef}
-                pageHeaderProps={{
-                    backgroundColor: background,
-                    children: (
-                        <LibraryHeaderBar>
-                            <LibraryHeaderBar.PlayButton onClick={handlePlay} />
-                            <LibraryHeaderBar.Title>
-                                {detailQuery?.data?.name}
-                            </LibraryHeaderBar.Title>
-                        </LibraryHeaderBar>
-                    ),
-                    offset: 200,
-                    target: headerRef,
-                }}
-            >
-                <PlaylistDetailHeader
-                    ref={headerRef}
-                    background={background}
-                    imagePlaceholderUrl={detailQuery?.data?.imageUrl}
-                    imageUrl={detailQuery?.data?.imageUrl}
-                />
-                <PlaylistDetailContent tableRef={tableRef} />
-            </NativeScrollArea>
-        </AnimatedPage>
-    );
-};
-
-export default PlaylistDetailRoute;
@@ -144,10 +144,6 @@ const PlaylistDetailSongListRoute = () => {
    };

    const itemCountCheck = usePlaylistSongList({
-        options: {
-            cacheTime: 1000 * 60 * 60 * 2,
-            staleTime: 1000 * 60 * 60 * 2,
-        },
        query: {
            id: playlistId,
            limit: 1,
@@ -157,10 +153,7 @@ const PlaylistDetailSongListRoute = () => {
        serverId: server?.id,
    });

-    const itemCount =
-        itemCountCheck.data?.totalRecordCount === null
-            ? undefined
-            : itemCountCheck.data?.totalRecordCount;
+    const itemCount = itemCountCheck.data?.totalRecordCount || itemCountCheck.data?.items.length;

    return (
        <AnimatedPage key={`playlist-detail-songList-${playlistId}`}>
@@ -207,7 +200,12 @@ const PlaylistDetailSongListRoute = () => {
                    </Paper>
                </Box>
            )}
-            <PlaylistDetailSongListContent tableRef={tableRef} />
+            <PlaylistDetailSongListContent
+                songs={
+                    server?.type === ServerType.SUBSONIC ? itemCountCheck.data?.items : undefined
+                }
+                tableRef={tableRef}
+            />
        </AnimatedPage>
    );
 };
@@ -1,7 +1,7 @@
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
 import { useMemo, useRef } from 'react';
 import { useParams } from 'react-router';
-import { PlaylistListSort, SortOrder } from '/@/renderer/api/types';
+import { PlaylistListSort, PlaylistSongListQuery, SortOrder } from '/@/renderer/api/types';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { ListContext } from '/@/renderer/context/list-context';
 import { PlaylistListContent } from '/@/renderer/features/playlists/components/playlist-list-content';
@@ -16,7 +16,7 @@ const PlaylistListRoute = () => {
    const server = useCurrentServer();
    const { playlistId } = useParams();
    const pageKey = 'playlist';
-    const { filter } = useListStoreByKey({ key: pageKey });
+    const { filter } = useListStoreByKey<PlaylistSongListQuery>({ key: pageKey });

    const itemCountCheck = usePlaylistList({
        options: {
@@ -5,7 +5,12 @@ import debounce from 'lodash/debounce';
 import { useTranslation } from 'react-i18next';
 import { generatePath, Link, useParams, useSearchParams } from 'react-router-dom';
 import { useCurrentServer } from '../../../store/auth.store';
-import { LibraryItem } from '/@/renderer/api/types';
+import {
+    AlbumArtistListQuery,
+    AlbumListQuery,
+    LibraryItem,
+    SongListQuery,
+} from '/@/renderer/api/types';
 import { Button, PageHeader, SearchInput } from '/@/renderer/components';
 import { FilterBar, LibraryHeaderBar } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
@@ -24,7 +29,9 @@ export const SearchHeader = ({ tableRef, navigationId }: SearchHeaderProps) => {
    const [searchParams, setSearchParams] = useSearchParams();
    const cq = useContainerQuery();
    const server = useCurrentServer();
-    const { filter } = useListStoreByKey({ key: itemType });
+    const { filter } = useListStoreByKey<AlbumListQuery | AlbumArtistListQuery | SongListQuery>({
+        key: itemType,
+    });

    const { handleRefreshTable } = useListFilterRefresh({
        itemType,
@@ -17,7 +17,7 @@ const localSettings = isElectron() ? window.electron.localSettings : null;
 const SERVER_TYPES = [
    { label: 'Jellyfin', value: ServerType.JELLYFIN },
    { label: 'Navidrome', value: ServerType.NAVIDROME },
-    // { label: 'Subsonic', value: ServerType.SUBSONIC },
+    { label: 'Subsonic', value: ServerType.SUBSONIC },
 ];

 interface AddServerFormProps {
@@ -3,6 +3,7 @@ import { Stack, Group, Divider } from '@mantine/core';
 import { Button, Text, TimeoutButton } from '/@/renderer/components';
 import { useDisclosure } from '@mantine/hooks';
 import isElectron from 'is-electron';
+import { useTranslation } from 'react-i18next';
 import { RiDeleteBin2Line, RiEdit2Fill } from 'react-icons/ri';
 import { EditServerForm } from '/@/renderer/features/servers/components/edit-server-form';
 import { ServerSection } from '/@/renderer/features/servers/components/server-section';
@@ -16,6 +17,7 @@ interface ServerListItemProps {
 }

 export const ServerListItem = ({ server }: ServerListItemProps) => {
+    const { t } = useTranslation();
    const [edit, editHandlers] = useDisclosure(false);
    const [savedPassword, setSavedPassword] = useState('');
    const { deleteServer } = useAuthStoreActions();
@@ -54,7 +56,11 @@ export const ServerListItem = ({ server }: ServerListItemProps) => {
            <ServerSection
                title={
                    <Group position="apart">
-                        <Text>Server details</Text>
+                        <Text>
+                            {t('page.manageServers.serverDetails', {
+                                postProcess: 'sentenceCase',
+                            })}
+                        </Text>
                    </Group>
                }
            >
@@ -68,8 +74,16 @@ export const ServerListItem = ({ server }: ServerListItemProps) => {
                    <Stack>
                        <Group noWrap>
                            <Stack>
-                                <Text>URL</Text>
-                                <Text>Username</Text>
+                                <Text>
+                                    {t('page.manageServers.url', {
+                                        postProcess: 'sentenceCase',
+                                    })}
+                                </Text>
+                                <Text>
+                                    {t('page.manageServers.username', {
+                                        postProcess: 'sentenceCase',
+                                    })}
+                                </Text>
                            </Stack>
                            <Stack>
                                <Text>{server.url}</Text>
@@ -79,11 +93,15 @@ export const ServerListItem = ({ server }: ServerListItemProps) => {
                        <Group grow>
                            <Button
                                leftIcon={<RiEdit2Fill />}
-                                tooltip={{ label: 'Edit server details' }}
+                                tooltip={{
+                                    label: t('page.manageServers.editServerDetailsTooltip', {
+                                        postProcess: 'sentenceCase',
+                                    }),
+                                }}
                                variant="subtle"
                                onClick={() => handleEdit()}
                            >
-                                Edit
+                                {t('common.edit')}
                            </Button>
                        </Group>
                    </Stack>
@@ -95,7 +113,7 @@ export const ServerListItem = ({ server }: ServerListItemProps) => {
                timeoutProps={{ callback: handleDeleteServer, duration: 1000 }}
                variant="subtle"
            >
-                Remove server
+                {t('page.manageServers.removeServer', { postProcess: 'sentenceCase' })}
            </TimeoutButton>
        </Stack>
    );
@@ -215,6 +215,13 @@ export const ControlSettings = () => {
                            }),
                            value: Play.LAST,
                        },
+                        {
+                            label: t('setting.playButtonBehavior', {
+                                context: 'optionPlayShuffled',
+                                postProcess: 'titleCase',
+                            }),
+                            value: Play.SHUFFLE,
+                        },
                    ]}
                    defaultValue={settings.playButtonBehavior}
                    onChange={(e) =>
@@ -368,28 +375,6 @@ export const ControlSettings = () => {
            isHidden: !isElectron(),
            title: t('setting.savePlayQueue', { postProcess: 'sentenceCase' }),
        },
-        {
-            control: (
-                <Switch
-                    aria-label="Go to playlist songs page by default"
-                    defaultChecked={settings.defaultFullPlaylist}
-                    onChange={(e) =>
-                        setSettings({
-                            general: {
-                                ...settings,
-                                defaultFullPlaylist: e.currentTarget.checked,
-                            },
-                        })
-                    }
-                />
-            ),
-            description: t('setting.skipPlaylistPage', {
-                context: 'description',
-                postProcess: 'sentenceCase',
-            }),
-            isHidden: false,
-            title: t('setting.skipPlaylistPage', { postProcess: 'sentenceCase' }),
-        },
        {
            control: (
                <Switch
@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
-import { SelectItem, Switch } from '@mantine/core';
+import { SelectItem } from '@mantine/core';
 import isElectron from 'is-electron';
-import { Select, Slider, toast } from '/@/renderer/components';
+import { Select, Slider, Switch, toast } from '/@/renderer/components';
 import {
    SettingsSection,
    SettingOption,
@@ -3,11 +3,19 @@ import {
    SettingsSection,
 } from '/@/renderer/features/settings/components/settings-section';
 import { useLyricsSettings, useSettingsStoreActions } from '/@/renderer/store';
-import { MultiSelect, MultiSelectProps, NumberInput, Switch } from '/@/renderer/components';
+import {
+    Select,
+    MultiSelect,
+    MultiSelectProps,
+    TextInput,
+    NumberInput,
+    Switch,
+} from '/@/renderer/components';
 import isElectron from 'is-electron';
 import styled from 'styled-components';
 import { LyricSource } from '/@/renderer/api/types';
 import { useTranslation } from 'react-i18next';
+import { languages } from '/@/i18n/i18n';

 const localSettings = isElectron() ? window.electron.localSettings : null;

@@ -116,6 +124,58 @@ export const LyricSettings = () => {
            isHidden: !isElectron(),
            title: t('setting.lyricOffset', { postProcess: 'sentenceCase' }),
        },
+        {
+            control: (
+                <Select
+                    data={languages}
+                    value={settings.translationTargetLanguage}
+                    onChange={(value) => {
+                        setSettings({ lyrics: { ...settings, translationTargetLanguage: value } });
+                    }}
+                />
+            ),
+            description: t('setting.translationTargetLanguage', {
+                context: 'description',
+                postProcess: 'sentenceCase',
+            }),
+            isHidden: !isElectron(),
+            title: t('setting.translationTargetLanguage', { postProcess: 'sentenceCase' }),
+        },
+        {
+            control: (
+                <Select
+                    data={['Microsoft Azure', 'Google Cloud']}
+                    value={settings.translationApiProvider}
+                    onChange={(value) => {
+                        setSettings({ lyrics: { ...settings, translationApiProvider: value } });
+                    }}
+                />
+            ),
+            description: t('setting.translationApiProvider', {
+                context: 'description',
+                postProcess: 'sentenceCase',
+            }),
+            isHidden: !isElectron(),
+            title: t('setting.translationApiProvider', { postProcess: 'sentenceCase' }),
+        },
+        {
+            control: (
+                <TextInput
+                    value={settings.translationApiKey}
+                    onChange={(e) => {
+                        setSettings({
+                            lyrics: { ...settings, translationApiKey: e.currentTarget.value },
+                        });
+                    }}
+                />
+            ),
+            description: t('setting.translationApiKey', {
+                context: 'description',
+                postProcess: 'sentenceCase',
+            }),
+            isHidden: !isElectron(),
+            title: t('setting.translationApiKey', { postProcess: 'sentenceCase' }),
+        },
    ];

    return (
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hosted Weblate	c7214fc7ce	Update translation files Updated by "Remove blank strings" hook in Weblate. Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 99.8% (652 of 653 strings) Co-authored-by: ENDzZ <godzmichael@outlook.com> Co-authored-by: Hosted Weblate <hosted@weblate.org> Translate-URL: https://hosted.weblate.org/projects/feishin/translation/ Translate-URL: https://hosted.weblate.org/projects/feishin/translation/zh_Hans/ Translation: feishin/Translation	2024-09-29 06:44:18 +02:00
Hosted Weblate	84bcfb6eb9	Translated using Weblate (Spanish) Currently translated at 99.8% (652 of 653 strings) Co-authored-by: Hosted Weblate <hosted@weblate.org> Co-authored-by: gallegonovato <fran-carro@hotmail.es> Translate-URL: https://hosted.weblate.org/projects/feishin/translation/es/ Translation: feishin/Translation	2024-09-29 06:44:17 +02:00
Hosted Weblate	0ca7a0efc9	Translated using Weblate (Czech) Currently translated at 100.0% (653 of 653 strings) Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: Hosted Weblate <hosted@weblate.org> Translate-URL: https://hosted.weblate.org/projects/feishin/translation/cs/ Translation: feishin/Translation	2024-09-29 06:44:17 +02:00
Torsten Curdt	cb76436a2a	point help menu items to feishin instead of just electron (#767 )	2024-09-28 21:44:13 -07:00
jeffvli	88a951e2e7	Update to v0.10.1	2024-09-28 21:39:30 -07:00
jeffvli	6f1b78c2d6	Fix Subsonic servertype lock from docker configuration	2024-09-28 21:37:09 -07:00
jeffvli	107074b240	Fix subsonic album list sort options	2024-09-28 21:35:32 -07:00
Kendall Garner	6e8ca7e035	fix navidrome getPlaylistSOngList end	2024-09-28 21:22:14 -07:00
jeffvli	3c99a662e8	Fix album detail header track count	2024-09-26 21:23:48 -07:00
jeffvli	fc8110ca79	Fix layout shift on lyrics container hover	2024-09-26 21:21:54 -07:00
jeffvli	715f800788	Add getStructuredLyrics to navidrome controller	2024-09-26 12:13:29 -07:00
jeffvli	244aee45cd	Handle potential null response on genre results from Navidrome	2024-09-26 12:13:03 -07:00
jeffvli	c96f5b207d	Handle subsonic endpoints that potentially return optional response when no items	2024-09-26 11:14:06 -07:00
Hosted Weblate	0e8b2aed72	Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (642 of 642 strings) Co-authored-by: ENDzZ <godzmichael@outlook.com> Co-authored-by: Hosted Weblate <hosted@weblate.org> Translate-URL: https://hosted.weblate.org/projects/feishin/translation/zh_Hans/ Translation: feishin/Translation	2024-09-26 06:57:33 +02:00
Hosted Weblate	f2accd63fd	Translated using Weblate (French) Currently translated at 96.5% (620 of 642 strings) Co-authored-by: Hosted Weblate <hosted@weblate.org> Co-authored-by: Jucgshu <brewal.bouvet@gmail.com> Translate-URL: https://hosted.weblate.org/projects/feishin/translation/fr/ Translation: feishin/Translation	2024-09-26 06:57:33 +02:00
Hosted Weblate	c024e975fb	Translated using Weblate (Spanish) Currently translated at 100.0% (642 of 642 strings) Co-authored-by: Hosted Weblate <hosted@weblate.org> Co-authored-by: gallegonovato <fran-carro@hotmail.es> Translate-URL: https://hosted.weblate.org/projects/feishin/translation/es/ Translation: feishin/Translation	2024-09-26 06:57:33 +02:00
Hosted Weblate	a3f725b0ef	Translated using Weblate (Czech) Currently translated at 100.0% (642 of 642 strings) Translated using Weblate (Czech) Currently translated at 100.0% (642 of 642 strings) Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: Hosted Weblate <hosted@weblate.org> Translate-URL: https://hosted.weblate.org/projects/feishin/translation/cs/ Translation: feishin/Translation	2024-09-26 06:57:33 +02:00
Hosted Weblate	f137f487aa	Translated using Weblate (English) Currently translated at 98.1% (641 of 653 strings) Co-authored-by: Anonymous <noreply@weblate.org> Translate-URL: https://hosted.weblate.org/projects/feishin/translation/en/ Translation: feishin/Translation	2024-09-26 06:57:33 +02:00
jeffvli	8e59514524	Update to v.10.0	2024-09-25 21:57:19 -07:00
Mikhail Tsarev	7bcfe30a8e	Improved translations for English and Russian versions. (#760 ) * First version of Russian translation * Improvements --------- Co-authored-by: Suoslex <mtsarev06@gmail.com>	2024-09-25 21:42:41 -07:00
Kendall Garner	8cddbef701	Subsonic 2, general rework (#758 )	2024-09-25 21:23:08 -07:00
Xudong Zhou	31492fa9ef	Lyrics Translation and Romaji (Fulfill #732 ) [Translation Part] (#747 )	2024-09-23 20:25:17 -07:00
Jeff	e3946a9413	Update Navidrome list sort mappings for ND v0.53.2 (#754 ) * Update navidrome list sort mappings * Rename ownerName to owner_name * Remove deprecated client-side sort	2024-09-22 18:37:13 -07:00
Jamie King	28c12496f1	Removed references to "ElectronReact" in MacOS menu bar (#756 )	2024-09-20 13:26:28 +00:00
jeffvli	f8c2ff735b	Replace "SortName" for "Name" in Jellyfin song sort	2024-09-19 20:39:47 -07:00
Kendall Garner	22e4974191	refactor navidrome-types	2024-09-18 20:43:35 -07:00
Kendall Garner	6eecc3c0fd	handle sanitized sort and filter post-fact	2024-09-18 18:00:25 -07:00
Kendall Garner	b628b684ae	require limit to specified (nonzero) for shuffle all	2024-09-18 07:31:58 -07:00
Kendall Garner	4c49e403ab	make headers optional?	2024-09-16 19:57:59 -07:00
Kendall Garner	730683fe25	different date formats based off of metadata	2024-09-16 17:33:06 -07:00
Kendall Garner	96b4f8dd89	update album play count	2024-09-15 21:48:32 -07:00
Kendall Garner	f82889e5ec	npm audit fix	2024-09-15 20:05:48 -07:00
Benjamin	8d8826a9b7	use utc for absolute date formatting (#743 ) * use utc for date formatting * add seperate utc function and call that instead * swap date format to be a constant * make dateadded use non-utc	2024-09-13 01:35:57 +00:00
Kendall Garner	660c9744bf	clear queue when shuffle now	2024-09-11 20:36:46 -07:00
Kendall Garner	8221af9a8f	break by newline for comment	2024-09-11 07:41:15 -07:00
jeffvli	93f2573847	Update to v0.9.0	2024-09-10 22:37:48 -07:00
Kendall Garner	03d97c6b1e	use unique id for paginated playlist	2024-09-10 22:37:24 -07:00
Hosted Weblate	0b86cb51d3	Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (634 of 634 strings) Co-authored-by: 無情天 <kofzhanganguo@126.com> Translate-URL: https://hosted.weblate.org/projects/feishin/translation/zh_Hans/ Translation: feishin/Translation	2024-09-10 04:01:31 +02:00
Hosted Weblate	ee54b8219b	Translated using Weblate (French) Currently translated at 96.8% (610 of 630 strings) Co-authored-by: Evan <evan_g@orange.fr> Co-authored-by: Hosted Weblate <hosted@weblate.org> Translate-URL: https://hosted.weblate.org/projects/feishin/translation/fr/ Translation: feishin/Translation	2024-09-10 04:01:31 +02:00
Hosted Weblate	25b593aadd	Translated using Weblate (Spanish) Currently translated at 100.0% (634 of 634 strings) Translated using Weblate (Spanish) Currently translated at 100.0% (632 of 632 strings) Translated using Weblate (Spanish) Currently translated at 99.8% (631 of 632 strings) Co-authored-by: Fordas <fordas15@gmail.com> Co-authored-by: Hosted Weblate <hosted@weblate.org> Co-authored-by: gallegonovato <fran-carro@hotmail.es> Translate-URL: https://hosted.weblate.org/projects/feishin/translation/es/ Translation: feishin/Translation	2024-09-10 04:01:31 +02:00
Hosted Weblate	5253e32b67	Translated using Weblate (Czech) Currently translated at 100.0% (634 of 634 strings) Translated using Weblate (Czech) Currently translated at 100.0% (632 of 632 strings) Translated using Weblate (Czech) Currently translated at 99.6% (630 of 632 strings) Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: Hosted Weblate <hosted@weblate.org> Translate-URL: https://hosted.weblate.org/projects/feishin/translation/cs/ Translation: feishin/Translation	2024-09-10 04:01:31 +02:00
Hosted Weblate	b0b558c90a	Translated using Weblate (German) Currently translated at 85.0% (536 of 630 strings) Co-authored-by: Hosted Weblate <hosted@weblate.org> Co-authored-by: Schroti <schrotihd@gmail.com> Translate-URL: https://hosted.weblate.org/projects/feishin/translation/de/ Translation: feishin/Translation	2024-09-10 04:01:31 +02:00
Kendall Garner	f11a53c1a4	fix suspense	2024-09-09 19:01:07 -07:00
Kendall Garner	e2a05f4204	add track normalization for jellyfin as well	2024-09-09 07:15:26 -07:00
Kendall Garner	fcc010eb54	move transcoding placeholder	2024-09-08 22:05:44 -07:00
Kendall Garner	1b41a5a674	enable disabling tray	2024-09-08 20:55:07 -07:00
Kendall Garner	74aa88e082	add web visualizer (#314 ) * add web visualizer * fallback to simple model * less samples, hopefully more efficient * Use audiomotion analyzer - Note: fixed to 4.1.1 because 4.2.0 uses esm which breaks in the current workflow... * revert publish changes * r2 * don't massively change package.json * lazy	2024-09-09 01:25:01 +00:00
Kendall Garner	fbac33ceba	add shuffle context menu item	2024-09-07 21:31:01 -07:00
Kendall Garner	42ba5a531c	use feishin switch instead of default	2024-09-05 18:08:37 -07:00
Kendall Garner	257e1e2cd9	...	2024-09-05 07:06:37 -07:00
Kendall Garner	3025e84c58	remove height everywhere for jellyfin images	2024-09-04 22:30:50 -07:00
Kendall Garner	4a111d9cf2	don't make artist clickable if no id	2024-09-04 20:01:45 -07:00
Kendall Garner	e6bd8deb0c	use unique id for places that may have duplicates	2024-09-04 19:34:07 -07:00