Remove field lastActivity from subscription data

packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js

@@ -105,8 +105,6 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 	// Update all other subscriptions to alert their owners but witout incrementing
 	// the unread counter, as it is only for mentions and direct messages
 	RocketChat.models.Subscriptions.setAlertForRoomIdExcludingUserId(message.rid, message.u._id);
-	// Used to order subscriptions by activity
-	RocketChat.models.Subscriptions.updateUserSubscription(message.rid, message.u._id);
 
 	return message;
 

packages/rocketchat-lib/server/models/Subscriptions.js

@@ -416,19 +416,6 @@ class ModelSubscriptions extends RocketChat.models._Base {
 
 		return this.update(query, update, { multi: true });
 	}
-	updateUserSubscription(rid, userId) {
-		const query = {
-			rid,
-			'u._id': userId
-		};
-		const update = {
-			$set: {
-				open: true,
-				lastActivity: new Date
-			}
-		};
-		return this.update(query, update);
-	}
 	setAlertForRoomIdExcludingUserId(roomId, userId) {
 		const query = {
 			rid: roomId,

packages/rocketchat-ui-sidenav/client/roomList.js

@@ -19,17 +19,16 @@ Template.roomList.helpers({
 		const query = {
 			open: true
 		};
-		let sort = { 't': 1, 'name': 1 };
+		const sort = { 't': 1, 'name': 1 };
 		if (this.identifier === 'f') {
 			query.f = favoritesEnabled;
 		} else {
 			let types = [this.identifier];
 			if (this.identifier === 'activity') {
 				types = ['c', 'p', 'd'];
-				sort = { lastActivity : -1, _updatedAt: -1};
 			}
 			if (this.identifier === 'channels' || this.identifier === 'unread') {
-				types= [ 'c', 'p'];
+				types = [ 'c', 'p'];
 			}
 			const user = Meteor.user();
 			if (user && user.settings && user.settings.preferences && user.settings.preferences.roomsListExhibitionMode === 'unread') {
@@ -50,9 +49,8 @@ Template.roomList.helpers({
 				};
 			});
 			return _.sortBy(list, 'lm').reverse();
-		} else {
-			return ChatSubscription.find(query, { sort });
 		}
+		return ChatSubscription.find(query, { sort });
 	},
 
 	isLivechat() {

server/publications/room.js

@@ -23,7 +23,6 @@ const options = {
 		sms: 1,
 		code: 1,
 		open: 1,
-		lastActivity: 1,
 		v: 1,
 		label: 1,
 		ro: 1,

server/publications/subscription.js

@@ -8,7 +8,6 @@ const fields = {
 	code: 1,
 	f: 1,
 	u: 1,
-	lastActivity: 1,
 	open: 1,
 	alert: 1,
 	roles: 1,

server/startup/migrations/v101.js

@@ -0,0 +1,6 @@
+RocketChat.Migrations.add({
+	version: 101,
+	up() {
+		RocketChat.models.Subscriptions.update({lastActivity:{$exists:1}}, { $unset: { 'lastActivity': '' } }, {multi: true});
+	}
+});