[BREAK] Remove cache layer and internal calculated property room.usernames

packages/rocketchat-action-links/both/lib/actionLinks.js

@@ -5,7 +5,8 @@ RocketChat.actionLinks = {
 		RocketChat.actionLinks.actions[name] = funct;
 	},
 	getMessage(name, messageId) {
-		if (!Meteor.userId()) {
+		const userId = Meteor.userId();
+		if (!userId) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { function: 'actionLinks.getMessage' });
 		}
 
@@ -14,8 +15,11 @@ RocketChat.actionLinks = {
 			throw new Meteor.Error('error-invalid-message', 'Invalid message', { function: 'actionLinks.getMessage' });
 		}
 
-		const room = RocketChat.models.Rooms.findOne({ _id: message.rid });
-		if (Array.isArray(room.usernames) && room.usernames.indexOf(Meteor.user().username) === -1) {
+		const subscription = RocketChat.models.Subscriptions.findOne({
+			rid: message.rid,
+			'u._id': userId
+		});
+		if (!subscription) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { function: 'actionLinks.getMessage' });
 		}
 

packages/rocketchat-api/server/api.js

@@ -9,10 +9,7 @@ class API extends Restivus {
 		this.fieldSeparator = '.';
 		this.defaultFieldsToExclude = {
 			joinCode: 0,
-			$loki: 0,
-			meta: 0,
 			members: 0,
-			usernames: 0, // Please use the `channel/dm/group.members` endpoint. This is disabled for performance reasons
 			importIds: 0
 		};
 		this.limitedUserFieldsToExclude = {
@@ -85,13 +82,14 @@ class API extends Restivus {
 		return result;
 	}
 
-	failure(result, errorType) {
+	failure(result, errorType, stack) {
 		if (_.isObject(result)) {
 			result.success = false;
 		} else {
 			result = {
 				success: false,
-				error: result
+				error: result,
+				stack
 			};
 
 			if (errorType) {

packages/rocketchat-api/server/v1/channels.js

@@ -1,15 +1,12 @@
 import _ from 'underscore';
 
 //Returns the channel IF found otherwise it will return the failure of why it didn't. Check the `statusCode` property
-function findChannelByIdOrName({ params, checkedArchived = true, returnUsernames = false }) {
+function findChannelByIdOrName({ params, checkedArchived = true }) {
 	if ((!params.roomId || !params.roomId.trim()) && (!params.roomName || !params.roomName.trim())) {
 		throw new Meteor.Error('error-roomid-param-not-provided', 'The parameter "roomId" or "roomName" is required');
 	}
 
 	const fields = { ...RocketChat.API.v1.defaultFieldsToExclude };
-	if (returnUsernames) {
-		delete fields.usernames;
-	}
 
 	let room;
 	if (params.roomId) {
@@ -143,7 +140,7 @@ RocketChat.API.v1.addRoute('channels.close', { authRequired: true }, {
 RocketChat.API.v1.addRoute('channels.counters', { authRequired: true }, {
 	get() {
 		const access = RocketChat.authz.hasPermission(this.userId, 'view-room-administration');
-		const ruserId = this.requestParams().userId;
+		const userId = this.requestParams().userId;
 		let user = this.userId;
 		let unreads = null;
 		let userMentions = null;
@@ -152,34 +149,33 @@ RocketChat.API.v1.addRoute('channels.counters', { authRequired: true }, {
 		let msgs = null;
 		let latest = null;
 		let members = null;
-		let lm = null;
 
-		if (ruserId) {
+		if (userId) {
 			if (!access) {
 				return RocketChat.API.v1.unauthorized();
 			}
-			user = ruserId;
+			user = userId;
 		}
 		const room = findChannelByIdOrName({
 			params: this.requestParams(),
 			returnUsernames: true
 		});
-		const channel = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(room._id, user);
-		lm = channel._room.lm ? channel._room.lm : channel._room._updatedAt;
+		const subscription = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(room._id, user);
+		const lm = room.lm ? room.lm : room._updatedAt;
 
-		if (typeof channel !== 'undefined' && channel.open) {
-			if (channel.ls) {
-				unreads = RocketChat.models.Messages.countVisibleByRoomIdBetweenTimestampsInclusive(channel.rid, channel.ls, lm);
-				unreadsFrom = channel.ls;
+		if (typeof subscription !== 'undefined' && subscription.open) {
+			if (subscription.ls) {
+				unreads = RocketChat.models.Messages.countVisibleByRoomIdBetweenTimestampsInclusive(subscription.rid, subscription.ls, lm);
+				unreadsFrom = subscription.ls;
 			}
-			userMentions = channel.userMentions;
+			userMentions = subscription.userMentions;
 			joined = true;
 		}
 
 		if (access || joined) {
 			msgs = room.msgs;
 			latest = lm;
-			members = room.usernames.length;
+			members = room.usersCount;
 		}
 
 		return RocketChat.API.v1.success({
@@ -494,28 +490,32 @@ RocketChat.API.v1.addRoute('channels.list', { authRequired: true }, {
 			const { sort, fields, query } = this.parseJsonQuery();
 			const hasPermissionToSeeAllPublicChannels = RocketChat.authz.hasPermission(this.userId, 'view-c-room');
 
-			const ourQuery = Object.assign({}, query, { t: 'c' });
+			const ourQuery = { ...query, t: 'c' };
 
-			if (RocketChat.authz.hasPermission(this.userId, 'view-joined-room') && !hasPermissionToSeeAllPublicChannels) {
-				ourQuery.usernames = {
-					$in: [this.user.username]
-				};
-			} else if (!hasPermissionToSeeAllPublicChannels) {
-				return RocketChat.API.v1.unauthorized();
+			if (!hasPermissionToSeeAllPublicChannels) {
+				if (!RocketChat.authz.hasPermission(this.userId, 'view-joined-room')) {
+					return RocketChat.API.v1.unauthorized();
+				}
+				const roomIds = RocketChat.models.Subscriptions.findByUserIdAndType(this.userId, 'c', { fields: { rid: 1 } }).fetch().map(s => s.rid);
+				ourQuery._id = { $in: roomIds };
 			}
 
-			const rooms = RocketChat.models.Rooms.find(ourQuery, {
+			const cursor = RocketChat.models.Rooms.find(ourQuery, {
 				sort: sort ? sort : { name: 1 },
 				skip: offset,
 				limit: count,
 				fields
-			}).fetch();
+			});
+
+			const total = cursor.count();
+
+			const rooms = cursor.fetch();
 
 			return RocketChat.API.v1.success({
 				channels: rooms,
 				count: rooms.length,
 				offset,
-				total: RocketChat.models.Rooms.find(ourQuery).count()
+				total
 			});
 		}
 	}
@@ -524,22 +524,19 @@ RocketChat.API.v1.addRoute('channels.list', { authRequired: true }, {
 RocketChat.API.v1.addRoute('channels.list.joined', { authRequired: true }, {
 	get() {
 		const { offset, count } = this.getPaginationItems();
-		const { sort, fields, query } = this.parseJsonQuery();
-		const ourQuery = Object.assign({}, query, {
-			t: 'c',
-			'u._id': this.userId
-		});
-
-		let rooms = _.pluck(RocketChat.models.Subscriptions.find(ourQuery).fetch(), '_room');
-		const totalCount = rooms.length;
+		const { sort, fields } = this.parseJsonQuery();
 
-		rooms = RocketChat.models.Rooms.processQueryOptionsOnResult(rooms, {
+		// TODO: CACHE: Add Breacking notice since we removed the query param
+		const cursor = RocketChat.models.Rooms.findBySubscriptionTypeAndUserId('c', this.userId, {
 			sort: sort ? sort : { name: 1 },
 			skip: offset,
 			limit: count,
 			fields
 		});
 
+		const totalCount = cursor.count();
+		const rooms = cursor.fetch();
+
 		return RocketChat.API.v1.success({
 			channels: rooms,
 			offset,
@@ -553,38 +550,37 @@ RocketChat.API.v1.addRoute('channels.members', { authRequired: true }, {
 	get() {
 		const findResult = findChannelByIdOrName({
 			params: this.requestParams(),
-			checkedArchived: false,
-			returnUsernames: true
+			checkedArchived: false
 		});
 
 		if (findResult.broadcast && !RocketChat.authz.hasPermission(this.userId, 'view-broadcast-member-list')) {
 			return RocketChat.API.v1.unauthorized();
 		}
 
 		const { offset, count } = this.getPaginationItems();
-		const { sort } = this.parseJsonQuery();
-
-		const shouldBeOrderedDesc = Match.test(sort, Object) && Match.test(sort.username, Number) && sort.username === -1;
+		const { sort = {} } = this.parseJsonQuery();
 
-		let members = RocketChat.models.Rooms.processQueryOptionsOnResult(Array.from(findResult.usernames).sort(), {
+		const subscriptions = RocketChat.models.Subscriptions.findByRoomId(findResult._id, {
+			fields: { 'u._id': 1 },
+			sort: { 'u.username': sort.username != null ? sort.username : 1 },
 			skip: offset,
 			limit: count
 		});
 
-		if (shouldBeOrderedDesc) {
-			members = members.reverse();
-		}
+		const total = subscriptions.count();
+
+		const members = subscriptions.fetch().map(s => s.u && s.u._id);
 
-		const users = RocketChat.models.Users.find({ username: { $in: members } }, {
+		const users = RocketChat.models.Users.find({ _id: { $in: members } }, {
 			fields: { _id: 1, username: 1, name: 1, status: 1, utcOffset: 1 },
-			sort: sort ? sort : { username: 1 }
+			sort: { username:  sort.username != null ? sort.username : 1 }
 		}).fetch();
 
 		return RocketChat.API.v1.success({
 			members: users,
 			count: users.length,
 			offset,
-			total: findResult.usernames.length
+			total
 		});
 	}
 });
@@ -593,36 +589,67 @@ RocketChat.API.v1.addRoute('channels.messages', { authRequired: true }, {
 	get() {
 		const findResult = findChannelByIdOrName({
 			params: this.requestParams(),
-			checkedArchived: false,
-			returnUsernames: true
+			checkedArchived: false
 		});
 		const { offset, count } = this.getPaginationItems();
 		const { sort, fields, query } = this.parseJsonQuery();
 
 		const ourQuery = Object.assign({}, query, { rid: findResult._id });
 
 		//Special check for the permissions
-		if (RocketChat.authz.hasPermission(this.userId, 'view-joined-room') && !findResult.usernames.includes(this.user.username)) {
+		if (RocketChat.authz.hasPermission(this.userId, 'view-joined-room') && !RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(findResult._id, this.userId, { fields: { _id: 1 } })) {
 			return RocketChat.API.v1.unauthorized();
-		} else if (!RocketChat.authz.hasPermission(this.userId, 'view-c-room')) {
+		}
+		if (!RocketChat.authz.hasPermission(this.userId, 'view-c-room')) {
 			return RocketChat.API.v1.unauthorized();
 		}
 
-		const messages = RocketChat.models.Messages.find(ourQuery, {
+		const cursor = RocketChat.models.Messages.find(ourQuery, {
 			sort: sort ? sort : { ts: -1 },
 			skip: offset,
 			limit: count,
 			fields
-		}).fetch();
+		});
+
+		const total = cursor.count();
+		const messages = cursor.fetch();
 
 		return RocketChat.API.v1.success({
 			messages,
 			count: messages.length,
 			offset,
-			total: RocketChat.models.Messages.find(ourQuery).count()
+			total
 		});
 	}
 });
+// TODO: CACHE: I dont like this method( functionality and how we implemented ) its very expensive
+// TODO check if this code is better or not
+// RocketChat.API.v1.addRoute('channels.online', { authRequired: true }, {
+// 	get() {
+// 		const { query } = this.parseJsonQuery();
+// 		const ourQuery = Object.assign({}, query, { t: 'c' });
+
+// 		const room = RocketChat.models.Rooms.findOne(ourQuery);
+
+// 		if (room == null) {
+// 			return RocketChat.API.v1.failure('Channel does not exists');
+// 		}
+
+// 		const ids = RocketChat.models.Subscriptions.find({ rid: room._id }, { fields: { 'u._id': 1 } }).fetch().map(sub => sub.u._id);
+
+// 		const online = RocketChat.models.Users.find({
+// 			username: { $exists: 1 },
+// 			_id: { $in: ids },
+// 			status: { $in: ['online', 'away', 'busy'] }
+// 		}, {
+// 			fields: { username: 1 }
+// 		}).fetch();
+
+// 		return RocketChat.API.v1.success({
+// 			online
+// 		});
+// 	}
+// });
 
 RocketChat.API.v1.addRoute('channels.online', { authRequired: true }, {
 	get() {
@@ -636,14 +663,13 @@ RocketChat.API.v1.addRoute('channels.online', { authRequired: true }, {
 		}
 
 		const online = RocketChat.models.Users.findUsersNotOffline({
-			fields: {
-				username: 1
-			}
+			fields: { username: 1 }
 		}).fetch();
 
 		const onlineInRoom = [];
 		online.forEach(user => {
-			if (room.usernames.indexOf(user.username) !== -1) {
+			const subscription = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(root._id, user._id, { fields: { _id: 1 } });
+			if (subscription) {
 				onlineInRoom.push({
 					_id: user._id,
 					username: user.username