diff --git a/packages/backend/src/models/Notification.ts b/packages/backend/src/models/Notification.ts index 2b2c2920a4..9c1dee6376 100644 --- a/packages/backend/src/models/Notification.ts +++ b/packages/backend/src/models/Notification.ts @@ -83,7 +83,7 @@ export type MiNotification = { type: 'exportCompleted'; id: string; createdAt: string; - exportedEntitity: typeof exportableEntities[number]; + exportedEntity: typeof exportableEntities[number]; fileId: MiDriveFile['id']; } | { type: 'app'; diff --git a/packages/backend/src/models/json-schema/notification.ts b/packages/backend/src/models/json-schema/notification.ts index f5e002b004..e34dab1d13 100644 --- a/packages/backend/src/models/json-schema/notification.ts +++ b/packages/backend/src/models/json-schema/notification.ts @@ -307,7 +307,7 @@ export const packedNotificationSchema = { optional: false, nullable: false, enum: ['exportCompleted'], }, - exportedEntitity: { + exportedEntity: { type: 'string', optional: false, nullable: false, enum: exportableEntities, diff --git a/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts b/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts index 18e1f811a7..b3111865ad 100644 --- a/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts @@ -99,7 +99,7 @@ export class ExportAntennasProcessorService { this.logger.succ('Exported to: ' + driveFile.id); this.notificationService.createNotification(user.id, 'exportCompleted', { - exportedEntitity: 'antenna', + exportedEntity: 'antenna', fileId: driveFile.id, }); } finally { diff --git a/packages/backend/src/queue/processors/ExportBlockingProcessorService.ts b/packages/backend/src/queue/processors/ExportBlockingProcessorService.ts index 5e72b9375c..ecc439db69 100644 --- a/packages/backend/src/queue/processors/ExportBlockingProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportBlockingProcessorService.ts @@ -113,7 +113,7 @@ export class ExportBlockingProcessorService { this.logger.succ(`Exported to: ${driveFile.id}`); this.notificationService.createNotification(user.id, 'exportCompleted', { - exportedEntitity: 'blocking', + exportedEntity: 'blocking', fileId: driveFile.id, }); } finally { diff --git a/packages/backend/src/queue/processors/ExportClipsProcessorService.ts b/packages/backend/src/queue/processors/ExportClipsProcessorService.ts index f0152dff24..583ddbb745 100644 --- a/packages/backend/src/queue/processors/ExportClipsProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportClipsProcessorService.ts @@ -83,7 +83,7 @@ export class ExportClipsProcessorService { this.logger.succ(`Exported to: ${driveFile.id}`); this.notificationService.createNotification(user.id, 'exportCompleted', { - exportedEntitity: 'clip', + exportedEntity: 'clip', fileId: driveFile.id, }); } finally { diff --git a/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts b/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts index 796c3b5704..e237cd4975 100644 --- a/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportCustomEmojisProcessorService.ts @@ -138,7 +138,7 @@ export class ExportCustomEmojisProcessorService { this.logger.succ(`Exported to: ${driveFile.id}`); this.notificationService.createNotification(user.id, 'exportCompleted', { - exportedEntitity: 'customEmoji', + exportedEntity: 'customEmoji', fileId: driveFile.id, }); diff --git a/packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts b/packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts index de87e3d6b2..b81feece01 100644 --- a/packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts @@ -127,7 +127,7 @@ export class ExportFavoritesProcessorService { this.logger.succ(`Exported to: ${driveFile.id}`); this.notificationService.createNotification(user.id, 'exportCompleted', { - exportedEntitity: 'favorite', + exportedEntity: 'favorite', fileId: driveFile.id, }); } finally { diff --git a/packages/backend/src/queue/processors/ExportFollowingProcessorService.ts b/packages/backend/src/queue/processors/ExportFollowingProcessorService.ts index 27163b3bcd..903f962515 100644 --- a/packages/backend/src/queue/processors/ExportFollowingProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportFollowingProcessorService.ts @@ -117,7 +117,7 @@ export class ExportFollowingProcessorService { this.logger.succ(`Exported to: ${driveFile.id}`); this.notificationService.createNotification(user.id, 'exportCompleted', { - exportedEntitity: 'following', + exportedEntity: 'following', fileId: driveFile.id, }); } finally { diff --git a/packages/backend/src/queue/processors/ExportMutingProcessorService.ts b/packages/backend/src/queue/processors/ExportMutingProcessorService.ts index 7e9f1dea04..f9867ade29 100644 --- a/packages/backend/src/queue/processors/ExportMutingProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportMutingProcessorService.ts @@ -114,7 +114,7 @@ export class ExportMutingProcessorService { this.logger.succ(`Exported to: ${driveFile.id}`); this.notificationService.createNotification(user.id, 'exportCompleted', { - exportedEntitity: 'muting', + exportedEntity: 'muting', fileId: driveFile.id, }); } finally { diff --git a/packages/backend/src/queue/processors/ExportNotesProcessorService.ts b/packages/backend/src/queue/processors/ExportNotesProcessorService.ts index cc053ac8d9..9e2b678219 100644 --- a/packages/backend/src/queue/processors/ExportNotesProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportNotesProcessorService.ts @@ -154,7 +154,7 @@ export class ExportNotesProcessorService { this.logger.succ(`Exported to: ${driveFile.id}`); this.notificationService.createNotification(user.id, 'exportCompleted', { - exportedEntitity: 'note', + exportedEntity: 'note', fileId: driveFile.id, }); } finally { diff --git a/packages/backend/src/queue/processors/ExportUserListsProcessorService.ts b/packages/backend/src/queue/processors/ExportUserListsProcessorService.ts index 954214cd69..c483d79854 100644 --- a/packages/backend/src/queue/processors/ExportUserListsProcessorService.ts +++ b/packages/backend/src/queue/processors/ExportUserListsProcessorService.ts @@ -93,7 +93,7 @@ export class ExportUserListsProcessorService { this.logger.succ(`Exported to: ${driveFile.id}`); this.notificationService.createNotification(user.id, 'exportCompleted', { - exportedEntitity: 'userList', + exportedEntity: 'userList', fileId: driveFile.id, }); } finally { diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue index de1bff6291..aa81993631 100644 --- a/packages/frontend/src/components/MkNotification.vue +++ b/packages/frontend/src/components/MkNotification.vue @@ -60,7 +60,7 @@ SPDX-License-Identifier: AGPL-3.0-only {{ i18n.ts._notification.roleAssigned }} {{ i18n.ts._notification.achievementEarned }} {{ i18n.ts._notification.testNotification }} - {{ i18n.tsx._notification.exportOfXCompleted({ x: exportEntityName[notification.exportedEntitity] }) }} + {{ i18n.tsx._notification.exportOfXCompleted({ x: exportEntityName[notification.exportedEntity] }) }} {{ i18n.tsx._notification.likedBySomeUsers({ n: getActualReactedUsersCount(notification) }) }} {{ i18n.tsx._notification.reactedBySomeUsers({ n: getActualReactedUsersCount(notification) }) }} @@ -180,7 +180,7 @@ const exportEntityName = { muting: i18n.ts.mutedUsers, note: i18n.ts.notes, userList: i18n.ts.lists, -} as const satisfies Record; +} as const satisfies Record; const followRequestDone = ref(false); diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts index ea1c493ab9..d9d6109d12 100644 --- a/packages/misskey-js/src/autogen/types.ts +++ b/packages/misskey-js/src/autogen/types.ts @@ -4262,7 +4262,7 @@ export type components = { /** @enum {string} */ type: 'exportCompleted'; /** @enum {string} */ - exportedEntitity: 'antenna' | 'blocking' | 'clip' | 'customEmoji' | 'favorite' | 'following' | 'muting' | 'note' | 'userList'; + exportedEntity: 'antenna' | 'blocking' | 'clip' | 'customEmoji' | 'favorite' | 'following' | 'muting' | 'note' | 'userList'; /** Format: id */ fileId: string; }) | ({ diff --git a/packages/sw/src/scripts/create-notification.ts b/packages/sw/src/scripts/create-notification.ts index 9d6e146491..a97cfbbbef 100644 --- a/packages/sw/src/scripts/create-notification.ts +++ b/packages/sw/src/scripts/create-notification.ts @@ -221,9 +221,9 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif muting: i18n.ts.mutedUsers, note: i18n.ts.notes, userList: i18n.ts.lists, - } as const satisfies Record; + } as const satisfies Record; - return [i18n.tsx._notification.exportOfXCompleted({ x: entityName[data.body.exportedEntitity] }), { + return [i18n.tsx._notification.exportOfXCompleted({ x: entityName[data.body.exportedEntity] }), { badge: iconUrl('users'), data, }];