From 93a9e8719bd6c7b27f69040bee6e8a3b036ec317 Mon Sep 17 00:00:00 2001 From: vapormusic Date: Thu, 10 Feb 2022 09:07:07 +0700 Subject: [PATCH] mk's data lang is now cider's lang --- src/renderer/index.js | 41 ++++++++++++++------- src/renderer/views/components/queue.ejs | 2 +- src/renderer/views/pages/artist-feed.ejs | 2 +- src/renderer/views/pages/cider-playlist.ejs | 2 +- src/renderer/views/pages/home.ejs | 10 ++--- src/renderer/views/pages/search.ejs | 2 +- 6 files changed, 37 insertions(+), 22 deletions(-) diff --git a/src/renderer/index.js b/src/renderer/index.js index c3884705..f2dd95c4 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -88,6 +88,7 @@ const app = new Vue({ radio: { personal: [] }, + mklang : 'en', webview: { url: "", title: "", @@ -572,6 +573,8 @@ const app = new Vue({ this.mk._services.timing.mode = 0 this.platform = ipcRenderer.sendSync('cider-platform'); + this.mklang = this.MKJSLang() + try { // Set profile name this.chrome.userinfo = (await app.mk.api.v3.music(`/v1/me/social-profile`)).data.data[0] @@ -796,6 +799,7 @@ const app = new Vue({ this.getBrowsePage(); this.$forceUpdate() }, 500) + }, setTheme(theme = "") { console.log(theme) @@ -1016,12 +1020,12 @@ const app = new Vue({ app.appRoute("collection-list") }, async showArtistView(artist, title, view) { - let response = (await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists/${artist}/view/${view}`, {}, {includeResponseMeta: !0})).data + let response = (await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists/${artist}/view/${view}?l=${this.mklang}`, {}, {includeResponseMeta: !0})).data console.log(response) await this.showCollection(response, title, "artists") }, async showRecordLabelView(label, title, view) { - let response = (await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/record-labels/${label}/view/${view}`)).data + let response = (await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/record-labels/${label}/view/${view}?l=${this.mklang}`)).data await this.showCollection(response, title, "record-labels") }, async showSearchView(term, group, title) { @@ -1051,7 +1055,8 @@ const app = new Vue({ omit: { resource: ["autos"] }, - groups: group + groups: group, + l : this.mklang } let response = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/search?term=${term}`, requestBody, { includeResponseMeta: !0 @@ -1102,7 +1107,8 @@ const app = new Vue({ "fields[playlists]": "curatorName,playlistType,name,artwork,url,playParams", "include[library-songs]": "catalog,artists,albums,playParams,name,artwork,url", "fields[catalog]": "artistUrl,albumUrl,url", - "fields[songs]": "artistUrl,albumUrl,playParams,name,artwork,url,artistName,albumName,durationInMillis" + "fields[songs]": "artistUrl,albumUrl,playParams,name,artwork,url,artistName,albumName,durationInMillis", + l : this.mklang } if (!transient) { this.playlists.loadingState = 0; @@ -1130,7 +1136,8 @@ const app = new Vue({ "include[songs]": "albums", "fields[albums]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url,trackCount", "limit[artists:top-songs]": 20, - "art[url]": "f" + "art[url]": "f", + l : this.mklang }, {includeResponseMeta: !0}) console.log(artistData.data.data[0]) this.artistPage.data = artistData.data.data[0] @@ -1325,7 +1332,7 @@ const app = new Vue({ } }, async getNowPlayingItemDetailed(target) { - let u = await app.mkapi(app.mk.nowPlayingItem.playParams.kind, (app.mk.nowPlayingItem.songId == -1), (app.mk.nowPlayingItem.songId != -1) ? app.mk.nowPlayingItem.songId : app.mk.nowPlayingItem["id"], {"include[songs]": "albums,artists"}); + let u = await app.mkapi(app.mk.nowPlayingItem.playParams.kind, (app.mk.nowPlayingItem.songId == -1), (app.mk.nowPlayingItem.songId != -1) ? app.mk.nowPlayingItem.songId : app.mk.nowPlayingItem["id"], {"include[songs]": "albums,artists", l : this.mklang}); app.searchAndNavigate(u.data.data[0], target) }, async searchAndNavigate(item, target) { @@ -1530,6 +1537,7 @@ const app = new Vue({ if (kind == "album" | kind == "albums") { params["include"] = "tracks,artists,record-labels,catalog"; } + params['l'] = this.mklang; try { a = await this.mkapi(kind.toString(), isLibrary, id.toString(), params, params2); } catch (e) { @@ -1820,10 +1828,11 @@ const app = new Vue({ "fields[catalog]": "artistUrl,albumUrl", "fields[songs]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url", limit: 100, + l: this.mklang } const safeparams = { "platform": "web", - "limit": 80, + "limit": 80 } self.library.songs.downloadState = 1 if (downloaded == null) { @@ -1923,6 +1932,7 @@ const app = new Vue({ "fields[catalog]": "artistUrl,albumUrl", "fields[albums]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url", limit: 100, + l: this.mklang } const safeparams = { platform: "web", @@ -2032,6 +2042,7 @@ const app = new Vue({ // "fields[catalog]": "artistUrl,albumUrl", // "fields[artists]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url", limit: 100, + l: this.mklang } const safeparams = { include: "catalog", @@ -2122,12 +2133,12 @@ const app = new Vue({ } }, async getLibrarySongs() { - let response = await this.mkapi("songs", true, "", {limit: 100}, {includeResponseMeta: !0}) + let response = await this.mkapi("songs", true, "", {limit: 100, l : this.mklang}, {includeResponseMeta: !0}) this.library.songs.listing = response.data.data this.library.songs.meta = response.data.meta }, async getLibraryAlbums() { - let response = await this.mkapi("albums", true, "", {limit: 100}, {includeResponseMeta: !0}) + let response = await this.mkapi("albums", true, "", {limit: 100,l : this.mklang}, {includeResponseMeta: !0}) this.library.albums.listing = response.data.data this.library.albums.meta = response.data.meta }, @@ -2161,7 +2172,8 @@ const app = new Vue({ "extend[stations]": ["airDate", "supportsAirTimeUpdates"], "meta[stations]": "inflectionPoints", types: "artists,albums,editorial-items,library-albums,library-playlists,music-movies,music-videos,playlists,stations,uploaded-audios,uploaded-videos,activities,apple-curators,curators,tv-shows,social-upsells", - platform: "web" + platform: "web", + l: this.mklang }, { includeResponseMeta: !0, reload: !0 @@ -2190,7 +2202,8 @@ const app = new Vue({ "include[music-videos]": "artists", extend: "editorialArtwork,artistUrl", "fields[artists]": "name,url,artwork,editorialArtwork,genreNames,editorialNotes", - "art[url]": "f" + "art[url]": "f", + l: this.mklang }); this.browsepage = browse.data.data[0]; this.browsepage.timestamp = Date.now() @@ -2207,7 +2220,8 @@ const app = new Vue({ try { this.radio.personal = (await app.mk.api.v3.music(`/v1/me/recent/radio-stations`, { "platform": "web", - "art[url]": "f" + "art[url]": "f", + l: this.mklang })).data.data; } catch (e) { console.log(e) @@ -2910,7 +2924,8 @@ const app = new Vue({ "art[url]": "c,f", "omit[resource]": "autos", "platform": "web", - limit: 25 + limit: 25, + l: this.mklang }).then(function (results) { results.data.results["meta"] = results.data.meta self.search.results = results.data.results diff --git a/src/renderer/views/components/queue.ejs b/src/renderer/views/components/queue.ejs index 90061dc8..eeb70ace 100644 --- a/src/renderer/views/components/queue.ejs +++ b/src/renderer/views/components/queue.ejs @@ -66,7 +66,7 @@ }, methods: { async getHistory() { - let history = await app.mk.api.v3.music(`/v1/me/recent/played/tracks`) + let history = await app.mk.api.v3.music(`/v1/me/recent/played/tracks`, { l : this.$root.mklang}) this.history = history.data.data }, select(e, position) { diff --git a/src/renderer/views/pages/artist-feed.ejs b/src/renderer/views/pages/artist-feed.ejs index 9c34d485..70059d09 100644 --- a/src/renderer/views/pages/artist-feed.ejs +++ b/src/renderer/views/pages/artist-feed.ejs @@ -78,7 +78,7 @@ let self = this this.artists = [] this.artistFeed = [] - this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists?ids=${artists.toString()}&views=latest-release&include[songs]=albums&fields[albums]=artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url,trackCount&limit[artists:top-songs]=2&art[url]=f`).then(artistData => { + this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists?ids=${artists.toString()}&views=latest-release&include[songs]=albums&fields[albums]=artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url,trackCount&limit[artists:top-songs]=2&art[url]=f`,{ l : this.$root.mklang}).then(artistData => { artistData.data.data.forEach(item => { self.artists.push(item) if (item.views["latest-release"].data.length != 0) { diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs index 74c81f7e..11dcac7a 100644 --- a/src/renderer/views/pages/cider-playlist.ejs +++ b/src/renderer/views/pages/cider-playlist.ejs @@ -289,7 +289,7 @@ this.confirm = false }, async removeFromLibrary(id) { - const params = {"fields[somgs]": "inLibrary", "fields[albums]": "inLibrary", "relate": "library"}; + const params = {"fields[songs]": "inLibrary", "fields[albums]": "inLibrary", "relate": "library"}; var id = this.data.id ?? this.data.attributes.playParams.id const res = await app.mkapi(this.data.attributes.playParams.kind ?? this.data.type, this.data.attributes.playParams.isLibrary ?? false, this.data.attributes.playParams.id ?? this.data.id, params); if (res.data.data[0] && res.data.data[0].relationships && res.data.data[0].relationships.library && res.data.data[0].relationships.library.data && res.data.data[0].relationships.library.data.length > 0) { diff --git a/src/renderer/views/pages/home.ejs b/src/renderer/views/pages/home.ejs index f0350c49..d8f89012 100644 --- a/src/renderer/views/pages/home.ejs +++ b/src/renderer/views/pages/home.ejs @@ -112,7 +112,7 @@ }, methods: { async seeAllHistory() { - let hist = await app.mk.api.v3.music(`/v1/me/recent/played/tracks`) + let hist = await app.mk.api.v3.music(`/v1/me/recent/played/tracks`, { l : this.$root.mklang}) app.showCollection(hist.data, app.getLz('term.history')) }, isSectionReady(section) { @@ -143,12 +143,12 @@ } } if (playlists.length != 0) { - this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/playlists/${playlists.toString()}`).then(playlistsData => { + this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/playlists/${playlists.toString()}`, { l : this.$root.mklang}).then(playlistsData => { self.favorites.push(...playlistsData.data) }) } if (libraryPlaylists.length != 0) { - this.app.mk.api.v3.music(`v1/me/library/playlists/${playlists.toString()}`).then(playlistsData => { + this.app.mk.api.v3.music(`v1/me/library/playlists/${playlists.toString()}`, { l : this.$root.mklang}).then(playlistsData => { self.favorites.push(...playlistsData.data) }) } @@ -156,7 +156,7 @@ async getArtistFeed() { let artists = this.followedArtists let self = this - this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists?ids=${artists.toString()}&views=latest-release&include[songs]=albums&fields[albums]=artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url,trackCount&limit[artists:top-songs]=2&art[url]=f`).then(artistData => { + this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists?ids=${artists.toString()}&views=latest-release&include[songs]=albums&fields[albums]=artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url,trackCount&limit[artists:top-songs]=2&art[url]=f&l=${this.$root.mklang}`).then(artistData => { artistData.data.data.forEach(item => { if (item.views["latest-release"].data.length != 0) { self.artistFeed.push(item.views["latest-release"].data[0]) @@ -177,7 +177,7 @@ }, async getListenNowData() { let self = this - this.app.mk.api.v3.music(`/v1/me/recommendations?timezone=${encodeURIComponent(app.formatTimezoneOffset())}&name=listen-now&with=friendsMix,library,social&art[social-profiles:url]=c&art[url]=c,f&omit[resource]=autos&relate[editorial-items]=contents&extend=editorialCard,editorialVideo&extend[albums]=artistUrl&extend[library-albums]=artistUrl,editorialVideo&extend[playlists]=artistNames,editorialArtwork,editorialVideo&extend[library-playlists]=artistNames,editorialArtwork,editorialVideo&extend[social-profiles]=topGenreNames&include[albums]=artists&include[songs]=artists&include[music-videos]=artists&fields[albums]=artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url&fields[artists]=name,url&extend[stations]=airDate,supportsAirTimeUpdates&meta[stations]=inflectionPoints&types=artists,albums,editorial-items,library-albums,library-playlists,music-movies,music-videos,playlists,stations,uploaded-audios,uploaded-videos,activities,apple-curators,curators,tv-shows,social-upsells&platform=web`).then((data) => { + this.app.mk.api.v3.music(`/v1/me/recommendations?timezone=${encodeURIComponent(app.formatTimezoneOffset())}&name=listen-now&with=friendsMix,library,social&art[social-profiles:url]=c&art[url]=c,f&omit[resource]=autos&relate[editorial-items]=contents&extend=editorialCard,editorialVideo&extend[albums]=artistUrl&extend[library-albums]=artistUrl,editorialVideo&extend[playlists]=artistNames,editorialArtwork,editorialVideo&extend[library-playlists]=artistNames,editorialArtwork,editorialVideo&extend[social-profiles]=topGenreNames&include[albums]=artists&include[songs]=artists&include[music-videos]=artists&fields[albums]=artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url&fields[artists]=name,url&extend[stations]=airDate,supportsAirTimeUpdates&meta[stations]=inflectionPoints&types=artists,albums,editorial-items,library-albums,library-playlists,music-movies,music-videos,playlists,stations,uploaded-audios,uploaded-videos,activities,apple-curators,curators,tv-shows,social-upsells&platform=web&l=${this.$root.mklang}`).then((data) => { console.log(data.data.data[1]) try { self.madeForYou = data.data.data.filter(section => { diff --git a/src/renderer/views/pages/search.ejs b/src/renderer/views/pages/search.ejs index fb9f94eb..1d2ac6fd 100644 --- a/src/renderer/views/pages/search.ejs +++ b/src/renderer/views/pages/search.ejs @@ -116,7 +116,7 @@ }, async getCategories() { if (this.categoriesView != [] && this.categoriesView.length > 0) { this.categoriesReady = true; return await true; } else { - let response = await this.app.mk.api.v3.music(`/v1/recommendations/${this.app.mk.storefrontId}?timezone=${encodeURIComponent(this.app.formatTimezoneOffset())}&name=search-landing&platform=web&extend=editorialArtwork&art%5Burl%5D=f%2Cc&types=editorial-items%2Capple-curators%2Cactivities`); + let response = await this.app.mk.api.v3.music(`/v1/recommendations/${this.app.mk.storefrontId}?timezone=${encodeURIComponent(this.app.formatTimezoneOffset())}&name=search-landing&platform=web&extend=editorialArtwork&art%5Burl%5D=f%2Cc&types=editorial-items%2Capple-curators%2Cactivities&l=${this.$root.mklang}`); this.categoriesView = response.data.data; console.log(this.categoriesView) this.categoriesReady = true;