diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-03-25 16:17:34 -0400 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-03-25 16:17:34 -0400 |
| commit | 40975719ec5bb889ab011bbc464dd0fdb09fdb68 (patch) | |
| tree | 1b8521df694b869b26c6d75c99ef885704b013b0 /packages/backend/src/models | |
| parent | merge upstream (diff) | |
| parent | Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff) | |
| download | sharkey-40975719ec5bb889ab011bbc464dd0fdb09fdb68.tar.gz sharkey-40975719ec5bb889ab011bbc464dd0fdb09fdb68.tar.bz2 sharkey-40975719ec5bb889ab011bbc464dd0fdb09fdb68.zip | |
Merge branch 'misskey-develop' into merge/2025-03-24
# Conflicts:
# package.json
# packages/backend/src/core/entities/NotificationEntityService.ts
# packages/backend/src/types.ts
# packages/frontend/src/pages/admin/modlog.ModLog.vue
# packages/misskey-js/src/consts.ts
# packages/misskey-js/src/entities.ts
Diffstat (limited to 'packages/backend/src/models')
| -rw-r--r-- | packages/backend/src/models/Notification.ts | 6 | ||||
| -rw-r--r-- | packages/backend/src/models/json-schema/notification.ts | 15 | ||||
| -rw-r--r-- | packages/backend/src/models/json-schema/user.ts | 1 |
3 files changed, 22 insertions, 0 deletions
diff --git a/packages/backend/src/models/Notification.ts b/packages/backend/src/models/Notification.ts index 46f88b9f22..cff95cbf6e 100644 --- a/packages/backend/src/models/Notification.ts +++ b/packages/backend/src/models/Notification.ts @@ -76,6 +76,12 @@ export type MiNotification = { createdAt: string; roleId: MiRole['id']; } | { + type: 'chatRoomInvitationReceived'; + id: string; + createdAt: string; + notifierId: MiUser['id']; + invitationId: string; +} | { type: 'achievementEarned'; id: string; createdAt: string; diff --git a/packages/backend/src/models/json-schema/notification.ts b/packages/backend/src/models/json-schema/notification.ts index bf33dab575..e7f8359556 100644 --- a/packages/backend/src/models/json-schema/notification.ts +++ b/packages/backend/src/models/json-schema/notification.ts @@ -294,6 +294,21 @@ export const packedNotificationSchema = { type: { type: 'string', optional: false, nullable: false, + enum: ['chatRoomInvitationReceived'], + }, + invitation: { + type: 'object', + ref: 'ChatRoomInvitation', + optional: false, nullable: false, + }, + }, + }, { + type: 'object', + properties: { + ...baseSchema.properties, + type: { + type: 'string', + optional: false, nullable: false, enum: ['achievementEarned'], }, achievement: { diff --git a/packages/backend/src/models/json-schema/user.ts b/packages/backend/src/models/json-schema/user.ts index e7160aa40d..e6f85afcce 100644 --- a/packages/backend/src/models/json-schema/user.ts +++ b/packages/backend/src/models/json-schema/user.ts @@ -681,6 +681,7 @@ export const packedMeDetailedOnlySchema = { receiveFollowRequest: { optional: true, ...notificationRecieveConfig }, followRequestAccepted: { optional: true, ...notificationRecieveConfig }, roleAssigned: { optional: true, ...notificationRecieveConfig }, + chatRoomInvitationReceived: { optional: true, ...notificationRecieveConfig }, achievementEarned: { optional: true, ...notificationRecieveConfig }, app: { optional: true, ...notificationRecieveConfig }, test: { optional: true, ...notificationRecieveConfig }, |