diff --git a/packages/backend/src/core/AnnouncementService.ts b/packages/backend/src/core/AnnouncementService.ts index d49641f54a..5449427b8d 100644 --- a/packages/backend/src/core/AnnouncementService.ts +++ b/packages/backend/src/core/AnnouncementService.ts @@ -326,6 +326,8 @@ export class AnnouncementService { icon: announcement.icon, display: announcement.display, needConfirmationToRead: announcement.needConfirmationToRead, + closeDuration: announcement.closeDuration, + displayOrder: announcement.displayOrder, forYou: announcement.userId === me?.id, isRead: reads.some(read => read.announcementId === announcement.id), })); diff --git a/packages/backend/src/core/DriveService.ts b/packages/backend/src/core/DriveService.ts index 7e90d9e1d3..ef1a8491ee 100644 --- a/packages/backend/src/core/DriveService.ts +++ b/packages/backend/src/core/DriveService.ts @@ -677,7 +677,7 @@ export class DriveService { await this.driveFilesRepository.update(file.id, values); - const fileObj = await this.driveFileEntityService.pack(file.id, { self: true }); + const fileObj = await this.driveFileEntityService.pack(file.id, updater, { self: true }); // Publish fileUpdated event if (file.userId) { diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/create.ts b/packages/backend/src/server/api/endpoints/admin/announcements/create.ts index 6b18b89baf..e98e27c224 100644 --- a/packages/backend/src/server/api/endpoints/admin/announcements/create.ts +++ b/packages/backend/src/server/api/endpoints/admin/announcements/create.ts @@ -53,7 +53,7 @@ export const meta = { type: 'string', optional: false, nullable: false, }, - forExistingUsers: { + forYou: { type: 'boolean', optional: false, nullable: false, }, @@ -69,9 +69,9 @@ export const meta = { type: 'number', optional: false, nullable: false, }, - userId: { - type: 'string', - optional: false, nullable: true, + isRead: { + type: 'boolean', + optional: true, nullable: false, }, }, },