Merge pull request #8314 from szluohua/synchronizing

[FIX] After deleting the room, cache is not synchronizing
RocketChat · Sep 29, 2017 · 70aee61 · 70aee61
2 parents 5abb1d2 + 1b13e0c
commit 70aee61
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/packages/rocketchat-lib/client/lib/cachedCollection.js b/packages/rocketchat-lib/client/lib/cachedCollection.js
@@ -330,6 +330,7 @@ class CachedCollection {
 			this.log('record received', t, record);
 			if (t === 'removed') {
 				this.collection.remove(record._id);
+				RoomManager.close(record.t+record.name);
 			} else {
 				delete record.$loki;
 				this.collection.upsert({ _id: record._id }, _.omit(record, '_id'));

diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
@@ -954,4 +954,10 @@ Template.room.onRendered(function() {
 			newMessage.classList.remove('not');
 		}
 	});
+	Tracker.autorun(function() {
+		const subRoom = ChatSubscription.findOne({rid:template.data._id});
+		if (!subRoom) {
+			FlowRouter.go('home');
+		}
+	});
 });
diff --git a/server/publications/room.js b/server/publications/room.js
@@ -97,7 +97,7 @@ RocketChat.models.Rooms.cache.on('sync', (type, room/*, diff*/) => {
 });
 
 RocketChat.models.Subscriptions.on('changed', (type, subscription/*, diff*/) => {
-	if (type === 'inserted') {
+	if (type === 'inserted' || type === 'removed') {
 		const room = RocketChat.models.Rooms.findOneById(subscription.rid);
 		if (room) {
 			RocketChat.Notifications.notifyUserInThisInstance(subscription.u._id, 'rooms-changed', type, roomMap({_room: room}));