Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
183af50
Fix room converter when closer is visitor
d-gubert Feb 3, 2025
d6d053c
Merge remote-tracking branch 'origin/develop' into fix/apps-room-conv…
d-gubert Feb 4, 2025
aeff00b
Add changeset
d-gubert Feb 4, 2025
e069b0a
Update .changeset/popular-mugs-try.md
KevLehman Feb 5, 2025
e2222c8
Merge branch 'develop' into fix/apps-room-converter
d-gubert Feb 6, 2025
8d111f4
Merge branch 'develop' into fix/apps-room-converter
d-gubert Feb 10, 2025
c64a581
Merge branch 'develop' into fix/apps-room-converter
d-gubert Feb 10, 2025
ebcc1bb
Merge branch 'develop' into fix/apps-room-converter
d-gubert Feb 11, 2025
090b598
Merge branch 'develop' into fix/apps-room-converter
d-gubert Feb 11, 2025
d5f4500
Merge branch 'develop' into fix/apps-room-converter
d-gubert Feb 13, 2025
e3ff00b
Merge branch 'develop' into fix/apps-room-converter
kodiakhq[bot] Feb 14, 2025
58ccfa4
Merge branch 'develop' into fix/apps-room-converter
kodiakhq[bot] Feb 17, 2025
986aeca
Merge branch 'develop' into fix/apps-room-converter
kodiakhq[bot] Feb 18, 2025
7ff8049
Merge branch 'develop' into fix/apps-room-converter
julio-rocketchat Feb 18, 2025
632994a
Merge branch 'develop' into fix/apps-room-converter
kodiakhq[bot] Feb 18, 2025
725c4e1
Merge branch 'develop' into fix/apps-room-converter
kodiakhq[bot] Feb 18, 2025
9116dd6
Merge branch 'develop' into fix/apps-room-converter
d-gubert Feb 18, 2025
9752701
Merge branch 'develop' into fix/apps-room-converter
kodiakhq[bot] Feb 18, 2025
cca19cd
Merge branch 'develop' into fix/apps-room-converter
kodiakhq[bot] Feb 18, 2025
6eb28e9
Merge branch 'develop' into fix/apps-room-converter
kodiakhq[bot] Feb 18, 2025
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: 5 additions & 0 deletions .changeset/popular-mugs-try.md
Original file line number Diff line number Diff line change
@@ -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
17 changes: 12 additions & 5 deletions apps/meteor/app/apps/server/converters/rooms.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading