fix(notifications): check once if call notification is valid (not mis…

…sed)

- if missed, don't show callbox, but native notification and default sound

Signed-off-by: Maksim Sukharev <[email protected]>

src/callbox/renderer/callbox.service.ts

@@ -57,6 +57,21 @@ async function hasCurrentUserJoinedCall(token: string) {
 	return participants.some((participant) => user.uid === participant.actorId)
 }
 
+/**
+ * Check if callbox should be rendered
+ * @param token - Conversation token
+ * @return Promise<boolean> - Resolved with boolean - true if the user should see the callbox, false otherwise
+ */
+export async function checkCurrentUserHasPendingCall(token: string): Promise<boolean> {
+	try {
+		const response = await hasCurrentUserJoinedCall(token)
+		return !response
+	} catch (e) {
+		console.warn('Error while checking if the user has pending call', e)
+		return false
+	}
+}
+
 /**
  * Wait until the current user has joined the call
  * @param token - Conversation token

src/talk/renderer/notifications/notifications.store.js

@@ -20,6 +20,7 @@ import { t } from '@nextcloud/l10n'
 import { getNotificationsData } from './notifications.service.js'
 import { appData } from '../../../app/AppData.js'
 import { useUserStatusStore } from '../UserStatus/userStatus.store.js'
+import { checkCurrentUserHasPendingCall } from '../../../callbox/renderer/callbox.service.ts'
 import { getAppConfigValue } from '../../../shared/appConfig.service.ts'
 import { subscribeBroadcast } from '../../../shared/broadcast.service.ts'
 import { openConversation } from '../utils/talk.service.ts'
@@ -160,16 +161,21 @@ export function createNotificationStore() {
 	 *
 	 * @param notification
 	 */
-	function showNativeNotification(notification) {
+	async function showNativeNotification(notification) {
 		if (notification.app !== 'spreed') {
 			return
 		}
 		if (notification.shouldNotify === false) {
 			return
 		}
 
+		const isNotificationFromPendingCall = notification.objectType === 'call'
+			&& await checkCurrentUserHasPendingCall(notification.objectId)
+
 		const enableCallboxConfig = getAppConfigValue('enableCallbox')
-		const shouldShowCallPopup = notification.objectType === 'call' && (enableCallboxConfig === 'always' || (enableCallboxConfig === 'respect-dnd' && !userStatusStore.isDnd))
+		const shouldShowCallPopup = isNotificationFromPendingCall
+			&& (enableCallboxConfig === 'always' || (enableCallboxConfig === 'respect-dnd' && !userStatusStore.isDnd))
+
 		if (shouldShowCallPopup) {
 			const params = {
 				token: notification.objectId,
@@ -201,7 +207,7 @@ export function createNotificationStore() {
 				emit('notifications:action:execute', event)
 			}, false)
 		}
-		playSound(notification.objectType === 'call')
+		playSound(isNotificationFromPendingCall)
 	}
 
 	/**
@@ -222,7 +228,7 @@ export function createNotificationStore() {
 			notificationsSet = new Set(state.notifications.map((notification) => notification.notificationId))
 			if (state.backgroundFetching) {
 				for (const notification of newNotifications) {
-					showNativeNotification(notification)
+					await showNativeNotification(notification)
 					emit('notifications:notification:received', { notification })
 				}
 			}