Resolve #6192

src/models/entities/notification.ts

@@ -4,6 +4,7 @@ import { id } from '../id';
 import { Note } from './note';
 import { FollowRequest } from './follow-request';
 import { UserGroupInvitation } from './user-group-invitation';
+import { AccessToken } from './access-token';
 
 @Entity()
 export class Notification {
@@ -35,11 +36,13 @@ export class Notification {
 	/**
 	 * 通知の送信者(initiator)
 	 */
+	@Index()
 	@Column({
 		...id(),
+		nullable: true,
 		comment: 'The ID of sender user of the Notification.'
 	})
-	public notifierId: User['id'];
+	public notifierId: User['id'] | null;
 
 	@ManyToOne(type => User, {
 		onDelete: 'CASCADE'
@@ -59,16 +62,19 @@ export class Notification {
 	 * receiveFollowRequest - フォローリクエストされた
 	 * followRequestAccepted - 自分の送ったフォローリクエストが承認された
 	 * groupInvited - グループに招待された
+	 * app - アプリ通知
 	 */
+	@Index()
 	@Column('enum', {
-		enum: ['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited'],
+		enum: ['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app'],
 		comment: 'The type of the Notification.'
 	})
-	public type: 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollVote' | 'receiveFollowRequest' | 'followRequestAccepted' | 'groupInvited';
+	public type: 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollVote' | 'receiveFollowRequest' | 'followRequestAccepted' | 'groupInvited' | 'app';
 
 	/**
 	 * 通知が読まれたかどうか
 	 */
+	@Index()
 	@Column('boolean', {
 		default: false,
 		comment: 'Whether the Notification is read.'
@@ -114,10 +120,52 @@ export class Notification {
 	@Column('varchar', {
 		length: 128, nullable: true
 	})
-	public reaction: string;
+	public reaction: string | null;
 
 	@Column('integer', {
 		nullable: true
 	})
-	public choice: number;
+	public choice: number | null;
+
+	/**
+	 * アプリ通知のbody
+	 */
+	@Column('varchar', {
+		length: 2048, nullable: true
+	})
+	public customBody: string | null;
+
+	/**
+	 * アプリ通知のheader
+	 * (省略時はアプリ名で表示されることを期待)
+	 */
+	@Column('varchar', {
+		length: 256, nullable: true
+	})
+	public customHeader: string | null;
+
+	/**
+	 * アプリ通知のicon(URL)
+	 * (省略時はアプリアイコンで表示されることを期待)
+	 */
+	@Column('varchar', {
+		length: 1024, nullable: true
+	})
+	public customIcon: string | null;
+
+	/**
+	 * アプリ通知のアプリ(のトークン)
+	 */
+	@Index()
+	@Column({
+		...id(),
+		nullable: true
+	})
+	public appAccessTokenId: AccessToken['id'] | null;
+
+	@ManyToOne(type => AccessToken, {
+		onDelete: 'CASCADE'
+	})
+	@JoinColumn()
+	public appAccessToken: AccessToken | null;
 }

src/models/repositories/notification.ts

@@ -1,5 +1,5 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { Users, Notes, UserGroupInvitations } from '..';
+import { Users, Notes, UserGroupInvitations, AccessTokens } from '..';
 import { Notification } from '../entities/notification';
 import { ensure } from '../../prelude/ensure';
 import { awaitAll } from '../../prelude/await-all';
@@ -13,13 +13,14 @@ export class NotificationRepository extends Repository<Notification> {
 		src: Notification['id'] | Notification,
 	): Promise<PackedNotification> {
 		const notification = typeof src === 'object' ? src : await this.findOne(src).then(ensure);
+		const token = notification.appAccessTokenId ? await AccessTokens.findOne(notification.appAccessTokenId).then(ensure) : null;
 
 		return await awaitAll({
 			id: notification.id,
 			createdAt: notification.createdAt.toISOString(),
 			type: notification.type,
 			userId: notification.notifierId,
-			user: Users.pack(notification.notifier || notification.notifierId),
+			user: notification.notifierId ? Users.pack(notification.notifier || notification.notifierId) : null,
 			...(notification.type === 'mention' ? {
 				note: Notes.pack(notification.note || notification.noteId!, notification.notifieeId),
 			} : {}),
@@ -43,6 +44,11 @@ export class NotificationRepository extends Repository<Notification> {
 			...(notification.type === 'groupInvited' ? {
 				invitation: UserGroupInvitations.pack(notification.userGroupInvitationId!),
 			} : {}),
+			...(notification.type === 'app' ? {
+				body: notification.customBody,
+				header: notification.customHeader || token!.name,
+				icon: notification.customIcon || token!.iconUrl,
+			} : {}),
 		});
 	}