Merge branch 'develop' into regression/geolocation

RocketChat · Feb 15, 2019 · 0e6ff28 · 0e6ff28
2 parents 66066f1 + 1a46bb0
commit 0e6ff28
Show file tree

Hide file tree

Showing 435 changed files with 3,106 additions and 2,544 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -4,7 +4,6 @@
 	"globals": {
 		"__meteor_bootstrap__"        : false,
 		"__meteor_runtime_config__"   : false,
-		"Apps"                        : false,
 		"Assets"                      : false,
 		"chrome"                      : false,
 		"DynamicCss"                  : false,

diff --git a/client/methods/deleteMessage.js b/client/methods/deleteMessage.js
@@ -1,6 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { ChatMessage } from 'meteor/rocketchat:models';
+import { hasAtLeastOnePermission } from 'meteor/rocketchat:authorization';
+import { settings } from 'meteor/rocketchat:settings';
 import _ from 'underscore';
 import moment from 'moment';
 
@@ -13,9 +15,9 @@ Meteor.methods({
 		// We're now only passed in the `_id` property to lower the amount of data sent to the server
 		message = ChatMessage.findOne({ _id: message._id });
 
-		const hasPermission = RocketChat.authz.hasAtLeastOnePermission('delete-message', message.rid);
-		const forceDelete = RocketChat.authz.hasAtLeastOnePermission('force-delete-message', message.rid);
-		const deleteAllowed = RocketChat.settings.get('Message_AllowDeleting');
+		const hasPermission = hasAtLeastOnePermission('delete-message', message.rid);
+		const forceDelete = hasAtLeastOnePermission('force-delete-message', message.rid);
+		const deleteAllowed = settings.get('Message_AllowDeleting');
 		let deleteOwn = false;
 
 		if (message && message.u && message.u._id) {
@@ -24,7 +26,7 @@ Meteor.methods({
 		if (!(forceDelete || hasPermission || (deleteAllowed && deleteOwn))) {
 			return false;
 		}
-		const blockDeleteInMinutes = RocketChat.settings.get('Message_AllowDeleting_BlockDeleteInMinutes');
+		const blockDeleteInMinutes = settings.get('Message_AllowDeleting_BlockDeleteInMinutes');
 		if (!forceDelete && _.isNumber(blockDeleteInMinutes) && blockDeleteInMinutes !== 0) {
 			const msgTs = moment(message.ts);
 			const currentTsDiff = moment().diff(msgTs, 'minutes');

diff --git a/client/methods/updateMessage.js b/client/methods/updateMessage.js
@@ -3,6 +3,9 @@ import { Tracker } from 'meteor/tracker';
 import { TimeSync } from 'meteor/mizzao:timesync';
 import { t } from 'meteor/rocketchat:utils';
 import { ChatMessage } from 'meteor/rocketchat:models';
+import { hasAtLeastOnePermission } from 'meteor/rocketchat:authorization';
+import { settings } from 'meteor/rocketchat:settings';
+import { callbacks } from 'meteor/rocketchat:callbacks';
 import _ from 'underscore';
 import moment from 'moment';
 import toastr from 'toastr';
@@ -15,8 +18,8 @@ Meteor.methods({
 
 		const originalMessage = ChatMessage.findOne(message._id);
 
-		const hasPermission = RocketChat.authz.hasAtLeastOnePermission('edit-message', message.rid);
-		const editAllowed = RocketChat.settings.get('Message_AllowEditing');
+		const hasPermission = hasAtLeastOnePermission('edit-message', message.rid);
+		const editAllowed = settings.get('Message_AllowEditing');
 		let editOwn = false;
 		if (originalMessage.msg === message.msg) {
 			return;
@@ -32,7 +35,7 @@ Meteor.methods({
 			return false;
 		}
 
-		const blockEditInMinutes = RocketChat.settings.get('Message_AllowEditing_BlockEditInMinutes');
+		const blockEditInMinutes = settings.get('Message_AllowEditing_BlockEditInMinutes');
 		if (_.isNumber(blockEditInMinutes) && blockEditInMinutes !== 0) {
 			if (originalMessage.ts) {
 				const msgTs = moment(originalMessage.ts);
@@ -59,7 +62,7 @@ Meteor.methods({
 				username: me.username,
 			};
 
-			message = RocketChat.callbacks.run('beforeSaveMessage', message);
+			message = callbacks.run('beforeSaveMessage', message);
 			const messageObject = { editedAt: message.editedAt, editedBy: message.editedBy, msg: message.msg };
 
 			if (originalMessage.attachments) {

diff --git a/client/notifications/UsersNameChanged.js b/client/notifications/UsersNameChanged.js
@@ -1,8 +1,10 @@
 import { Meteor } from 'meteor/meteor';
+import { Notifications } from 'meteor/rocketchat:notifications';
+import { Messages, Subscriptions } from 'meteor/rocketchat:models';
 
 Meteor.startup(function() {
-	RocketChat.Notifications.onLogged('Users:NameChanged', function({ _id, name, username }) {
-		RocketChat.models.Messages.update({
+	Notifications.onLogged('Users:NameChanged', function({ _id, name, username }) {
+		Messages.update({
 			'u._id': _id,
 		}, {
 			$set: {
@@ -12,7 +14,7 @@ Meteor.startup(function() {
 			multi: true,
 		});
 
-		RocketChat.models.Messages.update({
+		Messages.update({
 			mentions: {
 				$elemMatch: { _id },
 			},
@@ -24,7 +26,7 @@ Meteor.startup(function() {
 			multi: true,
 		});
 
-		RocketChat.models.Subscriptions.update({
+		Subscriptions.update({
 			name: username,
 			t: 'd',
 		}, {

diff --git a/client/notifications/notification.js b/client/notifications/notification.js
@@ -2,7 +2,11 @@ import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
-import { KonchatNotification, fireGlobalEvent, readMessage, CachedChatSubscription } from 'meteor/rocketchat:ui';
+import { KonchatNotification } from 'meteor/rocketchat:ui';
+import { CachedChatSubscription } from 'meteor/rocketchat:models';
+import { fireGlobalEvent, readMessage, Layout } from 'meteor/rocketchat:ui-utils';
+import { getUserPreference } from 'meteor/rocketchat:utils';
+import { Notifications } from 'meteor/rocketchat:notifications';
 
 // Show notifications and play a sound for new messages.
 // We trust the server to only send notifications for interesting messages, e.g. direct messages or
@@ -23,7 +27,7 @@ function notifyNewRoom(sub) {
 Meteor.startup(function() {
 	Tracker.autorun(function() {
 		if (Meteor.userId()) {
-			RocketChat.Notifications.onUser('notification', function(notification) {
+			Notifications.onUser('notification', function(notification) {
 
 				let openedRoomId = undefined;
 				if (['channel', 'group', 'direct'].includes(FlowRouter.getRouteName())) {
@@ -33,15 +37,15 @@ 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.userId(), 'muteFocusedConversations');
+				const muteFocusedConversations = getUserPreference(Meteor.userId(), 'muteFocusedConversations');
 
 				fireGlobalEvent('notification', {
 					notification,
 					fromOpenedRoom: messageIsInOpenedRoom,
 					hasFocus,
 				});
 
-				if (RocketChat.Layout.isEmbedded()) {
+				if (Layout.isEmbedded()) {
 					if (!hasFocus && messageIsInOpenedRoom) {
 						// Play a sound and show a notification.
 						KonchatNotification.newMessage(notification.payload.rid);
@@ -57,16 +61,16 @@ Meteor.startup(function() {
 				}
 			});
 
-			RocketChat.Notifications.onUser('audioNotification', function(notification) {
+			Notifications.onUser('audioNotification', function(notification) {
 
 				const openedRoomId = Session.get('openedRoom');
 
 				// This logic is duplicated in /client/startup/unread.coffee.
 				const hasFocus = readMessage.isEnable();
 				const messageIsInOpenedRoom = openedRoomId === notification.payload.rid;
-				const muteFocusedConversations = RocketChat.getUserPreference(Meteor.userId(), 'muteFocusedConversations');
+				const muteFocusedConversations = getUserPreference(Meteor.userId(), 'muteFocusedConversations');
 
-				if (RocketChat.Layout.isEmbedded()) {
+				if (Layout.isEmbedded()) {
 					if (!hasFocus && messageIsInOpenedRoom) {
 						// Play a notification sound
 						KonchatNotification.newMessage(notification.payload.rid);
@@ -83,7 +87,7 @@ Meteor.startup(function() {
 				}
 			};
 
-			RocketChat.Notifications.onUser('subscriptions-changed', (action, sub) => {
+			Notifications.onUser('subscriptions-changed', (action, sub) => {
 				notifyNewRoom(sub);
 			});
 		}

diff --git a/client/notifications/updateAvatar.js b/client/notifications/updateAvatar.js
@@ -1,8 +1,9 @@
 import { Meteor } from 'meteor/meteor';
-import { updateAvatarOfUsername } from 'meteor/rocketchat:ui';
+import { updateAvatarOfUsername } from 'meteor/rocketchat:ui-utils';
+import { Notifications } from 'meteor/rocketchat:notifications';
 
 Meteor.startup(function() {
-	RocketChat.Notifications.onLogged('updateAvatar', function(data) {
+	Notifications.onLogged('updateAvatar', function(data) {
 		updateAvatarOfUsername(data.username);
 	});
 });
diff --git a/client/notifications/updateUserState.js b/client/notifications/updateUserState.js
@@ -1,9 +1,10 @@
 import { Meteor } from 'meteor/meteor';
-import { fireGlobalEvent } from 'meteor/rocketchat:ui';
+import { fireGlobalEvent } from 'meteor/rocketchat:ui-utils';
+import { callbacks } from 'meteor/rocketchat:callbacks';
 
 /* fire user state change globally, to listen on desktop electron client */
 Meteor.startup(function() {
-	RocketChat.callbacks.add('userStatusManuallySet', (status) => {
+	callbacks.add('userStatusManuallySet', (status) => {
 		fireGlobalEvent('user-status-manually-set', status);
 	});
 });
diff --git a/client/routes/roomRoute.js b/client/routes/roomRoute.js
@@ -1,9 +1,10 @@
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { ChatSubscription } from 'meteor/rocketchat:models';
+import { roomTypes } from 'meteor/rocketchat:utils';
 
 FlowRouter.goToRoomById = (roomId) => {
 	const subscription = ChatSubscription.findOne({ rid: roomId });
 	if (subscription) {
-		RocketChat.roomTypes.openRouteLink(subscription.t, subscription, FlowRouter.current().queryParams);
+		roomTypes.openRouteLink(subscription.t, subscription, FlowRouter.current().queryParams);
 	}
 };
diff --git a/client/routes/router.js b/client/routes/router.js
@@ -6,6 +6,7 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 import { Session } from 'meteor/session';
 import { KonchatNotification } from 'meteor/rocketchat:ui';
+import { Layout } from 'meteor/rocketchat:ui-utils';
 import s from 'underscore.string';
 
 Blaze.registerHelper('pathFor', function(path, kw) {
@@ -27,7 +28,7 @@ FlowRouter.subscriptions = function() {
 FlowRouter.route('/', {
 	name: 'index',
 	action() {
-		BlazeLayout.render('main', { modal: RocketChat.Layout.isEmbedded(), center: 'loading' });
+		BlazeLayout.render('main', { modal: Layout.isEmbedded(), center: 'loading' });
 		if (!Meteor.userId()) {
 			return FlowRouter.go('home');
 		}

diff --git a/client/startup/emailVerification.js b/client/startup/emailVerification.js
@@ -2,12 +2,13 @@ import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { Session } from 'meteor/session';
 import { TAPi18n } from 'meteor/tap:i18n';
+import { settings } from 'meteor/rocketchat:settings';
 import toastr from 'toastr';
 
 Meteor.startup(function() {
 	Tracker.autorun(function() {
 		const user = Meteor.user();
-		if (user && user.emails && user.emails[0] && user.emails[0].verified !== true && RocketChat.settings.get('Accounts_EmailVerification') === true && !Session.get('Accounts_EmailVerification_Warning')) {
+		if (user && user.emails && user.emails[0] && user.emails[0].verified !== true && settings.get('Accounts_EmailVerification') === true && !Session.get('Accounts_EmailVerification_Warning')) {
 			toastr.warning(TAPi18n.__('You_have_not_verified_your_email'));
 			Session.set('Accounts_EmailVerification_Warning', true);
 		}

diff --git a/client/startup/i18n.js b/client/startup/i18n.js
@@ -3,6 +3,8 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { isRtl } from 'meteor/rocketchat:utils';
+import { settings } from 'meteor/rocketchat:settings';
+import { Users } from 'meteor/rocketchat:models';
 import moment from 'moment';
 
 const currentLanguage = new ReactiveVar();
@@ -66,11 +68,11 @@ Meteor.startup(() => {
 	};
 	window.setLanguage = setLanguage;
 
-	const defaultUserLanguage = () => RocketChat.settings.get('Language') || getBrowserLanguage() || 'en';
+	const defaultUserLanguage = () => settings.get('Language') || getBrowserLanguage() || 'en';
 	window.defaultUserLanguage = defaultUserLanguage;
 
 	Tracker.autorun(() => {
-		const user = RocketChat.models.Users.findOne(Meteor.userId(), { fields: { language: 1 } });
+		const user = Users.findOne(Meteor.userId(), { fields: { language: 1 } });
 
 		setLanguage((user && user.language) || defaultUserLanguage());
 	});

diff --git a/client/startup/startup.js b/client/startup/startup.js
@@ -3,7 +3,10 @@ import { Tracker } from 'meteor/tracker';
 import { Session } from 'meteor/session';
 import { TimeSync } from 'meteor/mizzao:timesync';
 import { UserPresence } from 'meteor/konecty:user-presence';
-import { fireGlobalEvent } from 'meteor/rocketchat:ui';
+import { fireGlobalEvent } from 'meteor/rocketchat:ui-utils';
+import { settings } from 'meteor/rocketchat:settings';
+import { Users } from 'meteor/rocketchat:models';
+import { getUserPreference } from 'meteor/rocketchat:utils';
 import toastr from 'toastr';
 import hljs from 'highlight.js';
 import 'highlight.js/styles/github.css';
@@ -26,7 +29,7 @@ Meteor.startup(function() {
 	window.lastMessageWindowHistory = {};
 
 	Tracker.autorun(function(computation) {
-		if (!Meteor.userId() && !RocketChat.settings.get('Accounts_AllowAnonymousRead')) {
+		if (!Meteor.userId() && !settings.get('Accounts_AllowAnonymousRead')) {
 			return;
 		}
 		Meteor.subscribe('userData');
@@ -39,7 +42,7 @@ Meteor.startup(function() {
 		if (!Meteor.userId()) {
 			return;
 		}
-		const user = RocketChat.models.Users.findOne(Meteor.userId(), {
+		const user = Users.findOne(Meteor.userId(), {
 			fields: {
 				status: 1,
 				'settings.preferences.idleTimeLimit': 1,
@@ -51,8 +54,8 @@ Meteor.startup(function() {
 			return;
 		}
 
-		if (RocketChat.getUserPreference(user, 'enableAutoAway')) {
-			const idleTimeLimit = RocketChat.getUserPreference(user, 'idleTimeLimit') || 300;
+		if (getUserPreference(user, 'enableAutoAway')) {
+			const idleTimeLimit = getUserPreference(user, 'idleTimeLimit') || 300;
 			UserPresence.awayTime = idleTimeLimit * 1000;
 		} else {
 			delete UserPresence.awayTime;

diff --git a/client/startup/unread.js b/client/startup/unread.js
@@ -5,6 +5,8 @@ import { Session } from 'meteor/session';
 import { Favico } from 'meteor/rocketchat:favico';
 import { ChatSubscription } from 'meteor/rocketchat:models';
 import { RoomManager, menu, fireGlobalEvent, readMessage } from 'meteor/rocketchat:ui-utils';
+import { getUserPreference } from 'meteor/rocketchat:utils';
+import { settings } from 'meteor/rocketchat:settings';
 
 Meteor.startup(function() {
 	Tracker.autorun(function() {
@@ -38,7 +40,7 @@ Meteor.startup(function() {
 				// Increment the total unread count.
 				unreadCount += subscription.unread;
 				if (subscription.alert === true && subscription.unreadAlert !== 'nothing') {
-					const userUnreadAlert = RocketChat.getUserPreference(Meteor.userId(), 'unreadAlert');
+					const userUnreadAlert = getUserPreference(Meteor.userId(), 'unreadAlert');
 					if (subscription.unreadAlert === 'all' || userUnreadAlert !== false) {
 						unreadAlert = '•';
 					}
@@ -73,7 +75,7 @@ Meteor.startup(function() {
 	});
 
 	Tracker.autorun(function() {
-		const siteName = RocketChat.settings.get('Site_Name') || '';
+		const siteName = settings.get('Site_Name') || '';
 
 		const unread = Session.get('unread');
 		fireGlobalEvent('unread-changed', unread);

diff --git a/client/startup/userSetUtcOffset.js b/client/startup/userSetUtcOffset.js
@@ -1,10 +1,11 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
+import { Users } from 'meteor/rocketchat:models';
 import moment from 'moment';
 
 Meteor.startup(function() {
 	Tracker.autorun(function() {
-		const user = RocketChat.models.Users.findOne({ _id: Meteor.userId() }, { fields: { statusConnection: 1, utcOffset: 1 } });
+		const user = Users.findOne({ _id: Meteor.userId() }, { fields: { statusConnection: 1, utcOffset: 1 } });
 		if (user && user.statusConnection === 'online') {
 			const utcOffset = moment().utcOffset() / 60;
 			if (user.utcOffset !== utcOffset) {

diff --git a/imports/message-read-receipt/client/main.js b/imports/message-read-receipt/client/main.js
@@ -1,8 +1,9 @@
 import { Template } from 'meteor/templating';
+import { settings } from 'meteor/rocketchat:settings';
 
 Template.main.helpers({
 	readReceiptsEnabled() {
-		if (RocketChat.settings.get('Message_Read_Receipt_Store_Users')) {
+		if (settings.get('Message_Read_Receipt_Store_Users')) {
 			return 'read-receipts-enabled';
 		}
 	},

diff --git a/imports/message-read-receipt/client/message.js b/imports/message-read-receipt/client/message.js
@@ -1,8 +1,9 @@
 import { Template } from 'meteor/templating';
+import { settings } from 'meteor/rocketchat:settings';
 
 Template.message.helpers({
 	readReceipt() {
-		if (!RocketChat.settings.get('Message_Read_Receipt_Enabled')) {
+		if (!settings.get('Message_Read_Receipt_Enabled')) {
 			return;
 		}
 

diff --git a/imports/message-read-receipt/client/readReceipts.js b/imports/message-read-receipt/client/readReceipts.js
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
+import { settings } from 'meteor/rocketchat:settings';
 import moment from 'moment';
 
 import './readReceipts.css';
@@ -11,7 +12,7 @@ Template.readReceipts.helpers({
 		return Template.instance().readReceipts.get();
 	},
 	displayName() {
-		return (RocketChat.settings.get('UI_Use_Real_Name') && this.user.name) || this.user.username;
+		return (settings.get('UI_Use_Real_Name') && this.user.name) || this.user.username;
 	},
 	time() {
 		return moment(this.ts).format('L LTS');