Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Revert "fix: update type of message bridge's create method" #30355

Merged
merged 5 commits into from
Sep 12, 2023
Merged

chore: Revert "fix: update type of message bridge's create method" #30355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
21a165e
Revert "fix: update type of message bridge's create method (#30321)"
d-gubert Sep 11, 2023
e8523fe
Merge branch 'develop' into revert-30321-new/dmnotify
kodiakhq[bot] Sep 12, 2023
bafd5f1
Merge branch 'develop' into revert-30321-new/dmnotify
kodiakhq[bot] Sep 12, 2023
45885d6
Merge branch 'develop' into revert-30321-new/dmnotify
kodiakhq[bot] Sep 12, 2023
9300baa
Merge branch 'develop' into revert-30321-new/dmnotify
kodiakhq[bot] Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .changeset/loud-bees-smoke.md
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions apps/meteor/app/apps/server/bridges/messages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { IMessage, IDirectMessage } from '@rocket.chat/apps-engine/definition/messages';
import type { IMessage } 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';
Expand All @@ -17,7 +17,7 @@ export class AppMessageBridge extends MessageBridge {
super();
}

protected async create(message: IMessage | IDirectMessage, appId: string): Promise<string> {
protected async create(message: IMessage, appId: string): Promise<string> {
this.orch.debugLog(`The App ${appId} is creating a new message.`);

const convertedMessage = await this.orch.getConverters()?.get('messages').convertAppMessage(message);
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.325",
"@rocket.chat/apps-engine": "1.41.0-alpha.312",
"@rocket.chat/base64": "workspace:^",
"@rocket.chat/cas-validate": "workspace:^",
"@rocket.chat/core-services": "workspace:^",
Expand Down
14 changes: 7 additions & 7 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7774,21 +7774,21 @@ __metadata:
languageName: node
linkType: hard

"@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"
"@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"
dependencies:
adm-zip: ^0.5.9
cryptiles: ^4.1.3
jose: ^4.11.1
lodash.clonedeep: ^4.5.0
semver: ^5.7.1
stack-trace: 0.0.10
uuid: ~8.3.2
uuid: ^3.4.0
vm2: ^3.9.19
peerDependencies:
"@rocket.chat/ui-kit": "*"
checksum: 3159b69d1174166bfe1fea13ac51e81bc39ddcabad3a8dcd20e4614d33592b7f93ae45625578d7545c149f52f90e9c30dee92a1bbd3f5830f7bcdc13d19fcef4
checksum: 003853d3c4d4374ab984474026e4ae657daf4591fe4c375b914aa57c27f576af0fcba66e70c539e056b5d80a1ef655775f6f3a07bf81a36ab6fd438ce464e70f
languageName: node
linkType: hard

Expand Down Expand Up @@ -8556,7 +8556,7 @@ __metadata:
"@rocket.chat/account-utils": "workspace:^"
"@rocket.chat/agenda": "workspace:^"
"@rocket.chat/api-client": "workspace:^"
"@rocket.chat/apps-engine": 1.41.0-alpha.325
"@rocket.chat/apps-engine": 1.41.0-alpha.312
"@rocket.chat/base64": "workspace:^"
"@rocket.chat/cas-validate": "workspace:^"
"@rocket.chat/core-services": "workspace:^"
Expand Down Expand Up @@ -38668,7 +38668,7 @@ __metadata:
languageName: node
linkType: hard

"uuid@npm:^8.0.0, uuid@npm:^8.3.1, uuid@npm:^8.3.2, uuid@npm:~8.3.2":
"uuid@npm:^8.0.0, uuid@npm:^8.3.1, uuid@npm:^8.3.2":
version: 8.3.2
resolution: "uuid@npm:8.3.2"
bin:
Expand Down
Loading