From bdbb3266ae9a720c48ae7c12c47ba7852445e89b Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 5 Nov 2023 09:04:03 +0900
Subject: [PATCH] =?UTF-8?q?fix(backend):=20=E3=82=A2=E3=83=BC=E3=82=AB?=
 =?UTF-8?q?=E3=82=A4=E3=83=96=E3=81=97=E3=81=9F=E3=81=8A=E7=9F=A5=E3=82=89?=
 =?UTF-8?q?=E3=81=9B=E3=81=8C=E3=82=B3=E3=83=B3=E3=83=88=E3=83=AD=E3=83=BC?=
 =?UTF-8?q?=E3=83=AB=E3=83=91=E3=83=8D=E3=83=AB=E3=81=AB=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E3=81=95=E3=82=8C=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                                     | 1 +
 .../backend/src/server/api/endpoints/admin/announcements/list.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37f40667bf..7890408cd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@
 - Fix: 11以上されているリアクションにおいてツールチップで示されるリアクション数が本来よりも1多い問題を修正 #12174
 - Fix: サイレンス状態で公開範囲のパブリックを選択できてしまう問題を修正 #12224
 - Fix: In deck layout, replies option is not saved after refresh
+- Fix: アーカイブしたお知らせがコントロールパネルに表示される問題を修正
 - Note: アップデート後、サウンドに関する設定が初期化されます
 
 ### Server
diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts
index fefc379c00..0bda61a361 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts
@@ -86,6 +86,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const query = this.queryService.makePaginationQuery(this.announcementsRepository.createQueryBuilder('announcement'), ps.sinceId, ps.untilId);
+			query.andWhere('announcement.isActive = true');
 			if (ps.userId) {
 				query.andWhere('announcement.userId = :userId', { userId: ps.userId });
 			} else {