From e0ba538c0a114e6b7959595777794daced88b13d Mon Sep 17 00:00:00 2001 From: RemixDev Date: Tue, 8 Jun 2021 19:56:53 +0200 Subject: [PATCH] Updated deemix lib to v0.2.0 --- package.json | 2 +- server/dist/main.js | 4 ++-- server/package.json | 2 +- server/src/main.ts | 4 ++-- server/yarn.lock | 8 ++++---- webui | 2 +- yarn.lock | 8 ++++---- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index aa210f9..3440653 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "cookie-parser": "1.4.5", "debug": "2.6.9", - "deemix": "^0.1.4", + "deemix": "^0.2.0", "deezer-js": "^1.0.0", "dotenv": "8.2.0", "express": "4.17.1", diff --git a/server/dist/main.js b/server/dist/main.js index a6d227e..6325276 100644 --- a/server/dist/main.js +++ b/server/dist/main.js @@ -50,13 +50,13 @@ exports.listener = { } }; function getSettings() { - return { settings, defaultSettings: exports.defaultSettings, spotifySettings: exports.plugins.spotify.getCredentials() }; + return { settings, defaultSettings: exports.defaultSettings, spotifySettings: exports.plugins.spotify.getSettings() }; } exports.getSettings = getSettings; function saveSettings(newSettings, newSpotifySettings) { deemix_1.default.settings.save(newSettings, exports.configFolder); settings = newSettings; - exports.plugins.spotify.setCredentials(newSpotifySettings); + exports.plugins.spotify.saveSettings(newSpotifySettings); } exports.saveSettings = saveSettings; let queueOrder = []; diff --git a/server/package.json b/server/package.json index ee4be59..165e5fd 100644 --- a/server/package.json +++ b/server/package.json @@ -15,7 +15,7 @@ "dependencies": { "cookie-parser": "1.4.5", "debug": "2.6.9", - "deemix": "^0.1.4", + "deemix": "^0.2.0", "deezer-js": "^1.0.0", "dotenv": "8.2.0", "express": "4.17.1", diff --git a/server/src/main.ts b/server/src/main.ts index 83465a7..0eba816 100644 --- a/server/src/main.ts +++ b/server/src/main.ts @@ -38,13 +38,13 @@ export const listener = { } export function getSettings(): any { - return { settings, defaultSettings, spotifySettings: plugins.spotify.getCredentials() } + return { settings, defaultSettings, spotifySettings: plugins.spotify.getSettings() } } export function saveSettings(newSettings: any, newSpotifySettings: any) { deemix.settings.save(newSettings, configFolder) settings = newSettings - plugins.spotify.setCredentials(newSpotifySettings) + plugins.spotify.saveSettings(newSpotifySettings) } let queueOrder: string[] = [] diff --git a/server/yarn.lock b/server/yarn.lock index 5f6e25c..f697a7e 100644 --- a/server/yarn.lock +++ b/server/yarn.lock @@ -1899,10 +1899,10 @@ decompress-response@^6.0.0: dependencies: mimic-response "^3.1.0" -deemix@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/deemix/-/deemix-0.1.4.tgz#ad43648895fd3bbe5583e7c558f786d6ce43598f" - integrity sha512-7v6zfcx+16g3Ii2yvntJM+MvTYPpWyabzHxRN0u8mUarc/P7o8hPrSVeofAZOhF6iSN0RBKeSjIoN5LTQsobSA== +deemix@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/deemix/-/deemix-0.2.0.tgz#8bee06c65ed072b8d184e18e8a6cb2d51be9a023" + integrity sha512-Co+q0RMh6rrF1e2J+KoLOXjil5hucd9Yj13diief6mwNyXrLx9eVEmiAACSPMojbEtWFgqdjpgSpDgzi44ol5g== dependencies: async "^3.2.0" browser-id3-writer "^4.4.0" diff --git a/webui b/webui index 268025f..fc89937 160000 --- a/webui +++ b/webui @@ -1 +1 @@ -Subproject commit 268025fa2fba73f382b1b7a2eeb6201cae38bf08 +Subproject commit fc899376e6915677edb020c6ecc7c6f6952d053a diff --git a/yarn.lock b/yarn.lock index 1f710f8..cb51098 100644 --- a/yarn.lock +++ b/yarn.lock @@ -813,10 +813,10 @@ decompress-response@^6.0.0: dependencies: mimic-response "^3.1.0" -deemix@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/deemix/-/deemix-0.1.4.tgz#ad43648895fd3bbe5583e7c558f786d6ce43598f" - integrity sha512-7v6zfcx+16g3Ii2yvntJM+MvTYPpWyabzHxRN0u8mUarc/P7o8hPrSVeofAZOhF6iSN0RBKeSjIoN5LTQsobSA== +deemix@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/deemix/-/deemix-0.2.0.tgz#8bee06c65ed072b8d184e18e8a6cb2d51be9a023" + integrity sha512-Co+q0RMh6rrF1e2J+KoLOXjil5hucd9Yj13diief6mwNyXrLx9eVEmiAACSPMojbEtWFgqdjpgSpDgzi44ol5g== dependencies: async "^3.2.0" browser-id3-writer "^4.4.0"