RocketChat · rodrigok · Nov 1, 2018 · Oct 19, 2018 · Oct 19, 2018 · Oct 19, 2018
diff --git a/.eslintrc b/.eslintrc
@@ -36,7 +36,6 @@
 		"LivechatTrigger"             : false,
 		"Logger"                      : false,
 		"Match"                       : false,
-		"Meteor"                      : false,
 		"modal"                       : false,
 		"moment"                      : false,
 		"Mongo"                       : false,

diff --git a/client/methods/deleteMessage.js b/client/methods/deleteMessage.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 import moment from 'moment';
 

diff --git a/client/methods/hideRoom.js b/client/methods/hideRoom.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 Meteor.methods({
 	hideRoom(rid) {
 		if (!Meteor.userId()) {

diff --git a/client/methods/openRoom.js b/client/methods/openRoom.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 Meteor.methods({
 	openRoom(rid) {
 		if (!Meteor.userId()) {

diff --git a/client/methods/setUserActiveStatus.js b/client/methods/setUserActiveStatus.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 Meteor.methods({
 	setUserActiveStatus(userId, active) {
 		Meteor.users.update(userId, { $set: { active } });

diff --git a/client/methods/toggleFavorite.js b/client/methods/toggleFavorite.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 Meteor.methods({
 	toggleFavorite(rid, f) {
 		if (!Meteor.userId()) {

diff --git a/client/methods/updateMessage.js b/client/methods/updateMessage.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 import moment from 'moment';
 import toastr from 'toastr';

diff --git a/client/notifications/UsersNameChanged.js b/client/notifications/UsersNameChanged.js
@@ -1,3 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
 Meteor.startup(function() {
 	RocketChat.Notifications.onLogged('Users:NameChanged', function({ _id, name, username }) {
 		RocketChat.models.Messages.update({

diff --git a/client/notifications/notification.js b/client/notifications/notification.js
@@ -1,4 +1,5 @@
 /* globals KonchatNotification, fireGlobalEvent, readMessage, CachedChatSubscription */
+import { Meteor } from 'meteor/meteor';
 
 // 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

diff --git a/client/notifications/updateAvatar.js b/client/notifications/updateAvatar.js
@@ -1,4 +1,5 @@
 /* globals updateAvatarOfUsername */
+import { Meteor } from 'meteor/meteor';
 
 Meteor.startup(function() {
 	RocketChat.Notifications.onLogged('updateAvatar', function(data) {

diff --git a/client/notifications/updateUserState.js b/client/notifications/updateUserState.js
@@ -1,4 +1,5 @@
 /* globals fireGlobalEvent */
+import { Meteor } from 'meteor/meteor';
 
 /* fire user state change globally, to listen on desktop electron client */
 Meteor.startup(function() {

diff --git a/client/routes/router.js b/client/routes/router.js
@@ -1,4 +1,5 @@
 /* globals KonchatNotification */
+import { Meteor } from 'meteor/meteor';
 import s from 'underscore.string';
 
 Blaze.registerHelper('pathFor', function(path, kw) {

diff --git a/client/startup/emailVerification.js b/client/startup/emailVerification.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import toastr from 'toastr';
 Meteor.startup(function() {
 	Tracker.autorun(function() {

diff --git a/client/startup/i18n.js b/client/startup/i18n.js
@@ -1,5 +1,6 @@
 /* globals isRtl */
 
+import { Meteor } from 'meteor/meteor';
 import moment from 'moment';
 
 const currentLanguage = new ReactiveVar();

diff --git a/client/startup/loginViaQuery.js b/client/startup/loginViaQuery.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 Meteor.startup(() => {
 	if (FlowRouter.getQueryParam('resumeToken')) {
 		Meteor.loginWithToken(FlowRouter.getQueryParam('resumeToken'), () => {

diff --git a/client/startup/roomObserve.js b/client/startup/roomObserve.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 Meteor.startup(function() {
 	ChatRoom.find().observe({
 		added(data) {

diff --git a/client/startup/startup.js b/client/startup/startup.js
@@ -1,5 +1,5 @@
 /* globals UserPresence, fireGlobalEvent */
-
+import { Meteor } from 'meteor/meteor';
 import toastr from 'toastr';
 import hljs from 'highlight.js';
 import 'highlight.js/styles/github.css';

diff --git a/client/startup/unread.js b/client/startup/unread.js
@@ -1,5 +1,5 @@
 /* globals fireGlobalEvent, readMessage, Favico, favico, menu */
-
+import { Meteor } from 'meteor/meteor';
 Meteor.startup(function() {
 	Tracker.autorun(function() {
 		let unreadCount = 0;

diff --git a/client/startup/userSetUtcOffset.js b/client/startup/userSetUtcOffset.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import moment from 'moment';
 
 Meteor.startup(function() {

diff --git a/client/startup/usersObserve.js b/client/startup/usersObserve.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 Meteor.startup(function() {
 	Meteor.users.find({}, { fields: { name: 1, username: 1, pictures: 1, status: 1, emails: 1, phone: 1, services: 1, utcOffset: 1 } }).observe({
 		added(user) {

diff --git a/imports/message-read-receipt/client/readReceipts.js b/imports/message-read-receipt/client/readReceipts.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import moment from 'moment';
 

diff --git a/imports/message-read-receipt/server/lib/ReadReceipt.js b/imports/message-read-receipt/server/lib/ReadReceipt.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
 import ModelReadReceipts from '../models/ReadReceipts';
 

diff --git a/imports/personal-access-tokens/client/personalAccessTokens.js b/imports/personal-access-tokens/client/personalAccessTokens.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import toastr from 'toastr';
 import moment from 'moment';

diff --git a/packages/chatpal-search/client/template/admin.js b/packages/chatpal-search/client/template/admin.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import toastr from 'toastr';
 
 Template.ChatpalAdmin.onCreated(function() {

diff --git a/packages/chatpal-search/server/provider/index.js b/packages/chatpal-search/server/provider/index.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import ChatpalLogger from '../utils/logger';
 import { Random } from 'meteor/random';
 

diff --git a/packages/chatpal-search/server/provider/provider.js b/packages/chatpal-search/server/provider/provider.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import { searchProviderService, SearchProvider } from 'meteor/rocketchat:search';
 import Index from './index';
 import ChatpalLogger from '../utils/logger';

diff --git a/packages/chatpal-search/server/utils/utils.js b/packages/chatpal-search/server/utils/utils.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 Meteor.methods({
 	'chatpalUtilsCreateKey'(email) {
 		try {

diff --git a/packages/meteor-accounts-saml/saml_client.js b/packages/meteor-accounts-saml/saml_client.js
@@ -1,5 +1,5 @@
 /* globals cordova */
-
+import { Meteor } from 'meteor/meteor';
 if (!Accounts.saml) {
 	Accounts.saml = {};
 }

diff --git a/packages/meteor-accounts-saml/saml_rocketchat.js b/packages/meteor-accounts-saml/saml_rocketchat.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 const logger = new Logger('steffo:meteor-accounts-saml', {
 	methods: {
 		updated: {

diff --git a/packages/meteor-accounts-saml/saml_server.js b/packages/meteor-accounts-saml/saml_server.js
@@ -1,5 +1,6 @@
 /* globals RoutePolicy, SAML */
 /* jshint newcap: false */
+import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 
 if (!Accounts.saml) {

diff --git a/packages/meteor-accounts-saml/saml_utils.js b/packages/meteor-accounts-saml/saml_utils.js
@@ -1,5 +1,6 @@
 /* globals SAML:true */
 
+import { Meteor } from 'meteor/meteor';
 import zlib from 'zlib';
 import xmlCrypto from 'xml-crypto';
 import crypto from 'crypto';

diff --git a/packages/meteor-autocomplete/client/autocomplete-client.js b/packages/meteor-autocomplete/client/autocomplete-client.js
@@ -1,4 +1,5 @@
 /* globals Deps, getCaretCoordinates*/
+import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 import AutoCompleteRecords from './collection';
 

diff --git a/packages/meteor-autocomplete/server/autocomplete-server.js b/packages/meteor-autocomplete/server/autocomplete-server.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 // This also attaches an onStop callback to sub, so we don't need to worry about that.
 // https://github.com/meteor/meteor/blob/devel/packages/mongo/collection.js
 const Autocomplete = class {

diff --git a/packages/rocketchat-2fa/client/TOTPPassword.js b/packages/rocketchat-2fa/client/TOTPPassword.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import toastr from 'toastr';
 
 function reportError(error, callback) {

diff --git a/packages/rocketchat-2fa/client/accountSecurity.js b/packages/rocketchat-2fa/client/accountSecurity.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import toastr from 'toastr';
 import qrcode from 'yaqrcode';
 

diff --git a/packages/rocketchat-2fa/server/loginHandler.js b/packages/rocketchat-2fa/server/loginHandler.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 Accounts.registerLoginHandler('totp', function(options) {
 	if (!options.totp || !options.totp.code) {
 		return;

diff --git a/packages/rocketchat-2fa/server/methods/checkCodesRemaining.js b/packages/rocketchat-2fa/server/methods/checkCodesRemaining.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 Meteor.methods({
 	'2fa:checkCodesRemaining'() {
 		if (!Meteor.userId()) {

diff --git a/packages/rocketchat-2fa/server/methods/disable.js b/packages/rocketchat-2fa/server/methods/disable.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 Meteor.methods({
 	'2fa:disable'(code) {
 		if (!Meteor.userId()) {

diff --git a/packages/rocketchat-2fa/server/methods/enable.js b/packages/rocketchat-2fa/server/methods/enable.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 Meteor.methods({
 	'2fa:enable'() {
 		if (!Meteor.userId()) {

diff --git a/packages/rocketchat-2fa/server/methods/regenerateCodes.js b/packages/rocketchat-2fa/server/methods/regenerateCodes.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 Meteor.methods({
 	'2fa:regenerateCodes'(userToken) {
 		if (!Meteor.userId()) {

diff --git a/packages/rocketchat-2fa/server/methods/validateTempToken.js b/packages/rocketchat-2fa/server/methods/validateTempToken.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 Meteor.methods({
 	'2fa:validateTempToken'(userToken) {
 		if (!Meteor.userId()) {

diff --git a/packages/rocketchat-action-links/both/lib/actionLinks.js b/packages/rocketchat-action-links/both/lib/actionLinks.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 // Action Links namespace creation.
 RocketChat.actionLinks = {
 	actions: {},

diff --git a/packages/rocketchat-action-links/client/lib/actionLinks.js b/packages/rocketchat-action-links/client/lib/actionLinks.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 // Action Links Handler. This method will be called off the client.
 
 RocketChat.actionLinks.run = (name, messageId, instance) => {

diff --git a/packages/rocketchat-action-links/server/actionLinkHandler.js b/packages/rocketchat-action-links/server/actionLinkHandler.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 // Action Links Handler. This method will be called off the client.
 
 Meteor.methods({

diff --git a/packages/rocketchat-analytics/client/loadScript.js b/packages/rocketchat-analytics/client/loadScript.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 Template.body.onRendered(() => {
 	Tracker.autorun((c) => {
 		const piwikUrl = RocketChat.settings.get('PiwikAnalytics_enabled') && RocketChat.settings.get('PiwikAnalytics_url');

diff --git a/packages/rocketchat-analytics/client/trackEvents.js b/packages/rocketchat-analytics/client/trackEvents.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 function trackEvent(category, action, label) {
 	if (window._paq) {
 		window._paq.push(['trackEvent', category, action, label]);

diff --git a/packages/rocketchat-api/server/api.js b/packages/rocketchat-api/server/api.js
@@ -1,4 +1,6 @@
 /* global Restivus, DDP, DDPCommon */
+import { Meteor } from 'meteor/meteor';
+
 import _ from 'underscore';
 const logger = new Logger('API', {});
 

diff --git a/packages/rocketchat-api/server/helpers/getUserFromParams.js b/packages/rocketchat-api/server/helpers/getUserFromParams.js
@@ -1,4 +1,6 @@
 // Convenience method, almost need to turn it into a middleware of sorts
+import { Meteor } from 'meteor/meteor';
+
 RocketChat.API.helperMethods.set('getUserFromParams', function _getUserFromParams() {
 	const doesntExist = { _doesntExist: true };
 	let user;

diff --git a/packages/rocketchat-api/server/helpers/parseJsonQuery.js b/packages/rocketchat-api/server/helpers/parseJsonQuery.js
@@ -1,3 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
 RocketChat.API.helperMethods.set('parseJsonQuery', function _parseJsonQuery() {
 	let sort;
 	if (this.queryParams.sort) {

diff --git a/packages/rocketchat-api/server/v1/assets.js b/packages/rocketchat-api/server/v1/assets.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import Busboy from 'busboy';
 
 RocketChat.API.v1.addRoute('assets.setAsset', { authRequired: true }, {

diff --git a/packages/rocketchat-api/server/v1/channels.js b/packages/rocketchat-api/server/v1/channels.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 
 // Returns the channel IF found otherwise it will return the failure of why it didn't. Check the `statusCode` property

diff --git a/packages/rocketchat-api/server/v1/chat.js b/packages/rocketchat-api/server/v1/chat.js
@@ -1,4 +1,5 @@
 /* global processWebhookMessage */
+import { Meteor } from 'meteor/meteor';
 
 RocketChat.API.v1.addRoute('chat.delete', { authRequired: true }, {
 	post() {

diff --git a/packages/rocketchat-api/server/v1/commands.js b/packages/rocketchat-api/server/v1/commands.js
@@ -1,3 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
 RocketChat.API.v1.addRoute('commands.get', { authRequired: true }, {
 	get() {
 		const params = this.queryParams;

diff --git a/packages/rocketchat-api/server/v1/e2e.js b/packages/rocketchat-api/server/v1/e2e.js
@@ -1,3 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
 RocketChat.API.v1.addRoute('e2e.fetchMyKeys', { authRequired: true }, {
 	get() {
 		let result;

diff --git a/packages/rocketchat-api/server/v1/emoji-custom.js b/packages/rocketchat-api/server/v1/emoji-custom.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 RocketChat.API.v1.addRoute('emoji-custom', { authRequired: true }, {
 	get() {
 		const emojis = Meteor.call('listEmojiCustom');

diff --git a/packages/rocketchat-api/server/v1/groups.js b/packages/rocketchat-api/server/v1/groups.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 
 // Returns the private group subscription IF found otherwise it will return the failure of why it didn't. Check the `statusCode` property

diff --git a/packages/rocketchat-api/server/v1/im.js b/packages/rocketchat-api/server/v1/im.js
@@ -1,3 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
 function findDirectMessageRoom(params, user) {
 	if ((!params.roomId || !params.roomId.trim()) && (!params.username || !params.username.trim())) {
 		throw new Meteor.Error('error-room-param-not-provided', 'Body param "roomId" or "username" is required');

diff --git a/packages/rocketchat-api/server/v1/integrations.js b/packages/rocketchat-api/server/v1/integrations.js
@@ -1,3 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
 RocketChat.API.v1.addRoute('integrations.create', { authRequired: true }, {
 	post() {
 		check(this.bodyParams, Match.ObjectIncluding({

diff --git a/packages/rocketchat-api/server/v1/misc.js b/packages/rocketchat-api/server/v1/misc.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 
 RocketChat.API.v1.addRoute('info', { authRequired: false }, {
 	get() {

diff --git a/packages/rocketchat-api/server/v1/permissions.js b/packages/rocketchat-api/server/v1/permissions.js
@@ -1,3 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
 /**
 	This API returns all permissions that exists
 	on the server, with respective roles.

diff --git a/packages/rocketchat-api/server/v1/push.js b/packages/rocketchat-api/server/v1/push.js
@@ -1,4 +1,5 @@
 /* globals Push */
+import { Meteor } from 'meteor/meteor';
 
 RocketChat.API.v1.addRoute('push.token', { authRequired: true }, {
 	post() {

diff --git a/packages/rocketchat-api/server/v1/roles.js b/packages/rocketchat-api/server/v1/roles.js
@@ -1,3 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
 RocketChat.API.v1.addRoute('roles.list', { authRequired: true }, {
 	get() {
 		const roles = RocketChat.models.Roles.find({}, { fields: { _updatedAt: 0 } }).fetch();

diff --git a/packages/rocketchat-api/server/v1/rooms.js b/packages/rocketchat-api/server/v1/rooms.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import Busboy from 'busboy';
 
 function findRoomByIdOrName({ params, checkedArchived = true }) {

diff --git a/packages/rocketchat-api/server/v1/settings.js b/packages/rocketchat-api/server/v1/settings.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 
 // settings endpoints

diff --git a/packages/rocketchat-api/server/v1/stats.js b/packages/rocketchat-api/server/v1/stats.js
@@ -1,3 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
 RocketChat.API.v1.addRoute('statistics', { authRequired: true }, {
 	get() {
 		let refresh = false;

diff --git a/packages/rocketchat-api/server/v1/subscriptions.js b/packages/rocketchat-api/server/v1/subscriptions.js
@@ -1,3 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
 RocketChat.API.v1.addRoute('subscriptions.get', { authRequired: true }, {
 	get() {
 		const { updatedSince } = this.queryParams;

diff --git a/packages/rocketchat-api/server/v1/users.js b/packages/rocketchat-api/server/v1/users.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 import Busboy from 'busboy';
 

diff --git a/packages/rocketchat-apps/client/admin/appManage.js b/packages/rocketchat-apps/client/admin/appManage.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';

diff --git a/packages/rocketchat-apps/client/admin/appWhatIsIt.js b/packages/rocketchat-apps/client/admin/appWhatIsIt.js
@@ -1,3 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
 Template.appWhatIsIt.onCreated(function() {
 	this.isLoading = new ReactiveVar(false);
 	this.hasError = new ReactiveVar(false);

diff --git a/packages/rocketchat-apps/client/communication/websockets.js b/packages/rocketchat-apps/client/communication/websockets.js
@@ -1,3 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
 export const AppEvents = Object.freeze({
 	APP_ADDED: 'app/added',
 	APP_REMOVED: 'app/removed',

diff --git a/packages/rocketchat-apps/client/orchestrator.js b/packages/rocketchat-apps/client/orchestrator.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import { AppWebsocketReceiver } from './communication';
 import { Utilities } from '../lib/misc/Utilities';
 

diff --git a/packages/rocketchat-apps/server/bridges/api.js b/packages/rocketchat-apps/server/bridges/api.js
@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import express from 'express';
 import { WebApp } from 'meteor/webapp';