diff --git a/apps/meteor/app/apps/server/converters/rooms.js b/apps/meteor/app/apps/server/converters/rooms.js
index 670c1a248a0f03cf2c379a38c26fddef236bd485..a98a6701b2c220e7b5120a382d8b9c886f36049a 100644
--- a/apps/meteor/app/apps/server/converters/rooms.js
+++ b/apps/meteor/app/apps/server/converters/rooms.js
@@ -111,8 +111,8 @@ export class AppRoomsConverter {
return Object.assign(newRoom, room._unmappedProperties_);
}
- async convertRoom(room) {
- if (!room) {
+ async convertRoom(originalRoom) {
+ if (!originalRoom) {
return undefined;
}
@@ -134,6 +134,7 @@ export class AppRoomsConverter {
_USERNAMES: '_USERNAMES',
description: 'description',
source: 'source',
+ closer: 'closer',
isDefault: (room) => {
const result = !!room.default;
delete room.default;
@@ -210,6 +211,19 @@ export class AppRoomsConverter {
return this.orch.getConverters().get('departments').convertById(departmentId);
},
+ closedBy: async (room) => {
+ const { closedBy } = room;
+
+ if (!closedBy) {
+ return undefined;
+ }
+
+ delete room.closedBy;
+ if (originalRoom.closer === 'user') {
+ return this.orch.getConverters().get('users').convertById(closedBy._id);
+ }
+ return this.orch.getConverters().get('visitors').convertById(closedBy._id);
+ },
servedBy: async (room) => {
const { servedBy } = room;
@@ -245,7 +259,7 @@ export class AppRoomsConverter {
},
};
- return transformMappedData(room, map);
+ return transformMappedData(originalRoom, map);
}
_convertTypeToApp(typeChar) {
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 52863be3e098833b5c038116629b1b47d2242e76..58b73351c4e00f666670f88c49730699fa476a73 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.45.0-alpha.864",
+ "@rocket.chat/apps-engine": "1.45.0-alpha.866",
"@rocket.chat/core-services": "workspace:^",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "~0.31.25",
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index c29d70127bd7b608b8e2ec127d369a83ea6bd2a8..9c49c2cb33f8e6c1e9c081f3d19586ea38ffd5a6 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -230,7 +230,7 @@
"@rocket.chat/agenda": "workspace:^",
"@rocket.chat/api-client": "workspace:^",
"@rocket.chat/apps": "workspace:^",
- "@rocket.chat/apps-engine": "1.45.0-alpha.864",
+ "@rocket.chat/apps-engine": "1.45.0-alpha.866",
"@rocket.chat/base64": "workspace:^",
"@rocket.chat/cas-validate": "workspace:^",
"@rocket.chat/core-services": "workspace:^",
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 9bf49018ed0a66075698584a517cbd3154b70124..1687042e0d313d9e02c23493d92f0ca6a4f6bbb6 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.45.0-alpha.864",
+ "@rocket.chat/apps-engine": "1.45.0-alpha.866",
"@rocket.chat/core-services": "workspace:^",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "~0.31.25",
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index ad160821647c0912ab3500ddcb4453343bbd7560..787eb2053007bf91b99771786d80bd9e97316fa5 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -6,7 +6,7 @@
"@babel/core": "~7.22.20",
"@babel/preset-env": "~7.22.20",
"@babel/preset-typescript": "~7.22.15",
- "@rocket.chat/apps-engine": "1.45.0-alpha.864",
+ "@rocket.chat/apps-engine": "1.45.0-alpha.866",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/rest-typings": "workspace:^",
"@types/node": "^14.18.63",
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 0aca06fdf07041103f7491263f73d46eb44af6cb..816e271535df33ae66a42b0677bb4e882f975db1 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -18,7 +18,7 @@
"/dist"
],
"dependencies": {
- "@rocket.chat/apps-engine": "1.45.0-alpha.864",
+ "@rocket.chat/apps-engine": "1.45.0-alpha.866",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/model-typings": "workspace:^"
}
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index a975a2ef2541d3b47726c59ba19afcb3d91bac6c..fe1d4ef0dceaf78e5e33cf5de3445505eb015bc9 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -34,7 +34,7 @@
"extends": "../../package.json"
},
"dependencies": {
- "@rocket.chat/apps-engine": "1.45.0-alpha.864",
+ "@rocket.chat/apps-engine": "1.45.0-alpha.866",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/icons": "~0.38.0",
"@rocket.chat/message-parser": "workspace:^",
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 3759caa666b81f5ab021f4abd1b0bc300ea1389d..34bdc67438ca7f59484625a246d8eeb6ba83383a 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -22,7 +22,7 @@
"/dist"
],
"dependencies": {
- "@rocket.chat/apps-engine": "1.45.0-alpha.864",
+ "@rocket.chat/apps-engine": "1.45.0-alpha.866",
"@rocket.chat/icons": "~0.38.0",
"@rocket.chat/message-parser": "workspace:^",
"@rocket.chat/ui-kit": "workspace:~"
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 9b35e473ce723cdcfb5c05cca08970e031aa6d57..9431a0c19d964bc9e463e666d9758b52c92ca267 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -63,7 +63,7 @@
"@babel/preset-env": "~7.22.20",
"@babel/preset-react": "~7.22.15",
"@babel/preset-typescript": "~7.22.15",
- "@rocket.chat/apps-engine": "1.45.0-alpha.864",
+ "@rocket.chat/apps-engine": "1.45.0-alpha.866",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/fuselage": "^0.57.0",
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 896e7890062607796c141273a1ee4a8a328fa768..53bd1d2f5cb2d154a3125131d11f06bc7fc6d5d1 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -23,7 +23,7 @@
"/dist"
],
"dependencies": {
- "@rocket.chat/apps-engine": "1.45.0-alpha.864",
+ "@rocket.chat/apps-engine": "1.45.0-alpha.866",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/message-parser": "workspace:^",
"@rocket.chat/ui-kit": "workspace:~",
diff --git a/yarn.lock b/yarn.lock
index 5e5c61d59f7324004333ae9e731c6706341aacd3..f2e90229584870cdf128726b448a3ebb88259632 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8483,9 +8483,9 @@ __metadata:
languageName: unknown
linkType: soft
-"@rocket.chat/apps-engine@npm:1.45.0-alpha.864":
- version: 1.45.0-alpha.864
- resolution: "@rocket.chat/apps-engine@npm:1.45.0-alpha.864"
+"@rocket.chat/apps-engine@npm:1.45.0-alpha.866":
+ version: 1.45.0-alpha.866
+ resolution: "@rocket.chat/apps-engine@npm:1.45.0-alpha.866"
dependencies:
"@msgpack/msgpack": 3.0.0-beta2
adm-zip: ^0.5.9
@@ -8501,7 +8501,7 @@ __metadata:
uuid: ~8.3.2
peerDependencies:
"@rocket.chat/ui-kit": "*"
- checksum: 4f223dd0671d920e4eaafa465fe87584473f3295061252d1020c0d0e1c076c3b74ee98af1ee5aedfeb72b042e38c3f381d10a151b3a2abcf33a7de8ac6146fa1
+ checksum: 04abb4f712fcca206c6791322b52e2a3d97f3db06f606cd1f58fdda4e63d2123d7004bb445ad7582c52808c3ec4433d465d8855e24f3ab2f8457dafa6b017c5b
languageName: node
linkType: hard
@@ -8509,7 +8509,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@rocket.chat/apps@workspace:packages/apps"
dependencies:
- "@rocket.chat/apps-engine": 1.45.0-alpha.864
+ "@rocket.chat/apps-engine": 1.45.0-alpha.866
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/model-typings": "workspace:^"
eslint: ~8.45.0
@@ -8582,7 +8582,7 @@ __metadata:
"@babel/core": ~7.22.20
"@babel/preset-env": ~7.22.20
"@babel/preset-typescript": ~7.22.15
- "@rocket.chat/apps-engine": 1.45.0-alpha.864
+ "@rocket.chat/apps-engine": 1.45.0-alpha.866
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/icons": ~0.38.0
@@ -8609,7 +8609,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@rocket.chat/core-typings@workspace:packages/core-typings"
dependencies:
- "@rocket.chat/apps-engine": 1.45.0-alpha.864
+ "@rocket.chat/apps-engine": 1.45.0-alpha.866
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/icons": ~0.38.0
"@rocket.chat/message-parser": "workspace:^"
@@ -8681,7 +8681,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer"
dependencies:
- "@rocket.chat/apps-engine": 1.45.0-alpha.864
+ "@rocket.chat/apps-engine": 1.45.0-alpha.866
"@rocket.chat/core-services": "workspace:^"
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/ddp-client": "workspace:~"
@@ -8879,7 +8879,7 @@ __metadata:
"@babel/preset-env": ~7.22.20
"@babel/preset-react": ~7.22.15
"@babel/preset-typescript": ~7.22.15
- "@rocket.chat/apps-engine": 1.45.0-alpha.864
+ "@rocket.chat/apps-engine": 1.45.0-alpha.866
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/fuselage": ^0.57.0
@@ -9329,7 +9329,7 @@ __metadata:
"@rocket.chat/agenda": "workspace:^"
"@rocket.chat/api-client": "workspace:^"
"@rocket.chat/apps": "workspace:^"
- "@rocket.chat/apps-engine": 1.45.0-alpha.864
+ "@rocket.chat/apps-engine": 1.45.0-alpha.866
"@rocket.chat/base64": "workspace:^"
"@rocket.chat/cas-validate": "workspace:^"
"@rocket.chat/core-services": "workspace:^"
@@ -9952,7 +9952,7 @@ __metadata:
"@babel/core": ~7.22.20
"@babel/preset-env": ~7.22.20
"@babel/preset-typescript": ~7.22.15
- "@rocket.chat/apps-engine": 1.45.0-alpha.864
+ "@rocket.chat/apps-engine": 1.45.0-alpha.866
"@rocket.chat/core-services": "workspace:^"
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/eslint-config": "workspace:^"
@@ -10066,7 +10066,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@rocket.chat/rest-typings@workspace:packages/rest-typings"
dependencies:
- "@rocket.chat/apps-engine": 1.45.0-alpha.864
+ "@rocket.chat/apps-engine": 1.45.0-alpha.866
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/eslint-config": "workspace:~"
"@rocket.chat/message-parser": "workspace:^"
@@ -36694,7 +36694,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "rocketchat-services@workspace:apps/meteor/ee/server/services"
dependencies:
- "@rocket.chat/apps-engine": 1.45.0-alpha.864
+ "@rocket.chat/apps-engine": 1.45.0-alpha.866
"@rocket.chat/core-services": "workspace:^"
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/emitter": ~0.31.25