From f156083d48f866fcd69d590794a33e0b25c8d95d Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Thu, 17 Feb 2022 01:01:17 +0000 Subject: [PATCH] Revert "LastFM can be unique and have its own call" This reverts commit d36e1b19f65259743d07001db4942fe3932608de. --- src/main/index.ts | 4 ---- src/main/plugins/lastfm.ts | 2 +- src/preload/cider-preload.js | 4 +--- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/index.ts b/src/main/index.ts index 9e0d53d9..7038f483 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -69,10 +69,6 @@ ipcMain.on('nowPlayingItemDidChange', (_event, attributes) => { CiderPlug.callPlugins('onNowPlayingItemDidChange', attributes); }); -ipcMain.on('lfmItemChange', (_event, attributes) => { - CiderPlug.callPlugins('lfmItemChange', attributes); -}); - app.on('before-quit', () => { CiderPlug.callPlugins('onBeforeQuit'); console.warn(`${app.getName()} exited.`); diff --git a/src/main/plugins/lastfm.ts b/src/main/plugins/lastfm.ts index 5e871f3b..6110ad31 100644 --- a/src/main/plugins/lastfm.ts +++ b/src/main/plugins/lastfm.ts @@ -265,7 +265,7 @@ export default class LastFMPlugin { * Runs on song change * @param attributes Music Attributes */ - lfmItemChange(attributes: object): void { + onNowPlayingItemDidChange(attributes: object): void { if (!this._store.lastfm.filterLoop){ this._lastfm.cachedNowPlayingAttributes = false; this._lastfm.cachedAttributes = false} diff --git a/src/preload/cider-preload.js b/src/preload/cider-preload.js index 47441d25..bf6f2924 100644 --- a/src/preload/cider-preload.js +++ b/src/preload/cider-preload.js @@ -25,10 +25,8 @@ const MusicKitInterop = { MusicKit.getInstance().addEventListener(MusicKit.Events.nowPlayingItemDidChange, async () => { // await MusicKitInterop.modifyNamesOnLocale(); if (MusicKitInterop.filterTrack(MusicKitInterop.getAttributes(), false, true) || !app.cfg.lastfm.filterLoop) { - global.ipcRenderer.send('lfmItemChange', MusicKitInterop.getAttributes()); + global.ipcRenderer.send('nowPlayingItemDidChange', MusicKitInterop.getAttributes()); } - - global.ipcRenderer.send('nowPlayingItemDidChange', MusicKitInterop.getAttributes()); }); MusicKit.getInstance().addEventListener(MusicKit.Events.authorizationStatusDidChange, () => {