feat: 個人宛てお知らせ機能

locales/index.d.ts

@@ -1066,6 +1066,8 @@ export interface Locale {
     "additionalEmojiDictionary": string;
     "installed": string;
     "branding": string;
+    "newUserAnnouncementAvailable": string;
+    "viewAnnouncement": string;
     "_initialAccountSetting": {
         "accountCreated": string;
         "letsStartAccountSetup": string;

locales/ja-JP.yml

@@ -1063,6 +1063,8 @@ goToMisskey: "Misskeyへ"
 additionalEmojiDictionary: "絵文字の追加辞書"
 installed: "インストール済み"
 branding: "ブランディング"
+newUserAnnouncementAvailable: "新着のあなた宛てのお知らせがあります"
+viewAnnouncement: "お知らせを見る"
 
 _initialAccountSetting:
   accountCreated: "アカウントの作成が完了しました！"

packages/backend/migration/1688647797135-userannouncement.js

@@ -0,0 +1,11 @@
+export class Userannouncement1688647797135 {
+    name = 'Userannouncement1688647797135'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "announcement" ADD COLUMN "userId" character varying(64)`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "announcement" DROP COLUMN "userId"`);  
+    }
+}

packages/backend/src/core/entities/UserEntityService.ts

@@ -1,5 +1,5 @@
 import { Inject, Injectable } from '@nestjs/common';
-import { In, Not } from 'typeorm';
+import { In, IsNull, Not } from 'typeorm';
 import * as Redis from 'ioredis';
 import Ajv from 'ajv';
 import { ModuleRef } from '@nestjs/core';
@@ -217,9 +217,16 @@ export class UserEntityService implements OnModuleInit {
 			userId: userId,
 		});
 
-		const count = await this.announcementsRepository.countBy(reads.length > 0 ? {
+		const count1 = await this.announcementsRepository.countBy(reads.length > 0 ? {
 			id: Not(In(reads.map(read => read.announcementId))),
-		} : {});
+			userId: IsNull(),
+		} : { userId: IsNull() });
+		const count2 = await this.announcementsRepository.countBy(reads.length > 0 ? {
+			id: Not(In(reads.map(read => read.announcementId))),
+			userId: userId,
+		} : { userId: userId });
+
+		const count = count1 + count2;
 
 		return count > 0;
 	}

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

@@ -33,6 +33,11 @@ export class Announcement {
 	})
 	public imageUrl: string | null;
 
+	@Column('varchar', {
+		length: 64, nullable: true,
+	})
+	public userId: string | null;
+
 	constructor(data: Partial<Announcement>) {
 		if (data == null) return;
 

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

@@ -42,6 +42,10 @@ export const meta = {
 				type: 'string',
 				optional: false, nullable: true,
 			},
+			userId: {
+				type: 'string',
+				optional: false, nullable: true,
+			},
 		},
 	},
 } as const;
@@ -52,6 +56,7 @@ export const paramDef = {
 		title: { type: 'string', minLength: 1 },
 		text: { type: 'string', minLength: 1 },
 		imageUrl: { type: 'string', nullable: true, minLength: 1 },
+		userId: { type: 'string', nullable: true },
 	},
 	required: ['title', 'text', 'imageUrl'],
 } as const;
@@ -73,8 +78,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				title: ps.title,
 				text: ps.text,
 				imageUrl: ps.imageUrl,
+				userId: ps.userId,
 			}).then(x => this.announcementsRepository.findOneByOrFail(x.identifiers[0]));
-
 			return Object.assign({}, announcement, { createdAt: announcement.createdAt.toISOString(), updatedAt: null });
 		});
 	}

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

@@ -1,5 +1,5 @@
 import { Inject, Injectable } from '@nestjs/common';
-import type { AnnouncementsRepository, AnnouncementReadsRepository } from '@/models/index.js';
+import type { AnnouncementsRepository, AnnouncementReadsRepository, UsersRepository } from '@/models/index.js';
 import type { Announcement } from '@/models/entities/Announcement.js';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { QueryService } from '@/core/QueryService.js';
@@ -46,6 +46,10 @@ export const meta = {
 					type: 'string',
 					optional: false, nullable: true,
 				},
+				userId: {
+					type: 'string',
+					optional: false, nullable: true,
+				},
 				reads: {
 					type: 'number',
 					optional: false, nullable: false,
@@ -61,6 +65,7 @@ export const paramDef = {
 		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
 		sinceId: { type: 'string', format: 'misskey:id' },
 		untilId: { type: 'string', format: 'misskey:id' },
+		userId: { type: 'string', format: 'misskey:id' },
 	},
 	required: [],
 } as const;
@@ -74,11 +79,21 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 		@Inject(DI.announcementReadsRepository)
 		private announcementReadsRepository: AnnouncementReadsRepository,
+
+		@Inject(DI.usersRepository)
+		private usersRepository: UsersRepository,
 
 		private queryService: QueryService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			const query = this.queryService.makePaginationQuery(this.announcementsRepository.createQueryBuilder('announcement'), ps.sinceId, ps.untilId);
+			const builder = this.announcementsRepository.createQueryBuilder('announcement');
+			if (ps.userId) {
+				builder.where('"userId" = :userId', { userId: ps.userId });
+			} else {
+				builder.where('"userId" IS NULL');
+			}
+
+			const query = this.queryService.makePaginationQuery(builder, ps.sinceId, ps.untilId);
 
 			const announcements = await query.take(ps.limit).getMany();
 
@@ -90,15 +105,17 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				}));
 			}
 
-			return announcements.map(announcement => ({
+			return await Promise.all(announcements.map(async announcement => ({
 				id: announcement.id,
 				createdAt: announcement.createdAt.toISOString(),
 				updatedAt: announcement.updatedAt?.toISOString() ?? null,
 				title: announcement.title,
 				text: announcement.text,
 				imageUrl: announcement.imageUrl,
+				userId: announcement.userId,
+				user: announcement.userId ? await this.usersRepository.findOneBy({ id: announcement.userId }) : null,
 				reads: reads.get(announcement)!,
-			}));
+			})));
 		});
 	}
 }

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

@@ -1,6 +1,6 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { AnnouncementsRepository } from '@/models/index.js';
+import type { AnnouncementReadsRepository, AnnouncementsRepository } from '@/models/index.js';
 import { DI } from '@/di-symbols.js';
 import { ApiError } from '../../../error.js';
 
@@ -26,8 +26,9 @@ export const paramDef = {
 		title: { type: 'string', minLength: 1 },
 		text: { type: 'string', minLength: 1 },
 		imageUrl: { type: 'string', nullable: true, minLength: 0 },
+		userId: { type: 'string', nullable: true },
 	},
-	required: ['id', 'title', 'text', 'imageUrl'],
+	required: ['id', 'title', 'text', 'imageUrl', 'userId'],
 } as const;
 
 // eslint-disable-next-line import/no-default-export
@@ -36,11 +37,18 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 	constructor(
 		@Inject(DI.announcementsRepository)
 		private announcementsRepository: AnnouncementsRepository,
+
+		@Inject(DI.announcementReadsRepository)
+		private announcementsReadsRepository: AnnouncementReadsRepository,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const announcement = await this.announcementsRepository.findOneBy({ id: ps.id });
 
 			if (announcement == null) throw new ApiError(meta.errors.noSuchAnnouncement);
+
+			if (announcement.userId && announcement.userId !== ps.userId) {
+				await this.announcementsReadsRepository.delete({ id: announcement.id, userId: announcement.userId });
+			}
 
 			await this.announcementsRepository.update(announcement.id, {
 				updatedAt: new Date(),

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

@@ -48,6 +48,10 @@ export const meta = {
 					type: 'boolean',
 					optional: true, nullable: false,
 				},
+				isPrivate: {
+					type: 'boolean',
+					optional: false, nullable: true,
+				},
 			},
 		},
 	},
@@ -60,6 +64,7 @@ export const paramDef = {
 		withUnreads: { type: 'boolean', default: false },
 		sinceId: { type: 'string', format: 'misskey:id' },
 		untilId: { type: 'string', format: 'misskey:id' },
+		privateOnly: { type: 'boolean', default: false },
 	},
 	required: [],
 } as const;
@@ -77,8 +82,19 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 		private queryService: QueryService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			const query = this.queryService.makePaginationQuery(this.announcementsRepository.createQueryBuilder('announcement'), ps.sinceId, ps.untilId);
+			const builder = this.announcementsRepository.createQueryBuilder('announcement');
+			if (me) {
+				if (ps.privateOnly) {
+					builder.where('"userId" = :userId', { userId: me.id });
+				} else {
+					builder.where('"userId" IS NULL');
+					builder.orWhere('"userId" = :userId', { userId: me.id });
+				}
+			} else {
+				builder.where('"userId" IS NULL');
+			}
 
+			const query = this.queryService.makePaginationQuery(builder, ps.sinceId, ps.untilId);
 			const announcements = await query.take(ps.limit).getMany();
 
 			if (me) {
@@ -95,6 +111,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				...a,
 				createdAt: a.createdAt.toISOString(),
 				updatedAt: a.updatedAt?.toISOString() ?? null,
+				isPrivate: !!a.userId,
 			}));
 		});
 	}

packages/backend/src/server/api/endpoints/i/read-announcement.ts

@@ -49,7 +49,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			// Check if announcement exists
 			const announcement = await this.announcementsRepository.findOneBy({ id: ps.announcementId });
 
-			if (announcement == null) {
+			if (announcement == null || (announcement.userId && announcement.userId !== me.id)) {
 				throw new ApiError(meta.errors.noSuchAnnouncement);
 			}
 

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

@@ -2,7 +2,7 @@ import { computed, createApp, watch, markRaw, version as vueVersion, defineAsync
 import { common } from './common';
 import { version, ui, lang, updateLocale } from '@/config';
 import { i18n, updateI18n } from '@/i18n';
-import { confirm, alert, post, popup, toast } from '@/os';
+import { confirm, alert, post, popup, toast, api } from '@/os';
 import { useStream } from '@/stream';
 import * as sound from '@/scripts/sound';
 import { $i, refreshAccount, login, updateAccount, signout } from '@/account';
@@ -245,6 +245,11 @@ export async function mainBoot() {
 		main.on('myTokenRegenerated', () => {
 			signout();
 		});
+
+		const unreadUserAnnouncementsList = await api('announcements', { privateOnly: true, withUnreads: true, limit: 1 });
+		if (unreadUserAnnouncementsList.length > 0) {
+			popup(defineAsyncComponent(() => import('@/components/MkNewUserAnnouncementModal.vue')), {}, {}, 'closed');
+		}
 	}
 
 	// shortcut

packages/frontend/src/components/MkNewUserAnnouncementModal.vue

@@ -0,0 +1,49 @@
+<template>
+<MkModal ref="modal" :zPriority="'middle'" @click="$refs.modal.close()" @closed="$emit('closed')">
+	<div :class="$style.root">
+		<div :class="$style.title">{{ i18n.ts.newUserAnnouncementAvailable }}</div>
+		<MkButton :class="$style.gotIt" primary full @click="jumpTo">{{ i18n.ts.viewAnnouncement }}</MkButton>
+	</div>
+</MkModal>
+</template>
+
+<script setup lang="ts">
+import { shallowRef } from 'vue';
+import MkModal from '@/components/MkModal.vue';
+import MkButton from '@/components/MkButton.vue';
+import { i18n } from '@/i18n';
+import { useRouter } from '@/router';
+const router = useRouter();
+const modal = shallowRef<InstanceType<typeof MkModal>>();
+
+function jumpTo() {
+	modal.value.close();
+	router.push('/announcements');
+}
+</script>
+
+<style lang="scss" module>
+.root {
+	margin: auto;
+	position: relative;
+	padding: 32px;
+	min-width: 320px;
+	max-width: 480px;
+	box-sizing: border-box;
+	text-align: center;
+	background: var(--panel);
+	border-radius: var(--radius);
+}
+
+.title {
+	font-weight: bold;
+}
+
+.version {
+	margin: 1em 0;
+}
+
+.gotIt {
+	margin: 8px 0 0 0;
+}
+</style>