diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2020-09-18 22:18:21 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-18 22:18:21 +0900 |
| commit | df71dbb0242d763695ea8a33d0b2262c74b050d0 (patch) | |
| tree | 804eddb878fbe86f181b76cb3ed814f00ef3433f /src/models | |
| parent | chore: better error text (diff) | |
| download | sharkey-df71dbb0242d763695ea8a33d0b2262c74b050d0.tar.gz sharkey-df71dbb0242d763695ea8a33d0b2262c74b050d0.tar.bz2 sharkey-df71dbb0242d763695ea8a33d0b2262c74b050d0.zip | |
Resolve #6692 (#6703)
Diffstat (limited to 'src/models')
| -rw-r--r-- | src/models/entities/user-profile.ts | 4 | ||||
| -rw-r--r-- | src/models/repositories/user.ts | 2 |
2 files changed, 3 insertions, 3 deletions
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<User> { hasPendingReceivedFollowRequest: this.getHasPendingReceivedFollowRequest(user.id), integrations: profile!.integrations, mutedWords: profile!.mutedWords, - includingNotificationTypes: profile?.includingNotificationTypes, + mutingNotificationTypes: profile?.mutingNotificationTypes, } : {}), ...(opts.includeSecrets ? { |