diff --git a/apps/meteor/app/apps/server/converters/rooms.js b/apps/meteor/app/apps/server/converters/rooms.js index 44d513bd591d7..111298213619c 100644 --- a/apps/meteor/app/apps/server/converters/rooms.js +++ b/apps/meteor/app/apps/server/converters/rooms.js @@ -39,8 +39,8 @@ export class AppRoomsConverter { if (room.visitor) { const visitor = await LivechatVisitors.findOneById(room.visitor.id); - const lastMessageTs = room?.visitor?.lastMessageTs; - const phone = room?.visitor?.channelPhone; + const { lastMessageTs, phone } = room.visitorChannelInfo; + v = { _id: visitor._id, username: visitor.username, @@ -170,26 +170,32 @@ export class AppRoomsConverter { return this.orch.getConverters().get('users').convertById(u._id); }, - visitor: async (room) => { + visitor: (room) => { const { v } = room; if (!v) { return undefined; } - const { lastMessageTs, phone } = v; + return this.orch.getConverters().get('visitors').convertById(v._id); + }, + // Note: room.v is not just visitor, it also contains channel related visitor data + // so we need to pass this data to the converter + // So suppose you have a contact whom we're contacting using SMS via 2 phone no's, + // let's call X and Y. Then if the contact sends a message using X phone number, + // then room.v.phoneNo would be X and correspondingly we'll store the timestamp of + // the last message from this visitor from X phone no on room.v.lastMessageTs + visitorChannelInfo: (room) => { + const { v } = room; - delete room.v; + if (!v) { + return undefined; + } + + const { lastMessageTs, phone } = v; return { - ...(await this.orch.getConverters().get('visitors').convertById(v._id)), - // Note: room.v is not just visitor, it also contains channel related visitor data - // so we need to pass this data to the converter - // So suppose you have a contact whom we're contacting using SMS via 2 phone no's, - // let's call X and Y. Then if the contact sends a message using X phone number, - // then room.v.phoneNo would be X and correspondingly we'll store the timestamp of - // the last message from this visitor from X phone no on room.v.lastMessageTs - ...(phone && { channelPhone: phone }), + ...(phone && { phone }), ...(lastMessageTs && { lastMessageTs }), }; }, diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index b9e82e1e9479e..0fcbaf37931ae 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -18,7 +18,7 @@ "author": "Rocket.Chat", "license": "MIT", "dependencies": { - "@rocket.chat/apps-engine": "1.40.0", + "@rocket.chat/apps-engine": "1.41.0-alpha.290", "@rocket.chat/core-services": "workspace:^", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/emitter": "next", diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index daf4732ce1bff..a773e20f8edd8 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -15,7 +15,7 @@ ], "author": "Rocket.Chat", "dependencies": { - "@rocket.chat/apps-engine": "1.40.0", + "@rocket.chat/apps-engine": "1.41.0-alpha.290", "@rocket.chat/core-services": "workspace:^", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/emitter": "next", diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index ac511d3151c67..5ba4f4e033386 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -6,7 +6,7 @@ "@babel/core": "~7.22.9", "@babel/preset-env": "~7.22.9", "@babel/preset-typescript": "~7.22.5", - "@rocket.chat/apps-engine": "1.40.0", + "@rocket.chat/apps-engine": "1.41.0-alpha.290", "@rocket.chat/eslint-config": "workspace:^", "@rocket.chat/rest-typings": "workspace:^", "@types/node": "^14.18.51", diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 07675f4b57301..1f293b4780f04 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -31,7 +31,7 @@ "/dist" ], "dependencies": { - "@rocket.chat/apps-engine": "1.40.0", + "@rocket.chat/apps-engine": "1.41.0-alpha.290", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/icons": "next", "@rocket.chat/message-parser": "next", diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index d12f71bc2160b..56039036af1aa 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -21,7 +21,7 @@ "/dist" ], "dependencies": { - "@rocket.chat/apps-engine": "1.40.0", + "@rocket.chat/apps-engine": "1.41.0-alpha.290", "@rocket.chat/icons": "next", "@rocket.chat/message-parser": "next", "@rocket.chat/ui-kit": "next" diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 76bff57751ff8..1c99d284b31a1 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -54,7 +54,7 @@ "react-dom": "*" }, "devDependencies": { - "@rocket.chat/apps-engine": "1.40.0", + "@rocket.chat/apps-engine": "1.41.0-alpha.290", "@rocket.chat/eslint-config": "workspace:^", "@rocket.chat/fuselage": "next", "@rocket.chat/fuselage-hooks": "next", diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index 962af8e44e365..9f0c9916ec788 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -24,7 +24,7 @@ "/dist" ], "dependencies": { - "@rocket.chat/apps-engine": "1.40.0", + "@rocket.chat/apps-engine": "1.41.0-alpha.290", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/message-parser": "next", "@rocket.chat/ui-kit": "next", diff --git a/yarn.lock b/yarn.lock index 2234668093eea..482da2db4e586 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7136,9 +7136,9 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/apps-engine@npm:1.40.0": - version: 1.40.0 - resolution: "@rocket.chat/apps-engine@npm:1.40.0" +"@rocket.chat/apps-engine@npm:1.41.0-alpha.290": + version: 1.41.0-alpha.290 + resolution: "@rocket.chat/apps-engine@npm:1.41.0-alpha.290" dependencies: adm-zip: ^0.5.9 cryptiles: ^4.1.3 @@ -7150,7 +7150,7 @@ __metadata: vm2: ^3.9.19 peerDependencies: "@rocket.chat/ui-kit": "*" - checksum: 868c5f8b53860ed18a54fb57299f1906c09a22242a3e1fafddf62c77860bc57dcc285ff9077aefbedc3697000a6412fad2b0ecf19d35c5fd71d498e256cec496 + checksum: f31f4c9bac7f036d22b023688d9854196340f5813112a016848ddbea9589088ab5a2a7830b691c24ef01e9cce98e9046c5b8780bc46dd3bef6f3a05207d51a60 languageName: node linkType: hard @@ -7240,7 +7240,7 @@ __metadata: "@babel/core": ~7.22.9 "@babel/preset-env": ~7.22.9 "@babel/preset-typescript": ~7.22.5 - "@rocket.chat/apps-engine": 1.40.0 + "@rocket.chat/apps-engine": 1.41.0-alpha.290 "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/icons": next @@ -7266,7 +7266,7 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/core-typings@workspace:packages/core-typings" dependencies: - "@rocket.chat/apps-engine": 1.40.0 + "@rocket.chat/apps-engine": 1.41.0-alpha.290 "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/icons": next "@rocket.chat/message-parser": next @@ -7377,7 +7377,7 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer" dependencies: - "@rocket.chat/apps-engine": 1.40.0 + "@rocket.chat/apps-engine": 1.41.0-alpha.290 "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/emitter": next @@ -7573,7 +7573,7 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/fuselage-ui-kit@workspace:packages/fuselage-ui-kit" dependencies: - "@rocket.chat/apps-engine": 1.40.0 + "@rocket.chat/apps-engine": 1.41.0-alpha.290 "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/fuselage": next "@rocket.chat/fuselage-hooks": next @@ -8513,7 +8513,7 @@ __metadata: "@babel/core": ~7.22.9 "@babel/preset-env": ~7.22.9 "@babel/preset-typescript": ~7.22.5 - "@rocket.chat/apps-engine": 1.40.0 + "@rocket.chat/apps-engine": 1.41.0-alpha.290 "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" @@ -8613,7 +8613,7 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/rest-typings@workspace:packages/rest-typings" dependencies: - "@rocket.chat/apps-engine": 1.40.0 + "@rocket.chat/apps-engine": 1.41.0-alpha.290 "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/message-parser": next @@ -33223,7 +33223,7 @@ __metadata: version: 0.0.0-use.local resolution: "rocketchat-services@workspace:apps/meteor/ee/server/services" dependencies: - "@rocket.chat/apps-engine": 1.40.0 + "@rocket.chat/apps-engine": 1.41.0-alpha.290 "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/emitter": next