Remove dependency of RC namespace in root server folder - step 5

server/startup/migrations/v041.js

@@ -1,10 +1,13 @@
-RocketChat.Migrations.add({
+import { Migrations } from 'meteor/rocketchat:migrations';
+import { Users } from 'meteor/rocketchat:models';
+
+Migrations.add({
 	version: 41,
 	up() {
-		if (RocketChat && RocketChat.models && RocketChat.models.Users) {
-			RocketChat.models.Users.update({ bot: true }, { $set: { type: 'bot' } }, { multi: true });
-			RocketChat.models.Users.update({ 'profile.guest': true }, { $set: { type: 'visitor' } }, { multi: true });
-			RocketChat.models.Users.update({ type: { $exists: false } }, { $set: { type: 'user' } }, { multi: true });
+		if (Users) {
+			Users.update({ bot: true }, { $set: { type: 'bot' } }, { multi: true });
+			Users.update({ 'profile.guest': true }, { $set: { type: 'visitor' } }, { multi: true });
+			Users.update({ type: { $exists: false } }, { $set: { type: 'user' } }, { multi: true });
 		}
 	},
 });

server/startup/migrations/v042.js

@@ -1,10 +1,13 @@
 import { Mongo } from 'meteor/mongo';
+import { Migrations } from 'meteor/rocketchat:migrations';
+import { settings } from 'meteor/rocketchat:settings';
+import { RocketChatAssets } from 'meteor/rocketchat:assets';
 
-RocketChat.Migrations.add({
+Migrations.add({
 	version: 42,
 	up() {
-		const files = RocketChat.__migration_assets_files = new Mongo.Collection('assets.files');
-		const chunks = RocketChat.__migration_assets_chunks = new Mongo.Collection('assets.chunks');
+		const files = new Mongo.Collection('assets.files');
+		const chunks = new Mongo.Collection('assets.chunks');
 		const list = {
 			'favicon.ico': 'favicon_ico',
 			'favicon.svg': 'favicon',
@@ -28,11 +31,11 @@ RocketChat.Migrations.add({
 				});
 
 				if (oldFile) {
-					const extension = RocketChat.Assets.mime.extension(oldFile.contentType);
-					RocketChat.settings.removeById(`Assets_${ from }`);
-					RocketChat.settings.updateById(`Assets_${ to }`, {
+					const extension = RocketChatAssets.mime.extension(oldFile.contentType);
+					settings.removeById(`Assets_${ from }`);
+					settings.updateById(`Assets_${ to }`, {
 						url: `/assets/${ to }.${ extension }`,
-						defaultUrl: RocketChat.Assets.assets[to].defaultUrl,
+						defaultUrl: RocketChatAssets.assets[to].defaultUrl,
 					});
 
 					oldFile._id = to;

server/startup/migrations/v043.js

@@ -1,8 +1,11 @@
-RocketChat.Migrations.add({
+import { Migrations } from 'meteor/rocketchat:migrations';
+import { Permissions } from 'meteor/rocketchat:models';
+
+Migrations.add({
 	version: 43,
 	up() {
-		if (RocketChat && RocketChat.models && RocketChat.models.Permissions) {
-			RocketChat.models.Permissions.update({ _id: 'pin-message' }, { $addToSet: { roles: 'admin' } });
+		if (Permissions) {
+			Permissions.update({ _id: 'pin-message' }, { $addToSet: { roles: 'admin' } });
 		}
 	},
 });

server/startup/migrations/v044.js

@@ -1,19 +1,22 @@
-RocketChat.Migrations.add({
+import { Migrations } from 'meteor/rocketchat:migrations';
+import { Users, Settings } from 'meteor/rocketchat:models';
+
+Migrations.add({
 	version: 44,
 	up() {
-		if (RocketChat && RocketChat.models && RocketChat.models.Users) {
-			RocketChat.models.Users.find({ $or: [{ 'settings.preferences.disableNewRoomNotification': { $exists: 1 } }, { 'settings.preferences.disableNewMessageNotification': { $exists: 1 } }] }).forEach(function(user) {
+		if (Users) {
+			Users.find({ $or: [{ 'settings.preferences.disableNewRoomNotification': { $exists: 1 } }, { 'settings.preferences.disableNewMessageNotification': { $exists: 1 } }] }).forEach(function(user) {
 				const newRoomNotification = !(user && user.settings && user.settings.preferences && user.settings.preferences.disableNewRoomNotification);
 				const newMessageNotification = !(user && user.settings && user.settings.preferences && user.settings.preferences.disableNewMessageNotification);
-				RocketChat.models.Users.update({ _id: user._id }, { $unset: { 'settings.preferences.disableNewRoomNotification': 1, 'settings.preferences.disableNewMessageNotification': 1 }, $set: { 'settings.preferences.newRoomNotification': newRoomNotification, 'settings.preferences.newMessageNotification': newMessageNotification } });
+				Users.update({ _id: user._id }, { $unset: { 'settings.preferences.disableNewRoomNotification': 1, 'settings.preferences.disableNewMessageNotification': 1 }, $set: { 'settings.preferences.newRoomNotification': newRoomNotification, 'settings.preferences.newMessageNotification': newMessageNotification } });
 			});
 		}
 
-		if (RocketChat && RocketChat.models && RocketChat.models.Settings) {
-			const optOut = RocketChat.models.Settings.findOne({ _id: 'Statistics_opt_out' });
+		if (Settings) {
+			const optOut = Settings.findOne({ _id: 'Statistics_opt_out' });
 			if (optOut) {
-				RocketChat.models.Settings.remove({ _id: 'Statistics_opt_out' });
-				RocketChat.models.Settings.upsert({ _id: 'Statistics_reporting' }, {
+				Settings.remove({ _id: 'Statistics_opt_out' });
+				Settings.upsert({ _id: 'Statistics_reporting' }, {
 					$set: {
 						value: !optOut.value,
 						i18nDescription: 'Statistics_reporting_Description',
@@ -24,11 +27,11 @@ RocketChat.Migrations.add({
 			}
 		}
 
-		if (RocketChat && RocketChat.models && RocketChat.models.Settings) {
-			const favoriteRooms = RocketChat.models.Settings.findOne({ _id: 'Disable_Favorite_Rooms' });
+		if (Settings) {
+			const favoriteRooms = Settings.findOne({ _id: 'Disable_Favorite_Rooms' });
 			if (favoriteRooms) {
-				RocketChat.models.Settings.remove({ _id: 'Disable_Favorite_Rooms' });
-				RocketChat.models.Settings.upsert({ _id: 'Favorite_Rooms' }, {
+				Settings.remove({ _id: 'Disable_Favorite_Rooms' });
+				Settings.upsert({ _id: 'Favorite_Rooms' }, {
 					$set: {
 						value: !favoriteRooms.value,
 						i18nDescription: 'Favorite_Rooms_Description',

server/startup/migrations/v045.js

@@ -1,14 +1,18 @@
-RocketChat.Migrations.add({
+import { Migrations } from 'meteor/rocketchat:migrations';
+import { Users } from 'meteor/rocketchat:models';
+import { settings } from 'meteor/rocketchat:settings';
+
+Migrations.add({
 	version: 45,
 	up() {
 
 		// finds the latest created visitor
-		const lastVisitor = RocketChat.models.Users.find({ type: 'visitor' }, { fields: { username: 1 }, sort: { createdAt: -1 }, limit: 1 }).fetch();
+		const lastVisitor = Users.find({ type: 'visitor' }, { fields: { username: 1 }, sort: { createdAt: -1 }, limit: 1 }).fetch();
 
 		if (lastVisitor && lastVisitor.length > 0) {
 			const lastNumber = lastVisitor[0].username.replace(/^guest\-/, '');
 
-			RocketChat.settings.add('Livechat_guest_count', (parseInt(lastNumber) + 1), { type: 'int', group: 'Livechat' });
+			settings.add('Livechat_guest_count', (parseInt(lastNumber) + 1), { type: 'int', group: 'Livechat' });
 		}
 	},
 });

server/startup/migrations/v046.js

@@ -1,8 +1,11 @@
-RocketChat.Migrations.add({
+import { Migrations } from 'meteor/rocketchat:migrations';
+import { Users } from 'meteor/rocketchat:models';
+
+Migrations.add({
 	version: 46,
 	up() {
-		if (RocketChat && RocketChat.models && RocketChat.models.Users) {
-			RocketChat.models.Users.update({ type: { $exists: false } }, { $set: { type: 'user' } }, { multi: true });
+		if (Users) {
+			Users.update({ type: { $exists: false } }, { $set: { type: 'user' } }, { multi: true });
 		}
 	},
 });

server/startup/migrations/v047.js

@@ -1,23 +1,26 @@
-RocketChat.Migrations.add({
+import { Migrations } from 'meteor/rocketchat:migrations';
+import { Settings } from 'meteor/rocketchat:models';
+
+Migrations.add({
 	version: 47,
 	up() {
-		if (RocketChat && RocketChat.models && RocketChat.models.Settings) {
-			const autolinkerUrls = RocketChat.models.Settings.findOne({ _id: 'AutoLinker_Urls' });
+		if (Settings) {
+			const autolinkerUrls = Settings.findOne({ _id: 'AutoLinker_Urls' });
 			if (autolinkerUrls) {
-				RocketChat.models.Settings.remove({ _id: 'AutoLinker_Urls' });
-				RocketChat.models.Settings.upsert({ _id: 'AutoLinker_Urls_Scheme' }, {
+				Settings.remove({ _id: 'AutoLinker_Urls' });
+				Settings.upsert({ _id: 'AutoLinker_Urls_Scheme' }, {
 					$set: {
 						value: !!autolinkerUrls.value,
 						i18nLabel: 'AutoLinker_Urls_Scheme',
 					},
 				});
-				RocketChat.models.Settings.upsert({ _id: 'AutoLinker_Urls_www' }, {
+				Settings.upsert({ _id: 'AutoLinker_Urls_www' }, {
 					$set: {
 						value: !!autolinkerUrls.value,
 						i18nLabel: 'AutoLinker_Urls_www',
 					},
 				});
-				RocketChat.models.Settings.upsert({ _id: 'AutoLinker_Urls_TLD' }, {
+				Settings.upsert({ _id: 'AutoLinker_Urls_TLD' }, {
 					$set: {
 						value: !!autolinkerUrls.value,
 						i18nLabel: 'AutoLinker_Urls_TLD',

server/startup/migrations/v048.js

@@ -1,16 +1,19 @@
-RocketChat.Migrations.add({
+import { Migrations } from 'meteor/rocketchat:migrations';
+import { Settings } from 'meteor/rocketchat:models';
+
+Migrations.add({
 	version: 48,
 	up() {
-		if (RocketChat && RocketChat.models && RocketChat.models.Settings) {
+		if (Settings) {
 
-			const RocketBot_Enabled = RocketChat.models.Settings.findOne({
+			const RocketBot_Enabled = Settings.findOne({
 				_id: 'RocketBot_Enabled',
 			});
 			if (RocketBot_Enabled) {
-				RocketChat.models.Settings.remove({
+				Settings.remove({
 					_id: 'RocketBot_Enabled',
 				});
-				RocketChat.models.Settings.upsert({
+				Settings.upsert({
 					_id: 'InternalHubot_Enabled',
 				}, {
 					$set: {
@@ -19,14 +22,14 @@ RocketChat.Migrations.add({
 				});
 			}
 
-			const RocketBot_Name = RocketChat.models.Settings.findOne({
+			const RocketBot_Name = Settings.findOne({
 				_id: 'RocketBot_Name',
 			});
 			if (RocketBot_Name) {
-				RocketChat.models.Settings.remove({
+				Settings.remove({
 					_id: 'RocketBot_Name',
 				});
-				RocketChat.models.Settings.upsert({
+				Settings.upsert({
 					_id: 'InternalHubot_Username',
 				}, {
 					$set: {

server/startup/migrations/v049.js

@@ -1,16 +1,19 @@
-RocketChat.Migrations.add({
+import { Migrations } from 'meteor/rocketchat:migrations';
+import { Rooms, Subscriptions, Settings } from 'meteor/rocketchat:models';
+
+Migrations.add({
 	version: 49,
 	up() {
 
 		let count = 1;
 
-		RocketChat.models.Rooms.find({ t: 'l' }, { sort: { ts: 1 }, fields: { _id: 1 } }).forEach(function(room) {
-			RocketChat.models.Rooms.update({ _id: room._id }, { $set: { code: count } });
-			RocketChat.models.Subscriptions.update({ rid: room._id }, { $set: { code: count } }, { multi: true });
+		Rooms.find({ t: 'l' }, { sort: { ts: 1 }, fields: { _id: 1 } }).forEach(function(room) {
+			Rooms.update({ _id: room._id }, { $set: { code: count } });
+			Subscriptions.update({ rid: room._id }, { $set: { code: count } }, { multi: true });
 			count++;
 		});
 
-		RocketChat.models.Settings.upsert({ _id: 'Livechat_Room_Count' }, {
+		Settings.upsert({ _id: 'Livechat_Room_Count' }, {
 			$set: {
 				value: count,
 				type: 'int',

server/startup/migrations/v050.js

@@ -1,7 +1,10 @@
-RocketChat.Migrations.add({
+import { Migrations } from 'meteor/rocketchat:migrations';
+import { Subscriptions } from 'meteor/rocketchat:models';
+
+Migrations.add({
 	version: 50,
 	up() {
-		RocketChat.models.Subscriptions.tryDropIndex('u._id_1_name_1_t_1');
-		RocketChat.models.Subscriptions.tryEnsureIndex({ 'u._id': 1, name: 1, t: 1 });
+		Subscriptions.tryDropIndex('u._id_1_name_1_t_1');
+		Subscriptions.tryEnsureIndex({ 'u._id': 1, name: 1, t: 1 });
 	},
 });

server/startup/migrations/v051.js

@@ -1,16 +1,19 @@
-RocketChat.Migrations.add({
+import { Migrations } from 'meteor/rocketchat:migrations';
+import { Users, Rooms, Subscriptions } from 'meteor/rocketchat:models';
+
+Migrations.add({
 	version: 51,
 	up() {
-		RocketChat.models.Rooms.find({ t: 'l', 'v.token': { $exists: true }, label: { $exists: false } }).forEach(function(room) {
-			const user = RocketChat.models.Users.findOne({ 'profile.token': room.v.token });
+		Rooms.find({ t: 'l', 'v.token': { $exists: true }, label: { $exists: false } }).forEach(function(room) {
+			const user = Users.findOne({ 'profile.token': room.v.token });
 			if (user) {
-				RocketChat.models.Rooms.update({ _id: room._id }, {
+				Rooms.update({ _id: room._id }, {
 					$set: {
 						label: user.name || user.username,
 						'v._id': user._id,
 					},
 				});
-				RocketChat.models.Subscriptions.update({ rid: room._id }, {
+				Subscriptions.update({ rid: room._id }, {
 					$set: {
 						name: user.name || user.username,
 					},

server/startup/migrations/v052.js

@@ -1,6 +1,9 @@
-RocketChat.Migrations.add({
+import { Migrations } from 'meteor/rocketchat:migrations';
+import { Users } from 'meteor/rocketchat:models';
+
+Migrations.add({
 	version: 52,
 	up() {
-		RocketChat.models.Users.update({ _id: 'rocket.cat' }, { $addToSet: { roles: 'bot' } });
+		Users.update({ _id: 'rocket.cat' }, { $addToSet: { roles: 'bot' } });
 	},
 });

server/startup/migrations/v053.js

@@ -1,13 +1,16 @@
-RocketChat.Migrations.add({
+import { Migrations } from 'meteor/rocketchat:migrations';
+import { Settings } from 'meteor/rocketchat:models';
+
+Migrations.add({
 	version: 53,
 	up() {
-		RocketChat.models.Settings.update({ _id: 'Email_Header', value: '' }, {
+		Settings.update({ _id: 'Email_Header', value: '' }, {
 			$set: {
 				value: '<table border="0" cellspacing="0" cellpadding="0" width="100%" bgcolor="#f3f3f3" style="color:#4a4a4a;font-family: Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;border-collapse:callapse;border-spacing:0;margin:0 auto"><tr><td style="padding:1em"><table border="0" cellspacing="0" cellpadding="0" align="center" width="100%" style="width:100%;margin:0 auto;max-width:800px"><tr><td bgcolor="#ffffff" style="background-color:#ffffff; border: 1px solid #DDD; font-size: 10pt; font-family: Helvetica,Arial,sans-serif;"><table width="100%" border="0" cellspacing="0" cellpadding="0"><tr><td style="background-color: #04436a;"><h1 style="font-family: Helvetica,Arial,sans-serif; padding: 0 1em; margin: 0; line-height: 70px; color: #FFF;">[Site_Name]</h1></td></tr><tr><td style="padding: 1em; font-size: 10pt; font-family: Helvetica,Arial,sans-serif;">',
 			},
 		});
 
-		RocketChat.models.Settings.update({ _id: 'Email_Footer', value: '' }, {
+		Settings.update({ _id: 'Email_Footer', value: '' }, {
 			$set: {
 				value: '</td></tr></table></td></tr><tr><td border="0" cellspacing="0" cellpadding="0" width="100%" style="font-family: Helvetica,Arial,sans-serif; max-width: 800px; margin: 0 auto; padding: 1.5em; text-align: center; font-size: 8pt; color: #999;">Powered by <a href="https://rocket.chat" target="_blank">Rocket.Chat</a></td></tr></table></td></tr></table>',
 			},

server/startup/migrations/v054.js

@@ -1,10 +1,13 @@
-RocketChat.Migrations.add({
+import { Migrations } from 'meteor/rocketchat:migrations';
+import { Users } from 'meteor/rocketchat:models';
+
+Migrations.add({
 	version: 54,
 	up() {
-		if (RocketChat && RocketChat.models && RocketChat.models.Users) {
+		if (Users) {
 			// Set default message viewMode to 'normal' or 'cozy' depending on the users' current settings and remove the field 'compactView'
-			RocketChat.models.Users.update({ 'settings.preferences.compactView': true }, { $set: { 'settings.preferences.viewMode': 1 }, $unset: { 'settings.preferences.compactView': 1 } }, { multi: true });
-			RocketChat.models.Users.update({ 'settings.preferences.viewMode': { $ne: 1 } }, { $set: { 'settings.preferences.viewMode': 0 } }, { multi: true });
+			Users.update({ 'settings.preferences.compactView': true }, { $set: { 'settings.preferences.viewMode': 1 }, $unset: { 'settings.preferences.compactView': 1 } }, { multi: true });
+			Users.update({ 'settings.preferences.viewMode': { $ne: 1 } }, { $set: { 'settings.preferences.viewMode': 0 } }, { multi: true });
 		}
 	},
 });

server/startup/migrations/v055.js

@@ -1,12 +1,14 @@
+import { Migrations } from 'meteor/rocketchat:migrations';
+import { Rooms, Messages } from 'meteor/rocketchat:models';
 import s from 'underscore.string';
 
-RocketChat.Migrations.add({
+Migrations.add({
 	version: 55,
 	up() {
-		RocketChat.models.Rooms.find({ topic: { $exists: 1, $ne: '' } }, { topic: 1 }).forEach(function(room) {
+		Rooms.find({ topic: { $exists: 1, $ne: '' } }, { topic: 1 }).forEach(function(room) {
 			const topic = s.escapeHTML(room.topic);
-			RocketChat.models.Rooms.update({ _id: room._id }, { $set: { topic } });
-			RocketChat.models.Messages.update({ t: 'room_changed_topic', rid: room._id }, { $set: { msg: topic } });
+			Rooms.update({ _id: room._id }, { $set: { topic } });
+			Messages.update({ t: 'room_changed_topic', rid: room._id }, { $set: { msg: topic } });
 		});
 	},
 });

server/startup/migrations/v056.js

@@ -1,11 +1,14 @@
-RocketChat.Migrations.add({
+import { Migrations } from 'meteor/rocketchat:migrations';
+import { Messages } from 'meteor/rocketchat:models';
+
+Migrations.add({
 	version: 56,
 	up() {
-		RocketChat.models.Messages.find({ _id: /\./ }).forEach(function(message) {
+		Messages.find({ _id: /\./ }).forEach(function(message) {
 			const oldId = message._id;
 			message._id = message._id.replace(/(.*)\.S?(.*)/, 'slack-$1-$2');
-			RocketChat.models.Messages.insert(message);
-			RocketChat.models.Messages.remove({ _id: oldId });
+			Messages.insert(message);
+			Messages.remove({ _id: oldId });
 		});
 	},
 });