Merge branch 'ciderapp:develop' into develop

ciderapp · Feb 17, 2022 · 20fd0c0 · 20fd0c0
2 parents 4937e29 + cb82ff4
commit 20fd0c0
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 50 deletions.
diff --git a/src/main/base/browserwindow.ts b/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.

diff --git a/src/main/base/store.ts b/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"

diff --git a/src/main/index.ts b/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.`);

diff --git a/src/main/plugins/discordrpc.ts b/src/main/plugins/discordrpc.ts
@@ -8,8 +8,8 @@ export default class DiscordRichPresence {
      * Private variables for interaction in plugins
      */
     private static _store: any;
-    private _app: any;
-    private _attributes: any;
+    private _app : any;
+    private _attributes : any;
     private static _connection: boolean = false;
 
     /**
@@ -76,10 +76,10 @@ export default class DiscordRichPresence {
 
         // Login to Discord
         this._client.login({clientId})
-            .then(() => {
-                DiscordRichPresence._connection = true;
-            })
-            .catch((e: any) => console.error(`[DiscordRichPresence][connect] ${e}`));
+        .then(() => {
+            DiscordRichPresence._connection = true;
+        })
+        .catch((e: any) => console.error(`[DiscordRichPresence][connect] ${e}`));
     }
 
     /**
@@ -94,43 +94,43 @@ export default class DiscordRichPresence {
         }).catch((e: any) => console.error(`[DiscordRPC][disconnect] ${e}`));
     }
 
-    /**
-     * Filter the Discord activity object
-     */
-    private filterActivity(activity: any, attributes: any): Object {
-
-        // Checks if the name is greater than 128 because some songs can be that long
+	/**
+	 * Filter the Discord activity object
+	 */
+	private filterActivity(activity: any, attributes: any): Object {
+		
+		// Checks if the name is greater than 128 because some songs can be that long
         if (activity.details && activity.details.length > 128) {
             activity.details = activity.details.substring(0, 125) + '...'
         }
 
-        // Check large image
-        if (activity.largeImageKey == null || activity.largeImageKey === "" || activity.largeImageKey.length > 256) {
+		// Check large image
+        if (activity.largeImageKey == null || activity.largeImageKey === "" || activity.largeImageKey.length > 256) { 
             activity.largeImageKey = "cider";
         }
 
-        // Timestamp
-        if (new Date(attributes.endTime).getTime() < 0) {
-            delete activity.startTime
-            delete activity.endTime
-        }
+		// Timestamp 
+		if (new Date(attributes.endTime).getTime() < 0) {
+			delete activity.startTime
+			delete activity.endTime
+		}
 
-        // not sure
-        if (!attributes.artistName) {
-            delete activity.state;
-        }
+		// not sure
+		if (!attributes.artistName) {
+			delete activity.state;
+		}
 
-        if (!activity.largeImageText || activity.largeImageText.length < 2) {
+		if (!activity.largeImageText || activity.largeImageText.length < 2) {
             delete activity.largeImageText
         }
 
-        activity.buttons.forEach((key: { label: string, url: string }, _v: Number) => {
-            if (key.url.includes('undefined') || key.url.includes('no-id-found')) {
+		activity.buttons.forEach((key: {label: string, url: string}, _v: Number) => {
+			if (key.url.includes('undefined') || key.url.includes('no-id-found')) {
                 activity.buttons.splice(key, 1);
-            }
-        })
-        return activity
-    }
+			}
+		})
+		return activity
+	}
 
     /**
      * Sets the activity of the client
@@ -158,15 +158,29 @@ export default class DiscordRichPresence {
             ]
         };
 
-        this._activity = this.filterActivity(this._activity, attributes)
+		this._activity = this.filterActivity(this._activity, attributes)
 
         // Check if its pausing (false) or playing (true)
         if (!attributes.status) {
-            this._client.clearActivity()
+            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}`));
+            .catch((e: any) => console.error(`[DiscordRichPresence][updateActivity] ${e}`));
             this._activityCache = this._activity;
         }
 
@@ -193,21 +207,21 @@ export default class DiscordRichPresence {
         this.connect((DiscordRichPresence._store.general.discord_rpc == 1) ? '911790844204437504' : '886578863147192350');
         console.debug(`[Plugin][${this.name}] Ready.`);
         ipcMain.on('updateRPCImage', (_event, imageurl) => {
-            fetch('https://api.cider.sh/v1/images', {
+            fetch('https://api.cider.sh/v1/images' ,{ 
 
                 method: 'POST',
-                body: JSON.stringify({url: imageurl}),
-                headers: {
+                body: JSON.stringify({url : imageurl}),
+                headers: { 
                     'Content-Type': 'application/json',
                     'User-Agent': _win.webContents.getUserAgent()
                 },
             })
-                .then(res => res.json())
-                .then(function (json) {
-                    self._attributes["artwork"]["url"] = json.url
-                    self.updateActivity(self._attributes)
-                })
-
+            .then(res => res.json())
+            .then(function(json){
+                self._attributes["artwork"]["url"] = json.url
+                self.updateActivity(self._attributes)
+            })
+        
         })
     }
 

diff --git 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
      */
-    onNowPlayingItemDidChange(attributes: object): void {
+    lfmItemChange(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
@@ -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, () => {

diff --git a/src/renderer/style.less b/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;

diff --git a/src/renderer/views/pages/settings.ejs b/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')}}