Merge branch 'ciderapp:develop' into develop

src/main/base/browserwindow.ts

@@ -88,7 +88,7 @@ export class BrowserWindow {
         y: undefined,
         minWidth: 900,
         minHeight: 390,
-        frame: (process.platform === "linux"),
+        frame: false,
         title: "Cider",
         vibrancy: "fullscreen-ui",
         transparent: process.platform === "darwin",
@@ -130,7 +130,6 @@ export class BrowserWindow {
         this.startWebServer();
 
         BrowserWindow.win = new bw(this.options);
-        BrowserWindow.win.setMenuBarVisibility(false)
         const ws = new wsapi(BrowserWindow.win)
         ws.InitWebSockets()
         // and load the renderer.

src/main/base/store.ts

@@ -9,6 +9,7 @@ export class Store {
             "close_button_hide": false,
             "open_on_startup": false,
             "discord_rpc": 1, // 0 = disabled, 1 = enabled as Cider, 2 = enabled as Apple Music
+            "discord_rpc_clear_on_pause": true,
             "language": "en_US", // electron.app.getLocale().replace('-', '_') this can be used in future
             "playbackNotifications": true,
             "update_branch": "main"

src/main/index.ts

@@ -69,6 +69,10 @@ 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.`);

src/main/plugins/discordrpc.ts

@@ -162,9 +162,23 @@ export default class DiscordRichPresence {
 
         // Check if its pausing (false) or playing (true)
         if (!attributes.status) {
+            if (DiscordRichPresence._store.general.discord_rpc_clear_on_pause) {
                 this._client.clearActivity()
                 .catch((e: any) => console.error(`[DiscordRichPresence][clearActivity] ${e}`));
+            } else {
+                this._activity.smallImageKey = 'pause';
+                this._activity.smallImageText = 'Paused';
+                delete this._activity.endTimestamp;
+                delete this._activity.startTimestamp;
+                this._client.setActivity(this._activity)
+                .catch((e: any) => console.error(`[DiscordRichPresence][setActivity] ${e}`));
+            }
         } else if (this._activity && this._activityCache !== this._activity && this._activity.details) {
+            if (!DiscordRichPresence._store.general.discord_rpc_clear_on_pause) {
+                this._activity.smallImageKey = 'play';
+                this._activity.smallImageText = 'Playing';
+            }
+
             this._client.setActivity(this._activity)
             .catch((e: any) => console.error(`[DiscordRichPresence][updateActivity] ${e}`));
             this._activityCache = this._activity;

src/main/plugins/lastfm.ts

@@ -265,7 +265,7 @@ export default class LastFMPlugin {
      * Runs on song change
      * @param attributes Music Attributes
      */
-    onNowPlayingItemDidChange(attributes: object): void {
+    lfmItemChange(attributes: object): void {
         if (!this._store.lastfm.filterLoop){
             this._lastfm.cachedNowPlayingAttributes = false;
             this._lastfm.cachedAttributes = false}    

src/preload/cider-preload.js

@@ -25,8 +25,10 @@ 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('nowPlayingItemDidChange', MusicKitInterop.getAttributes());
+				global.ipcRenderer.send('lfmItemChange', MusicKitInterop.getAttributes());
 			}
+
+			global.ipcRenderer.send('nowPlayingItemDidChange', MusicKitInterop.getAttributes());
 		});
 
 		MusicKit.getInstance().addEventListener(MusicKit.Events.authorizationStatusDidChange, () => {

src/renderer/style.less

@@ -3134,10 +3134,6 @@ body[platform='darwin'] {
   }
 }
 
-body[platform='linux'] #window-controls-container  {
-  display: none;
-}
-
 .percent {
   display: inline-block;
   position: relative;

src/renderer/views/pages/settings.ejs

@@ -568,6 +568,14 @@
                         </select>
                     </div>
                 </div>
+                <div class="md-option-line" v-show="app.cfg.general.discord_rpc != 0">
+                    <div class="md-option-segment">
+                        {{$root.getLz('settings.option.connectivity.discordRPC.clearOnPause')}}
+                    </div>
+                    <div class="md-option-segment md-option-segment_auto">
+                        <input type="checkbox" v-model="app.cfg.general.discord_rpc_clear_on_pause" switch/>
+                    </div>
+                </div>
                 <div class="md-option-line">
                     <div class="md-option-segment">
                         {{$root.getLz('settings.option.connectivity.lastfmScrobble')}}