Bounce dock only once on receiving a private message

app/renderer/js/components/webview.ts

@@ -91,21 +91,6 @@ class WebView extends BaseComponent {
 			this.canGoBackButton();
 		});
 
-		this.$el.addEventListener('page-favicon-updated', event => {
-			const { favicons } = event;
-
-			// This returns a string of favicons URL. If there is a PM counts in unread messages then the URL would be like
-			// https://chat.zulip.org/static/images/favicon/favicon-pms.png
-			if (favicons[0].indexOf('favicon-pms') > 0 && process.platform === 'darwin') {
-				// This api is only supported on macOS
-				app.dock.setBadge('●');
-				// bounce the dock
-				if (ConfigUtil.getConfigItem('dockBouncing')) {
-					app.dock.bounce();
-				}
-			}
-		});
-
 		this.$el.addEventListener('dom-ready', () => {
 			if (this.props.role === 'server') {
 				this.$el.classList.add('onload');
@@ -197,6 +182,16 @@ class WebView extends BaseComponent {
 		}
 	}
 
+	updatePMCount(count: number): void {
+		if (process.platform === 'darwin') {
+			app.dock.setBadge(count.toString());
+			if (ConfigUtil.getConfigItem('dockBouncing') && ConfigUtil.getConfigItem('showNotification')) {
+				app.dock.bounce();
+			}
+			this.props.unreadPmCount = count;
+		}
+	}
+
 	focus(): void {
 		// focus Webview and it's contents when Window regain focus.
 		const webContents = this.$el.getWebContents();

app/renderer/js/electron-bridge.ts

@@ -38,6 +38,12 @@ electron_bridge.on('total_unread_count', (...args) => {
 	ipcRenderer.send('unread-count', ...args);
 });
 
+electron_bridge.on('unread_pm_count', unreadPMs => {
+	const unreadPMCount = unreadPMs.unread_pm_count;
+	const realmUri = unreadPMs.realm_uri;
+	ipcRenderer.send('forward-message', 'unread-pm-count', unreadPMCount, realmUri);
+});
+
 electron_bridge.on('realm_name', realmName => {
 	const serverURL = location.origin;
 	ipcRenderer.send('realm-name-changed', serverURL, realmName);

app/renderer/js/main.ts

@@ -373,7 +373,8 @@ class ServerManagerView {
 				onNetworkError: this.openNetworkTroubleshooting.bind(this),
 				onTitleChange: this.updateBadge.bind(this),
 				nodeIntegration: false,
-				preload: true
+				preload: true,
+				unreadPMCount: 0
 			})
 		}));
 		this.loading[server.url] = true;
@@ -994,6 +995,13 @@ class ServerManagerView {
 				webview.send('set-idle');
 			});
 		});
+
+		ipcRenderer.on('unread-pm-count', (event: Event, unreadPMCount: number, realmUri: string) => {
+			const tabIndex = DomainUtil.getIndex(realmUri);
+			if (tabIndex < 0) {
+				this.tabs[tabIndex].webview.updatePMCount(unreadPMCount);
+			}
+		});
 	}
 }
 

app/renderer/js/utils/domain-util.ts

@@ -59,6 +59,18 @@ class DomainUtil {
 		return this.db.getData(`/domains[${index}]`);
 	}
 
+	getIndex(url: string): number {
+		const domains = this.getDomains();
+		for (let i = 0; i < domains.length; i++) {
+			const domain = domains[i];
+			if (domain.url === url) {
+				return i;
+			}
+		}
+		// invalid index, use check in calling function
+		return -1;
+	}
+
 	updateDomain(index: number, server: object): void {
 		this.reloadDB();
 		this.db.push(`/domains[${index}]`, server, true);