Merge pull request #1193 from jijojosephk/issue_1147

Now lets user choose notification method and urgency #1147

Author: jijojosephk

app/browser/index.js

@@ -25,16 +25,24 @@
 			}
 			options = options || {};
 			options.icon = options.icon ? options.icon : 'data:image/png;base64,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';
-			const notifSound = {
-				type: options.type ? options.type : 'new-message',
-				audio: 'default',
-				title: title,
-				body: options.body
-			};
-			console.log('Requesting application to play sound');
-			ipcRenderer.invoke('play-notification-sound', notifSound);
-			console.log('Continues to default notification workflow');
-			return new classicNotification(title, options);
+			options.title = options.title ? options.title : title;
+			options.type = options.type ? options.type : 'new-message';
+
+			if (config.notificationMethod === 'web') {
+				const notifSound = {
+					type: options.type,
+					audio: 'default',
+					title: title,
+					body: options.body
+				};
+				console.log('Requesting application to play sound');
+				ipcRenderer.invoke('play-notification-sound', notifSound);
+				console.log('Continues to default notification workflow');
+				return new classicNotification(title, options);
+			} else {
+				ipcRenderer.invoke('show-notification', options);
+				return { onclick: null, onclose: null, onerror: null, onclose: onshow };
+			}
 		}
 		static requestPermission(callback) {
 			if (typeof (callback) == 'function') {

app/config/README.md

@@ -23,7 +23,7 @@ Here is the list of available arguments and its usage:
 | customBGServiceBaseUrl          | Base URL of the server which provides custom background images                            | string                |
 | customBGServiceIgnoreMSDefaults | A flag indicates whether to ignore Microsoft provided images or not                       | false               |
 | customBGServiceConfigFetchInterval | A numeric value in seconds as poll interval to download background service config download | number                |
-| customCACertsFingerprints       | Array of custom CA Certs Fingerprints to allow SSL unrecognized signer or self signed certificate | array             |
+| customCACertsFingerprints       | Array of custom CA Certs Fingerprints to allow SSL unrecognized signer or self signed certificate | []             |
 | customCSSName                   | custom CSS name for the packaged available css files                                      | string                |
 | customCSSLocation               | custom CSS styles file location                                                           | string                |
 | followSystemTheme               | Follow system theme                                                                      | false               |
@@ -49,13 +49,15 @@ Here is the list of available arguments and its usage:
 | optInTeamsV2                    | Opt in to use Teams V2                                                                   | false               |
 | partition                       | BrowserWindow webpreferences partition                                                    | string                |
 | proxyServer                     | Proxy Server with format address:port                                                     | string                |
-| screenLockInhibitionMethod      | Screen lock inhibition method to be used (Electron/WakeLockSentinel)                      | string                |
-| spellCheckerLanguages           | Array of languages to use with Electron's spell checker (experimental)                    | array                 |
+| screenLockInhibitionMethod      | Screen lock inhibition method to be used (`Electron`/`WakeLockSentinel`)                      | Electron                |
+| spellCheckerLanguages           | Array of languages to use with Electron's spell checker                    | []                 |
 | url                             | Microsoft Teams URL                                                                      | string                |
 | useMutationTitleLogic         | Use MutationObserver to update counter from title                                          | false               |
 | version                         | Show the version number                                                                  | false                 |
 | webDebug                        | Enable web debugging                                                                     | false               |
 | electronCLIFlags | Electron CLI flags to be added when the app starts | [] |
+| notificationMethod | Notification method to be used by the application (`web`/`electron`) | web |
+| defaultNotificationUrgency | Default urgency for new notifications (`low`/`normal`/`critical`). Only applicable when `notificationMethod` is `electron` | normal |
 
 
 As an example, to disable the persistence, you can run the following command:

app/config/index.js

@@ -247,6 +247,18 @@ function argv(configPath, appVersion) {
 				default: [],
 				describe: "Electron CLI flags",
 				type: 'array'
+			},
+			notificationMethod: {
+				default: 'web',
+				describe: 'Notification method to be used by the application (web/electron)',
+				type: 'string',
+				choices: ['web', 'electron']
+			},
+			defaultNotificationUrgency: {
+				default: 'normal',
+				describe: 'Default urgency for new notifications (low/normal/critical)',
+				type: 'string',
+				choices: ['low', 'normal', 'critical']
 			}
 		})
 		.parse(process.argv.slice(1));

app/index.js

@@ -1,4 +1,4 @@
-const { app, ipcMain, desktopCapturer, systemPreferences, powerMonitor } = require('electron');
+const { app, ipcMain, desktopCapturer, systemPreferences, powerMonitor, Notification, nativeImage } = require('electron');
 const path = require('path');
 const fs = require('fs');
 const { LucidLog } = require('lucid-log');
@@ -83,6 +83,7 @@ if (!gotTheLock) {
 	ipcMain.handle('desktopCapturerGetSources', (event, opts) => desktopCapturer.getSources(opts));
 	ipcMain.handle('getCustomBGList', handleGetCustomBGList);
 	ipcMain.handle('play-notification-sound', playNotificationSound);
+	ipcMain.handle('show-notification', showNotification);
 	ipcMain.handle('user-status-changed', userStatusChangedHandler);
 	ipcMain.handle('set-badge-count', setBadgeCountHandler);
 }
@@ -154,6 +155,22 @@ function addElectronCLIFlagsFromConfig() {
 	}
 }
 
+async function showNotification(event, options) {
+	logger.debug('Showing notification using electron API');
+	playNotificationSound(null, {
+		type: options.type,
+		audio: 'default',
+		title: options.title,
+		body: options.body
+	});
+	new Notification({
+		icon: nativeImage.createFromDataURL(options.icon),
+		title: options.title,
+		body: options.body,
+		urgency: config.defaultNotificationUrgency
+	}).show();
+}
+
 // eslint-disable-next-line no-unused-vars
 async function playNotificationSound(event, options) {
 	logger.debug(`Notificaion => Type: ${options.type}, Audio: ${options.audio}, Title: ${options.title}, Body: ${options.body}`);

com.github.IsmaelMartinez.teams_for_linux.appdata.xml

@@ -14,6 +14,13 @@
 	<url type="bugtracker">https://github.com/IsmaelMartinez/teams-for-linux/issues</url>
 	<launchable type="desktop-id">com.github.IsmaelMartinez.teams_for_linux.desktop</launchable>
 	<releases>
+		<release version="1.4.25" date="2024-04-14">
+			<description>
+				<ul>
+					<li>Now lets user choose the notification method and urgency</li>
+				</ul>
+			</description>
+		</release>
 		<release version="1.4.24" date="2024-04-13">
 			<description>
 				<ul>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "teams-for-linux",
-  "version": "1.4.24",
+  "version": "1.4.25",
   "main": "app/index.js",
   "description": "Unofficial client for Microsoft Teams for Linux",
   "homepage": "https://github.com/IsmaelMartinez/teams-for-linux",