Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-02-15 07:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ms-winsoundevent:Notification.IM on Windows

Browse Source
This commit is contained in:
Fedor Indutny
2025-02-26 12:42:31 -08:00
committed by GitHub
parent 1d4290d1e7
commit 9fede7e467
2 changed files with 69 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/renderWindowsToast.tsx
View File

@@ -33,6 +33,7 @@ const Text = (props: { id: string; children: React.ReactNode }) =>
React.createElement('text', props);
const Image = (props: { id: string; src: string; 'hint-crop': string }) =>
React.createElement('image', props);
const Audio = (props: { src: string }) => React.createElement('audio', props);
export function renderWindowsToast({
avatarPath,
@@ -51,6 +52,8 @@ export function renderWindowsToast({
const template = avatarPath ? 'ToastImageAndText02' : 'ToastText02';
let launch: URL;
let audio: React.ReactNode | undefined;
// Note:
// 1) this maps to the notify() function in services/notifications.ts
// 2) this also maps to the url-handling in main.ts
@@ -58,6 +61,7 @@ export function renderWindowsToast({
launch = showConversationRoute.toAppUrl({
token,
});
audio = <Audio src="ms-winsoundevent:Notification.IM" />;
} else if (type === NotificationType.IncomingGroupCall) {
launch = startCallLobbyRoute.toAppUrl({
token,
@@ -79,6 +83,7 @@ export function renderWindowsToast({
<Text id="2">{body}</Text>
</Binding>
</Visual>
{audio}
</Toast>
);
}

76
ts/test-node/app/renderWindowsToast_test.tsx
View File

@@ -16,8 +16,18 @@ describe('renderWindowsToast', () => {
type: NotificationType.Message,
});
const expected =
'<toast launch="sgnl://show-conversation?token=token" activationType="protocol"><visual><binding template="ToastImageAndText02"><image id="1" src="file:///C:/temp/ab/abcd" hint-crop="circle"></image><text id="1">Alice</text><text id="2">Hi there!</text></binding></visual></toast>';
const expected = [
'<toast launch="sgnl://show-conversation?token=token" activationType="protocol">',
'<visual>',
'<binding template="ToastImageAndText02">',
'<image id="1" src="file:///C:/temp/ab/abcd" hint-crop="circle"></image>',
'<text id="1">Alice</text>',
'<text id="2">Hi there!</text>',
'</binding>',
'</visual>',
'<audio src="ms-winsoundevent:Notification.IM"></audio>',
'</toast>',
].join('');
assert.strictEqual(xml, expected);
});
@@ -30,8 +40,17 @@ describe('renderWindowsToast', () => {
type: NotificationType.Message,
});
const expected =
'<toast launch="sgnl://show-conversation?token=token" activationType="protocol"><visual><binding template="ToastText02"><text id="1">Alice</text><text id="2">Hi there!</text></binding></visual></toast>';
const expected = [
'<toast launch="sgnl://show-conversation?token=token" activationType="protocol">',
'<visual>',
'<binding template="ToastText02">',
'<text id="1">Alice</text>',
'<text id="2">Hi there!</text>',
'</binding>',
'</visual>',
'<audio src="ms-winsoundevent:Notification.IM"></audio>',
'</toast>',
].join('');
assert.strictEqual(xml, expected);
});
@@ -44,8 +63,17 @@ describe('renderWindowsToast', () => {
type: NotificationType.Message,
});
const expected =
'<toast launch="sgnl://show-conversation?token=token" activationType="protocol"><visual><binding template="ToastText02"><text id="1">Alice</text><text id="2">Hi there!</text></binding></visual></toast>';
const expected = [
'<toast launch="sgnl://show-conversation?token=token" activationType="protocol">',
'<visual>',
'<binding template="ToastText02">',
'<text id="1">Alice</text>',
'<text id="2">Hi there!</text>',
'</binding>',
'</visual>',
'<audio src="ms-winsoundevent:Notification.IM"></audio>',
'</toast>',
].join('');
assert.strictEqual(xml, expected);
});
@@ -58,8 +86,16 @@ describe('renderWindowsToast', () => {
type: NotificationType.IncomingCall,
});
const expected =
'<toast launch="sgnl://show-window" activationType="protocol"><visual><binding template="ToastText02"><text id="1">Alice</text><text id="2">Hi there!</text></binding></visual></toast>';
const expected = [
'<toast launch="sgnl://show-window" activationType="protocol">',
'<visual>',
'<binding template="ToastText02">',
'<text id="1">Alice</text>',
'<text id="2">Hi there!</text>',
'</binding>',
'</visual>',
'</toast>',
].join('');
assert.strictEqual(xml, expected);
});
@@ -72,8 +108,16 @@ describe('renderWindowsToast', () => {
type: NotificationType.IncomingGroupCall,
});
const expected =
'<toast launch="sgnl://start-call-lobby?token=token" activationType="protocol"><visual><binding template="ToastText02"><text id="1">Alice</text><text id="2">Hi there!</text></binding></visual></toast>';
const expected = [
'<toast launch="sgnl://start-call-lobby?token=token" activationType="protocol">',
'<visual>',
'<binding template="ToastText02">',
'<text id="1">Alice</text>',
'<text id="2">Hi there!</text>',
'</binding>',
'</visual>',
'</toast>',
].join('');
assert.strictEqual(xml, expected);
});
@@ -86,8 +130,16 @@ describe('renderWindowsToast', () => {
type: NotificationType.IsPresenting,
});
const expected =
'<toast launch="sgnl://cancel-presenting" activationType="protocol"><visual><binding template="ToastText02"><text id="1">Alice</text><text id="2">Hi there!</text></binding></visual></toast>';
const expected = [
'<toast launch="sgnl://cancel-presenting" activationType="protocol">',
'<visual>',
'<binding template="ToastText02">',
'<text id="1">Alice</text>',
'<text id="2">Hi there!</text>',
'</binding>',
'</visual>',
'</toast>',
].join('');
assert.strictEqual(xml, expected);
});