RocketChat · sampaiodiego · Jun 21, 2020 · Apr 16, 2020 · Apr 22, 2020 · Apr 22, 2020
diff --git a/app/api/server/v1/chat.js b/app/api/server/v1/chat.js
@@ -10,6 +10,7 @@ import { executeSetReaction } from '../../../reactions/server/setReaction';
 import { API } from '../api';
 import Rooms from '../../../models/server/models/Rooms';
 import Users from '../../../models/server/models/Users';
+import Subscriptions from '../../../models/server/models/Subscriptions';
 import { settings } from '../../../settings';
 import { findMentionedMessages, findStarredMessages, findSnippetedMessageById, findSnippetedMessages, findDiscussionsFromRoom } from '../lib/messages';
 
@@ -427,9 +428,10 @@ API.v1.addRoute('chat.getPinnedMessages', { authRequired: true }, {
 
 API.v1.addRoute('chat.getThreadsList', { authRequired: true }, {
 	get() {
-		const { rid } = this.queryParams;
+		const { rid, type, text } = this.queryParams;
 		const { offset, count } = this.getPaginationItems();
 		const { sort, fields, query } = this.parseJsonQuery();
+
 		if (!rid) {
 			throw new Meteor.Error('The required "rid" query param is missing.');
 		}
@@ -441,9 +443,20 @@ API.v1.addRoute('chat.getThreadsList', { authRequired: true }, {
 		if (!canAccessRoom(room, user)) {
 			throw new Meteor.Error('error-not-allowed', 'Not Allowed');
 		}
-		const threadQuery = Object.assign({}, query, { rid, tcount: { $exists: true } });
+
+		const typeThread = {
+			...type === 'following' && { replies: { $in: [this.userId] } },
+			...type === 'unread' && { _id: { $in: Subscriptions.findOneByRoomIdAndUserId(room._id, user._id).tunread } },
+			...text && {
+				$text: {
+					$search: text,
+				},
+			},
+		};
+
+		const threadQuery = { ...query, ...typeThread, rid, tcount: { $exists: true } };
 		const cursor = Messages.find(threadQuery, {
-			sort: sort || { ts: 1 },
+			sort: sort || { tlm: -1 },
 			skip: offset,
 			limit: count,
 			fields,

diff --git a/app/api/server/v1/rooms.js b/app/api/server/v1/rooms.js
@@ -198,8 +198,9 @@ API.v1.addRoute('rooms.cleanHistory', { authRequired: true }, {
 			oldest,
 			inclusive,
 			limit: this.bodyParams.limit,
-			excludePinned: this.bodyParams.excludePinned,
-			filesOnly: this.bodyParams.filesOnly,
+			excludePinned: [true, 'true', 1, '1'].includes(this.bodyParams.excludePinned),
+			filesOnly: [true, 'true', 1, '1'].includes(this.bodyParams.filesOnly),
+			ignoreThreads: [true, 'true', 1, '1'].includes(this.bodyParams.ignoreThreads),
 			fromUsers: this.bodyParams.users,
 		}));
 

diff --git a/app/api/server/v1/users.js b/app/api/server/v1/users.js
@@ -543,6 +543,7 @@ API.v1.addRoute('users.setPreferences', { authRequired: true }, {
 				highlights: Match.Maybe(Array),
 				desktopNotificationRequireInteraction: Match.Maybe(Boolean),
 				messageViewMode: Match.Maybe(Number),
+				showMessageInMainThread: Match.Maybe(Boolean),
 				hideUsernames: Match.Maybe(Boolean),
 				hideRoles: Match.Maybe(Boolean),
 				hideAvatars: Match.Maybe(Boolean),

diff --git a/app/channel-settings/client/views/channelSettings.html b/app/channel-settings/client/views/channelSettings.html
@@ -324,6 +324,21 @@
 						</div>
 					</div>
 				{{/with}}
+				{{#with settings.retentionKeepThreads}}
+					<div class="rc-user-info__row">
+						<div class="rc-switch rc-switch--blue">
+							<label class="rc-switch__label">
+								<span class="rc-switch__text">
+									{{_ label}}{{equal default value '*'}}
+								</span>
+								<input type="checkbox" class="rc-switch__input js-input-check" name="retentionKeepThreads" checked="{{checked}}" disabled="{{./disabled}}">
+								<span class="rc-switch__button">
+									<span class="rc-switch__button-inside"></span>
+								</span>
+							</label>
+						</div>
+					</div>
+				{{/with}}
 			{{/if}}
 		{{/if}}
 	</div>

diff --git a/app/channel-settings/server/methods/saveRoomSettings.js b/app/channel-settings/server/methods/saveRoomSettings.js
@@ -17,7 +17,7 @@ import { saveRoomTokenpass } from '../functions/saveRoomTokens';
 import { saveStreamingOptions } from '../functions/saveStreamingOptions';
 import { RoomSettingsEnum, roomTypes } from '../../../utils';
 
-const fields = ['featured', 'roomName', 'roomTopic', 'roomAnnouncement', 'roomCustomFields', 'roomDescription', 'roomType', 'readOnly', 'reactWhenReadOnly', 'systemMessages', 'default', 'joinCode', 'tokenpass', 'streamingOptions', 'retentionEnabled', 'retentionMaxAge', 'retentionExcludePinned', 'retentionFilesOnly', 'retentionOverrideGlobal', 'encrypted', 'favorite'];
+const fields = ['featured', 'roomName', 'roomTopic', 'roomAnnouncement', 'roomCustomFields', 'roomDescription', 'roomType', 'readOnly', 'reactWhenReadOnly', 'systemMessages', 'default', 'joinCode', 'tokenpass', 'streamingOptions', 'retentionEnabled', 'retentionMaxAge', 'retentionExcludePinned', 'retentionFilesOnly', 'retentionIgnoreThreads', 'retentionOverrideGlobal', 'encrypted', 'favorite'];
 Meteor.methods({
 	saveRoomSettings(rid, settings, value) {
 		const userId = Meteor.userId();
@@ -128,10 +128,17 @@ Meteor.methods({
 					action: 'Editing_room',
 				});
 			}
+			if (setting === 'retentionIgnoreThreads' && !hasPermission(userId, 'edit-room-retention-policy', rid) && value !== room.retention.ignoreThreads) {
+				throw new Meteor.Error('error-action-not-allowed', 'Editing room retention policy is not allowed', {
+					method: 'saveRoomSettings',
+					action: 'Editing_room',
+				});
+			}
 			if (setting === 'retentionOverrideGlobal') {
 				delete settings.retentionMaxAge;
 				delete settings.retentionExcludePinned;
 				delete settings.retentionFilesOnly;
+				delete settings.retentionIgnoreThreads;
 			}
 		});
 
@@ -215,6 +222,9 @@ Meteor.methods({
 				case 'retentionFilesOnly':
 					Rooms.saveRetentionFilesOnlyById(rid, value);
 					break;
+				case 'retentionIgnoreThreads':
+					Rooms.saveRetentionIgnoreThreadsById(rid, value);
+					break;
 				case 'retentionOverrideGlobal':
 					Rooms.saveRetentionOverrideGlobalById(rid, value);
 					break;

diff --git a/app/discussion/client/public/stylesheets/discussion.css b/app/discussion/client/public/stylesheets/discussion.css
@@ -3,6 +3,8 @@
 
 	padding: 0.5rem 0;
 	align-items: center;
+
+	flex-wrap: wrap;
 }
 
 .discussion-reply-lm {
@@ -11,6 +13,9 @@
 	color: var(--color-gray);
 
 	font-size: 12px;
+
+	flex-grow: 0;
+	flex-shrink: 0;
 }
 
 .discussions-list .load-more {

diff --git a/app/discussion/server/config.js b/app/discussion/server/config.js
@@ -36,4 +36,14 @@ Meteor.startup(() => {
 		i18nDescription: 'RetentionPolicy_DoNotExcludeDiscussion_Description',
 		enableQuery: globalQuery,
 	});
+
+	settings.add('RetentionPolicy_DoNotExcludeThreads', true, {
+		group: 'RetentionPolicy',
+		section: 'Global Policy',
+		type: 'boolean',
+		public: true,
+		i18nLabel: 'RetentionPolicy_DoNotExcludeThreads',
+		i18nDescription: 'RetentionPolicy_DoNotExcludeThreads_Description',
+		enableQuery: globalQuery,
+	});
 });
diff --git a/app/emoji-emojione/client/emojione-sprites.css b/app/emoji-emojione/client/emojione-sprites.css
@@ -29,7 +29,7 @@
 	image-rendering: optimizeQuality;
 }
 
-.emojione.big {
+.message .emojione.big {
 	width: 44px;
 	height: 44px;
 }
diff --git a/app/federation/server/endpoints/dispatch.js b/app/federation/server/endpoints/dispatch.js
@@ -22,7 +22,6 @@ import { getUpload, requestEventsFromLatest } from '../handler';
 import { notifyUsersOnMessage } from '../../../lib/server/lib/notifyUsersOnMessage';
 import { sendAllNotifications } from '../../../lib/server/lib/sendNotificationsOnMessage';
 import { processThreads } from '../../../threads/server/hooks/aftersavemessage';
-import { processDeleteInThread } from '../../../threads/server/hooks/afterdeletemessage';
 
 const eventHandlers = {
 	//
@@ -312,11 +311,6 @@ const eventHandlers = {
 		if (eventResult.success) {
 			const { data: { roomId, messageId } } = event;
 
-			const message = Messages.findOne({ _id: messageId });
-			if (message) {
-				processDeleteInThread(message);
-			}
-
 			// Remove the message
 			Messages.removeById(messageId);
 

diff --git a/app/lib/lib/roomTypes/direct.js b/app/lib/lib/roomTypes/direct.js
@@ -13,7 +13,7 @@ export class DirectMessageRoomRoute extends RoomTypeRouteConfig {
 	constructor() {
 		super({
 			name: 'direct',
-			path: '/direct/:rid',
+			path: '/direct/:rid/:tab?/:context?',
 		});
 	}
 

diff --git a/app/lib/lib/roomTypes/private.js b/app/lib/lib/roomTypes/private.js
@@ -13,7 +13,7 @@ export class PrivateRoomRoute extends RoomTypeRouteConfig {
 	constructor() {
 		super({
 			name: 'group',
-			path: '/group/:name',
+			path: '/group/:name/:tab?/:context?',
 		});
 	}
 

diff --git a/app/lib/lib/roomTypes/public.js b/app/lib/lib/roomTypes/public.js
@@ -11,7 +11,7 @@ export class PublicRoomRoute extends RoomTypeRouteConfig {
 	constructor() {
 		super({
 			name: 'channel',
-			path: '/channel/:name',
+			path: '/channel/:name/:tab?/:context?',
 		});
 	}
 

diff --git a/app/lib/server/functions/cleanRoomHistory.js b/app/lib/server/functions/cleanRoomHistory.js
@@ -5,7 +5,7 @@ import { FileUpload } from '../../../file-upload';
 import { Messages, Rooms } from '../../../models';
 import { Notifications } from '../../../notifications';
 
-export const cleanRoomHistory = function({ rid, latest = new Date(), oldest = new Date('0001-01-01T00:00:00Z'), inclusive = true, limit = 0, excludePinned = true, ignoreDiscussion = true, filesOnly = false, fromUsers = [] }) {
+export const cleanRoomHistory = function({ rid, latest = new Date(), oldest = new Date('0001-01-01T00:00:00Z'), inclusive = true, limit = 0, excludePinned = true, ignoreDiscussion = true, filesOnly = false, fromUsers = [], ignoreThreads = true }) {
 	const gt = inclusive ? '$gte' : '$gt';
 	const lt = inclusive ? '$lte' : '$lt';
 
@@ -20,6 +20,7 @@ export const cleanRoomHistory = function({ rid, latest = new Date(), oldest = ne
 		ignoreDiscussion,
 		ts,
 		fromUsers,
+		ignoreThreads,
 		{ fields: { 'file._id': 1, pinned: 1 }, limit },
 	).forEach((document) => {
 		FileUpload.getStore('Uploads').deleteById(document.file._id);
@@ -28,12 +29,13 @@ export const cleanRoomHistory = function({ rid, latest = new Date(), oldest = ne
 			Messages.update({ _id: document._id }, { $unset: { file: 1 }, $set: { attachments: [{ color: '#FD745E', text }] } });
 		}
 	});
+
 	if (filesOnly) {
 		return fileCount;
 	}
 
 	if (!ignoreDiscussion) {
-		Messages.findDiscussionByRoomIdPinnedTimestampAndUsers(rid, excludePinned, ts, fromUsers, { fields: { drid: 1 }, ...limit && { limit } }).fetch()
+		Messages.findDiscussionByRoomIdPinnedTimestampAndUsers(rid, excludePinned, ts, fromUsers, { fields: { drid: 1 }, ...limit && { limit } }, ignoreThreads).fetch()
 			.forEach(({ drid }) => deleteRoom(drid));
 	}
 

diff --git a/app/lib/server/functions/deleteMessage.js b/app/lib/server/functions/deleteMessage.js
@@ -8,9 +8,10 @@ import { callbacks } from '../../../callbacks/server';
 import { Apps } from '../../../apps/server';
 
 export const deleteMessage = function(message, user) {
-	const keepHistory = settings.get('Message_KeepHistory');
-	const showDeletedStatus = settings.get('Message_ShowDeletedStatus');
 	const deletedMsg = Messages.findOneById(message._id);
+	const isThread = deletedMsg.tcount > 0;
+	const keepHistory = settings.get('Message_KeepHistory') || isThread;
+	const showDeletedStatus = settings.get('Message_ShowDeletedStatus') || isThread;
 
 	if (deletedMsg && Apps && Apps.isLoaded()) {
 		const prevent = Promise.await(Apps.getBridges().getListenerBridge().messageEvent('IPreMessageDeletePrevent', deletedMsg));

diff --git a/app/lib/server/functions/notifications/audio.js b/app/lib/server/functions/notifications/audio.js
@@ -13,6 +13,7 @@ export function shouldNotifyAudio({
 	hasMentionToUser,
 	hasReplyToThread,
 	roomType,
+	isThread,
 }) {
 	if (disableAllMessageNotifications && audioNotifications == null && !hasReplyToThread) {
 		return false;
@@ -23,15 +24,15 @@ export function shouldNotifyAudio({
 	}
 
 	if (!audioNotifications) {
-		if (settings.get('Accounts_Default_User_Preferences_audioNotifications') === 'all') {
+		if (settings.get('Accounts_Default_User_Preferences_audioNotifications') === 'all' && (!isThread || hasReplyToThread)) {
 			return true;
 		}
 		if (settings.get('Accounts_Default_User_Preferences_audioNotifications') === 'nothing') {
 			return false;
 		}
 	}
 
-	return roomType === 'd' || (!disableAllMessageNotifications && (hasMentionToAll || hasMentionToHere)) || isHighlighted || audioNotifications === 'all' || hasMentionToUser || hasReplyToThread;
+	return (roomType === 'd' || (!disableAllMessageNotifications && (hasMentionToAll || hasMentionToHere)) || isHighlighted || audioNotifications === 'all' || hasMentionToUser) && (!isThread || hasReplyToThread);
 }
 
 export function notifyAudioUser(userId, message, room) {

diff --git a/app/lib/server/functions/notifications/desktop.js b/app/lib/server/functions/notifications/desktop.js
@@ -30,6 +30,7 @@ export function notifyDesktopUser({
 		payload: {
 			_id: message._id,
 			rid: message.rid,
+			tmid: message.tmid,
 			sender: message.u,
 			type: room.t,
 			name: room.name,
@@ -52,6 +53,7 @@ export function shouldNotifyDesktop({
 	hasMentionToUser,
 	hasReplyToThread,
 	roomType,
+	isThread,
 }) {
 	if (disableAllMessageNotifications && desktopNotifications == null && !isHighlighted && !hasMentionToUser && !hasReplyToThread) {
 		return false;
@@ -62,13 +64,13 @@ export function shouldNotifyDesktop({
 	}
 
 	if (!desktopNotifications) {
-		if (settings.get('Accounts_Default_User_Preferences_desktopNotifications') === 'all') {
+		if (settings.get('Accounts_Default_User_Preferences_desktopNotifications') === 'all' && (!isThread || hasReplyToThread)) {
 			return true;
 		}
 		if (settings.get('Accounts_Default_User_Preferences_desktopNotifications') === 'nothing') {
 			return false;
 		}
 	}
 
-	return roomType === 'd' || (!disableAllMessageNotifications && (hasMentionToAll || hasMentionToHere)) || isHighlighted || desktopNotifications === 'all' || hasMentionToUser || hasReplyToThread;
+	return (roomType === 'd' || (!disableAllMessageNotifications && (hasMentionToAll || hasMentionToHere)) || isHighlighted || desktopNotifications === 'all' || hasMentionToUser) && (!isThread || hasReplyToThread);
 }
diff --git a/app/lib/server/functions/notifications/email.js b/app/lib/server/functions/notifications/email.js
@@ -192,6 +192,7 @@ export function shouldNotifyEmail({
 	hasMentionToAll,
 	hasReplyToThread,
 	roomType,
+	isThread,
 }) {
 	// email notifications are disabled globally
 	if (!settings.get('Accounts_AllowEmailNotifications')) {
@@ -220,5 +221,5 @@ export function shouldNotifyEmail({
 		}
 	}
 
-	return roomType === 'd' || isHighlighted || emailNotifications === 'all' || hasMentionToUser || hasReplyToThread || (!disableAllMessageNotifications && hasMentionToAll);
+	return (roomType === 'd' || isHighlighted || emailNotifications === 'all' || hasMentionToUser || (!disableAllMessageNotifications && hasMentionToAll)) && (!isThread || hasReplyToThread);
 }
diff --git a/app/lib/server/functions/notifications/mobile.js b/app/lib/server/functions/notifications/mobile.js
@@ -52,6 +52,7 @@ export async function getPushData({ room, message, userId, receiverUsername, sen
 			type: room.t,
 			name: room.name,
 			messageType: message.t,
+			tmid: message.tmid,
 		},
 		roomName: settings.get('Push_show_username_room') && roomTypes.getConfig(room.t).isGroupChat(room) ? `#${ roomTypes.getRoomName(room.t, room) }` : '',
 		username,
@@ -69,6 +70,7 @@ export function shouldNotifyMobile({
 	hasMentionToUser,
 	hasReplyToThread,
 	roomType,
+	isThread,
 }) {
 	if (disableAllMessageNotifications && mobilePushNotifications == null && !isHighlighted && !hasMentionToUser && !hasReplyToThread) {
 		return false;
@@ -79,13 +81,13 @@ export function shouldNotifyMobile({
 	}
 
 	if (!mobilePushNotifications) {
-		if (settings.get('Accounts_Default_User_Preferences_mobileNotifications') === 'all') {
+		if (settings.get('Accounts_Default_User_Preferences_mobileNotifications') === 'all' && (!isThread || hasReplyToThread)) {
 			return true;
 		}
 		if (settings.get('Accounts_Default_User_Preferences_mobileNotifications') === 'nothing') {
 			return false;
 		}
 	}
 
-	return roomType === 'd' || (!disableAllMessageNotifications && hasMentionToAll) || isHighlighted || mobilePushNotifications === 'all' || hasMentionToUser || hasReplyToThread;
+	return (roomType === 'd' || (!disableAllMessageNotifications && hasMentionToAll) || isHighlighted || mobilePushNotifications === 'all' || hasMentionToUser) && (!isThread || hasReplyToThread);
 }