diff --git a/.changeset/popular-mugs-try.md b/.changeset/popular-mugs-try.md new file mode 100644 index 0000000000000..030422a3a76a1 --- /dev/null +++ b/.changeset/popular-mugs-try.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Fixes an issue where the room converter would throw if the room was an omnichannel room that had been closed by the visitor diff --git a/apps/meteor/app/apps/server/converters/rooms.js b/apps/meteor/app/apps/server/converters/rooms.js index 741f989321916..03cbc2028b7c2 100644 --- a/apps/meteor/app/apps/server/converters/rooms.js +++ b/apps/meteor/app/apps/server/converters/rooms.js @@ -68,11 +68,18 @@ export class AppRoomsConverter { let closedBy; if (room.closedBy) { - const user = await Users.findOneById(room.closedBy.id); - closedBy = { - _id: user._id, - username: user.username, - }; + if (room.closer === 'user') { + const user = await Users.findOneById(room.closedBy.id); + closedBy = { + _id: user._id, + username: user.username, + }; + } else if (room.closer === 'visitor') { + closedBy = { + _id: v._id, + username: v.username, + }; + } } let contactId;