Revert "[NEW][ENTERPRISE] Hide message history for new channel members (

#20253)" (#20461) This reverts commit 97311da.
RocketChat · Jan 29, 2021 · 2b5831b · 2b5831b
1 parent 6852fab
commit 2b5831b
Show file tree

Hide file tree

Showing 50 changed files with 293 additions and 1,227 deletions.
diff --git a/app/api/server/lib/messages.js b/app/api/server/lib/messages.js
@@ -1,7 +1,6 @@
 import { canAccessRoomAsync } from '../../../authorization/server/functions/canAccessRoom';
 import { Rooms, Messages, Users } from '../../../models/server/raw';
 import { getValue } from '../../../settings/server/raw';
-import { Message } from '../../../../server/sdk';
 
 export async function findMentionedMessages({ uid, roomId, pagination: { offset, count, sort } }) {
 	const room = await Rooms.findOneById(roomId);
@@ -13,16 +12,16 @@ export async function findMentionedMessages({ uid, roomId, pagination: { offset,
 		throw new Error('invalid-user');
 	}
 
-	const { records: messages, total } = await Message.get(uid, {
-		rid: roomId,
-		mentionsUsername: user.username,
-		queryOptions: {
-			sort: sort || { ts: -1 },
-			skip: offset,
-			limit: count,
-		},
+	const cursor = await Messages.findVisibleByMentionAndRoomId(user.username, roomId, {
+		sort: sort || { ts: -1 },
+		skip: offset,
+		limit: count,
 	});
 
+	const total = await cursor.count();
+
+	const messages = await cursor.toArray();
+
 	return {
 		messages,
 		count: messages.length,
@@ -99,13 +98,15 @@ export async function findSnippetedMessages({ uid, roomId, pagination: { offset,
 		throw new Error('error-not-allowed');
 	}
 
-	const queryOptions = {
+	const cursor = await Messages.findSnippetedByRoom(roomId, {
 		sort: sort || { ts: -1 },
 		skip: offset,
 		limit: count,
-	};
+	});
 
-	const { records: messages, total } = await Message.get(uid, { snippeted: true, queryOptions });
+	const total = await cursor.count();
+
+	const messages = await cursor.toArray();
 
 	return {
 		messages,
@@ -122,16 +123,16 @@ export async function findDiscussionsFromRoom({ uid, roomId, text, pagination: {
 		throw new Error('error-not-allowed');
 	}
 
-	const { records: messages, total } = await Message.getDiscussions({
-		rid: roomId,
-		text,
-		queryOptions: {
-			sort: sort || { ts: -1 },
-			skip: offset,
-			limit: count,
-		},
+	const cursor = Messages.findDiscussionsByRoomAndText(roomId, text, {
+		sort: sort || { ts: -1 },
+		skip: offset,
+		limit: count,
 	});
 
+	const total = await cursor.count();
+
+	const messages = await cursor.toArray();
+
 	return {
 		messages,
 		count: messages.length,

diff --git a/app/api/server/v1/channels.js b/app/api/server/v1/channels.js
@@ -7,7 +7,6 @@ import { mountIntegrationQueryBasedOnPermissions } from '../../../integrations/s
 import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMessagesForUser';
 import { API } from '../api';
 import { settings } from '../../../settings';
-import { Message } from '../../../../server/sdk';
 
 
 // Returns the channel IF found otherwise it will return the failure of why it didn't. Check the `statusCode` property
@@ -338,12 +337,12 @@ API.v1.addRoute('channels.history', { authRequired: true }, {
 	get() {
 		const findResult = findChannelByIdOrName({ params: this.requestParams(), checkedArchived: false });
 
-		let latestDate;
+		let latestDate = new Date();
 		if (this.queryParams.latest) {
 			latestDate = new Date(this.queryParams.latest);
 		}
 
-		let oldestDate;
+		let oldestDate = undefined;
 		if (this.queryParams.oldest) {
 			oldestDate = new Date(this.queryParams.oldest);
 		}
@@ -577,16 +576,15 @@ API.v1.addRoute('channels.messages', { authRequired: true }, {
 			return API.v1.unauthorized();
 		}
 
-		const { records: messages, total } = Promise.await(Message.customQuery({
-			query: ourQuery,
-			userId: this.userId,
-			queryOptions: {
-				sort: sort || { ts: -1 },
-				skip: offset,
-				limit: count,
-				fields,
-			},
-		}));
+		const cursor = Messages.find(ourQuery, {
+			sort: sort || { ts: -1 },
+			skip: offset,
+			limit: count,
+			fields,
+		});
+
+		const total = cursor.count();
+		const messages = cursor.fetch();
 
 		return API.v1.success({
 			messages: normalizeMessagesForUser(messages, this.userId),

diff --git a/app/api/server/v1/chat.js b/app/api/server/v1/chat.js
@@ -2,7 +2,6 @@ import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 
 import { Messages } from '../../../models';
-import { Message } from '../../../../server/sdk';
 import { canAccessRoom, hasPermission } from '../../../authorization';
 import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMessagesForUser';
 import { processWebhookMessage } from '../../../lib/server';
@@ -409,14 +408,14 @@ API.v1.addRoute('chat.getPinnedMessages', { authRequired: true }, {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed');
 		}
 
-		const { records: messages, total } = Promise.await(Message.get(this.userId, {
-			rid: room._id,
-			pinned: true,
-			queryOptions: {
-				skip: offset,
-				limit: count,
-			},
-		}));
+		const cursor = Messages.findPinnedByRoom(room._id, {
+			skip: offset,
+			limit: count,
+		});
+
+		const total = cursor.count();
+
+		const messages = cursor.fetch();
 
 		return API.v1.success({
 			messages,
@@ -457,17 +456,16 @@ API.v1.addRoute('chat.getThreadsList', { authRequired: true }, {
 		};
 
 		const threadQuery = { ...query, ...typeThread, rid, tcount: { $exists: true } };
+		const cursor = Messages.find(threadQuery, {
+			sort: sort || { tlm: -1 },
+			skip: offset,
+			limit: count,
+			fields,
+		});
 
-		const { records: threads, total } = Promise.await(Message.customQuery({
-			query: threadQuery,
-			userId: this.userId,
-			queryOptions: {
-				sort: sort || { tlm: -1 },
-				skip: offset,
-				limit: count,
-				fields,
-			},
-		}));
+		const total = cursor.count();
+
+		const threads = cursor.fetch();
 
 		return API.v1.success({
 			threads,
@@ -503,12 +501,11 @@ API.v1.addRoute('chat.syncThreadsList', { authRequired: true }, {
 		if (!canAccessRoom(room, user)) {
 			throw new Meteor.Error('error-not-allowed', 'Not Allowed');
 		}
-		const threadQuery = { ...query, rid, tcount: { $exists: true } };
-
+		const threadQuery = Object.assign({}, query, { rid, tcount: { $exists: true } });
 		return API.v1.success({
 			threads: {
-				update: Promise.await(Message.customQuery({ query: { ...threadQuery, _updatedAt: { $gt: updatedSinceDate } }, queryOptions: { returnTotal: false, fields, sort } })).records,
-				remove: Promise.await(Message.getDeleted({ rid, userId: this.userId, timestamp: updatedSinceDate, query: threadQuery, queryOptions: { returnTotal: false, fields, sort } })).records,
+				update: Messages.find({ ...threadQuery, _updatedAt: { $gt: updatedSinceDate } }, { fields, sort }).fetch(),
+				remove: Messages.trashFindDeletedAfter(updatedSinceDate, threadQuery, { fields, sort }).fetch(),
 			},
 		});
 	},
@@ -536,19 +533,16 @@ API.v1.addRoute('chat.getThreadMessages', { authRequired: true }, {
 		if (!canAccessRoom(room, user)) {
 			throw new Meteor.Error('error-not-allowed', 'Not Allowed');
 		}
+		const cursor = Messages.find({ ...query, tmid }, {
+			sort: sort || { ts: 1 },
+			skip: offset,
+			limit: count,
+			fields,
+		});
 
-		const ourQuery = Object.assign({}, query, { rid: thread.rid, tmid });
+		const total = cursor.count();
 
-		const { records: messages, total } = Promise.await(Message.customQuery({
-			query: ourQuery,
-			userId: this.userId,
-			queryOptions: {
-				sort: sort || { ts: 1 },
-				skip: offset,
-				limit: count,
-				fields,
-			},
-		}));
+		const messages = cursor.fetch();
 
 		return API.v1.success({
 			messages,
@@ -579,7 +573,6 @@ API.v1.addRoute('chat.syncThreadMessages', { authRequired: true }, {
 		} else {
 			updatedSinceDate = new Date(updatedSince);
 		}
-
 		const thread = Messages.findOneById(tmid, { fields: { rid: 1 } });
 		if (!thread || !thread.rid) {
 			throw new Meteor.Error('error-invalid-message', 'Invalid Message');
@@ -590,11 +583,10 @@ API.v1.addRoute('chat.syncThreadMessages', { authRequired: true }, {
 		if (!canAccessRoom(room, user)) {
 			throw new Meteor.Error('error-not-allowed', 'Not Allowed');
 		}
-
 		return API.v1.success({
 			messages: {
-				update: Promise.await(Message.customQuery({ query: { ...query, tmid, _updatedAt: { $gt: updatedSinceDate } }, queryOptions: { returnTotal: false, fields, sort } })).records,
-				remove: Promise.await(Message.getDeleted({ rid: thread.rid, timestamp: updatedSinceDate, query: { ...query, tmid }, queryOptions: { returnTotal: false, fields, sort } })).records,
+				update: Messages.find({ ...query, tmid, _updatedAt: { $gt: updatedSinceDate } }, { fields, sort }).fetch(),
+				remove: Messages.trashFindDeletedAfter(updatedSinceDate, { ...query, tmid }, { fields, sort }).fetch(),
 			},
 		});
 	},

diff --git a/app/api/server/v1/groups.js b/app/api/server/v1/groups.js
@@ -7,7 +7,6 @@ import { Subscriptions, Rooms, Messages, Uploads, Integrations, Users } from '..
 import { hasPermission, hasAtLeastOnePermission, canAccessRoom } from '../../../authorization/server';
 import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMessagesForUser';
 import { API } from '../api';
-import { Message } from '../../../../server/sdk';
 
 // Returns the private group subscription IF found otherwise it will return the failure of why it didn't. Check the `statusCode` property
 export function findPrivateGroupByIdOrName({ params, userId, checkedArchived = true }) {
@@ -526,22 +525,18 @@ API.v1.addRoute('groups.messages', { authRequired: true }, {
 
 		const ourQuery = Object.assign({}, query, { rid: findResult.rid });
 
-		const { records: messages, total } = Promise.await(Message.customQuery({
-			query: ourQuery,
-			userId: this.userId,
-			queryOptions: {
-				sort: sort || { ts: -1 },
-				skip: offset,
-				limit: count,
-				fields,
-			},
-		}));
+		const messages = Messages.find(ourQuery, {
+			sort: sort || { ts: -1 },
+			skip: offset,
+			limit: count,
+			fields,
+		}).fetch();
 
 		return API.v1.success({
 			messages: normalizeMessagesForUser(messages, this.userId),
 			count: messages.length,
 			offset,
-			total,
+			total: Messages.find(ourQuery).count(),
 		});
 	},
 });

diff --git a/app/api/server/v1/im.js b/app/api/server/v1/im.js
@@ -1,12 +1,11 @@
 import { Meteor } from 'meteor/meteor';
 
-import { Subscriptions, Uploads, Users, Rooms } from '../../../models';
+import { Subscriptions, Uploads, Users, Messages, Rooms } from '../../../models';
 import { hasPermission } from '../../../authorization';
 import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMessagesForUser';
 import { settings } from '../../../settings';
 import { API } from '../api';
 import { getDirectMessageByNameOrIdWithOptionToJoin } from '../../../lib/server/functions/getDirectMessageByNameOrIdWithOptionToJoin';
-import { Message } from '../../../../server/sdk';
 
 function findDirectMessageRoom(params, user) {
 	if ((!params.roomId || !params.roomId.trim()) && (!params.username || !params.username.trim())) {
@@ -235,22 +234,18 @@ API.v1.addRoute(['dm.messages', 'im.messages'], { authRequired: true }, {
 
 		const ourQuery = Object.assign({}, query, { rid: findResult.room._id });
 
-		const { records: messages, total } = Promise.await(Message.customQuery({
-			query: ourQuery,
-			userId: this.userId,
-			queryOptions: {
-				sort: sort || { ts: -1 },
-				skip: offset,
-				limit: count,
-				fields,
-			},
-		}));
+		const messages = Messages.find(ourQuery, {
+			sort: sort || { ts: -1 },
+			skip: offset,
+			limit: count,
+			fields,
+		}).fetch();
 
 		return API.v1.success({
 			messages: normalizeMessagesForUser(messages, this.userId),
 			count: messages.length,
 			offset,
-			total,
+			total: Messages.find(ourQuery).count(),
 		});
 	},
 });
@@ -279,22 +274,18 @@ API.v1.addRoute(['dm.messages.others', 'im.messages.others'], { authRequired: tr
 		const { sort, fields, query } = this.parseJsonQuery();
 		const ourQuery = Object.assign({}, query, { rid: room._id });
 
-		const { records: msgs, total } = Promise.await(Message.customQuery({
-			query: ourQuery,
-			userId: this.userId,
-			queryOptions: {
-				sort: sort || { ts: -1 },
-				skip: offset,
-				limit: count,
-				fields,
-			},
-		}));
+		const msgs = Messages.find(ourQuery, {
+			sort: sort || { ts: -1 },
+			skip: offset,
+			limit: count,
+			fields,
+		}).fetch();
 
 		return API.v1.success({
 			messages: normalizeMessagesForUser(msgs, this.userId),
 			offset,
 			count: msgs.length,
-			total,
+			total: Messages.find(ourQuery).count(),
 		});
 	},
 });

diff --git a/app/channel-settings/server/methods/saveRoomSettings.js b/app/channel-settings/server/methods/saveRoomSettings.js
@@ -18,9 +18,8 @@ import { saveRoomTokenpass } from '../functions/saveRoomTokens';
 import { saveRoomEncrypted } from '../functions/saveRoomEncrypted';
 import { saveStreamingOptions } from '../functions/saveStreamingOptions';
 import { RoomSettingsEnum, roomTypes } from '../../../utils';
-import { isEnterprise } from '../../../../ee/app/license/server/license';
 
-const fields = ['roomAvatar', 'featured', 'roomName', 'roomTopic', 'roomAnnouncement', 'roomCustomFields', 'roomDescription', 'roomType', 'readOnly', 'reactWhenReadOnly', 'systemMessages', 'default', 'joinCode', 'tokenpass', 'streamingOptions', 'retentionEnabled', 'retentionMaxAge', 'retentionExcludePinned', 'retentionFilesOnly', 'retentionIgnoreThreads', 'retentionOverrideGlobal', 'encrypted', 'favorite', 'hideHistoryForNewMembers'];
+const fields = ['roomAvatar', 'featured', 'roomName', 'roomTopic', 'roomAnnouncement', 'roomCustomFields', 'roomDescription', 'roomType', 'readOnly', 'reactWhenReadOnly', 'systemMessages', 'default', 'joinCode', 'tokenpass', 'streamingOptions', 'retentionEnabled', 'retentionMaxAge', 'retentionExcludePinned', 'retentionFilesOnly', 'retentionIgnoreThreads', 'retentionOverrideGlobal', 'encrypted', 'favorite'];
 
 const validators = {
 	default({ userId }) {
@@ -123,14 +122,6 @@ const validators = {
 			});
 		}
 	},
-	hideHistoryForNewMembers({ value }) {
-		if (!isEnterprise() && value) {
-			throw new Meteor.Error('error-action-not-allowed', 'Hiding the history for new users is not allowed.', {
-				method: 'saveRoomSettings',
-				action: 'Editing_room',
-			});
-		}
-	},
 };
 
 const settingSavers = {
@@ -226,9 +217,6 @@ const settingSavers = {
 	roomAvatar({ value, rid, user }) {
 		setRoomAvatar(rid, value, user);
 	},
-	hideHistoryForNewMembers({ value, rid }) {
-		Rooms.saveHideHistoryForNewMembers(rid, value);
-	},
 };
 
 Meteor.methods({