diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2023-02-23 20:46:14 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-23 20:46:14 +0900 |
| commit | becc4d2e540a07943d55a476c2e25cc22911162a (patch) | |
| tree | ceaf016fe075da2e7cc4c5226374ac68aba3f8b2 /packages/backend/src/models | |
| parent | chore(dev): remove outdated tip (diff) | |
| download | misskey-becc4d2e540a07943d55a476c2e25cc22911162a.tar.gz misskey-becc4d2e540a07943d55a476c2e25cc22911162a.tar.bz2 misskey-becc4d2e540a07943d55a476c2e25cc22911162a.zip | |
fix: i/notificationsで古い通知タイプを許容するなど、古い通知タイプの清算 (#10042)
* wip
* fix
* create migration
* oops
* fix front const
* changelog
* fix type
* fix
* wip
* Revert "wip"
This reverts commit 6cdb3600e280be3550b8b6353b2c7930f7b31438.
* enumのこす
* fix
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'packages/backend/src/models')
| -rw-r--r-- | packages/backend/src/models/entities/Notification.ts | 8 | ||||
| -rw-r--r-- | packages/backend/src/models/entities/UserProfile.ts | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/packages/backend/src/models/entities/Notification.ts b/packages/backend/src/models/entities/Notification.ts index 105f0d0407..51117efba5 100644 --- a/packages/backend/src/models/entities/Notification.ts +++ b/packages/backend/src/models/entities/Notification.ts @@ -1,5 +1,5 @@ import { Entity, Index, JoinColumn, ManyToOne, Column, PrimaryColumn } from 'typeorm'; -import { notificationTypes } from '@/types.js'; +import { notificationTypes, obsoleteNotificationTypes } from '@/types.js'; import { id } from '../id.js'; import { User } from './User.js'; import { Note } from './Note.js'; @@ -58,7 +58,6 @@ export class Notification { * renote - 投稿がRenoteされた * quote - 投稿が引用Renoteされた * reaction - 投稿にリアクションされた - * pollVote - 投稿のアンケートに投票された (廃止) * pollEnded - 自分のアンケートもしくは自分が投票したアンケートが終了した * receiveFollowRequest - フォローリクエストされた * followRequestAccepted - 自分の送ったフォローリクエストが承認された @@ -67,7 +66,10 @@ export class Notification { */ @Index() @Column('enum', { - enum: notificationTypes, + enum: [ + ...notificationTypes, + ...obsoleteNotificationTypes, + ], comment: 'The type of the Notification.', }) public type: typeof notificationTypes[number]; diff --git a/packages/backend/src/models/entities/UserProfile.ts b/packages/backend/src/models/entities/UserProfile.ts index 3d35b4cb5a..60c1c55de5 100644 --- a/packages/backend/src/models/entities/UserProfile.ts +++ b/packages/backend/src/models/entities/UserProfile.ts @@ -1,5 +1,5 @@ import { Entity, Column, Index, OneToOne, JoinColumn, PrimaryColumn } from 'typeorm'; -import { ffVisibility, notificationTypes } from '@/types.js'; +import { obsoleteNotificationTypes, ffVisibility, notificationTypes } from '@/types.js'; import { id } from '../id.js'; import { User } from './User.js'; import { Page } from './Page.js'; @@ -205,7 +205,7 @@ export class UserProfile { enum: [ ...notificationTypes, // マイグレーションで削除が困難なので古いenumは残しておく - 'groupInvited', + ...obsoleteNotificationTypes, ], array: true, default: [], |