From df71dbb0242d763695ea8a33d0b2262c74b050d0 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 18 Sep 2020 22:18:21 +0900 Subject: Resolve #6692 (#6703) --- src/models/entities/user-profile.ts | 4 ++-- src/models/repositories/user.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/models') diff --git a/src/models/entities/user-profile.ts b/src/models/entities/user-profile.ts index 0eeed1b40e..7195c20ffe 100644 --- a/src/models/entities/user-profile.ts +++ b/src/models/entities/user-profile.ts @@ -162,9 +162,9 @@ export class UserProfile { @Column('enum', { enum: notificationTypes, array: true, - nullable: true, + default: [], }) - public includingNotificationTypes: typeof notificationTypes[number][] | null; + public mutingNotificationTypes: typeof notificationTypes[number][]; //#region Denormalized fields @Index() diff --git a/src/models/repositories/user.ts b/src/models/repositories/user.ts index b1b084b740..7ea4d42bcb 100644 --- a/src/models/repositories/user.ts +++ b/src/models/repositories/user.ts @@ -248,7 +248,7 @@ export class UserRepository extends Repository { hasPendingReceivedFollowRequest: this.getHasPendingReceivedFollowRequest(user.id), integrations: profile!.integrations, mutedWords: profile!.mutedWords, - includingNotificationTypes: profile?.includingNotificationTypes, + mutingNotificationTypes: profile?.mutingNotificationTypes, } : {}), ...(opts.includeSecrets ? { -- cgit v1.2.3-freya