wip

locales/index.d.ts

@@ -1098,6 +1098,8 @@ export interface Locale {
     "doYouAgree": string;
     "beSureToReadThisAsItIsImportant": string;
     "iHaveReadXCarefullyAndAgree": string;
+    "dialog": string;
+    "icon": string;
     "_announcement": {
         "forExistingUsers": string;
         "forExistingUsersDescription": string;

locales/ja-JP.yml

@@ -1096,6 +1096,7 @@ doYouAgree: "同意しますか？"
 beSureToReadThisAsItIsImportant: "重要ですので必ずお読みください。"
 iHaveReadXCarefullyAndAgree: "「{x}」の内容をよく読み、同意します。"
 dialog: "ダイアログ"
+icon: "アイコン"
 
 _announcement:
   forExistingUsers: "既存ユーザーのみ"

packages/backend/migration/1691657412740-refine-announcement-2.js

@@ -0,0 +1,11 @@
+export class RefineAnnouncement21691657412740 {
+    name = 'RefineAnnouncement21691657412740'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "announcement" ADD "icon" character varying(256) NOT NULL DEFAULT 'info'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "announcement" DROP COLUMN "icon"`);
+    }
+}

packages/backend/src/core/AnnouncementService.ts

@@ -66,6 +66,7 @@ export class AnnouncementService {
 			title: values.title,
 			text: values.text,
 			imageUrl: values.imageUrl,
+			icon: values.icon,
 			display: values.display,
 			forExistingUsers: values.forExistingUsers,
 			needConfirmationToRead: values.needConfirmationToRead,
@@ -118,6 +119,7 @@ export class AnnouncementService {
 			text: announcement.text,
 			title: announcement.title,
 			imageUrl: announcement.imageUrl,
+			icon: announcement.icon,
 			display: announcement.display,
 			needConfirmationToRead: announcement.needConfirmationToRead,
 			forYou: announcement.userId === me?.id,

packages/backend/src/models/entities/Announcement.ts

@@ -39,6 +39,13 @@ export class Announcement {
 	})
 	public imageUrl: string | null;
 
+	// info, warning, error, success
+	@Column('varchar', {
+		length: 256, nullable: false,
+		default: 'info',
+	})
+	public icon: string;
+
 	// normal ... お知らせページ掲載
 	// banner ... お知らせページ掲載 + バナー表示
 	// dialog ... お知らせページ掲載 + ダイアログ表示

packages/backend/src/models/json-schema/announcement.ts

@@ -34,6 +34,10 @@ export const packedAnnouncementSchema = {
 			type: 'string',
 			optional: false, nullable: true,
 		},
+		icon: {
+			type: 'string',
+			optional: false, nullable: false,
+		},
 		display: {
 			type: 'string',
 			optional: false, nullable: false,

packages/backend/src/server/api/endpoints/admin/announcements/create.ts

@@ -55,6 +55,7 @@ export const paramDef = {
 		title: { type: 'string', minLength: 1 },
 		text: { type: 'string', minLength: 1 },
 		imageUrl: { type: 'string', nullable: true, minLength: 1 },
+		icon: { type: 'string', enum: ['info', 'warning', 'error', 'success'], default: 'info' },
 		display: { type: 'string', enum: ['normal', 'banner', 'dialog'], default: 'normal' },
 		forExistingUsers: { type: 'boolean', default: false },
 		needConfirmationToRead: { type: 'boolean', default: false },
@@ -76,6 +77,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				title: ps.title,
 				text: ps.text,
 				imageUrl: ps.imageUrl,
+				icon: ps.icon,
 				display: ps.display,
 				forExistingUsers: ps.forExistingUsers,
 				needConfirmationToRead: ps.needConfirmationToRead,

packages/backend/src/server/api/endpoints/admin/announcements/list.ts

@@ -108,6 +108,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				title: announcement.title,
 				text: announcement.text,
 				imageUrl: announcement.imageUrl,
+				icon: announcement.icon,
 				display: announcement.display,
 				isActive: announcement.isActive,
 				forExistingUsers: announcement.forExistingUsers,

packages/backend/src/server/api/endpoints/admin/announcements/update.ts

@@ -31,12 +31,13 @@ export const paramDef = {
 		title: { type: 'string', minLength: 1 },
 		text: { type: 'string', minLength: 1 },
 		imageUrl: { type: 'string', nullable: true, minLength: 0 },
+		icon: { type: 'string', enum: ['info', 'warning', 'error', 'success'] },
 		display: { type: 'string', enum: ['normal', 'banner', 'dialog'] },
 		forExistingUsers: { type: 'boolean' },
 		needConfirmationToRead: { type: 'boolean' },
 		isActive: { type: 'boolean' },
 	},
-	required: ['id', 'title', 'text', 'imageUrl', 'display', 'forExistingUsers', 'needConfirmationToRead', 'isActive'],
+	required: ['id', 'title', 'text', 'imageUrl', 'icon', 'display', 'forExistingUsers', 'needConfirmationToRead', 'isActive'],
 } as const;
 
 // eslint-disable-next-line import/no-default-export
@@ -58,6 +59,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				/* eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- 空の文字列の場合、nullを渡すようにするため */
 				imageUrl: ps.imageUrl || null,
 				display: ps.display,
+				icon: ps.icon,
 				forExistingUsers: ps.forExistingUsers,
 				needConfirmationToRead: ps.needConfirmationToRead,
 				isActive: ps.isActive,

packages/frontend/src/boot/main-boot.ts

@@ -89,7 +89,14 @@ export async function mainBoot() {
 			}, {}, 'closed');
 		}
 
-		// TODO: announcementCreatedイベント監視
+		stream.on('announcementCreated', (ev) => {
+			const announcement = ev.announcement;
+			if (announcement.display === 'dialog') {
+				popup(defineAsyncComponent(() => import('@/components/MkAnnouncementDialog.vue')), {
+					announcement,
+				}, {}, 'closed');
+			}
+		});
 
 		if ($i.isDeleted) {
 			alert({

packages/frontend/src/components/MkAnnouncementDialog.vue

@@ -16,6 +16,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { onMounted, shallowRef } from 'vue';
 import * as misskey from 'misskey-js';
+import * as os from '@/os';
 import MkModal from '@/components/MkModal.vue';
 import MkButton from '@/components/MkButton.vue';
 import { i18n } from '@/i18n';
@@ -29,6 +30,7 @@ const modal = shallowRef<InstanceType<typeof MkModal>>();
 
 function ok() {
 	modal.value.close();
+	os.api('i/read-announcement', { announcementId: props.announcement.id });
 }
 
 onMounted(() => {

packages/frontend/src/pages/admin/announcements.vue

@@ -69,6 +69,7 @@ function add() {
 		title: '',
 		text: '',
 		imageUrl: null,
+		icon: 'info',
 		display: 'normal',
 		forExistingUsers: false,
 		needConfirmationToRead: false,

packages/misskey-js/src/entities.ts

@@ -415,6 +415,7 @@ export type Announcement = {
 	title: string;
 	imageUrl: string | null;
 	display: 'normal' | 'banner' | 'dialog';
+	icon: 'info' | 'warning' | 'error' | 'success';
 	needConfirmationToRead: boolean;
 	forYou: boolean;
 	isRead?: boolean;