diff --git a/packages/backend/src/core/QueueModule.ts b/packages/backend/src/core/QueueModule.ts
index 99513998ee7b..8f2df7fc462d 100644
--- a/packages/backend/src/core/QueueModule.ts
+++ b/packages/backend/src/core/QueueModule.ts
@@ -17,12 +17,12 @@ import {
 	UserWebhookDeliverJobData,
 	SystemWebhookDeliverJobData,
 	ScheduleNotePostJobData,
+	ScheduledNoteDeleteJobData,
 } from '../queue/types.js';
 import type { Provider } from '@nestjs/common';
 
 export type SystemQueue = Bull.Queue<Record<string, unknown>>;
 export type EndedPollNotificationQueue = Bull.Queue<EndedPollNotificationJobData>;
-export type ScheduledNoteDeleteQueue = Bull.Queue<ScheduledNoteDeleteJobData>
 export type DeliverQueue = Bull.Queue<DeliverJobData>;
 export type InboxQueue = Bull.Queue<InboxJobData>;
 export type DbQueue = Bull.Queue;
@@ -31,6 +31,7 @@ export type ObjectStorageQueue = Bull.Queue;
 export type UserWebhookDeliverQueue = Bull.Queue<UserWebhookDeliverJobData>;
 export type SystemWebhookDeliverQueue = Bull.Queue<SystemWebhookDeliverJobData>;
 export type ScheduleNotePostQueue = Bull.Queue<ScheduleNotePostJobData>;
+export type ScheduledNoteDeleteQueue = Bull.Queue<ScheduledNoteDeleteJobData>
 
 const $system: Provider = {
 	provide: 'queue:system',
@@ -44,12 +45,6 @@ const $endedPollNotification: Provider = {
 	inject: [DI.config],
 };
 
-const $scheduledNoteDeleted: Provider = {
-	provide: 'queue:scheduledNoteDelete',
-	useFactory: (config: Config) => new Bull.Queue(QUEUE.SCHEDULED_NOTE_DELETE, baseQueueOptions(config, QUEUE.SCHEDULED_NOTE_DELETE)),
-	inject: [DI.config],
-};
-
 const $deliver: Provider = {
 	provide: 'queue:deliver',
 	useFactory: (config: Config) => new Bull.Queue(QUEUE.DELIVER, baseQueueOptions(config, QUEUE.DELIVER)),
@@ -98,13 +93,18 @@ const $scheduleNotePost: Provider = {
 	inject: [DI.config],
 };
 
+const $scheduledNoteDeleted: Provider = {
+	provide: 'queue:scheduledNoteDelete',
+	useFactory: (config: Config) => new Bull.Queue(QUEUE.SCHEDULED_NOTE_DELETE, baseQueueOptions(config, QUEUE.SCHEDULED_NOTE_DELETE)),
+	inject: [DI.config],
+};
+
 @Module({
 	imports: [
 	],
 	providers: [
 		$system,
 		$endedPollNotification,
-		$scheduledNoteDeleted,
 		$deliver,
 		$inbox,
 		$db,
@@ -113,11 +113,11 @@ const $scheduleNotePost: Provider = {
 		$userWebhookDeliver,
 		$systemWebhookDeliver,
 		$scheduleNotePost,
+		$scheduledNoteDeleted,
 	],
 	exports: [
 		$system,
 		$endedPollNotification,
-		$scheduledNoteDeleted,
 		$deliver,
 		$inbox,
 		$db,
@@ -126,13 +126,13 @@ const $scheduleNotePost: Provider = {
 		$userWebhookDeliver,
 		$systemWebhookDeliver,
 		$scheduleNotePost,
+		$scheduledNoteDeleted,
 	],
 })
 export class QueueModule implements OnApplicationShutdown {
 	constructor(
 		@Inject('queue:system') public systemQueue: SystemQueue,
 		@Inject('queue:endedPollNotification') public endedPollNotificationQueue: EndedPollNotificationQueue,
-		@Inject('queue:scheduledNoteDelete') public scheduledNoteDeleteQueue: ScheduledNoteDeleteQueue,
 		@Inject('queue:deliver') public deliverQueue: DeliverQueue,
 		@Inject('queue:inbox') public inboxQueue: InboxQueue,
 		@Inject('queue:db') public dbQueue: DbQueue,
@@ -141,6 +141,7 @@ export class QueueModule implements OnApplicationShutdown {
 		@Inject('queue:userWebhookDeliver') public userWebhookDeliverQueue: UserWebhookDeliverQueue,
 		@Inject('queue:systemWebhookDeliver') public systemWebhookDeliverQueue: SystemWebhookDeliverQueue,
 		@Inject('queue:scheduleNotePost') public scheduleNotePostQueue: ScheduleNotePostQueue,
+		@Inject('queue:scheduledNoteDelete') public scheduledNoteDeleteQueue: ScheduledNoteDeleteQueue,
 	) {}
 
 	public async dispose(): Promise<void> {
@@ -150,7 +151,6 @@ export class QueueModule implements OnApplicationShutdown {
 		await Promise.all([
 			this.systemQueue.close(),
 			this.endedPollNotificationQueue.close(),
-			this.scheduledNoteDeleteQueue.close(),
 			this.deliverQueue.close(),
 			this.inboxQueue.close(),
 			this.dbQueue.close(),
@@ -159,6 +159,7 @@ export class QueueModule implements OnApplicationShutdown {
 			this.userWebhookDeliverQueue.close(),
 			this.systemWebhookDeliverQueue.close(),
 			this.scheduleNotePostQueue.close(),
+			this.scheduledNoteDeleteQueue.close(),
 		]);
 	}
 
diff --git a/packages/backend/src/core/QueueService.ts b/packages/backend/src/core/QueueService.ts
index 0759ab6b7680..288ff2068751 100644
--- a/packages/backend/src/core/QueueService.ts
+++ b/packages/backend/src/core/QueueService.ts
@@ -35,6 +35,7 @@ import type {
 	SystemWebhookDeliverQueue,
 	UserWebhookDeliverQueue,
 	ScheduleNotePostQueue,
+	ScheduledNoteDeleteQueue,
 } from './QueueModule.js';
 import type httpSignature from '@peertube/http-signature';
 import type * as Bull from 'bullmq';
@@ -47,7 +48,6 @@ export class QueueService {
 
 		@Inject('queue:system') public systemQueue: SystemQueue,
 		@Inject('queue:endedPollNotification') public endedPollNotificationQueue: EndedPollNotificationQueue,
-		@Inject('queue:scheduledNoteDelete') public scheduledNoteDeleteQueue: ScheduledNoteDeleteQueue,
 		@Inject('queue:deliver') public deliverQueue: DeliverQueue,
 		@Inject('queue:inbox') public inboxQueue: InboxQueue,
 		@Inject('queue:db') public dbQueue: DbQueue,
@@ -56,6 +56,7 @@ export class QueueService {
 		@Inject('queue:userWebhookDeliver') public userWebhookDeliverQueue: UserWebhookDeliverQueue,
 		@Inject('queue:systemWebhookDeliver') public systemWebhookDeliverQueue: SystemWebhookDeliverQueue,
 		@Inject('queue:scheduleNotePost') public ScheduleNotePostQueue: ScheduleNotePostQueue,
+		@Inject('queue:scheduledNoteDelete') public scheduledNoteDeleteQueue: ScheduledNoteDeleteQueue,
 	) {
 		this.systemQueue.add('tickCharts', {
 		}, {
diff --git a/packages/backend/src/core/WebhookTestService.ts b/packages/backend/src/core/WebhookTestService.ts
index 555a39f71c16..681a87f96a6c 100644
--- a/packages/backend/src/core/WebhookTestService.ts
+++ b/packages/backend/src/core/WebhookTestService.ts
@@ -131,6 +131,7 @@ function generateDummyNote(override?: Partial<MiNote>): MiNote {
 		replyUserHost: null,
 		renoteUserId: null,
 		renoteUserHost: null,
+		deleteAt: null,
 		...override,
 	};
 }
diff --git a/packages/backend/src/core/entities/ChannelEntityService.ts b/packages/backend/src/core/entities/ChannelEntityService.ts
index a0347b6fdeec..5f595e106520 100644
--- a/packages/backend/src/core/entities/ChannelEntityService.ts
+++ b/packages/backend/src/core/entities/ChannelEntityService.ts
@@ -86,6 +86,7 @@ export class ChannelEntityService {
 			notesCount: channel.notesCount,
 			isSensitive: channel.isSensitive,
 			allowRenoteToExternal: channel.allowRenoteToExternal,
+			announcement: channel.announcement as string | null,
 
 			...(me ? {
 				isFollowing,
@@ -95,7 +96,6 @@ export class ChannelEntityService {
 
 			...(detailed ? {
 				pinnedNotes: (await this.noteEntityService.packMany(pinnedNotes, me)).sort((a, b) => channel.pinnedNoteIds.indexOf(a.id) - channel.pinnedNoteIds.indexOf(b.id)),
-				announcement: channel.announcement,
 			} : {}),
 		};
 	}
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 5ec3cfe631cc..30fc65f217a3 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts
@@ -161,7 +161,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				needConfirmationToRead: announcement.needConfirmationToRead,
 				userId: announcement.userId,
 				isRoleSpecified: announcement.isRoleSpecified,
-				roles: announcementRoles.filter(announcementRole => announcementRole.announcementId === announcement.id).map(announcementRole => announcementRole.role).filter((role): role is MiRole => role !== null),
+				roles: announcementRoles
+					.filter(announcementRole => announcementRole.announcementId === announcement.id)
+					.map(announcementRole => announcementRole.role)
+					.filter((role): role is NonNullable<typeof role> => role !== null),
 				reads: reads.get(announcement)!,
 			}));
 		});
diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts
index 81b26fb0b9b1..680b466b3898 100644
--- a/packages/backend/src/server/api/endpoints/admin/meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -193,8 +193,8 @@ export const meta = {
 				},
 			},
 			emailWhitelist: {
-				type: 'string',
-				optional: false, nullable: true,
+				type: 'boolean',
+				optional: false, nullable: false,
 			},
 			preservedUsernames: {
 				type: 'array',
@@ -518,8 +518,8 @@ export const meta = {
 				type: 'string',
 				optional: false, nullable: false,
 			},
-			emailToReceiveAbuseReport: {
-				type: 'string',
+			federationHosts: {
+				type: 'array',
 				optional: false, nullable: false,
 				items: {
 					type: 'string',
diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
index ecef42bd65f7..f988865b6162 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -188,7 +188,7 @@ export const paramDef = {
 		},
 		customSplashText: { type: 'array', nullable: true, items: {
 			type: 'string',
-		}},
+		} },
 	},
 	required: [],
 } as const;
diff --git a/packages/backend/src/server/api/endpoints/notes/schedule/create.ts b/packages/backend/src/server/api/endpoints/notes/schedule/create.ts
index 9018e6c75705..9a4e5486145f 100644
--- a/packages/backend/src/server/api/endpoints/notes/schedule/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/schedule/create.ts
@@ -26,6 +26,7 @@ import { QueueService } from '@/core/QueueService.js';
 import { IdService } from '@/core/IdService.js';
 import { MiScheduleNoteType } from '@/models/NoteSchedule.js';
 import { RoleService } from '@/core/RoleService.js';
+import { isQuote, isRenote } from '@/misc/is-renote.js';
 import { ApiError } from '../../../error.js';
 
 export const meta = {
@@ -132,6 +133,15 @@ export const meta = {
 	},
 } as const;
 
+function checkPureRenote(note: MiNote): boolean {
+	return note.renoteId != null &&
+		note.replyId == null &&
+		note.text == null &&
+		note.cw == null &&
+		(!note.fileIds || note.fileIds.length === 0) &&
+		!note.hasPoll;
+}
+
 export const paramDef = {
 	type: 'object',
 	properties: {
@@ -275,7 +285,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 				if (renote == null) {
 					throw new ApiError(meta.errors.noSuchRenoteTarget);
-				} else if (isPureRenote(renote)) {
+				} else if (isRenote(renote) && !isQuote(renote)) {
 					throw new ApiError(meta.errors.cannotReRenote);
 				}
 
@@ -308,7 +318,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 				if (reply == null) {
 					throw new ApiError(meta.errors.noSuchReplyTarget);
-				} else if (isPureRenote(reply)) {
+				} else if (checkPureRenote(reply)) {
 					throw new ApiError(meta.errors.cannotReplyToPureRenote);
 				}
 
diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts
index 2cac0e18d201..22f38448b3ee 100644
--- a/packages/backend/src/server/web/ClientServerService.ts
+++ b/packages/backend/src/server/web/ClientServerService.ts
@@ -35,6 +35,7 @@ import type {
 	UserWebhookDeliverQueue,
 	SystemWebhookDeliverQueue,
 	ScheduleNotePostQueue,
+	ScheduledNoteDeleteQueue,
 } from '@/core/QueueModule.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
@@ -137,7 +138,6 @@ export class ClientServerService {
 
 		@Inject('queue:system') public systemQueue: SystemQueue,
 		@Inject('queue:endedPollNotification') public endedPollNotificationQueue: EndedPollNotificationQueue,
-		@Inject('queue:scheduledNoteDelete') public scheduledNoteDeleteQueue: ScheduledNoteDeleteQueue,
 		@Inject('queue:deliver') public deliverQueue: DeliverQueue,
 		@Inject('queue:inbox') public inboxQueue: InboxQueue,
 		@Inject('queue:db') public dbQueue: DbQueue,
@@ -146,6 +146,7 @@ export class ClientServerService {
 		@Inject('queue:userWebhookDeliver') public userWebhookDeliverQueue: UserWebhookDeliverQueue,
 		@Inject('queue:systemWebhookDeliver') public systemWebhookDeliverQueue: SystemWebhookDeliverQueue,
 		@Inject('queue:scheduleNotePost') public scheduleNotePostQueue: ScheduleNotePostQueue,
+		@Inject('queue:scheduledNoteDelete') public scheduledNoteDeleteQueue: ScheduledNoteDeleteQueue,
 	) {
 		//this.createServer = this.createServer.bind(this);
 	}
@@ -268,7 +269,6 @@ export class ClientServerService {
 			queues: [
 				this.systemQueue,
 				this.endedPollNotificationQueue,
-				this.scheduledNoteDeleteQueue,
 				this.deliverQueue,
 				this.inboxQueue,
 				this.dbQueue,
@@ -277,6 +277,7 @@ export class ClientServerService {
 				this.userWebhookDeliverQueue,
 				this.systemWebhookDeliverQueue,
 				this.scheduleNotePostQueue,
+				this.scheduledNoteDeleteQueue,
 			].map(q => new BullMQAdapter(q)),
 			serverAdapter: bullBoardServerAdapter,
 		});
diff --git a/packages/backend/test/unit/NoteCreateService.ts b/packages/backend/test/unit/NoteCreateService.ts
index f2d4c8ffbb77..99a44c2c6c04 100644
--- a/packages/backend/test/unit/NoteCreateService.ts
+++ b/packages/backend/test/unit/NoteCreateService.ts
@@ -60,6 +60,7 @@ describe('NoteCreateService', () => {
 			replyUserHost: null,
 			renoteUserId: null,
 			renoteUserHost: null,
+			deleteAt: null,
 		};
 
 		const poll: IPoll = {
diff --git a/packages/backend/test/unit/misc/is-renote.ts b/packages/backend/test/unit/misc/is-renote.ts
index 0b713e8bf6b4..933879be4411 100644
--- a/packages/backend/test/unit/misc/is-renote.ts
+++ b/packages/backend/test/unit/misc/is-renote.ts
@@ -43,6 +43,7 @@ const base: MiNote = {
 	replyUserHost: null,
 	renoteUserId: null,
 	renoteUserHost: null,
+	deleteAt: null,
 };
 
 describe('misc:is-renote', () => {
diff --git a/packages/frontend/src/pages/admin/announcements.vue b/packages/frontend/src/pages/admin/announcements.vue
index 6f7290b5f1ef..04d08107b3dd 100644
--- a/packages/frontend/src/pages/admin/announcements.vue
+++ b/packages/frontend/src/pages/admin/announcements.vue
@@ -4,13 +4,22 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-	<MkStickyContainer>
-		<template #header><XHeader :actions="headerActions" :tabs="headerTabs"/></template>
-		<MkSpacer :contentMax="900">
-			<div class="_gaps">
-				<MkInfo>{{ i18n.ts._announcement.shouldNotBeUsedToPresentPermanentInfo }}</MkInfo>
-				<MkInfo v-if="announcements.length > 5" warn>{{ i18n.ts._announcement.tooManyActiveAnnouncementDescription }}</MkInfo>
+<MkStickyContainer>
+	<template #header><XHeader :actions="headerActions" :tabs="headerTabs"/></template>
+	<MkSpacer :contentMax="900">
+		<div class="_gaps">
+			<MkInfo>{{ i18n.ts._announcement.shouldNotBeUsedToPresentPermanentInfo }}</MkInfo>
+			<MkInfo v-if="announcements.length > 5" warn>{{ i18n.ts._announcement.tooManyActiveAnnouncementDescription }}</MkInfo>
 
+			<MkSelect v-model="announcementsStatus">
+				<template #label>{{ i18n.ts.filter }}</template>
+				<option value="active">{{ i18n.ts.active }}</option>
+				<option value="archived">{{ i18n.ts.archived }}</option>
+			</MkSelect>
+
+			<MkLoading v-if="loading"/>
+
+			<template v-else>
 				<MkFolder v-for="(announcement, announcementIndex) in announcements" :key="announcement.id ?? announcement._id" :defaultOpen="announcement.id == null">
 					<template #label>{{ announcement.title }}</template>
 					<template #icon>
@@ -75,100 +84,117 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<p v-if="announcement.reads">{{ i18n.tsx.nUsersRead({ n: announcement.reads }) }}</p>
 					</div>
 				</MkFolder>
-				<MkLoading v-if="loadingMore"/>
-				<MkButton @click="more()">
-					<i class="ti ti-reload"></i>{{ i18n.ts.more }}
-				</MkButton>
-			</div>
-		</MkSpacer>
-	</MkStickyContainer>
-	</template>
-
-	<script lang="ts" setup>
-	import { ref, computed } from 'vue';
-	import XHeader from './_header_.vue';
-	import MkButton from '@/components/MkButton.vue';
-	import MkInput from '@/components/MkInput.vue';
-	import MkSwitch from '@/components/MkSwitch.vue';
-	import MkRadios from '@/components/MkRadios.vue';
-	import MkInfo from '@/components/MkInfo.vue';
-	import * as os from '@/os.js';
-	import { misskeyApi } from '@/scripts/misskey-api.js';
-	import { i18n } from '@/i18n.js';
-	import { definePageMetadata } from '@/scripts/page-metadata.js';
-	import MkFolder from '@/components/MkFolder.vue';
-	import MkTextarea from '@/components/MkTextarea.vue';
-	import MkRolePreview from '@/components/MkRolePreview.vue';
-
-	const announcements = ref<any[]>([]);
+			</template>
+			<MkLoading v-if="loadingMore"/>
+			<MkButton @click="more()">
+				<i class="ti ti-reload"></i>{{ i18n.ts.more }}
+			</MkButton>
+		</div>
+	</MkSpacer>
+</MkStickyContainer>
+</template>
 
-	misskeyApi('admin/announcements/list').then(announcementResponse => {
+<script lang="ts" setup>
+import { ref, computed, watch } from 'vue';
+import XHeader from './_header_.vue';
+import MkButton from '@/components/MkButton.vue';
+import MkInput from '@/components/MkInput.vue';
+import MkSelect from '@/components/MkSelect.vue';
+import MkSwitch from '@/components/MkSwitch.vue';
+import MkRadios from '@/components/MkRadios.vue';
+import MkInfo from '@/components/MkInfo.vue';
+import * as os from '@/os.js';
+import { misskeyApi } from '@/scripts/misskey-api.js';
+import { i18n } from '@/i18n.js';
+import { definePageMetadata } from '@/scripts/page-metadata.js';
+import MkFolder from '@/components/MkFolder.vue';
+import MkTextarea from '@/components/MkTextarea.vue';
+import MkRolePreview from '@/components/MkRolePreview.vue';
+
+const announcementsStatus = ref<'active' | 'archived'>('active');
+
+const loading = ref(true);
+const loadingMore = ref(false);
+
+const announcements = ref<any[]>([]);
+
+watch(announcementsStatus, (to) => {
+	loading.value = true;
+	misskeyApi('admin/announcements/list', {
+		status: to,
+	}).then(announcementResponse => {
 		announcements.value = announcementResponse;
+		loading.value = false;
 	});
+}, { immediate: true });
 
-	function addRole(announcement) {
-		os.selectRole({ admin: true }).then(role => {
-			const index = announcements.value.findIndex(x => x.id === announcement.id);
-			console.log(index);
-			announcements.value[index].roles.push(role);
-		});
-	}
+misskeyApi('admin/announcements/list').then(announcementResponse => {
+	announcements.value = announcementResponse;
+});
 
-	function removeRole(index: number, role) {
-		announcements.value[index].roles = announcements.value[index].roles.filter(x => x.id !== role.id);
-	}
+function addRole(announcement) {
+	os.selectRole({ admin: true }).then(role => {
+		const index = announcements.value.findIndex(x => x.id === announcement.id);
+		console.log(index);
+		announcements.value[index].roles.push(role);
+	});
+}
 
-	function add() {
-		announcements.value.unshift({
-			_id: Math.random().toString(36),
-			id: null,
-			title: 'New announcement',
-			text: '',
-			imageUrl: null,
-			icon: 'info',
-			display: 'normal',
-			forExistingUsers: false,
-			silence: false,
-			needConfirmationToRead: false,
-			isRoleSpecified: false,
-			roles: [],
-			roleIds: [] as string[],
-		});
-	}
+function removeRole(index: number, role) {
+	announcements.value[index].roles = announcements.value[index].roles.filter(x => x.id !== role.id);
+}
 
-	function del(announcement) {
-		os.confirm({
-			type: 'warning',
-			text: i18n.tsx.deleteAreYouSure({ x: announcement.title }),
-		}).then(({ canceled }) => {
-			if (canceled) return;
-			announcements.value = announcements.value.filter(x => x !== announcement);
-			misskeyApi('admin/announcements/delete', announcement);
-		});
-	}
+function add() {
+	announcements.value.unshift({
+		_id: Math.random().toString(36),
+		id: null,
+		title: 'New announcement',
+		text: '',
+		imageUrl: null,
+		icon: 'info',
+		display: 'normal',
+		forExistingUsers: false,
+		silence: false,
+		needConfirmationToRead: false,
+		isRoleSpecified: false,
+		roles: [],
+		roleIds: [] as string[],
+	});
+}
 
-	async function archive(announcement) {
-		await os.apiWithDialog('admin/announcements/update', {
-			...announcement,
-			isActive: false,
-		});
-		refresh();
-	}
+function del(announcement) {
+	os.confirm({
+		type: 'warning',
+		text: i18n.tsx.deleteAreYouSure({ x: announcement.title }),
+	}).then(({ canceled }) => {
+		if (canceled) return;
+		announcements.value = announcements.value.filter(x => x !== announcement);
+		misskeyApi('admin/announcements/delete', announcement);
+	});
+}
 
-	async function save(announcement) {
-		announcement.roleIds = announcement.roles.map(role => role.id);
-		if (announcement.roleIds.length === 0) {
-			announcement.isRoleSpecified = false;
-		} else {
-			announcement.isRoleSpecified = true;
-		}
-		if (announcement.id == null) {
-			await os.apiWithDialog('admin/announcements/create', announcement);
-			refresh();
-		} else {
-			os.apiWithDialog('admin/announcements/update', announcement);
-		}
+async function archive(announcement) {
+	await os.apiWithDialog('admin/announcements/update', {
+		...announcement,
+		isActive: false,
+	});
+	refresh();
+}
+
+async function save(announcement) {
+	announcement.roleIds = announcement.roles.map(role => role.id);
+	if (announcement.roleIds.length === 0) {
+		announcement.isRoleSpecified = false;
+	} else {
+		announcement.isRoleSpecified = true;
+	}
+	if (announcement.id == null) {
+		await os.apiWithDialog('admin/announcements/create', announcement);
+		refresh();
+	} else {
+		os.apiWithDialog('admin/announcements/update', announcement);
 	}
+}
 
 function more() {
 	loadingMore.value = true;
@@ -181,53 +207,54 @@ function more() {
 	});
 }
 
-	function refresh() {
-		misskeyApi('admin/announcements/list').then(announcementResponse => {
-			announcements.value = announcementResponse;
-		});
-	}
+function refresh() {
+	misskeyApi('admin/announcements/list').then(announcementResponse => {
+		announcements.value = announcementResponse;
+	});
+}
 
-	refresh();
+refresh();
 
-	const headerActions = computed(() => [{
-		asFullButton: true,
-		icon: 'ti ti-plus',
-		text: i18n.ts.add,
-		handler: add,
-	}]);
-
-	const headerTabs = computed(() => []);
-
-	definePageMetadata(() => ({
-		title: i18n.ts.announcements,
-		icon: 'ti ti-speakerphone',
-	}));
-	</script>
-	<style module>
-	.roleItems {
-		display: flex;
-	}
+const headerActions = computed(() => [{
+	asFullButton: true,
+	icon: 'ti ti-plus',
+	text: i18n.ts.add,
+	handler: add,
+}]);
 
-	.rolePreview {
-		flex-grow: 1;
-	}
+const headerTabs = computed(() => []);
+
+definePageMetadata(() => ({
+	title: i18n.ts.announcements,
+	icon: 'ti ti-speakerphone',
+}));
+</script>
 
-	.rolesLabel {
-		font-size: 0.85em;
-		padding: 0 0 8px 0;
-		user-select: none;
+<style module>
+.roleItems {
+	display: flex;
+}
 
-		&:empty {
-			display: none;
-		}
+.rolePreview {
+	flex-grow: 1;
+}
+
+.rolesLabel {
+	font-size: 0.85em;
+	padding: 0 0 8px 0;
+	user-select: none;
+
+	&:empty {
+		display: none;
 	}
+}
 
-	.remove {
-		width: 32px;
-		height: 32px;
-		align-self: center;
-		& > i:before {
-			color: #ff2a2a;
-		}
+.remove {
+	width: 32px;
+	height: 32px;
+	align-self: center;
+	& > i:before {
+		color: #ff2a2a;
 	}
-	</style>
+}
+</style>
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index ebdc43a77d10..8c8d28083108 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -5208,7 +5208,7 @@ export type operations = {
             prohibitedWords: string[];
             prohibitedWordsForNameOfUser: string[];
             bannedEmailDomains?: string[];
-            emailWhitelist: string | null;
+            emailWhitelist: boolean;
             preservedUsernames: string[];
             hcaptchaSecretKey: string | null;
             mcaptchaSecretKey: string | null;
@@ -5292,9 +5292,9 @@ export type operations = {
             urlPreviewRequireContentLength: boolean;
             urlPreviewUserAgent: string | null;
             urlPreviewSummaryProxyUrl: string | null;
-            customSplashText: string[];
             federation: string;
             federationHosts: string[];
+            customSplashText: string[];
           };
         };
       };
@@ -9683,10 +9683,10 @@ export type operations = {
           urlPreviewRequireContentLength?: boolean;
           urlPreviewUserAgent?: string | null;
           urlPreviewSummaryProxyUrl?: string | null;
-          customSplashText?: string[] | null;
           /** @enum {string} */
           federation?: 'all' | 'none' | 'specified';
           federationHosts?: string[];
+          customSplashText?: string[] | null;
         };
       };
     };