[IMPROVE] Open rooms quicker (RocketChat#13417)

* [IMPROVE] Open rooms quicker * Close observer on room destroy * Fix tests * Back to cursor and improve permission query * More improvements
bhardwajaditya · Mar 17, 2019 · 8b5f44a · 8b5f44a
1 parent f51c1a3
commit 8b5f44a
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 39 deletions.
diff --git a/app/autotranslate/client/lib/autotranslate.js b/app/autotranslate/client/lib/autotranslate.js
@@ -7,6 +7,11 @@ import { hasAtLeastOnePermission } from '../../../authorization';
 import { CachedCollectionManager } from '../../../ui-cached-collection';
 import _ from 'underscore';
 import mem from 'mem';
+<<<<<<< HEAD:app/autotranslate/client/lib/autotranslate.js
+=======
+
+const findSubscriptionByRid = mem((rid) => RocketChat.models.Subscriptions.findOne({ rid }));
+>>>>>>> [IMPROVE] Open rooms quicker (#13417):packages/rocketchat-autotranslate/client/lib/autotranslate.js
 
 const findSubscriptionByRid = mem((rid) => Subscriptions.findOne({ rid }));
 
@@ -53,8 +58,13 @@ export const AutoTranslate = {
 		});
 
 		Tracker.autorun(() => {
+<<<<<<< HEAD:app/autotranslate/client/lib/autotranslate.js
 			if (settings.get('AutoTranslate_Enabled') && hasAtLeastOnePermission(['auto-translate'])) {
 				callbacks.add('renderMessage', (message) => {
+=======
+			if (RocketChat.settings.get('AutoTranslate_Enabled') && RocketChat.authz.hasAtLeastOnePermission(['auto-translate'])) {
+				RocketChat.callbacks.add('renderMessage', (message) => {
+>>>>>>> [IMPROVE] Open rooms quicker (#13417):packages/rocketchat-autotranslate/client/lib/autotranslate.js
 					const subscription = findSubscriptionByRid(message.rid);
 					const autoTranslateLanguage = this.getLanguage(message.rid);
 					if (message.u && message.u._id !== Meteor.userId()) {

diff --git a/app/ui-utils/client/lib/openRoom.js b/app/ui-utils/client/lib/openRoom.js
@@ -59,8 +59,16 @@ export const openRoom = function(type, name) {
 				replaceCenterDomBy(getDomOfLoading());
 				return;
 			}
+<<<<<<< HEAD:app/ui-utils/client/lib/openRoom.js
 			if (window.currentTracker) {
 				window.currentTracker = undefined;
+=======
+
+			BlazeLayout.render('main');
+
+			if (currentTracker) {
+				currentTracker = undefined;
+>>>>>>> [IMPROVE] Open rooms quicker (#13417):packages/rocketchat-lib/client/lib/openRoom.js
 			}
 			c.stop();