From 9f6efb1f738bf15a39595f171a7139688614f45a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=87=E3=83=AF=E3=83=B3=E3=82=B7=E3=83=A5?= <61188295+Dnouv@users.noreply.github.com> Date: Fri, 8 Sep 2023 23:25:20 +0530 Subject: [PATCH] fix: update type of message bridge's create method (#30321) --- .changeset/loud-bees-smoke.md | 5 +++++ apps/meteor/app/apps/server/bridges/messages.ts | 4 ++-- apps/meteor/package.json | 4 ++-- yarn.lock | 14 +++++++------- 4 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 .changeset/loud-bees-smoke.md diff --git a/.changeset/loud-bees-smoke.md b/.changeset/loud-bees-smoke.md new file mode 100644 index 000000000000..7b34a0d58af4 --- /dev/null +++ b/.changeset/loud-bees-smoke.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': minor +--- + +New helper for Apps to notify users via a Direct Message diff --git a/apps/meteor/app/apps/server/bridges/messages.ts b/apps/meteor/app/apps/server/bridges/messages.ts index d75a0c244674..47648e445939 100644 --- a/apps/meteor/app/apps/server/bridges/messages.ts +++ b/apps/meteor/app/apps/server/bridges/messages.ts @@ -1,4 +1,4 @@ -import type { IMessage } from '@rocket.chat/apps-engine/definition/messages'; +import type { IMessage, IDirectMessage } from '@rocket.chat/apps-engine/definition/messages'; import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms'; import type { IUser } from '@rocket.chat/apps-engine/definition/users'; import type { ITypingDescriptor } from '@rocket.chat/apps-engine/server/bridges/MessageBridge'; @@ -17,7 +17,7 @@ export class AppMessageBridge extends MessageBridge { super(); } - protected async create(message: IMessage, appId: string): Promise { + protected async create(message: IMessage | IDirectMessage, appId: string): Promise { this.orch.debugLog(`The App ${appId} is creating a new message.`); const convertedMessage = await this.orch.getConverters()?.get('messages').convertAppMessage(message); diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 4b4d1275656e..562908ff67a9 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -225,7 +225,7 @@ "@rocket.chat/account-utils": "workspace:^", "@rocket.chat/agenda": "workspace:^", "@rocket.chat/api-client": "workspace:^", - "@rocket.chat/apps-engine": "1.41.0-alpha.312", + "@rocket.chat/apps-engine": "1.41.0-alpha.325", "@rocket.chat/base64": "workspace:^", "@rocket.chat/cas-validate": "workspace:^", "@rocket.chat/core-services": "workspace:^", @@ -469,4 +469,4 @@ "installConfig": { "hoistingLimits": "workspaces" } -} +} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 36f1aba8d8ae..249995955936 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7774,9 +7774,9 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/apps-engine@npm:1.41.0-alpha.312": - version: 1.41.0-alpha.312 - resolution: "@rocket.chat/apps-engine@npm:1.41.0-alpha.312" +"@rocket.chat/apps-engine@npm:1.41.0-alpha.325": + version: 1.41.0-alpha.325 + resolution: "@rocket.chat/apps-engine@npm:1.41.0-alpha.325" dependencies: adm-zip: ^0.5.9 cryptiles: ^4.1.3 @@ -7784,11 +7784,11 @@ __metadata: lodash.clonedeep: ^4.5.0 semver: ^5.7.1 stack-trace: 0.0.10 - uuid: ^3.4.0 + uuid: ~8.3.2 vm2: ^3.9.19 peerDependencies: "@rocket.chat/ui-kit": "*" - checksum: 003853d3c4d4374ab984474026e4ae657daf4591fe4c375b914aa57c27f576af0fcba66e70c539e056b5d80a1ef655775f6f3a07bf81a36ab6fd438ce464e70f + checksum: 3159b69d1174166bfe1fea13ac51e81bc39ddcabad3a8dcd20e4614d33592b7f93ae45625578d7545c149f52f90e9c30dee92a1bbd3f5830f7bcdc13d19fcef4 languageName: node linkType: hard @@ -8520,7 +8520,7 @@ __metadata: "@rocket.chat/account-utils": "workspace:^" "@rocket.chat/agenda": "workspace:^" "@rocket.chat/api-client": "workspace:^" - "@rocket.chat/apps-engine": 1.41.0-alpha.312 + "@rocket.chat/apps-engine": 1.41.0-alpha.325 "@rocket.chat/base64": "workspace:^" "@rocket.chat/cas-validate": "workspace:^" "@rocket.chat/core-services": "workspace:^" @@ -38612,7 +38612,7 @@ __metadata: languageName: node linkType: hard -"uuid@npm:^8.0.0, uuid@npm:^8.3.1, uuid@npm:^8.3.2": +"uuid@npm:^8.0.0, uuid@npm:^8.3.1, uuid@npm:^8.3.2, uuid@npm:~8.3.2": version: 8.3.2 resolution: "uuid@npm:8.3.2" bin: