[IMPROVE] Avoid unnecessary calls to Meteor.user() on client (#11212)

RocketChat · Oct 18, 2018 · 3243634 · 3243634
1 parent af2c793
commit 3243634
Show file tree

Hide file tree

Showing 22 changed files with 60 additions and 67 deletions.
diff --git a/client/notifications/notification.js b/client/notifications/notification.js
@@ -29,7 +29,7 @@ Meteor.startup(function() {
 				// This logic is duplicated in /client/startup/unread.coffee.
 				const hasFocus = readMessage.isEnable();
 				const messageIsInOpenedRoom = openedRoomId === notification.payload.rid;
-				const muteFocusedConversations = RocketChat.getUserPreference(Meteor.user(), 'muteFocusedConversations');
+				const muteFocusedConversations = RocketChat.getUserPreference(Meteor.userId(), 'muteFocusedConversations');
 
 				fireGlobalEvent('notification', {
 					notification,
@@ -60,7 +60,7 @@ Meteor.startup(function() {
 				// This logic is duplicated in /client/startup/unread.coffee.
 				const hasFocus = readMessage.isEnable();
 				const messageIsInOpenedRoom = openedRoomId === notification.payload.rid;
-				const muteFocusedConversations = RocketChat.getUserPreference(Meteor.user(), 'muteFocusedConversations');
+				const muteFocusedConversations = RocketChat.getUserPreference(Meteor.userId(), 'muteFocusedConversations');
 
 				if (RocketChat.Layout.isEmbedded()) {
 					if (!hasFocus && messageIsInOpenedRoom) {

diff --git a/client/startup/unread.js b/client/startup/unread.js
@@ -32,7 +32,7 @@ Meteor.startup(function() {
 				// Increment the total unread count.
 				unreadCount += subscription.unread;
 				if (subscription.alert === true && subscription.unreadAlert !== 'nothing') {
-					const userUnreadAlert = RocketChat.getUserPreference(Meteor.user(), 'unreadAlert');
+					const userUnreadAlert = RocketChat.getUserPreference(Meteor.userId(), 'unreadAlert');
 					if (subscription.unreadAlert === 'all' || userUnreadAlert !== false) {
 						unreadAlert = '•';
 					}

diff --git a/packages/rocketchat-emoji-emojione/rocketchat.js b/packages/rocketchat-emoji-emojione/rocketchat.js
@@ -35,8 +35,8 @@ for (const key in emojione.emojioneList) {
 Meteor.startup(function() {
 	Tracker.autorun(function() {
 		if (isSetNotNull(() => RocketChat.emoji.packages.emojione)) {
-			if (isSetNotNull(() => RocketChat.getUserPreference(Meteor.user(), 'convertAsciiEmoji'))) {
-				RocketChat.emoji.packages.emojione.ascii = RocketChat.getUserPreference(Meteor.user(), 'convertAsciiEmoji');
+			if (isSetNotNull(() => RocketChat.getUserPreference(Meteor.userId(), 'convertAsciiEmoji'))) {
+				RocketChat.emoji.packages.emojione.ascii = RocketChat.getUserPreference(Meteor.userId(), 'convertAsciiEmoji');
 			} else {
 				RocketChat.emoji.packages.emojione.ascii = true;
 			}

diff --git a/packages/rocketchat-emoji/client/emojiButton.js b/packages/rocketchat-emoji/client/emojiButton.js
@@ -4,7 +4,7 @@ Template.messageBox.events({
 		event.stopPropagation();
 		event.preventDefault();
 
-		if (!RocketChat.getUserPreference(Meteor.user(), 'useEmojis')) {
+		if (!RocketChat.getUserPreference(Meteor.userId(), 'useEmojis')) {
 			return false;
 		}
 

diff --git a/packages/rocketchat-emoji/client/emojiParser.js b/packages/rocketchat-emoji/client/emojiParser.js
@@ -6,8 +6,8 @@ import s from 'underscore.string';
  * @param {Object} message - The message object
  */
 RocketChat.callbacks.add('renderMessage', (message) => {
-	if (isSetNotNull(() => RocketChat.getUserPreference(Meteor.user(), 'useEmojis')) &&
-		!RocketChat.getUserPreference(Meteor.user(), 'useEmojis')) {
+	if (isSetNotNull(() => RocketChat.getUserPreference(Meteor.userId(), 'useEmojis')) &&
+		!RocketChat.getUserPreference(Meteor.userId(), 'useEmojis')) {
 		return message;
 	}
 

diff --git a/packages/rocketchat-highlight-words/client/client.js b/packages/rocketchat-highlight-words/client/client.js
@@ -15,7 +15,7 @@ function HighlightWordsClient(message) {
 		}
 	}
 
-	const to_highlight = RocketChat.getUserPreference(Meteor.user(), 'highlights');
+	const to_highlight = RocketChat.getUserPreference(Meteor.userId(), 'highlights');
 	if (Array.isArray(to_highlight)) {
 		to_highlight.forEach((highlight) => {
 			if (!s.isBlank(highlight)) {

diff --git a/packages/rocketchat-message-attachments/client/messageAttachment.js b/packages/rocketchat-message-attachments/client/messageAttachment.js
@@ -50,8 +50,7 @@ Template.messageAttachment.helpers({
 		if (this.collapsed != null) {
 			return this.collapsed;
 		} else {
-			const user = Meteor.user();
-			return RocketChat.getUserPreference(user, 'collapseMediaByDefault') === true;
+			return RocketChat.getUserPreference(Meteor.userId(), 'collapseMediaByDefault') === true;
 		}
 	},
 	time() {

diff --git a/packages/rocketchat-oembed/client/oembedAudioWidget.js b/packages/rocketchat-oembed/client/oembedAudioWidget.js
@@ -3,8 +3,7 @@ Template.oembedAudioWidget.helpers({
 		if (this.collapsed) {
 			return this.collapsed;
 		} else {
-			const user = Meteor.user();
-			return RocketChat.getUserPreference(user, 'collapseMediaByDefault') === true;
+			return RocketChat.getUserPreference(Meteor.userId(), 'collapseMediaByDefault') === true;
 		}
 	},
 });
diff --git a/packages/rocketchat-oembed/client/oembedFrameWidget.js b/packages/rocketchat-oembed/client/oembedFrameWidget.js
@@ -3,8 +3,7 @@ Template.oembedFrameWidget.helpers({
 		if (this.collapsed) {
 			return this.collapsed;
 		} else {
-			const user = Meteor.user();
-			return RocketChat.getUserPreference(user, 'collapseMediaByDefault') === true;
+			return RocketChat.getUserPreference(Meteor.userId(), 'collapseMediaByDefault') === true;
 		}
 	},
 });
diff --git a/packages/rocketchat-oembed/client/oembedImageWidget.js b/packages/rocketchat-oembed/client/oembedImageWidget.js
@@ -1,11 +1,9 @@
 Template.oembedImageWidget.helpers({
 	loadImage() {
-		const user = Meteor.user();
-
-		if (RocketChat.getUserPreference(user, 'autoImageLoad') === false && this.downloadImages == null) {
+		if (RocketChat.getUserPreference(Meteor.userId(), 'autoImageLoad') === false && this.downloadImages == null) {
 			return false;
 		}
-		if (Meteor.Device.isPhone() && RocketChat.getUserPreference(user, 'saveMobileBandwidth') && this.downloadImages == null) {
+		if (Meteor.Device.isPhone() && RocketChat.getUserPreference(Meteor.userId(), 'saveMobileBandwidth') && this.downloadImages == null) {
 			return false;
 		}
 		return true;
@@ -14,8 +12,7 @@ Template.oembedImageWidget.helpers({
 		if (this.collapsed != null) {
 			return this.collapsed;
 		} else {
-			const user = Meteor.user();
-			return RocketChat.getUserPreference(user, 'collapseMediaByDefault') === true;
+			return RocketChat.getUserPreference(Meteor.userId(), 'collapseMediaByDefault') === true;
 		}
 	},
 });
diff --git a/packages/rocketchat-oembed/client/oembedUrlWidget.js b/packages/rocketchat-oembed/client/oembedUrlWidget.js
@@ -62,8 +62,7 @@ Template.oembedUrlWidget.helpers({
 		if (this.collapsed != null) {
 			return this.collapsed;
 		} else {
-			const user = Meteor.user();
-			return RocketChat.getUserPreference(user, 'collapseMediaByDefault') === true;
+			return RocketChat.getUserPreference(Meteor.userId(), 'collapseMediaByDefault') === true;
 		}
 	},
 });
diff --git a/packages/rocketchat-oembed/client/oembedVideoWidget.js b/packages/rocketchat-oembed/client/oembedVideoWidget.js
@@ -27,8 +27,7 @@ Template.oembedVideoWidget.helpers({
 		if (this.collapsed) {
 			return this.collapsed;
 		} else {
-			const user = Meteor.user();
-			return RocketChat.getUserPreference(user, 'collapseMediaByDefault') === true;
+			return RocketChat.getUserPreference(Meteor.userId(), 'collapseMediaByDefault') === true;
 		}
 	},
 

diff --git a/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js b/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js
@@ -73,21 +73,21 @@ Template.pushNotificationsFlexTab.helpers({
 		}
 	},
 	defaultAudioNotification() {
-		let preference = RocketChat.getUserPreference(Meteor.user(), 'audioNotifications');
+		let preference = RocketChat.getUserPreference(Meteor.userId(), 'audioNotifications');
 		if (preference === 'default') {
 			preference = RocketChat.settings.get('Accounts_Default_User_Preferences_audioNotifications');
 		}
 		return notificationLabels[preference];
 	},
 	defaultDesktopNotification() {
-		let preference = RocketChat.getUserPreference(Meteor.user(), 'desktopNotifications');
+		let preference = RocketChat.getUserPreference(Meteor.userId(), 'desktopNotifications');
 		if (preference === 'default') {
 			preference = RocketChat.settings.get('Accounts_Default_User_Preferences_desktopNotifications');
 		}
 		return notificationLabels[preference];
 	},
 	defaultMobileNotification() {
-		let preference = RocketChat.getUserPreference(Meteor.user(), 'mobileNotifications');
+		let preference = RocketChat.getUserPreference(Meteor.userId(), 'mobileNotifications');
 		if (preference === 'default') {
 			preference = RocketChat.settings.get('Accounts_Default_User_Preferences_mobileNotifications');
 		}
@@ -190,7 +190,7 @@ Template.pushNotificationsFlexTab.events({
 
 	'click [data-play]'(e) {
 		e.preventDefault();
-		const user = Meteor.user();
+		const user = Meteor.userId();
 
 		let value = Template.instance().form.audioNotificationValue.get();
 		if (value === '0') {
@@ -340,7 +340,7 @@ Template.pushNotificationsPopover.helpers({
 		return Template.instance().data.options;
 	},
 	defaultDesktopNotification() {
-		let preference = RocketChat.getUserPreference(Meteor.user(), 'desktopNotifications');
+		let preference = RocketChat.getUserPreference(Meteor.userId(), 'desktopNotifications');
 		if (preference === 'default') {
 			preference = RocketChat.settings.get('Accounts_Default_User_Preferences_desktopNotifications');
 		}

diff --git a/packages/rocketchat-ui-account/client/accountPreferences.js b/packages/rocketchat-ui-account/client/accountPreferences.js
@@ -18,21 +18,21 @@ function checkedSelected(property, value, defaultValue = undefined) {
 	if (defaultValue && defaultValue.hash) {
 		defaultValue = undefined;
 	}
-	return RocketChat.getUserPreference(Meteor.user(), property, defaultValue) === value;
+	return RocketChat.getUserPreference(Meteor.userId(), property, defaultValue) === value;
 }
 
 Template.accountPreferences.helpers({
 	audioAssets() {
 		return (RocketChat.CustomSounds && RocketChat.CustomSounds.getList && RocketChat.CustomSounds.getList()) || [];
 	},
 	newMessageNotification() {
-		return RocketChat.getUserPreference(Meteor.user(), 'newMessageNotification');
+		return RocketChat.getUserPreference(Meteor.userId(), 'newMessageNotification');
 	},
 	newRoomNotification() {
-		return RocketChat.getUserPreference(Meteor.user(), 'newRoomNotification');
+		return RocketChat.getUserPreference(Meteor.userId(), 'newRoomNotification');
 	},
 	muteFocusedConversations() {
-		return RocketChat.getUserPreference(Meteor.user(), 'muteFocusedConversations');
+		return RocketChat.getUserPreference(Meteor.userId(), 'muteFocusedConversations');
 	},
 	languages() {
 		const languages = TAPi18n.getLanguages();
@@ -60,7 +60,7 @@ Template.accountPreferences.helpers({
 		return checkedSelected(property, value, defaultValue);
 	},
 	highlights() {
-		const userHighlights = RocketChat.getUserPreference(Meteor.user(), 'highlights');
+		const userHighlights = RocketChat.getUserPreference(Meteor.userId(), 'highlights');
 		return userHighlights ? userHighlights.join(',\n') : undefined;
 	},
 	desktopNotificationEnabled() {
@@ -70,14 +70,14 @@ Template.accountPreferences.helpers({
 		return KonchatNotification.notificationStatus.get() === 'denied' || (window.Notification && Notification.permission === 'denied');
 	},
 	desktopNotificationDuration() {
-		const userPref = RocketChat.getUserPreference(Meteor.user(), 'desktopNotificationDuration', 'undefined');
+		const userPref = RocketChat.getUserPreference(Meteor.userId(), 'desktopNotificationDuration', 'undefined');
 		return userPref !== 'undefined' ? userPref : undefined;
 	},
 	defaultDesktopNotificationDuration() {
 		return RocketChat.settings.get('Accounts_Default_User_Preferences_desktopNotificationDuration');
 	},
 	idleTimeLimit() {
-		return RocketChat.getUserPreference(Meteor.user(), 'idleTimeLimit');
+		return RocketChat.getUserPreference(Meteor.userId(), 'idleTimeLimit');
 	},
 	defaultIdleTimeLimit() {
 		return RocketChat.settings.get('Accounts_Default_User_Preferences_idleTimeLimit');
@@ -98,15 +98,14 @@ Template.accountPreferences.helpers({
 		return RocketChat.settings.get('UserData_EnableDownload') !== false;
 	},
 	notificationsSoundVolume() {
-		return RocketChat.getUserPreference(Meteor.user(), 'notificationsSoundVolume');
+		return RocketChat.getUserPreference(Meteor.userId(), 'notificationsSoundVolume');
 	},
 	dontAskAgainList() {
-		return RocketChat.getUserPreference(Meteor.user(), 'dontAskAgainList');
+		return RocketChat.getUserPreference(Meteor.userId(), 'dontAskAgainList');
 	},
 });
 
 Template.accountPreferences.onCreated(function() {
-	const user = Meteor.user();
 	const settingsTemplate = this.parentTemplate(3);
 
 	if (settingsTemplate.child == null) {
@@ -115,7 +114,7 @@ Template.accountPreferences.onCreated(function() {
 
 	settingsTemplate.child.push(this);
 
-	this.useEmojis = new ReactiveVar(RocketChat.getUserPreference(user, 'useEmojis'));
+	this.useEmojis = new ReactiveVar(RocketChat.getUserPreference(Meteor.userId(), 'useEmojis'));
 
 	let instance = this;
 
@@ -172,7 +171,7 @@ Template.accountPreferences.onCreated(function() {
 		}
 
 		// if highlights changed we need page reload
-		const highlights = RocketChat.getUserPreference(Meteor.user(), 'highlights');
+		const highlights = RocketChat.getUserPreference(Meteor.userId(), 'highlights');
 		if (highlights && highlights.join('\n') !== data.highlights.join('\n')) {
 			reload = true;
 		}

diff --git a/packages/rocketchat-ui-message/client/message.js b/packages/rocketchat-ui-message/client/message.js
@@ -51,8 +51,7 @@ Template.message.helpers({
 		}
 	},
 	roleTags() {
-		const user = Meteor.user();
-		if (!RocketChat.settings.get('UI_DisplayRoles') || RocketChat.getUserPreference(user, 'hideRoles')) {
+		if (!RocketChat.settings.get('UI_DisplayRoles') || RocketChat.getUserPreference(Meteor.userId(), 'hideRoles')) {
 			return [];
 		}
 

diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
@@ -267,7 +267,7 @@ Template.messageBox.helpers({
 		return RocketChat.Layout.isEmbedded();
 	},
 	isEmojiEnable() {
-		return RocketChat.getUserPreference(Meteor.user(), 'useEmojis');
+		return RocketChat.getUserPreference(Meteor.userId(), 'useEmojis');
 	},
 	dataReply() {
 		return Template.instance().dataReply.get();

diff --git a/packages/rocketchat-ui-sidenav/client/roomList.js b/packages/rocketchat-ui-sidenav/client/roomList.js
@@ -13,7 +13,16 @@ Template.roomList.helpers({
 		if (this.anonymous) {
 			return RocketChat.models.Rooms.find({ t: 'c' }, { sort: { name: 1 } });
 		}
-		const user = Meteor.userId();
+
+		const user = RocketChat.models.Users.findOne(Meteor.userId(), {
+			fields: {
+				'settings.preferences.sidebarSortby': 1,
+				'settings.preferences.sidebarShowFavorites': 1,
+				'settings.preferences.sidebarShowUnread': 1,
+				'services.tokenpass': 1,
+			},
+		});
+
 		const sortBy = RocketChat.getUserPreference(user, 'sidebarSortby') || 'alphabetical';
 		const query = {
 			open: true,

diff --git a/packages/rocketchat-ui-sidenav/client/sideNav.js b/packages/rocketchat-ui-sidenav/client/sideNav.js
@@ -37,7 +37,7 @@ Template.sideNav.helpers({
 	},
 
 	sidebarHideAvatar() {
-		return RocketChat.getUserPreference(Meteor.user(), 'sidebarHideAvatar');
+		return RocketChat.getUserPreference(Meteor.userId(), 'sidebarHideAvatar');
 	},
 });
 

diff --git a/packages/rocketchat-ui-sidenav/client/sortlist.js b/packages/rocketchat-ui-sidenav/client/sortlist.js
@@ -1,18 +1,18 @@
 /* globals popover */
 
 const checked = function(prop, field) {
-	const user = Meteor.userId();
+	const userId = Meteor.userId();
 	if (prop === 'sidebarShowFavorites') {
-		return RocketChat.getUserPreference(user, 'sidebarShowFavorites');
+		return RocketChat.getUserPreference(userId, 'sidebarShowFavorites');
 	}
 	if (prop === 'sidebarGroupByType') {
-		return RocketChat.getUserPreference(user, 'sidebarGroupByType');
+		return RocketChat.getUserPreference(userId, 'sidebarGroupByType');
 	}
 	if (prop === 'sidebarShowUnread') {
-		return RocketChat.getUserPreference(user, 'sidebarShowUnread');
+		return RocketChat.getUserPreference(userId, 'sidebarShowUnread');
 	}
 	if (prop === 'sidebarSortby') {
-		return (RocketChat.getUserPreference(user, 'sidebarSortby') || 'alphabetical') === field;
+		return (RocketChat.getUserPreference(userId, 'sidebarSortby') || 'alphabetical') === field;
 	}
 };
 

diff --git a/packages/rocketchat-ui/client/lib/notification.js b/packages/rocketchat-ui/client/lib/notification.js
@@ -30,8 +30,7 @@ const KonchatNotification = {
 					canReply: true,
 				});
 
-				const user = Meteor.user();
-				const notificationDuration = notification.duration - 0 || RocketChat.getUserPreference(user, 'desktopNotificationDuration') - 0;
+				const notificationDuration = notification.duration - 0 || RocketChat.getUserPreference(Meteor.userId(), 'desktopNotificationDuration') - 0;
 				if (notificationDuration > 0) {
 					setTimeout((() => n.close()), notificationDuration * 1000);
 				}
@@ -89,9 +88,9 @@ const KonchatNotification = {
 
 	newMessage(rid) {
 		if (!Session.equals(`user_${ Meteor.user().username }_status`, 'busy')) {
-			const user = Meteor.user();
-			const newMessageNotification = RocketChat.getUserPreference(user, 'newMessageNotification');
-			const audioVolume = RocketChat.getUserPreference(user, 'notificationsSoundVolume');
+			const userId = Meteor.userId();
+			const newMessageNotification = RocketChat.getUserPreference(userId, 'newMessageNotification');
+			const audioVolume = RocketChat.getUserPreference(userId, 'notificationsSoundVolume');
 
 			const sub = ChatSubscription.findOne({ rid }, { fields: { audioNotificationValue: 1 } });
 

diff --git a/packages/rocketchat-ui/client/views/app/modal.js b/packages/rocketchat-ui/client/views/app/modal.js
@@ -132,7 +132,7 @@ Template.rc_modal.events({
 				label: dontAskAgain.label,
 			};
 
-			let dontAskAgainList = RocketChat.getUserPreference(Meteor.user(), 'dontAskAgainList');
+			let dontAskAgainList = RocketChat.getUserPreference(Meteor.userId(), 'dontAskAgainList');
 			if (dontAskAgainList) {
 				dontAskAgainList.push(dontAskAgainObject);
 			} else {