From 625bcb04dbc69bcc942b9d7b2482e5353ace6c04 Mon Sep 17 00:00:00 2001 From: Tasso Evangelista Date: Mon, 18 Jun 2018 14:43:54 -0300 Subject: [PATCH 1/2] Fix room creation error due absence of subscriptions --- packages/rocketchat-ui-sidenav/client/roomList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-ui-sidenav/client/roomList.js b/packages/rocketchat-ui-sidenav/client/roomList.js index 28e8d558bcfa..b79393f85308 100644 --- a/packages/rocketchat-ui-sidenav/client/roomList.js +++ b/packages/rocketchat-ui-sidenav/client/roomList.js @@ -124,7 +124,7 @@ const mergeSubRoom = (record/*, t*/) => { RocketChat.callbacks.add('cachedCollection-received-rooms', (room) => { const sub = RocketChat.models.Subscriptions.findOne({ rid: room._id }); - const $set = {lastMessage : room.lastMessage, lm: room._updatedAt, ...getLowerCaseNames(room, sub.name)}; + const $set = {lastMessage : room.lastMessage, lm: room._updatedAt, ...getLowerCaseNames(room, sub && sub.name)}; RocketChat.models.Subscriptions.update({ rid: room._id }, {$set}); }); From 9f5af776efe38940d240e4bb90e7b18ff8a3ba38 Mon Sep 17 00:00:00 2001 From: Tasso Evangelista Date: Mon, 18 Jun 2018 15:08:30 -0300 Subject: [PATCH 2/2] Ignore update of nonexistent subscription --- packages/rocketchat-ui-sidenav/client/roomList.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/rocketchat-ui-sidenav/client/roomList.js b/packages/rocketchat-ui-sidenav/client/roomList.js index b79393f85308..fcb0116a6b77 100644 --- a/packages/rocketchat-ui-sidenav/client/roomList.js +++ b/packages/rocketchat-ui-sidenav/client/roomList.js @@ -124,7 +124,10 @@ const mergeSubRoom = (record/*, t*/) => { RocketChat.callbacks.add('cachedCollection-received-rooms', (room) => { const sub = RocketChat.models.Subscriptions.findOne({ rid: room._id }); - const $set = {lastMessage : room.lastMessage, lm: room._updatedAt, ...getLowerCaseNames(room, sub && sub.name)}; + if (!sub) { + return; + } + const $set = {lastMessage : room.lastMessage, lm: room._updatedAt, ...getLowerCaseNames(room, sub.name)}; RocketChat.models.Subscriptions.update({ rid: room._id }, {$set}); });