ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Notifications: Fix new window always popping up on click (#1392)

Browse Source
This commit is contained in:
Alexander Zinchuk 2021-08-16 20:42:25 +03:00
parent 5a7bbb19b1
commit be4e05b8ca
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/serviceWorker/pushNotification.ts
View File

@ -163,12 +163,14 @@ async function focusChatMessage(client: WindowClient, data: { chatId?: number; m
} }
export function handleNotificationClick(e: NotificationEvent) { export function handleNotificationClick(e: NotificationEvent) {
const appUrl = self.location.href.replace('serviceWorker.js', ''); const appUrl = new URL(self.registration.scope).origin;
e.notification.close(); // Android needs explicit close. e.notification.close(); // Android needs explicit close.
const { data } = e.notification; const { data } = e.notification;
const notifyClients = async () => { const notifyClients = async () => {
const clients = await self.clients.matchAll({ type: 'window' }) as WindowClient[]; const clients = await self.clients.matchAll({ type: 'window' }) as WindowClient[];
const clientsInScope = clients.filter((client) => client.url === self.registration.scope); const clientsInScope = clients.filter((client) => {
return new URL(client.url).origin === appUrl;
});
e.waitUntil(Promise.all(clientsInScope.map((client) => { e.waitUntil(Promise.all(clientsInScope.map((client) => {
clickBuffer[client.id] = data; clickBuffer[client.id] = data;
return focusChatMessage(client, data); return focusChatMessage(client, data);