[NEW] server-side filter for message type

app/api/server/v1/channels.js

@@ -337,12 +337,12 @@ API.v1.addRoute('channels.history', { authRequired: true }, {
 	get() {
 		const findResult = findChannelByIdOrName({ params: this.requestParams(), checkedArchived: false });
 
-		let latestDate = new Date();
+		let latestDate;
 		if (this.queryParams.latest) {
 			latestDate = new Date(this.queryParams.latest);
 		}
 
-		let oldestDate = undefined;
+		let oldestDate;
 		if (this.queryParams.oldest) {
 			oldestDate = new Date(this.queryParams.oldest);
 		}
@@ -359,6 +359,12 @@ API.v1.addRoute('channels.history', { authRequired: true }, {
 			offset = parseInt(this.queryParams.offset);
 		}
 
+		const excludeTypes = [];
+		if (this.queryParams.notContainingTypes) {
+			const t = this.queryParams.excludeTypes;
+			Array.isArray(t) ? excludeTypes.push(...t) : excludeTypes.push(...t.split(','));
+		}
+
 		const unreads = this.queryParams.unreads || false;
 
 		let result;
@@ -371,6 +377,7 @@ API.v1.addRoute('channels.history', { authRequired: true }, {
 				offset,
 				count,
 				unreads,
+				excludeTypes,
 			});
 		});
 

app/lib/server/functions/loadMessageHistory.js

@@ -27,7 +27,18 @@ export const loadMessageHistory = function loadMessageHistory({ userId, rid, end
 		};
 	}
 
-	const records = end != null ? Messages.findVisibleByRoomIdBeforeTimestampNotContainingTypes(rid, end, hiddenMessageTypes, options).fetch() : Messages.findVisibleByRoomIdNotContainingTypes(rid, hiddenMessageTypes, options).fetch();
+	let records;
+	if (end) {
+		records = Messages.findVisibleByRoomId({
+			rid,
+			latest: end,
+			excludeTypes: hiddenMessageTypes,
+			queryOptions: options,
+		}).fetch();
+	} else {
+		records = Messages.findVisibleByRoomId({ rid, excludeTypes: hiddenMessageTypes, queryOptions: options }).fetch();
+	}
+
 	const messages = normalizeMessagesForUser(records, userId);
 	let unreadNotLoaded = 0;
 	let firstUnread;
@@ -37,10 +48,16 @@ export const loadMessageHistory = function loadMessageHistory({ userId, rid, end
 
 		if ((firstMessage != null ? firstMessage.ts : undefined) > ls) {
 			delete options.limit;
-			const unreadMessages = Messages.findVisibleByRoomIdBetweenTimestampsNotContainingTypes(rid, ls, firstMessage.ts, hiddenMessageTypes, {
-				limit: 1,
-				sort: {
-					ts: 1,
+			const unreadMessages = Messages.findVisibleByRoomId({
+				rid,
+				latest: ls,
+				oldest: firstMessage.ts,
+				excludeTypes: hiddenMessageTypes,
+				queryOptions: {
+					limit: 1,
+					sort: {
+						ts: 1,
+					},
 				},
 			});
 

app/lib/server/methods/getChannelHistory.js

@@ -8,7 +8,7 @@ import { settings } from '../../../settings';
 import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMessagesForUser';
 
 Meteor.methods({
-	getChannelHistory({ rid, latest, oldest, inclusive, offset = 0, count = 20, unreads }) {
+	getChannelHistory({ rid, latest, oldest, offset = 0, count = 20, unreads, excludeTypes }) {
 		check(rid, String);
 
 		if (!Meteor.userId()) {
@@ -26,13 +26,8 @@ Meteor.methods({
 			return false;
 		}
 
-		// Ensure latest is always defined.
-		if (_.isUndefined(latest)) {
-			latest = new Date();
-		}
-
 		// Verify oldest is a date if it exists
-		if (!_.isUndefined(oldest) && !_.isDate(oldest)) {
+		if ((oldest && !_.isDate(oldest)) || (latest && !_.isDate(latest))) {
 			throw new Meteor.Error('error-invalid-date', 'Invalid date', { method: 'getChannelHistory' });
 		}
 
@@ -48,16 +43,7 @@ Meteor.methods({
 			options.fields = { editedAt: 0 };
 		}
 
-		let records = [];
-		if (_.isUndefined(oldest) && inclusive) {
-			records = Messages.findVisibleByRoomIdBeforeTimestampInclusive(rid, latest, options).fetch();
-		} else if (_.isUndefined(oldest) && !inclusive) {
-			records = Messages.findVisibleByRoomIdBeforeTimestamp(rid, latest, options).fetch();
-		} else if (!_.isUndefined(oldest) && inclusive) {
-			records = Messages.findVisibleByRoomIdBetweenTimestampsInclusive(rid, oldest, latest, options).fetch();
-		} else {
-			records = Messages.findVisibleByRoomIdBetweenTimestamps(rid, oldest, latest, options).fetch();
-		}
+		const records = Messages.findVisibleByRoomId({ rid, latest, oldest, queryOptions: options, excludeTypes });
 
 		const messages = normalizeMessagesForUser(records, fromUserId);
 
@@ -68,7 +54,12 @@ Meteor.methods({
 			if (!_.isUndefined(oldest)) {
 				const firstMsg = messages[messages.length - 1];
 				if (!_.isUndefined(firstMsg) && firstMsg.ts > oldest) {
-					const unreadMessages = Messages.findVisibleByRoomIdBetweenTimestamps(rid, oldest, firstMsg.ts, { limit: 1, sort: { ts: 1 } });
+					const unreadMessages = Messages.findVisibleByRoomIdBetweenTimestamps({
+						rid,
+						oldest,
+						latest: firstMsg.ts,
+						queryOptions: { limit: 1, sort: { ts: 1 } },
+					});
 					firstUnread = unreadMessages.fetch()[0];
 					unreadNotLoaded = unreadMessages.count();
 				}

app/livechat/server/hooks/sendToCRM.js

@@ -63,7 +63,7 @@ function sendToCRM(type, room, includeMessages = true) {
 
 	let messages;
 	if (typeof includeMessages === 'boolean' && includeMessages) {
-		messages = Messages.findVisibleByRoomId(room._id, { sort: { ts: 1 } });
+		messages = Messages.findVisibleByRoomId({ rid: room._id, queryOptions: { sort: { ts: 1 } } });
 	} else if (includeMessages instanceof Array) {
 		messages = includeMessages;
 	}

app/livechat/server/lib/Livechat.js

@@ -976,7 +976,7 @@ export const Livechat = {
 
 		const showAgentInfo = settings.get('Livechat_show_agent_info');
 		const ignoredMessageTypes = ['livechat_navigation_history', 'livechat_transcript_history', 'command', 'livechat-close', 'livechat_video_call'];
-		const messages = Messages.findVisibleByRoomIdNotContainingTypes(rid, ignoredMessageTypes, { sort: { ts: 1 } });
+		const messages = Messages.findVisibleByRoomId({ rid, excludeTypes: ignoredMessageTypes, queryOptions: { sort: { ts: 1 } } });
 
 		let html = '<div> <hr>';
 		messages.forEach((message) => {

app/message-mark-as-unread/server/unreadMessages.js

@@ -13,7 +13,7 @@ Meteor.methods({
 		}
 
 		if (room) {
-			const lastMessage = Messages.findVisibleByRoomId(room, { limit: 1, sort: { ts: -1 } }).fetch()[0];
+			const lastMessage = Messages.findVisibleByRoomId({ rid: room, queryOptions: { limit: 1, sort: { ts: -1 } } }).fetch()[0];
 
 			if (lastMessage == null) {
 				throw new Meteor.Error('error-action-not-allowed', 'Not allowed', {

app/models/server/models/Messages.js

@@ -227,7 +227,7 @@ export class Messages extends Base {
 		return this.find(query, options);
 	}
 
-	findVisibleByRoomId(rid, options) {
+	findVisibleByRoomId({ rid, latest, oldest, notContainingTypes, queryOptions, inclusive }) {
 		const query = {
 			_hidden: {
 				$ne: true,
@@ -236,7 +236,32 @@ export class Messages extends Base {
 			rid,
 		};
 
-		return this.find(query, options);
+		if (Match.test(notContainingTypes, [String]) && (notContainingTypes.length > 0)) {
+			query.t = { $nin: notContainingTypes };
+		}
+
+		console.log('latest: ', latest);
+		console.log('oldest: ', oldest);
+		console.log('query: ', query);
+		console.log('notContainingTypes: ', notContainingTypes);
+
+		if (latest && oldest) {
+			console.log('!latest && !oldest');
+			return this.findVisibleByRoomIdBetweenTimestamps(rid, oldest, latest, notContainingTypes, queryOptions);
+		}
+
+		if (latest && !oldest) {
+			console.log('latest && !oldest');
+			return this.findVisibleByRoomIdBeforeTimestamp(rid, latest, queryOptions, inclusive);
+		}
+
+		if (!latest && oldest) {
+			console.log('!latest && oldest');
+			return this.findVisibleByRoomIdAfterTimestamp(rid, oldest, queryOptions);
+		}
+
+		console.log('!latest && !oldest');
+		return this.find(query, queryOptions);
 	}
 
 	findVisibleThreadByThreadId(tmid, options) {
@@ -302,33 +327,21 @@ export class Messages extends Base {
 		return this.find(query, options);
 	}
 
-	findVisibleByRoomIdBeforeTimestamp(roomId, timestamp, options) {
+	findVisibleByRoomIdBeforeTimestamp(roomId, timestamp, options, inclusive) {
+		const timestampKey = inclusive ? '$lte' : '$lt';
 		const query = {
 			_hidden: {
 				$ne: true,
 			},
 			rid: roomId,
 			ts: {
-				$lt: timestamp,
+				[timestampKey]: timestamp,
 			},
 		};
 
 		return this.find(query, options);
 	}
 
-	findVisibleByRoomIdBeforeTimestampInclusive(roomId, timestamp, options) {
-		const query = {
-			_hidden: {
-				$ne: true,
-			},
-			rid: roomId,
-			ts: {
-				$lte: timestamp,
-			},
-		};
-
-		return this.find(query, options);
-	}
 
 	findVisibleByRoomIdBetweenTimestamps(roomId, afterTimestamp, beforeTimestamp, options) {
 		const query = {
@@ -378,25 +391,6 @@ export class Messages extends Base {
 		return this.find(query, options);
 	}
 
-	findVisibleByRoomIdBetweenTimestampsNotContainingTypes(roomId, afterTimestamp, beforeTimestamp, types, options) {
-		const query = {
-			_hidden: {
-				$ne: true,
-			},
-			rid: roomId,
-			ts: {
-				$gt: afterTimestamp,
-				$lt: beforeTimestamp,
-			},
-		};
-
-		if (Match.test(types, [String]) && (types.length > 0)) {
-			query.t = { $nin: types };
-		}
-
-		return this.find(query, options);
-	}
-
 	findVisibleCreatedOrEditedAfterTimestamp(timestamp, options) {
 		const query = {
 			_hidden: { $ne: true },

server/methods/loadMissedMessages.js

@@ -20,18 +20,18 @@ Meteor.methods({
 			return false;
 		}
 
-		const options = {
+		const queryOptions = {
 			sort: {
 				ts: -1,
 			},
 		};
 
 		if (!settings.get('Message_ShowEditedStatus')) {
-			options.fields = {
+			queryOptions.fields = {
 				editedAt: 0,
 			};
 		}
 
-		return Messages.findVisibleByRoomIdAfterTimestamp(rid, start, options).fetch();
+		return Messages.findVisibleByRoomIdAfterTimestamp({ rid, oldest: start, queryOptions }).fetch();
 	},
 });

server/methods/loadNextMessages.js

@@ -22,24 +22,24 @@ Meteor.methods({
 			return false;
 		}
 
-		const options = {
+		const queryOptions = {
 			sort: {
 				ts: 1,
 			},
 			limit,
 		};
 
 		if (!settings.get('Message_ShowEditedStatus')) {
-			options.fields = {
+			queryOptions.fields = {
 				editedAt: 0,
 			};
 		}
 
 		let records;
 		if (end) {
-			records = Messages.findVisibleByRoomIdAfterTimestamp(rid, end, options).fetch();
+			records = Messages.findVisibleByRoomId({ rid, oldest: end, queryOptions }).fetch();
 		} else {
-			records = Messages.findVisibleByRoomId(rid, options).fetch();
+			records = Messages.findVisibleByRoomId({ rid, queryOptions }).fetch();
 		}
 
 		return {

server/methods/loadSurroundingMessages.js

@@ -34,34 +34,34 @@ Meteor.methods({
 
 		limit -= 1;
 
-		const options = {
+		const queryOptions = {
 			sort: {
 				ts: -1,
 			},
 			limit: Math.ceil(limit / 2),
 		};
 
 		if (!settings.get('Message_ShowEditedStatus')) {
-			options.fields = {
+			queryOptions.fields = {
 				editedAt: 0,
 			};
 		}
 
-		const messages = Messages.findVisibleByRoomIdBeforeTimestamp(message.rid, message.ts, options).fetch();
+		const messages = Messages.findVisibleByRoomId({ rid: message.rid, latest: message.ts, queryOptions }).fetch();
 
-		const moreBefore = messages.length === options.limit;
+		const moreBefore = messages.length === queryOptions.limit;
 
 		messages.push(message);
 
-		options.sort = {
+		queryOptions.sort = {
 			ts: 1,
 		};
 
-		options.limit = Math.floor(limit / 2);
+		queryOptions.limit = Math.floor(limit / 2);
 
-		const afterMessages = Messages.findVisibleByRoomIdAfterTimestamp(message.rid, message.ts, options).fetch();
+		const afterMessages = Messages.findVisibleByRoomId({ rid: message.rid, oldest: message.ts, queryOptions }).fetch();
 
-		const moreAfter = afterMessages.length === options.limit;
+		const moreAfter = afterMessages.length === queryOptions.limit;
 
 		messages.push(...afterMessages);