From e94b15d14738dd5bf7326fa48ee3e36b73fa40f3 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 20 Jun 2018 18:16:07 -0300 Subject: [PATCH 1/3] removed --- client/notifications/notification.js | 4 ++-- client/startup/unread.js | 2 +- .../rocketchat-emoji-emojione/rocketchat.js | 4 ++-- .../rocketchat-emoji/client/emojiButton.js | 2 +- .../rocketchat-emoji/client/emojiParser.js | 4 ++-- .../client/client.js | 2 +- .../client/messageAttachment.js | 3 +-- .../client/oembedAudioWidget.js | 3 +-- .../client/oembedFrameWidget.js | 3 +-- .../client/oembedImageWidget.js | 9 +++----- .../client/oembedUrlWidget.js | 3 +-- .../client/oembedVideoWidget.js | 3 +-- .../client/views/pushNotificationsFlexTab.js | 10 ++++---- .../client/accountPreferences.js | 23 +++++++++---------- .../rocketchat-ui-message/client/message.js | 3 +-- .../client/messageBox.js | 2 +- .../client/popup/messagePopupConfig.js | 2 +- .../rocketchat-ui-sidenav/client/roomList.js | 13 ++++------- .../rocketchat-ui-sidenav/client/sideNav.js | 2 +- .../rocketchat-ui-sidenav/client/sortlist.js | 10 ++++---- .../rocketchat-ui/client/lib/chatMessages.js | 3 +-- .../rocketchat-ui/client/lib/notification.js | 9 ++++---- .../rocketchat-ui/client/views/app/modal.js | 4 ++-- .../rocketchat-ui/client/views/app/room.js | 13 ++++------- 24 files changed, 58 insertions(+), 78 deletions(-) diff --git a/client/notifications/notification.js b/client/notifications/notification.js index db2b30ca3bb7..6b629d080d1c 100644 --- 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 index 258bfa418a2d..4e6dd906f0f3 100644 --- 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 index 48d15ba3b6eb..b3a35384a424 100644 --- 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 index 997dc4966763..34196a463dd8 100644 --- 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 index d31b4bc77887..b0d95916e2f2 100644 --- 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 index f2174eb38ca5..6afd8938c453 100644 --- 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 index 37acc16c00ba..61da4fe7b24b 100644 --- a/packages/rocketchat-message-attachments/client/messageAttachment.js +++ b/packages/rocketchat-message-attachments/client/messageAttachment.js @@ -42,8 +42,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 index 5c47bcef006f..e459144f3ba5 100644 --- 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 index 8ef60bc08d14..dab541bf2707 100644 --- 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 index e62ce218b77b..33afddb1295c 100644 --- 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 index dc8378ee39da..a055122b4b49 100644 --- 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 index 7a987fa084b4..92b664c15ef1 100644 --- 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 index d999dce8f5b9..e279098f245a 100644 --- a/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js +++ b/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.js @@ -75,21 +75,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') { @@ -345,7 +345,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 index 23972e48cb92..33805d9a58c7 100644 --- a/packages/rocketchat-ui-account/client/accountPreferences.js +++ b/packages/rocketchat-ui-account/client/accountPreferences.js @@ -18,7 +18,7 @@ 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({ @@ -26,13 +26,13 @@ Template.accountPreferences.helpers({ 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(); @@ -63,7 +63,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() { @@ -73,14 +73,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'); @@ -101,15 +101,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) { @@ -118,7 +117,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; @@ -176,7 +175,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 index 6cc3c7c855e7..8aeabc430291 100644 --- a/packages/rocketchat-ui-message/client/message.js +++ b/packages/rocketchat-ui-message/client/message.js @@ -22,8 +22,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 index fa0d273c1f95..7f4d1f878118 100644 --- a/packages/rocketchat-ui-message/client/messageBox.js +++ b/packages/rocketchat-ui-message/client/messageBox.js @@ -271,7 +271,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-message/client/popup/messagePopupConfig.js b/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js index 3eb7e4cded52..338fab2eceac 100644 --- a/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js +++ b/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js @@ -317,7 +317,7 @@ Template.messagePopupConfig.helpers({ getFilter(collection, filter) { const key = `:${ filter }`; - if (!RocketChat.getUserPreference(Meteor.user(), 'useEmojis')) { + if (!RocketChat.getUserPreference(Meteor.userId(), 'useEmojis')) { return []; } diff --git a/packages/rocketchat-ui-sidenav/client/roomList.js b/packages/rocketchat-ui-sidenav/client/roomList.js index fcb0116a6b77..efe60e8f4170 100644 --- a/packages/rocketchat-ui-sidenav/client/roomList.js +++ b/packages/rocketchat-ui-sidenav/client/roomList.js @@ -14,8 +14,8 @@ Template.roomList.helpers({ if (this.anonymous) { return RocketChat.models.Rooms.find({t: 'c'}, {sort: {name: 1}}); } - const user = Meteor.userId(); - const sortBy = RocketChat.getUserPreference(user, 'sidebarSortby') || 'alphabetical'; + const userId = Meteor.userId(); + const sortBy = RocketChat.getUserPreference(userId, 'sidebarSortby') || 'alphabetical'; const query = { open: true }; @@ -36,7 +36,7 @@ Template.roomList.helpers({ return ChatSubscription.find(query, {sort}); } - const favoritesEnabled = !!(RocketChat.settings.get('Favorite_Rooms') && RocketChat.getUserPreference(user, 'sidebarShowFavorites')); + const favoritesEnabled = !!(RocketChat.settings.get('Favorite_Rooms') && RocketChat.getUserPreference(userId, 'sidebarShowFavorites')); if (this.identifier === 'f') { query.f = favoritesEnabled; @@ -57,11 +57,8 @@ Template.roomList.helpers({ query.tokens = { $exists: true }; } - if (RocketChat.getUserPreference(user, 'sidebarShowUnread')) { - query.$or = [ - {alert: {$ne: true}}, - {hideUnreadStatus: true} - ]; + if (RocketChat.getUserPreference(userId, 'sidebarShowUnread')) { + query.$or = [{ alert: { $ne: true } }, { hideUnreadStatus: true }]; } query.t = {$in: types}; if (favoritesEnabled) { diff --git a/packages/rocketchat-ui-sidenav/client/sideNav.js b/packages/rocketchat-ui-sidenav/client/sideNav.js index 3e096e77d48b..7dc9a98feae4 100644 --- a/packages/rocketchat-ui-sidenav/client/sideNav.js +++ b/packages/rocketchat-ui-sidenav/client/sideNav.js @@ -39,7 +39,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 index 65ddf8286708..71b819044404 100644 --- 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/chatMessages.js b/packages/rocketchat-ui/client/lib/chatMessages.js index d1768f9c0dba..9b30721e5e61 100644 --- a/packages/rocketchat-ui/client/lib/chatMessages.js +++ b/packages/rocketchat-ui/client/lib/chatMessages.js @@ -452,8 +452,7 @@ this.ChatMessages = class ChatMessages { } keydown(rid, event) { - const user = Meteor.user(); - const sendOnEnter = RocketChat.getUserPreference(user, 'sendOnEnter'); + const sendOnEnter = RocketChat.getUserPreference(Meteor.userId(), 'sendOnEnter'); const input = event.currentTarget; // const $input = $(input); const k = event.which; diff --git a/packages/rocketchat-ui/client/lib/notification.js b/packages/rocketchat-ui/client/lib/notification.js index 7688ae79c28e..58367b30c680 100644 --- a/packages/rocketchat-ui/client/lib/notification.js +++ b/packages/rocketchat-ui/client/lib/notification.js @@ -29,8 +29,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); } @@ -80,9 +79,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 index 86a801ff790d..9ceb915b6587 100644 --- a/packages/rocketchat-ui/client/views/app/modal.js +++ b/packages/rocketchat-ui/client/views/app/modal.js @@ -23,7 +23,7 @@ this.modal = { this.config = config; if (config.dontAskAgain) { - const dontAskAgainList = RocketChat.getUserPreference(Meteor.user(), 'dontAskAgainList'); + const dontAskAgainList = RocketChat.getUserPreference(Meteor.userId(), 'dontAskAgainList'); if (dontAskAgainList && dontAskAgainList.some(dontAsk => dontAsk.action === config.dontAskAgain.action)) { this.confirm(true); @@ -123,7 +123,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 { diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js index c68679bc7b23..7947c2f382bd 100644 --- a/packages/rocketchat-ui/client/views/app/room.js +++ b/packages/rocketchat-ui/client/views/app/room.js @@ -329,8 +329,7 @@ Template.room.helpers({ }, messageViewMode() { - const user = Meteor.user(); - const viewMode = RocketChat.getUserPreference(user, 'messageViewMode'); + const viewMode = RocketChat.getUserPreference(Meteor.userId(), 'messageViewMode'); const modes = ['', 'cozy', 'compact']; return modes[viewMode] || modes[0]; }, @@ -340,13 +339,11 @@ Template.room.helpers({ }, hideUsername() { - const user = Meteor.user(); - return RocketChat.getUserPreference(user, 'hideUsernames') ? 'hide-usernames' : undefined; + return RocketChat.getUserPreference(Meteor.userId(), 'hideUsernames') ? 'hide-usernames' : undefined; }, hideAvatar() { - const user = Meteor.user(); - return RocketChat.getUserPreference(user, 'hideAvatars') ? 'hide-avatars' : undefined; + return RocketChat.getUserPreference(Meteor.userId(), 'hideAvatars') ? 'hide-avatars' : undefined; }, userCanDrop() { @@ -407,9 +404,7 @@ Template.room.events({ }, 'click .messages-container-main'() { - const user = Meteor.user(); - - if ((Template.instance().tabBar.getState() === 'opened') && RocketChat.getUserPreference(user, 'hideFlexTab')) { + if (Template.instance().tabBar.getState() === 'opened' && RocketChat.getUserPreference(Meteor.userId(), 'hideFlexTab')) { Template.instance().tabBar.close(); } }, From e1f504035c1ca9b8c53eb5d33828c2c0d66a3364 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Thu, 21 Jun 2018 11:46:57 -0300 Subject: [PATCH 2/3] fix lint --- .../rocketchat-ui-sidenav/client/roomList.js | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/packages/rocketchat-ui-sidenav/client/roomList.js b/packages/rocketchat-ui-sidenav/client/roomList.js index efe60e8f4170..a8988d23c80f 100644 --- a/packages/rocketchat-ui-sidenav/client/roomList.js +++ b/packages/rocketchat-ui-sidenav/client/roomList.js @@ -14,8 +14,18 @@ Template.roomList.helpers({ if (this.anonymous) { return RocketChat.models.Rooms.find({t: 'c'}, {sort: {name: 1}}); } - const userId = Meteor.userId(); - const sortBy = RocketChat.getUserPreference(userId, 'sidebarSortby') || 'alphabetical'; + + 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 }; @@ -36,7 +46,7 @@ Template.roomList.helpers({ return ChatSubscription.find(query, {sort}); } - const favoritesEnabled = !!(RocketChat.settings.get('Favorite_Rooms') && RocketChat.getUserPreference(userId, 'sidebarShowFavorites')); + const favoritesEnabled = !!(RocketChat.settings.get('Favorite_Rooms') && RocketChat.getUserPreference(user, 'sidebarShowFavorites')); if (this.identifier === 'f') { query.f = favoritesEnabled; @@ -57,7 +67,7 @@ Template.roomList.helpers({ query.tokens = { $exists: true }; } - if (RocketChat.getUserPreference(userId, 'sidebarShowUnread')) { + if (RocketChat.getUserPreference(user, 'sidebarShowUnread')) { query.$or = [{ alert: { $ne: true } }, { hideUnreadStatus: true }]; } query.t = {$in: types}; From 3c102f64022556bc9f68f2fdf0a0d616f053b42a Mon Sep 17 00:00:00 2001 From: Tasso Evangelista Date: Tue, 2 Oct 2018 11:51:52 -0300 Subject: [PATCH 3/3] Fix eslint errors --- packages/rocketchat-ui-account/client/accountPreferences.js | 2 +- packages/rocketchat-ui-sidenav/client/roomList.js | 5 ++--- packages/rocketchat-ui-sidenav/client/sideNav.js | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/rocketchat-ui-account/client/accountPreferences.js b/packages/rocketchat-ui-account/client/accountPreferences.js index 4c0dcaef09fb..6778dae534c6 100644 --- a/packages/rocketchat-ui-account/client/accountPreferences.js +++ b/packages/rocketchat-ui-account/client/accountPreferences.js @@ -102,7 +102,7 @@ Template.accountPreferences.helpers({ }, dontAskAgainList() { return RocketChat.getUserPreference(Meteor.userId(), 'dontAskAgainList'); - } + }, }); Template.accountPreferences.onCreated(function() { diff --git a/packages/rocketchat-ui-sidenav/client/roomList.js b/packages/rocketchat-ui-sidenav/client/roomList.js index 8d68df8b5fc2..085700cb3631 100644 --- a/packages/rocketchat-ui-sidenav/client/roomList.js +++ b/packages/rocketchat-ui-sidenav/client/roomList.js @@ -19,9 +19,8 @@ Template.roomList.helpers({ 'settings.preferences.sidebarSortby': 1, 'settings.preferences.sidebarShowFavorites': 1, 'settings.preferences.sidebarShowUnread': 1, - 'services.tokenpass': 1 - - } + 'services.tokenpass': 1, + }, }); const sortBy = RocketChat.getUserPreference(user, 'sidebarSortby') || 'alphabetical'; diff --git a/packages/rocketchat-ui-sidenav/client/sideNav.js b/packages/rocketchat-ui-sidenav/client/sideNav.js index 5376ec643567..df7c955c9e63 100644 --- a/packages/rocketchat-ui-sidenav/client/sideNav.js +++ b/packages/rocketchat-ui-sidenav/client/sideNav.js @@ -38,7 +38,7 @@ Template.sideNav.helpers({ sidebarHideAvatar() { return RocketChat.getUserPreference(Meteor.userId(), 'sidebarHideAvatar'); - } + }, }); Template.sideNav.events({