From 96be648c8e5b8a997dde5aea77972198c6f7e110 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Jul 2022 21:17:11 +0100
Subject: [PATCH] im over this

---
 src/main/base/browserwindow.ts                    |  5 -----
 src/main/base/store.ts                            |  1 +
 src/preload/cider-preload.js                      |  4 ++--
 src/renderer/views/components/settings-window.ejs | 11 +++++++++++
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 4401f484..e8ca660f 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -1183,11 +1183,6 @@ export class BrowserWindow {
             app.quit();
         })
 
-        app.on('before-quit', () => {
-
-        })
-
-
         ipcMain.on('play', (_event, type, id) => {
             BrowserWindow.win.webContents.executeJavaScript(`
 			    MusicKit.getInstance().setQueue({ ${type}: '${id}', parameters : {l : app.mklang}}).then(function(queue) {
diff --git a/src/main/base/store.ts b/src/main/base/store.ts
index d7881352..9c022595 100644
--- a/src/main/base/store.ts
+++ b/src/main/base/store.ts
@@ -134,6 +134,7 @@ export class Store {
                 "scrobble_after": 50,
                 "filter_loop": false,
                 "filter_types": {},
+                "remove_featured": false,
                 "secrets": {
                     "username": "",
                     "key": ""
diff --git a/src/preload/cider-preload.js b/src/preload/cider-preload.js
index b746f6ef..9eccc0ca 100644
--- a/src/preload/cider-preload.js
+++ b/src/preload/cider-preload.js
@@ -22,7 +22,7 @@ const MusicKitInterop = {
 			ipcRenderer.send('wsapi-updatePlaybackState', attributes);
 			// lastfm call
 			if (app.mk.currentPlaybackProgress === (app.cfg.connectivity.lastfm.scrobble_after / 100)) {
-				attributes.primaryArtist = app.cfg.connectivity.lastfm.enabled ? await this.fetchPrimaryArtist(attributes.artistName) : attributes.artistName;
+				attributes.primaryArtist = (app.cfg.connectivity.lastfm.enabled && app.cfg.connectivity.lastfm.remove_featured) ? await this.fetchPrimaryArtist(attributes.artistName) : attributes.artistName;
 				ipcRenderer.send('lastfm:scrobbleTrack', attributes);
 			}
 		});
@@ -36,7 +36,7 @@ const MusicKitInterop = {
 		MusicKit.getInstance().addEventListener(MusicKit.Events.nowPlayingItemDidChange, async () => {
 			console.debug('[cider:preload] nowPlayingItemDidChange')
 			const attributes = MusicKitInterop.getAttributes()
-			attributes.primaryArtist = app.cfg.connectivity.lastfm.enabled ? await this.fetchPrimaryArtist(attributes.artistName) : attributes.artistName;
+			attributes.primaryArtist = (app.cfg.connectivity.lastfm.enabled && app.cfg.connectivity.lastfm.remove_featured) ? await this.fetchPrimaryArtist(attributes.artistName) : attributes.artistName;
 
 			if (MusicKitInterop.filterTrack(attributes, false, true)) {
 				global.ipcRenderer.send('nowPlayingItemDidChange', attributes);
diff --git a/src/renderer/views/components/settings-window.ejs b/src/renderer/views/components/settings-window.ejs
index 8e4c4f08..3f2d392c 100644
--- a/src/renderer/views/components/settings-window.ejs
+++ b/src/renderer/views/components/settings-window.ejs
@@ -1062,6 +1062,17 @@
                                         </label>
                                     </div>
                                 </div>
+                                <div class="md-option-line" v-show="app.cfg.connectivity.lastfm.enabled">
+                                    <div class="md-option-segment">
+                                        {{$root.getLz('settings.option.connectivity.lastfmScrobble.removeFeatured')}}
+                                    </div>
+                                    <div class="md-option-segment md-option-segment_auto">
+                                        <label>
+                                            <input type="checkbox" v-model="app.cfg.connectivity.lastfm.remove_featured"
+                                                   switch/>
+                                        </label>
+                                    </div>
+                                </div>
                                 <div class="md-option-line" v-show="app.cfg.connectivity.lastfm.enabled">
                                     <div class="md-option-segment">
                                         {{$root.getLz('settings.option.connectivity.lastfmScrobble.filterTypes')}}