Start using cache for Rooms (Part 1)

packages/rocketchat-action-links/server/actionLinkHandler.js

@@ -16,7 +16,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-actionlink', 'Invalid action link', { method: 'actionLinkHandler' });
 		}
 
-		var room = RocketChat.models.Rooms.findOneById(message.rid);
+		var room = RocketChat.cache.Rooms.findOneById(message.rid);
 		if (Array.isArray(room.usernames) && room.usernames.indexOf(Meteor.user().username) === -1) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'actionLinkHandler' });
 		}

packages/rocketchat-api/server/routes.coffee

@@ -103,13 +103,13 @@ RocketChat.API.v1.addRoute 'channels.create', authRequired: true,
 			return RocketChat.API.v1.failure e.name + ': ' + e.message
 
 		return RocketChat.API.v1.success
-			channel: RocketChat.models.Rooms.findOneById(id.rid)
+			channel: RocketChat.cache.Rooms.findOneById(id.rid)
 
 # List Private Groups a user has access to
 RocketChat.API.v1.addRoute 'groups.list', authRequired: true,
 	get: ->
 		roomIds = _.pluck RocketChat.models.Subscriptions.findByTypeAndUserId('p', @userId).fetch(), 'rid'
-		return { groups: RocketChat.models.Rooms.findByIds(roomIds).fetch() }
+		return { groups: RocketChat.cache.Rooms.findByIds(roomIds).fetch() }
 
 # Add All Users to Channel
 RocketChat.API.v1.addRoute 'channel.addall', authRequired: true,
@@ -123,7 +123,7 @@ RocketChat.API.v1.addRoute 'channel.addall', authRequired: true,
 			return RocketChat.API.v1.failure e.name + ': ' + e.message
 
 		return RocketChat.API.v1.success
-			channel: RocketChat.models.Rooms.findOneById(@bodyParams.roomId)
+			channel: RocketChat.cache.Rooms.findOneById(@bodyParams.roomId)
 
 # List all users
 RocketChat.API.v1.addRoute 'users.list', authRequired: true,
@@ -185,5 +185,5 @@ RocketChat.API.v1.addRoute 'groups.create', authRequired: true,
 			return RocketChat.API.v1.failure e.name + ': ' + e.message
 
 		return RocketChat.API.v1.success
-			group: RocketChat.models.Rooms.findOneById(id.rid)
+			group: RocketChat.cache.Rooms.findOneById(id.rid)
 

packages/rocketchat-channel-settings/server/functions/saveRoomName.coffee

@@ -2,7 +2,7 @@ RocketChat.saveRoomName = (rid, name) ->
 	if not Meteor.userId()
 		throw new Meteor.Error('error-invalid-user', "Invalid user", { function: 'RocketChat.saveRoomName' })
 
-	room = RocketChat.models.Rooms.findOneById rid
+	room = RocketChat.cache.Rooms.findOneById rid
 
 	if room.t not in ['c', 'p']
 		throw new Meteor.Error 'error-not-allowed', 'Not allowed', { function: 'RocketChat.saveRoomName' }
@@ -25,7 +25,7 @@ RocketChat.saveRoomName = (rid, name) ->
 		return
 
 	# avoid duplicate names
-	if RocketChat.models.Rooms.findOneByName name
+	if RocketChat.cache.Rooms.findOneByName name
 		throw new Meteor.Error 'error-duplicate-channel-name', 'A channel with name \'' + name + '\' exists', { function: 'RocketChat.saveRoomName', channel_name: name }
 
 	RocketChat.models.Rooms.setNameById rid, name

packages/rocketchat-channel-settings/server/methods/saveRoomSettings.coffee

@@ -12,7 +12,7 @@ Meteor.methods
 		if setting is 'default' and not RocketChat.authz.hasPermission(@userId, 'view-room-administration')
 			throw new Meteor.Error 'error-action-not-allowed', 'Viewing room administration is not allowed', { method: 'saveRoomSettings', action: 'Viewing_room_administration' }
 
-		room = RocketChat.models.Rooms.findOneById rid
+		room = RocketChat.cache.Rooms.findOneById rid
 		if room?
 			switch setting
 				when 'roomName'

packages/rocketchat-importer-hipchat/server.coffee

@@ -151,7 +151,7 @@ Importer.HipChat = class Importer.HipChat extends Importer.Base
 				do (channel) =>
 					Meteor.runAsUser startedByUserId, () =>
 						channel.name = channel.name.replace(/ /g, '')
-						existantRoom = RocketChat.models.Rooms.findOneByName channel.name
+						existantRoom = RocketChat.cache.Rooms.findOneByName channel.name
 						if existantRoom
 							channel.rocketId = existantRoom._id
 						else
@@ -177,7 +177,7 @@ Importer.HipChat = class Importer.HipChat extends Importer.Base
 					Meteor.runAsUser startedByUserId, () =>
 						hipchatChannel = @getHipChatChannelFromName channel
 						if hipchatChannel?.do_import
-							room = RocketChat.models.Rooms.findOneById hipchatChannel.rocketId, { fields: { usernames: 1, t: 1, name: 1 } }
+							room = RocketChat.cache.Rooms.findOneById hipchatChannel.rocketId, { fields: { usernames: 1, t: 1, name: 1 } }
 							for date, msgs of messagesObj
 								@updateRecord { 'messagesstatus': "#{channel}/#{date}.#{msgs.messages.length}" }
 								for message in msgs.messages

packages/rocketchat-importer-slack/server.coffee

@@ -157,7 +157,7 @@ Importer.Slack = class Importer.Slack extends Importer.Base
 			for channel in @channels.channels when channel.do_import
 				do (channel) =>
 					Meteor.runAsUser startedByUserId, () =>
-						existantRoom = RocketChat.models.Rooms.findOneByName channel.name
+						existantRoom = RocketChat.cache.Rooms.findOneByName channel.name
 						if existantRoom or channel.is_general
 							if channel.is_general and channel.name isnt existantRoom?.name
 								Meteor.call 'saveRoomSettings', 'GENERAL', 'roomName', channel.name
@@ -206,7 +206,7 @@ Importer.Slack = class Importer.Slack extends Importer.Base
 					Meteor.runAsUser startedByUserId, () =>
 						slackChannel = @getSlackChannelFromName channel
 						if slackChannel?.do_import
-							room = RocketChat.models.Rooms.findOneById slackChannel.rocketId, { fields: { usernames: 1, t: 1, name: 1 } }
+							room = RocketChat.cache.Rooms.findOneById slackChannel.rocketId, { fields: { usernames: 1, t: 1, name: 1 } }
 							for date, msgs of messagesObj
 								@updateRecord { 'messagesstatus': "#{channel}/#{date}.#{msgs.messages.length}" }
 								for message in msgs.messages

packages/rocketchat-integrations/server/methods/incoming/addIncomingIntegration.coffee

@@ -39,7 +39,7 @@ Meteor.methods
 
 			switch channelType
 				when '#'
-					record = RocketChat.models.Rooms.findOne
+					record = RocketChat.cache.Rooms.findOne
 						$or: [
 							{_id: channel}
 							{name: channel}

packages/rocketchat-integrations/server/methods/incoming/updateIncomingIntegration.coffee

@@ -42,7 +42,7 @@ Meteor.methods
 
 			switch channelType
 				when '#'
-					record = RocketChat.models.Rooms.findOne
+					record = RocketChat.cache.Rooms.findOne
 						$or: [
 							{_id: channel}
 							{name: channel}

packages/rocketchat-integrations/server/methods/outgoing/addOutgoingIntegration.coffee

@@ -57,7 +57,7 @@ Meteor.methods
 
 			switch channelType
 				when '#'
-					record = RocketChat.models.Rooms.findOne
+					record = RocketChat.cache.Rooms.findOne
 						$or: [
 							{_id: channel}
 							{name: channel}

packages/rocketchat-integrations/server/methods/outgoing/updateOutgoingIntegration.coffee

@@ -69,7 +69,7 @@ Meteor.methods
 
 			switch channelType
 				when '#'
-					record = RocketChat.models.Rooms.findOne
+					record = RocketChat.cache.Rooms.findOne
 						$or: [
 							{_id: channel}
 							{name: channel}

packages/rocketchat-integrations/server/processWebhookMessage.js

@@ -22,7 +22,7 @@ this.processWebhookMessage = function(messageObj, user, defaultValues) {
 
 		switch (channelType) {
 			case '#':
-				room = RocketChat.models.Rooms.findOneByIdOrName(channel);
+				room = RocketChat.cache.Rooms.findOneByIdOrName(channel);
 				if (!_.isObject(room)) {
 					throw new Meteor.Error('invalid-channel');
 				}
@@ -44,14 +44,14 @@ this.processWebhookMessage = function(messageObj, user, defaultValues) {
 					]
 				}) || {};
 				rid = [user._id, roomUser._id].sort().join('');
-				room = RocketChat.models.Rooms.findOneById({$in: [rid, channel]});
+				room = RocketChat.cache.Rooms.findOneById({$in: [rid, channel]});
 				if (!_.isObject(roomUser) && !_.isObject(room)) {
 					throw new Meteor.Error('invalid-channel');
 				}
 				if (!room) {
 					Meteor.runAsUser(user._id, function() {
 						Meteor.call('createDirectMessage', roomUser.username);
-						room = RocketChat.models.Rooms.findOneById(rid);
+						room = RocketChat.cache.Rooms.findOneById(rid);
 					});
 				}
 				break;

packages/rocketchat-internal-hubot/hubot.coffee

@@ -137,7 +137,7 @@ class InternalHubotReceiver
 	constructor: (message) ->
 		#console.log message
 		if message.u.username isnt InternalHubot.name
-			room = RocketChat.models.Rooms.findOneById message.rid
+			room = RocketChat.cache.Rooms.findOneById message.rid
 
 			if room.t is 'c'
 				console.log message

packages/rocketchat-lib/README.md

@@ -13,8 +13,8 @@ RocketChat.settings.addGroup('Settings_Group', function() {
 
     this.section('Group_Section', function() {
         this.add('Setting_Inside_Section', 'default_value', {
-            type: 'boolean', 
-            public: true, 
+            type: 'boolean',
+            public: true,
             enableQuery: { 
                 _id: 'SettingInGroup', 
                 value: true 

packages/rocketchat-lib/server/functions/Notifications.coffee

@@ -21,7 +21,7 @@ RocketChat.Notifications = new class
 			roomId = eventName.split('/')[0]
 
 			user = Meteor.users.findOne @userId, {fields: {username: 1}}
-			return RocketChat.models.Rooms.findOneByIdContainigUsername(roomId, user.username, {fields: {_id: 1}})?
+			return RocketChat.cache.Rooms.findOneByIdContainigUsername(roomId, user.username, {fields: {_id: 1}})?
 
 		@streamUser.allowRead (eventName) ->
 			userId = eventName.split('/')[0]

packages/rocketchat-lib/server/functions/deleteUser.js

@@ -4,7 +4,7 @@ RocketChat.deleteUser = function(userId) {
 
 	RocketChat.models.Messages.removeByUserId(userId); // Remove user messages
 	RocketChat.models.Subscriptions.findByUserId(userId).forEach((subscription) => {
-		let room = RocketChat.models.Rooms.findOneById(subscription.rid);
+		let room = RocketChat.cache.Rooms.findOneById(subscription.rid);
 		if (room) {
 			if (room.t !== 'c' && room.usernames.length === 1) {
 				RocketChat.models.Rooms.removeById(subscription.rid); // Remove non-channel rooms with only 1 user (the one being deleted)

packages/rocketchat-lib/server/methods/joinDefaultChannels.coffee

@@ -9,7 +9,7 @@ Meteor.methods
 
 		RocketChat.callbacks.run 'beforeJoinDefaultChannels', user
 
-		defaultRooms = RocketChat.models.Rooms.findByDefaultAndTypes(true, ['c', 'p'], {fields: {usernames: 0}}).fetch()
+		defaultRooms = RocketChat.cache.Rooms.findByDefaultAndTypes(true, ['c', 'p'], {fields: {usernames: 0}}).fetch()
 
 		defaultRooms.forEach (room) ->
 

packages/rocketchat-livechat/server/api.js

@@ -25,7 +25,7 @@ Api.addRoute('sms-incoming/:service', {
 		};
 
 		if (visitor) {
-			const rooms = RocketChat.models.Rooms.findOpenByVisitorToken(visitor.profile.token).fetch();
+			const rooms = RocketChat.cache.Rooms.findOpenByVisitorToken(visitor.profile.token).fetch();
 
 			if (rooms && rooms.length > 0) {
 				sendMessage.message.rid = rooms[0]._id;

packages/rocketchat-livechat/server/methods/closeRoom.js

@@ -4,7 +4,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-not-authorized', 'Not authorized', { method: 'livechat:closeRoom' });
 		}
 
-		const room = RocketChat.models.Rooms.findOneById(roomId);
+		const room = RocketChat.cache.Rooms.findOneById(roomId);
 
 		const user = Meteor.user();
 

packages/rocketchat-livechat/server/methods/saveSurveyFeedback.js

@@ -7,7 +7,7 @@ Meteor.methods({
 		check(formData, [Match.ObjectIncluding({ name: String, value: String })]);
 
 		const visitor = RocketChat.models.Users.getVisitorByToken(visitorToken);
-		const room = RocketChat.models.Rooms.findOneById(visitorRoom);
+		const room = RocketChat.cache.Rooms.findOneById(visitorRoom);
 
 		if (visitor !== undefined && room !== undefined && room.v !== undefined && visitor.profile !== undefined && room.v.token === visitor.profile.token) {
 			const updateData = {};

packages/rocketchat-livechat/server/publications/visitorInfo.js

@@ -7,7 +7,7 @@ Meteor.publish('livechat:visitorInfo', function({ rid: roomId }) {
 		return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:visitorInfo' }));
 	}
 
-	var room = RocketChat.models.Rooms.findOneById(roomId);
+	var room = RocketChat.cache.Rooms.findOneById(roomId);
 
 	if (room && room.v && room.v._id) {
 		return RocketChat.models.Users.findById(room.v._id);

packages/rocketchat-livechat/server/publications/visitorPageVisited.js

@@ -7,7 +7,7 @@ Meteor.publish('livechat:visitorPageVisited', function({ rid: roomId }) {
 		return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:visitorPageVisited' }));
 	}
 
-	var room = RocketChat.models.Rooms.findOneById(roomId);
+	var room = RocketChat.cache.Rooms.findOneById(roomId);
 
 	if (room && room.v && room.v.token) {
 		return RocketChat.models.LivechatPageVisited.findByToken(room.v.token);

packages/rocketchat-mentions/server.coffee

@@ -17,7 +17,7 @@ class MentionsServer
 				if mention is 'all'
 					messageMaxAll = RocketChat.settings.get('Message_MaxAll')
 					if messageMaxAll > 0
-						allChannel = RocketChat.models.Rooms.findOneById message.rid
+						allChannel = RocketChat.cache.Rooms.findOneById message.rid
 						if allChannel.usernames.length <= messageMaxAll
 							verifiedMention =
 								_id: mention
@@ -42,7 +42,7 @@ class MentionsServer
 			channels = _.unique channels
 			verifiedChannels = []
 			channels.forEach (mention) ->
-				verifiedChannel = RocketChat.models.Rooms.findOneByNameAndType(mention, 'c', { fields: {_id: 1, name: 1 } })
+				verifiedChannel = RocketChat.cache.Rooms.findOneByNameAndType(mention, 'c', { fields: {_id: 1, name: 1 } })
 				verifiedChannels.push verifiedChannel if verifiedChannel?
 
 			if verifiedChannels.length isnt 0

packages/rocketchat-message-pin/server/pinMessage.coffee

@@ -6,7 +6,7 @@ Meteor.methods
 		if not RocketChat.settings.get 'Message_AllowPinning'
 			throw new Meteor.Error 'error-action-not-allowed', 'Message pinning not allowed', { method: 'pinMessage', action: 'Message_pinning' }
 
-		room = RocketChat.models.Rooms.findOneById(message.rid)
+		room = RocketChat.cache.Rooms.findOneById(message.rid)
 
 		if Array.isArray(room.usernames) && room.usernames.indexOf(Meteor.user().username) is -1
 			return false
@@ -42,7 +42,7 @@ Meteor.methods
 		if not RocketChat.settings.get 'Message_AllowPinning'
 			throw new Meteor.Error 'error-action-not-allowed', 'Message pinning not allowed', { method: 'unpinMessage', action: 'Message_pinning' }
 
-		room = RocketChat.models.Rooms.findOneById(message.rid)
+		room = RocketChat.cache.Rooms.findOneById(message.rid)
 
 		if Array.isArray(room.usernames) && room.usernames.indexOf(Meteor.user().username) is -1
 			return false

packages/rocketchat-message-star/server/starMessage.coffee

@@ -6,7 +6,7 @@ Meteor.methods
 		if not RocketChat.settings.get 'Message_AllowStarring'
 			throw new Meteor.Error 'error-action-not-allowed', 'Message starring not allowed', { method: 'pinMessage', action: 'Message_starring' }
 
-		room = RocketChat.models.Rooms.findOneById(message.rid)
+		room = RocketChat.cache.Rooms.findOneById(message.rid)
 
 		if Array.isArray(room.usernames) && room.usernames.indexOf(Meteor.user().username) is -1
 			return false

packages/rocketchat-slackbridge/slackbridge.js

@@ -75,7 +75,7 @@ class SlackBridge {
 	}
 
 	findChannel(channelId) {
-		return RocketChat.models.Rooms.findOneByImportId(channelId);
+		return RocketChat.cache.Rooms.findOneByImportId(channelId);
 	}
 
 	addChannel(channelId, hasRetried = false) {
@@ -89,7 +89,7 @@ class SlackBridge {
 		}
 		if (data && data.data && data.data.ok === true) {
 			let channelData = isGroup ? data.data.group : data.data.channel;
-			let existingRoom = RocketChat.models.Rooms.findOneByName(channelData.name);
+			let existingRoom = RocketChat.cache.Rooms.findOneByName(channelData.name);
 			if (existingRoom || channelData.is_general) {
 				if (channelData.is_general && channelData.name !== (existingRoom && existingRoom.name)) {
 					Meteor.call('saveRoomSettings', 'GENERAL', 'roomName', channelData.name);
@@ -143,7 +143,7 @@ class SlackBridge {
 				}
 				RocketChat.models.Rooms.update({ _id: channelData.rocketId }, { $set: roomUpdate, $addToSet: { importIds: channelData.id } });
 			}
-			return RocketChat.models.Rooms.findOneById(channelData.rocketId);
+			return RocketChat.cache.Rooms.findOneById(channelData.rocketId);
 		}
 
 		return;

packages/rocketchat-slashcommands-archiveroom/server.js

@@ -5,11 +5,11 @@ function Archive(command, params, item) {
 	}
 	channel = params.trim();
 	if (channel === '') {
-		room = RocketChat.models.Rooms.findOneById(item.rid)
+		room = RocketChat.cache.Rooms.findOneById(item.rid)
 		channel = room.name;
 	} else {
 		channel = channel.replace('#', '');
-		room = RocketChat.models.Rooms.findOneByName(channel);
+		room = RocketChat.cache.Rooms.findOneByName(channel);
 	}
 	user = Meteor.users.findOne(Meteor.userId());
 

packages/rocketchat-slashcommands-create/server.js

@@ -9,7 +9,7 @@ function Create(command, params, item) {
 	}
 
 	user = Meteor.users.findOne(Meteor.userId());
-	room = RocketChat.models.Rooms.findOneByName(channel);
+	room = RocketChat.cache.Rooms.findOneByName(channel);
 	if (room != null) {
 		RocketChat.Notifications.notifyUser(Meteor.userId(), 'message', {
 			_id: Random.id(),

packages/rocketchat-slashcommands-invite/server.coffee

@@ -28,7 +28,7 @@ class Invite
 			return
 
 		# cancel if the user is already in this room
-		if RocketChat.models.Rooms.findOneByIdContainigUsername(item.rid, user.username)?
+		if RocketChat.cache.Rooms.findOneByIdContainigUsername(item.rid, user.username)?
 			RocketChat.Notifications.notifyUser Meteor.userId(), 'message', {
 				_id: Random.id()
 				rid: item.rid

packages/rocketchat-slashcommands-join/server.coffee

@@ -15,7 +15,7 @@ class Join
 		channel = channel.replace('#', '')
 
 		user = Meteor.users.findOne Meteor.userId()
-		room = RocketChat.models.Rooms.findOneByNameAndTypeNotContainigUsername(channel, 'c', user.username)
+		room = RocketChat.cache.Rooms.findOneByNameAndTypeNotContainigUsername(channel, 'c', user.username)
 
 		if not room?
 			RocketChat.Notifications.notifyUser Meteor.userId(), 'message', {

packages/rocketchat-slashcommands-kick/server.coffee

@@ -15,7 +15,7 @@ class Kick
 
 		user = Meteor.users.findOne Meteor.userId()
 		kickedUser = RocketChat.models.Users.findOneByUsername username
-		room = RocketChat.models.Rooms.findOneById item.rid
+		room = RocketChat.cache.Rooms.findOneById item.rid
 
 		if not kickedUser?
 			RocketChat.Notifications.notifyUser Meteor.userId(), 'message', {

packages/rocketchat-slashcommands-mute/server/mute.coffee

@@ -15,7 +15,7 @@ class Mute
 
 		user = Meteor.users.findOne Meteor.userId()
 		mutedUser = RocketChat.models.Users.findOneByUsername username
-		room = RocketChat.models.Rooms.findOneById item.rid
+		room = RocketChat.cache.Rooms.findOneById item.rid
 
 		if not mutedUser?
 			RocketChat.Notifications.notifyUser Meteor.userId(), 'message', {

packages/rocketchat-slashcommands-mute/server/unmute.coffee

@@ -15,7 +15,7 @@ class Unmute
 
 		user = Meteor.users.findOne Meteor.userId()
 		unmutedUser = RocketChat.models.Users.findOneByUsername username
-		room = RocketChat.models.Rooms.findOneById item.rid
+		room = RocketChat.cache.Rooms.findOneById item.rid
 
 		if not unmutedUser?
 			RocketChat.Notifications.notifyUser Meteor.userId(), 'message', {

packages/rocketchat-slashcommands-unarchiveroom/server.js

@@ -5,11 +5,11 @@ function Unarchive(command, params, item) {
 	}
 	channel = params.trim();
 	if (channel === '') {
-		room = RocketChat.models.Rooms.findOneById(item.rid)
+		room = RocketChat.cache.Rooms.findOneById(item.rid)
 		channel = room.name;
 	} else {
 		channel = channel.replace('#', '');
-		room = RocketChat.models.Rooms.findOneByName(channel);
+		room = RocketChat.cache.Rooms.findOneByName(channel);
 	}
 	user = Meteor.users.findOne(Meteor.userId());
 

packages/rocketchat-statistics/server/functions/get.coffee

@@ -17,10 +17,10 @@ RocketChat.statistics.get = ->
 	statistics.offlineUsers = statistics.totalUsers - statistics.onlineUsers - statistics.awayUsers
 
 	# Room statistics
-	statistics.totalRooms = RocketChat.models.Rooms.find().count()
-	statistics.totalChannels = RocketChat.models.Rooms.findByType('c').count()
-	statistics.totalPrivateGroups = RocketChat.models.Rooms.findByType('p').count()
-	statistics.totalDirect = RocketChat.models.Rooms.findByType('d').count()
+	statistics.totalRooms = RocketChat.cache.Rooms.find().count()
+	statistics.totalChannels = RocketChat.cache.Rooms.findByType('c').count()
+	statistics.totalPrivateGroups = RocketChat.cache.Rooms.findByType('p').count()
+	statistics.totalDirect = RocketChat.cache.Rooms.findByType('d').count()
 
 	# Message statistics
 	statistics.totalMessages = RocketChat.models.Messages.find().count()

packages/rocketchat-videobridge/server/methods/jitsiSetTimeout.js

@@ -1,7 +1,7 @@
 
 Meteor.methods({
 	'jitsi:updateTimeout': (rid) => {
-		let room = RocketChat.models.Rooms.findOneById(rid);
+		let room = RocketChat.cache.Rooms.findOneById(rid);
 		let currentTime = new Date().getTime();
 
 		let jitsiTimeout = new Date(room.jitsiTimeout || currentTime).getTime();

server/methods/addAllUserToRoom.js

@@ -8,7 +8,7 @@ Meteor.methods({
 					method: 'addAllToRoom'
 				});
 			}
-			room = RocketChat.models.Rooms.findOneById(rid);
+			room = RocketChat.cache.Rooms.findOneById(rid);
 			if (room == null) {
 				throw new Meteor.Error('error-invalid-room', 'Invalid room', {
 					method: 'addAllToRoom'

server/methods/addUserToRoom.coffee

@@ -10,7 +10,7 @@ Meteor.methods
 		unless Match.test data?.username, String
 			throw new Meteor.Error 'error-invalid-username', 'Invalid username', { method: 'addUserToRoom' }
 
-		room = RocketChat.models.Rooms.findOneById data.rid
+		room = RocketChat.cache.Rooms.findOneById data.rid
 
 		if room.usernames.indexOf(Meteor.user().username) is -1
 			throw new Meteor.Error 'error-not-allowed', 'Not allowed', { method: 'addUserToRoom' }

server/methods/archiveRoom.coffee

@@ -3,7 +3,7 @@ Meteor.methods
 		if not Meteor.userId()
 			throw new Meteor.Error 'error-invalid-user', 'Invalid user', { method: 'archiveRoom' }
 
-		room = RocketChat.models.Rooms.findOneById rid
+		room = RocketChat.cache.Rooms.findOneById rid
 
 		unless room
 			throw new Meteor.Error 'error-invalid-room', 'Invalid room', { method: 'archiveRoom' }

server/methods/canAccessRoom.coffee

@@ -8,7 +8,7 @@ Meteor.methods
 		unless rid
 			throw new Meteor.Error 'error-invalid-room', 'Invalid room', { method: 'canAccessRoom' }
 
-		room = RocketChat.models.Rooms.findOneById rid, { fields: { usernames: 1, t: 1, name: 1, muted: 1, sms: 1, v: 1 } }
+		room = RocketChat.cache.Rooms.findOneById rid, { fields: { usernames: 1, t: 1, name: 1, muted: 1, sms: 1, v: 1 } }
 
 		if room
 			if RocketChat.authz.canAccessRoom.call(this, room, user)

server/methods/channelsList.coffee

@@ -30,8 +30,8 @@ Meteor.methods
 
 		if roomTypes.length
 			if filter
-				return { channels: RocketChat.models.Rooms.findByNameContainingTypesWithUsername(filter, roomTypes, options).fetch() }
+				return { channels: RocketChat.cache.Rooms.findByNameContainingTypesWithUsername(filter, roomTypes, options).fetch() }
 			else
-				return { channels: RocketChat.models.Rooms.findContainingTypesWithUsername(roomTypes, options).fetch() }
+				return { channels: RocketChat.cache.Rooms.findContainingTypesWithUsername(roomTypes, options).fetch() }
 		else
 			return { channels: [] }

server/methods/createChannel.coffee

@@ -20,8 +20,8 @@ Meteor.methods
 		members.push user.username if user.username not in members
 
 		# avoid duplicate names
-		if RocketChat.models.Rooms.findOneByName name
-			if RocketChat.models.Rooms.findOneByName(name).archived
+		if RocketChat.cache.Rooms.findOneByName name
+			if RocketChat.cache.Rooms.findOneByName(name).archived
 				throw new Meteor.Error 'error-archived-duplicate-name', "There's an archived channel with name " + name, { method: 'createChannel', room_name: name }
 			else
 				throw new Meteor.Error 'error-duplicate-channel-name', "A channel with name '" + name + "' exists", { method: 'createChannel', room_name: name }

server/methods/createPrivateGroup.coffee

@@ -23,8 +23,8 @@ Meteor.methods
 		# name = s.slugify name
 
 		# avoid duplicate names
-		if RocketChat.models.Rooms.findOneByName name
-			if RocketChat.models.Rooms.findOneByName(name).archived
+		if RocketChat.cache.Rooms.findOneByName name
+			if RocketChat.cache.Rooms.findOneByName(name).archived
 				throw new Meteor.Error 'error-archived-duplicate-name', "There's an archived channel with name " + name, { method: 'createPrivateGroup', room_name: name }
 			else
 				throw new Meteor.Error 'error-duplicate-channel-name', "A channel with name '" + name + "' exists", { method: 'createPrivateGroup', room_name: name }

server/methods/eraseRoom.coffee

@@ -5,7 +5,7 @@ Meteor.methods
 
 		fromId = Meteor.userId()
 
-		roomType = RocketChat.models.Rooms.findOneById(rid)?.t
+		roomType = RocketChat.cache.Rooms.findOneById(rid)?.t
 
 		if RocketChat.authz.hasPermission( fromId, "delete-#{roomType}", rid )
 			# ChatRoom.update({ _id: rid}, {'$pull': { userWatching: Meteor.userId(), userIn: Meteor.userId() }})

server/methods/getRoomIdByNameOrId.coffee

@@ -3,7 +3,7 @@ Meteor.methods
 		if not Meteor.userId()
 			throw new Meteor.Error 'error-invalid-user', 'Invalid user', { method: 'getRoomIdByNameOrId' }
 
-		room = RocketChat.models.Rooms.findOneById(rid) or RocketChat.models.Rooms.findOneByName(rid)
+		room = RocketChat.cache.Rooms.findOneById(rid) or RocketChat.cache.Rooms.findOneByName(rid)
 
 		if not room?
 			throw new Meteor.Error 'error-not-allowed', 'Not allowed', { method: 'getRoomIdByNameOrId' }

server/methods/getTotalChannels.coffee

@@ -3,4 +3,4 @@ Meteor.methods
 		if not Meteor.userId()
 			throw new Meteor.Error 'error-invalid-user', 'Invalid user', { method: 'getTotalChannels' }
 
-		return RocketChat.models.Rooms.find({ t: 'c' }).count()
+		return RocketChat.cache.Rooms.find({ t: 'c' }).count()

server/methods/joinRoom.coffee

@@ -3,7 +3,7 @@ Meteor.methods
 		if not Meteor.userId()
 			throw new Meteor.Error 'error-invalid-user', 'Invalid user', { method: 'joinRoom' }
 
-		room = RocketChat.models.Rooms.findOneById rid
+		room = RocketChat.cache.Rooms.findOneById rid
 
 		if not room?
 			throw new Meteor.Error 'error-invalid-room', 'Invalid room', { method: 'joinRoom' }

server/methods/leaveRoom.coffee

@@ -6,7 +6,7 @@ Meteor.methods
 		this.unblock()
 
 		fromId = Meteor.userId()
-		room = RocketChat.models.Rooms.findOneById rid
+		room = RocketChat.cache.Rooms.findOneById rid
 		user = Meteor.user()
 
 		# If user is room owner, check if there are other owners. If there isn't anyone else, warn user to set a new owner.

server/methods/muteUserInRoom.coffee

@@ -9,7 +9,7 @@ Meteor.methods
 		unless RocketChat.authz.hasPermission(fromId, 'mute-user', data.rid)
 			throw new Meteor.Error 'error-not-allowed', 'Not allowed', { method: 'muteUserInRoom' }
 
-		room = RocketChat.models.Rooms.findOneById data.rid
+		room = RocketChat.cache.Rooms.findOneById data.rid
 		if not room
 			throw new Meteor.Error 'error-invalid-room', 'Invalid room', { method: 'muteUserInRoom' }
 

server/methods/removeUserFromRoom.coffee

@@ -9,7 +9,7 @@ Meteor.methods
 		unless RocketChat.authz.hasPermission(fromId, 'remove-user', data.rid)
 			throw new Meteor.Error 'error-not-allowed', 'Not allowed', { method: 'removeUserFromRoom' }
 
-		room = RocketChat.models.Rooms.findOneById data.rid
+		room = RocketChat.cache.Rooms.findOneById data.rid
 
 		if data.username not in (room?.usernames or [])
 			throw new Meteor.Error 'error-user-not-in-room', 'User is not in this room', { method: 'removeUserFromRoom' }

server/methods/unarchiveRoom.coffee

@@ -3,7 +3,7 @@ Meteor.methods
 		if not Meteor.userId()
 			throw new Meteor.Error 'error-invalid-user', 'Invalid user', { method: 'unarchiveRoom' }
 
-		room = RocketChat.models.Rooms.findOneById rid
+		room = RocketChat.cache.Rooms.findOneById rid
 
 		unless room
 			throw new Meteor.Error 'error-invalid-room', 'Invalid room', { method: 'unarchiveRoom' }

server/methods/unmuteUserInRoom.coffee

@@ -6,7 +6,7 @@ Meteor.methods
 		unless RocketChat.authz.hasPermission(fromId, 'mute-user', data.rid)
 			throw new Meteor.Error 'error-not-allowed', 'Not allowed', { method: 'unmuteUserInRoom' }
 
-		room = RocketChat.models.Rooms.findOneById data.rid
+		room = RocketChat.cache.Rooms.findOneById data.rid
 		if not room
 			throw new Meteor.Error 'error-invalid-room', 'Invalid room', { method: 'unmuteUserInRoom' }
 

server/methods/updateMessage.coffee

@@ -46,7 +46,7 @@ Meteor.methods
 		,
 			$set: message
 
-		room = RocketChat.models.Rooms.findOneById message.rid
+		room = RocketChat.cache.Rooms.findOneById message.rid
 
 		Meteor.defer ->
 			RocketChat.callbacks.run 'afterSaveMessage', RocketChat.models.Messages.findOneById(tempid), room

server/publications/privateHistory.coffee

@@ -2,7 +2,7 @@ Meteor.publish 'privateHistory', ->
 	unless this.userId
 		return this.ready()
 
-	RocketChat.models.Rooms.findByContainigUsername RocketChat.models.Users.findOneById(this.userId).username,
+	RocketChat.cache.Rooms.findByContainigUsername RocketChat.models.Users.findOneById(this.userId).username,
 		fields:
 			t: 1
 			name: 1

server/restapi/restapi.coffee

@@ -15,7 +15,7 @@ Api.addRoute 'version', authRequired: false,
 
 Api.addRoute 'publicRooms', authRequired: true,
 	get: ->
-		rooms = RocketChat.models.Rooms.findByType('c', { sort: { msgs:-1 } }).fetch()
+		rooms = RocketChat.cache.Rooms.findByType('c', { sort: { msgs:-1 } }).fetch()
 		status: 'success', rooms: rooms
 
 ###
@@ -23,7 +23,7 @@ Api.addRoute 'publicRooms', authRequired: true,
 ###
 Api.addRoute 'joinedRooms', authRequired: true,
 	get: ->
-		rooms = RocketChat.models.Rooms.findByContainigUsername(@user.username).fetch()
+		rooms = RocketChat.cache.Rooms.findByContainigUsername(@user.username).fetch()
 		status: 'success', rooms: rooms
 
 # join a room
@@ -83,7 +83,7 @@ Api.addRoute 'rooms/:id/send', authRequired: true,
 # get list of online users in a room
 Api.addRoute 'rooms/:id/online', authRequired: true,
 	get: ->
-		room = RocketChat.models.Rooms.findOneById @urlParams.id
+		room = RocketChat.cache.Rooms.findOneById @urlParams.id
 		online = RocketChat.models.Users.findUsersNotOffline(fields:
 			username: 1
 			status: 1).fetch()

server/startup/initialData.coffee

@@ -1,7 +1,7 @@
 Meteor.startup ->
 	Meteor.defer ->
 
-		if not RocketChat.models.Rooms.findOneById('GENERAL')?
+		if not RocketChat.cache.Rooms.findOneById('GENERAL')?
 			RocketChat.models.Rooms.createWithIdTypeAndName 'GENERAL', 'c', 'general',
 				default: true