From cf9bf6fa0f9c3623ffa148245b2c7c82595ebe6b Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Thu, 11 Jan 2024 17:05:35 +0900
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=EC=95=8C=EB=A6=BC=20=EC=9C=84?=
 =?UTF-8?q?=EC=A0=AF=20=ED=95=84=ED=84=B0=EB=A7=81=EC=9D=B4=20=EC=9E=91?=
 =?UTF-8?q?=EB=8F=99=ED=95=98=EC=A7=80=20=EC=95=8A=EC=9D=84=20=EC=88=98=20?=
 =?UTF-8?q?=EC=9E=88=EC=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG_CHERRYPICK.md                       |  1 +
 .../src/widgets/WidgetNotifications.vue       | 26 ++-----------------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index f397823c64..21eec20aa4 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -31,6 +31,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2023xx](CHANGE
 ### Client
 - Enhance: 빌트인 테마를 설치하려고 할 때 오류 메시지 개선
 - Fix: 장식 추가로 일부 태그를 추가할 수 없음
+- Fix: 알림 위젯 필터링이 작동하지 않을 수 있음 #404
 
 ---
 
diff --git a/packages/frontend/src/widgets/WidgetNotifications.vue b/packages/frontend/src/widgets/WidgetNotifications.vue
index 79851ea039..54c175ad0b 100644
--- a/packages/frontend/src/widgets/WidgetNotifications.vue
+++ b/packages/frontend/src/widgets/WidgetNotifications.vue
@@ -8,28 +8,24 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template #icon><i class="ti ti-bell"></i></template>
 	<template #header>{{ i18n.ts.notifications }}</template>
 	<template #func="{ buttonStyleClass }">
-		<button v-tooltip="i18n.ts.filter" class="_button" :class="buttonStyleClass" @click="setFilter"><i class="ti ti-filter"></i></button>
 		<button v-tooltip="i18n.ts.markAllAsRead" class="_button" :class="buttonStyleClass" @click="os.apiWithDialog('notifications/mark-all-as-read')"><i class="ti ti-check"></i></button>
 		<button v-tooltip="i18n.ts.settings" class="_button" :class="buttonStyleClass" @click="configureNotification()"><i class="ti ti-settings"></i></button>
 	</template>
 
 	<div>
-		<XNotifications :includeTypes="includeTypes"/>
+		<XNotifications :excludeTypes="widgetProps.excludeTypes"/>
 	</div>
 </MkContainer>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, ref } from 'vue';
+import { defineAsyncComponent } from 'vue';
 import { useWidgetPropsManager, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget.js';
 import { GetFormResultType } from '@/scripts/form.js';
 import MkContainer from '@/components/MkContainer.vue';
 import XNotifications from '@/components/MkNotifications.vue';
 import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
-import { notificationTypes } from '@/const.js';
-
-const includeTypes = ref<string[] | null>(null);
 
 const name = 'notifications';
 
@@ -72,24 +68,6 @@ const configureNotification = () => {
 	}, 'closed');
 };
 
-const setFilter = (ev) => {
-	const typeItems = notificationTypes.map(t => ({
-		text: i18n.t(`_notification._types.${t}`),
-		active: includeTypes.value && includeTypes.value.includes(t),
-		action: () => {
-			includeTypes.value = [t];
-		},
-	}));
-	const items = includeTypes.value != null ? [{
-		icon: 'ti ti-x',
-		text: i18n.ts.clear,
-		action: () => {
-			includeTypes.value = null;
-		},
-	}, null, ...typeItems] : typeItems;
-	os.popupMenu(items, ev.currentTarget ?? ev.target);
-};
-
 defineExpose<WidgetComponentExpose>({
 	name,
 	configure,