From aa289c9cb0ce0c88f44260da98ded45e8f56b5f5 Mon Sep 17 00:00:00 2001
From: tsukimizake <shomasd@gmail.com>
Date: Tue, 18 Apr 2023 13:29:45 +0900
Subject: [PATCH 1/2] use channels/my-favorites on
 deck/channel-column/setChannel (#10662)

---
 packages/frontend/src/ui/deck/channel-column.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/ui/deck/channel-column.vue b/packages/frontend/src/ui/deck/channel-column.vue
index ff0cba33ac..9605d1b22e 100644
--- a/packages/frontend/src/ui/deck/channel-column.vue
+++ b/packages/frontend/src/ui/deck/channel-column.vue
@@ -40,7 +40,7 @@ if (props.column.channelId == null) {
 }
 
 async function setChannel() {
-	const channels = await os.api('channels/followed', {
+	const channels = await os.api('channels/my-favorites', {
 		limit: 100,
 	});
 	const { canceled, result: channel } = await os.select({

From 471b836a4450745929e738f05cb369f5e1377fbd Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 18 Apr 2023 06:01:18 +0000
Subject: [PATCH 2/2] =?UTF-8?q?fix(sw):=20=E9=80=9A=E7=9F=A5=E5=85=A8?=
 =?UTF-8?q?=E5=89=8A=E9=99=A4=E6=99=82=E3=81=ABread=5Fnotification?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E3=81=8C=E6=B6=88=E3=81=88=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=20=E9=80=9A=E7=9F=A5=E6=AC=84?=
 =?UTF-8?q?=E3=81=AB=E7=8F=BE=E3=82=8C=E3=81=9F=E3=82=8A=E6=B6=88=E3=81=88?=
 =?UTF-8?q?=E3=81=9F=E3=82=8A=E3=81=99=E3=82=8B=E3=81=A8=E3=81=86=E3=81=96?=
 =?UTF-8?q?=E3=81=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/sw/src/sw.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/sw/src/sw.ts b/packages/sw/src/sw.ts
index 9e0d9f0d1e..2783f2bfb5 100644
--- a/packages/sw/src/sw.ts
+++ b/packages/sw/src/sw.ts
@@ -56,7 +56,7 @@ globalThis.addEventListener('push', ev => {
 				return createNotification(data);
 			case 'readAllNotifications':
 				await globalThis.registration.getNotifications()
-					.then(notifications => notifications.forEach(n => n.close()));
+					.then(notifications => notifications.forEach(n => n.tag !== 'read_notification' && n.close()));
 				break;
 		}
 
@@ -133,7 +133,7 @@ globalThis.addEventListener('notificationclick', (ev: ServiceWorkerGlobalScopeEv
 				switch (action) {
 					case 'markAllAsRead':
 						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 => {
 							return Promise.all(accounts.map(async account => {
 								await swos.sendMarkAllAsRead(account.id);