okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mk's data lang is now cider's lang

Browse source
This commit is contained in:
vapormusic 2022-02-10 09:07:07 +07:00
parent 62ac278a85
commit 93a9e8719b
6 changed files with 37 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/renderer/index.js
View file

@ -88,6 +88,7 @@ const app = new Vue({
radio: { radio: {
personal: [] personal: []
}, },
mklang : 'en',
webview: { webview: {
url: "", url: "",
title: "", title: "",
@ -572,6 +573,8 @@ const app = new Vue({
this.mk._services.timing.mode = 0 this.mk._services.timing.mode = 0
this.platform = ipcRenderer.sendSync('cider-platform'); this.platform = ipcRenderer.sendSync('cider-platform');
this.mklang = this.MKJSLang()
try { try {
// Set profile name // Set profile name
this.chrome.userinfo = (await app.mk.api.v3.music(`/v1/me/social-profile`)).data.data[0] 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.getBrowsePage();
this.$forceUpdate() this.$forceUpdate()
}, 500) }, 500)
}, },
setTheme(theme = "") { setTheme(theme = "") {
console.log(theme) console.log(theme)
@ -1016,12 +1020,12 @@ const app = new Vue({
app.appRoute("collection-list") app.appRoute("collection-list")
}, },
async showArtistView(artist, title, view) { 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) console.log(response)
await this.showCollection(response, title, "artists") await this.showCollection(response, title, "artists")
}, },
async showRecordLabelView(label, title, view) { 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") await this.showCollection(response, title, "record-labels")
}, },
async showSearchView(term, group, title) { async showSearchView(term, group, title) {
@ -1051,7 +1055,8 @@ const app = new Vue({
omit: { omit: {
resource: ["autos"] 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, { let response = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/search?term=${term}`, requestBody, {
includeResponseMeta: !0 includeResponseMeta: !0
@ -1102,7 +1107,8 @@ const app = new Vue({
"fields[playlists]": "curatorName,playlistType,name,artwork,url,playParams", "fields[playlists]": "curatorName,playlistType,name,artwork,url,playParams",
"include[library-songs]": "catalog,artists,albums,playParams,name,artwork,url", "include[library-songs]": "catalog,artists,albums,playParams,name,artwork,url",
"fields[catalog]": "artistUrl,albumUrl,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) { if (!transient) {
this.playlists.loadingState = 0; this.playlists.loadingState = 0;
@ -1130,7 +1136,8 @@ const app = new Vue({
"include[songs]": "albums", "include[songs]": "albums",
"fields[albums]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url,trackCount", "fields[albums]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url,trackCount",
"limit[artists:top-songs]": 20, "limit[artists:top-songs]": 20,
"art[url]": "f" "art[url]": "f",
l : this.mklang
}, {includeResponseMeta: !0}) }, {includeResponseMeta: !0})
console.log(artistData.data.data[0]) console.log(artistData.data.data[0])
this.artistPage.data = artistData.data.data[0] this.artistPage.data = artistData.data.data[0]
@ -1325,7 +1332,7 @@ const app = new Vue({
} }
}, },
async getNowPlayingItemDetailed(target) { 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) app.searchAndNavigate(u.data.data[0], target)
}, },
async searchAndNavigate(item, target) { async searchAndNavigate(item, target) {
@ -1530,6 +1537,7 @@ const app = new Vue({
if (kind == "album" | kind == "albums") { if (kind == "album" | kind == "albums") {
params["include"] = "tracks,artists,record-labels,catalog"; params["include"] = "tracks,artists,record-labels,catalog";
} }
params['l'] = this.mklang;
try { try {
a = await this.mkapi(kind.toString(), isLibrary, id.toString(), params, params2); a = await this.mkapi(kind.toString(), isLibrary, id.toString(), params, params2);
} catch (e) { } catch (e) {
@ -1820,10 +1828,11 @@ const app = new Vue({
"fields[catalog]": "artistUrl,albumUrl", "fields[catalog]": "artistUrl,albumUrl",
"fields[songs]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url", "fields[songs]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url",
limit: 100, limit: 100,
l: this.mklang
} }
const safeparams = { const safeparams = {
"platform": "web", "platform": "web",
"limit": 80, "limit": 80
} }
self.library.songs.downloadState = 1 self.library.songs.downloadState = 1
if (downloaded == null) { if (downloaded == null) {
@ -1923,6 +1932,7 @@ const app = new Vue({
"fields[catalog]": "artistUrl,albumUrl", "fields[catalog]": "artistUrl,albumUrl",
"fields[albums]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url", "fields[albums]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url",
limit: 100, limit: 100,
l: this.mklang
} }
const safeparams = { const safeparams = {
platform: "web", platform: "web",
@ -2032,6 +2042,7 @@ const app = new Vue({
// "fields[catalog]": "artistUrl,albumUrl", // "fields[catalog]": "artistUrl,albumUrl",
// "fields[artists]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url", // "fields[artists]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url",
limit: 100, limit: 100,
l: this.mklang
} }
const safeparams = { const safeparams = {
include: "catalog", include: "catalog",
@ -2122,12 +2133,12 @@ const app = new Vue({
} }
}, },
async getLibrarySongs() { 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.listing = response.data.data
this.library.songs.meta = response.data.meta this.library.songs.meta = response.data.meta
}, },
async getLibraryAlbums() { 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.listing = response.data.data
this.library.albums.meta = response.data.meta this.library.albums.meta = response.data.meta
}, },
@ -2161,7 +2172,8 @@ const app = new Vue({
"extend[stations]": ["airDate", "supportsAirTimeUpdates"], "extend[stations]": ["airDate", "supportsAirTimeUpdates"],
"meta[stations]": "inflectionPoints", "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", 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, includeResponseMeta: !0,
reload: !0 reload: !0
@ -2190,7 +2202,8 @@ const app = new Vue({
"include[music-videos]": "artists", "include[music-videos]": "artists",
extend: "editorialArtwork,artistUrl", extend: "editorialArtwork,artistUrl",
"fields[artists]": "name,url,artwork,editorialArtwork,genreNames,editorialNotes", "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 = browse.data.data[0];
this.browsepage.timestamp = Date.now() this.browsepage.timestamp = Date.now()
@ -2207,7 +2220,8 @@ const app = new Vue({
try { try {
this.radio.personal = (await app.mk.api.v3.music(`/v1/me/recent/radio-stations`, { this.radio.personal = (await app.mk.api.v3.music(`/v1/me/recent/radio-stations`, {
"platform": "web", "platform": "web",
"art[url]": "f" "art[url]": "f",
l: this.mklang
})).data.data; })).data.data;
} catch (e) { } catch (e) {
console.log(e) console.log(e)
@ -2910,7 +2924,8 @@ const app = new Vue({
"art[url]": "c,f", "art[url]": "c,f",
"omit[resource]": "autos", "omit[resource]": "autos",
"platform": "web", "platform": "web",
limit: 25 limit: 25,
l: this.mklang
}).then(function (results) { }).then(function (results) {
results.data.results["meta"] = results.data.meta results.data.results["meta"] = results.data.meta
self.search.results = results.data.results self.search.results = results.data.results

2
src/renderer/views/components/queue.ejs
View file

@ -66,7 +66,7 @@
}, },
methods: { methods: {
async getHistory() { 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 this.history = history.data.data
}, },
select(e, position) { select(e, position) {

2
src/renderer/views/pages/artist-feed.ejs
View file

@ -78,7 +78,7 @@
let self = this let self = this
this.artists = [] this.artists = []
this.artistFeed = [] 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 => { artistData.data.data.forEach(item => {
self.artists.push(item) self.artists.push(item)
if (item.views["latest-release"].data.length != 0) { if (item.views["latest-release"].data.length != 0) {

2
src/renderer/views/pages/cider-playlist.ejs
View file

@ -289,7 +289,7 @@
this.confirm = false this.confirm = false
}, },
async removeFromLibrary(id) { 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 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); 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) { 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) {

10
src/renderer/views/pages/home.ejs
View file

@ -112,7 +112,7 @@
}, },
methods: { methods: {
async seeAllHistory() { 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')) app.showCollection(hist.data, app.getLz('term.history'))
}, },
isSectionReady(section) { isSectionReady(section) {
@ -143,12 +143,12 @@
} }
} }
if (playlists.length != 0) { 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) self.favorites.push(...playlistsData.data)
}) })
} }
if (libraryPlaylists.length != 0) { 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) self.favorites.push(...playlistsData.data)
}) })
} }
@ -156,7 +156,7 @@
async getArtistFeed() { async getArtistFeed() {
let artists = this.followedArtists let artists = this.followedArtists
let self = this 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 => { artistData.data.data.forEach(item => {
if (item.views["latest-release"].data.length != 0) { if (item.views["latest-release"].data.length != 0) {
self.artistFeed.push(item.views["latest-release"].data[0]) self.artistFeed.push(item.views["latest-release"].data[0])
@ -177,7 +177,7 @@
}, },
async getListenNowData() { async getListenNowData() {
let self = this 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]) console.log(data.data.data[1])
try { try {
self.madeForYou = data.data.data.filter(section => { self.madeForYou = data.data.data.filter(section => {

2
src/renderer/views/pages/search.ejs
View file

@ -116,7 +116,7 @@
}, },
async getCategories() { async getCategories() {
if (this.categoriesView != [] && this.categoriesView.length > 0) { this.categoriesReady = true; return await true; } else { 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; this.categoriesView = response.data.data;
console.log(this.categoriesView) console.log(this.categoriesView)
this.categoriesReady = true; this.categoriesReady = true;