Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into enhance-migration

Browse source
This commit is contained in:
Namekuji 2023-04-18 06:16:56 -04:00 committed by GitHub
parent ad1bacc2e5 471b836a44
commit e2e77ac4f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/frontend/src/ui/deck/channel-column.vue
View file

@ -40,7 +40,7 @@ if (props.column.channelId == null) {
} }
async function setChannel() { async function setChannel() {
const channels = await os.api('channels/followed', { const channels = await os.api('channels/my-favorites', {
limit: 100, limit: 100,
}); });
const { canceled, result: channel } = await os.select({ const { canceled, result: channel } = await os.select({

4
packages/sw/src/sw.ts
View file

@ -56,7 +56,7 @@ globalThis.addEventListener('push', ev => {
return createNotification(data); return createNotification(data);
case 'readAllNotifications': case 'readAllNotifications':
await globalThis.registration.getNotifications() await globalThis.registration.getNotifications()
.then(notifications => notifications.forEach(n => n.close())); .then(notifications => notifications.forEach(n => n.tag !== 'read_notification' && n.close()));
break; break;
} }
@ -133,7 +133,7 @@ globalThis.addEventListener('notificationclick', (ev: ServiceWorkerGlobalScopeEv
switch (action) { switch (action) {
case 'markAllAsRead': case 'markAllAsRead':
await globalThis.registration.getNotifications() await globalThis.registration.getNotifications()
.then(notifications => notifications.forEach(n => n.close())); .then(notifications => notifications.forEach(n => n.tag !== 'read_notification' && n.close()));
await get('accounts').then(accounts => { await get('accounts').then(accounts => {
return Promise.all(accounts.map(async account => { return Promise.all(accounts.map(async account => {
await swos.sendMarkAllAsRead(account.id); await swos.sendMarkAllAsRead(account.id);