[IMPROVE] Mention autocomplete UI and performance improvements

app/api/server/v1/misc.js

@@ -262,6 +262,8 @@ const methodCall = () => ({
 			const result = Meteor.call(method, ...params);
 			return API.v1.success(mountResult({ id, result }));
 		} catch (error) {
+			Meteor._debug(`Exception while invoking method ${ method }`, error.stack);
+
 			return API.v1.success(mountResult({ id, error }));
 		}
 	},

app/lib/server/startup/settings.js

@@ -1374,6 +1374,12 @@ settings.addGroup('Layout', function() {
 			type: 'boolean',
 			public: true,
 		});
+
+		this.add('Number_of_users_autocomplete_suggestions', 5, {
+			type: 'int',
+			public: true,
+		});
+
 		this.add('UI_Unread_Counter_Style', 'Different_Style_For_User_Mentions', {
 			type: 'select',
 			values: [

app/migrations/server/migrations.js

@@ -293,6 +293,7 @@ Migrations._migrateTo = function(version, rerun) {
 				`Branch: ${ Info.commit.branch }`,
 				`Tag: ${ Info.commit.tag }`,
 			]));
+			console.log(e.stack);
 			process.exit(1);
 		}
 	}

app/models/server/models/Subscriptions.js

@@ -1308,6 +1308,10 @@ export class Subscriptions extends Base {
 
 		Rooms.incUsersCountById(room._id);
 
+		if (!['d', 'l'].includes(room.t)) {
+			Users.addRoomByUserId(user._id, room._id);
+		}
+
 		return result;
 	}
 
@@ -1326,6 +1330,8 @@ export class Subscriptions extends Base {
 			Rooms.incUsersCountNotDMsByIds(roomIds, -1);
 		}
 
+		Users.removeAllRoomsByUserId(userId);
+
 		return result;
 	}
 
@@ -1340,6 +1346,8 @@ export class Subscriptions extends Base {
 			Rooms.incUsersCountById(roomId, - result);
 		}
 
+		Users.removeRoomByRoomId(roomId);
+
 		return result;
 	}
 
@@ -1355,11 +1363,17 @@ export class Subscriptions extends Base {
 			Rooms.incUsersCountById(roomId, - result);
 		}
 
+		Users.removeRoomByUserId(userId, roomId);
+
 		return result;
 	}
 
 	removeByRoomIds(rids) {
-		return this.remove({ rid: { $in: rids } });
+		const result = this.remove({ rid: { $in: rids } });
+
+		Users.removeRoomByRoomIds(rids);
+
+		return result;
 	}
 
 	// //////////////////////////////////////////////////////////////////

app/models/server/models/Users.js

@@ -28,6 +28,12 @@ export class Users extends Base {
 	constructor(...args) {
 		super(...args);
 
+		this.defaultFields = {
+			__rooms: 0,
+		};
+
+		this.tryEnsureIndex({ __rooms: 1 }, { sparse: 1 });
+
 		this.tryEnsureIndex({ roles: 1 }, { sparse: 1 });
 		this.tryEnsureIndex({ name: 1 });
 		this.tryEnsureIndex({ bio: 1 }, { sparse: 1 });
@@ -388,6 +394,48 @@ export class Users extends Base {
 		});
 	}
 
+	addRoomByUserId(_id, rid) {
+		return this.update({
+			_id,
+			__rooms: { $ne: rid },
+		}, {
+			$addToSet: { __rooms: rid },
+		});
+	}
+
+	removeRoomByUserId(_id, rid) {
+		return this.update({
+			_id,
+			__rooms: rid,
+		}, {
+			$pull: { __rooms: rid },
+		});
+	}
+
+	removeAllRoomsByUserId(_id) {
+		return this.update({
+			_id,
+		}, {
+			$set: { __rooms: [] },
+		});
+	}
+
+	removeRoomByRoomId(rid) {
+		return this.update({
+			__rooms: rid,
+		}, {
+			$pull: { __rooms: rid },
+		}, { multi: true });
+	}
+
+	removeRoomByRoomIds(rids) {
+		return this.update({
+			__rooms: { $in: rids },
+		}, {
+			$pullAll: { __rooms: rids },
+		}, { multi: true });
+	}
+
 	update2FABackupCodesByUserId(userId, backupCodes) {
 		return this.update({
 			_id: userId,
@@ -509,6 +557,19 @@ export class Users extends Base {
 		return this.findOne(query, options);
 	}
 
+	findOneByUsernameAndRoomIgnoringCase(username, rid, options) {
+		if (typeof username === 'string') {
+			username = new RegExp(`^${ s.escapeRegExp(username) }$`, 'i');
+		}
+
+		const query = {
+			__rooms: rid,
+			username,
+		};
+
+		return this.findOne(query, options);
+	}
+
 	findOneByUsernameAndServiceNameIgnoringCase(username, userId, serviceName, options) {
 		if (typeof username === 'string') {
 			username = new RegExp(`^${ s.escapeRegExp(username) }$`, 'i');
@@ -661,7 +722,7 @@ export class Users extends Base {
 		return this.find(query, options);
 	}
 
-	findByActiveUsersExcept(searchTerm, exceptions, options, forcedSearchFields, extraQuery = []) {
+	findByActiveUsersExcept(searchTerm, exceptions, options, forcedSearchFields, extraQuery = [], { startsWith = false, endsWith = false } = {}) {
 		if (exceptions == null) { exceptions = []; }
 		if (options == null) { options = {}; }
 		if (!_.isArray(exceptions)) {
@@ -683,7 +744,7 @@ export class Users extends Base {
 			return this._db.find(query, options);
 		}
 
-		const termRegex = new RegExp(s.escapeRegExp(searchTerm), 'i');
+		const termRegex = new RegExp((startsWith ? '^' : '') + s.escapeRegExp(searchTerm) + (endsWith ? '$' : ''), 'i');
 
 		const searchFields = forcedSearchFields || settings.get('Accounts_SearchFields').trim().split(',');
 

app/models/server/models/_BaseDb.js

@@ -124,7 +124,15 @@ export class BaseDb extends EventEmitter {
 		};
 	}
 
+	_ensureDefaultFields(options) {
+		if ((options?.fields == null || Object.keys(options?.fields).length === 0) && this.baseModel.defaultFields) {
+			options.fields = this.baseModel.defaultFields;
+		}
+	}
+
 	_doNotMixInclusionAndExclusionFields(options) {
+		this._ensureDefaultFields(options);
+
 		if (options && options.fields) {
 			const keys = Object.keys(options.fields);
 			const removeKeys = keys.filter((key) => options.fields[key] === 0);
@@ -134,18 +142,18 @@ export class BaseDb extends EventEmitter {
 		}
 	}
 
-	find(...args) {
-		this._doNotMixInclusionAndExclusionFields(args[1]);
-		return this.model.find(...args);
+	find(query = {}, options = {}) {
+		this._doNotMixInclusionAndExclusionFields(options);
+		return this.model.find(query, options);
 	}
 
 	findById(_id, options) {
 		return this.find({ _id }, options);
 	}
 
-	findOne(...args) {
-		this._doNotMixInclusionAndExclusionFields(args[1]);
-		return this.model.findOne(...args);
+	findOne(query = {}, options = {}) {
+		this._doNotMixInclusionAndExclusionFields(options);
+		return this.model.findOne(query, options);
 	}
 
 	findOneById(_id, options) {

app/models/server/raw/BaseRaw.js

@@ -3,20 +3,28 @@ export class BaseRaw {
 		this.col = col;
 	}
 
+	_ensureDefaultFields(options) {
+		if ((options?.fields == null || Object.keys(options?.fields).length === 0) && this.defaultFields) {
+			options.fields = this.defaultFields;
+		}
+	}
+
 	findOneById(_id, options = {}) {
 		return this.findOne({ _id }, options);
 	}
 
-	findOne(...args) {
-		return this.col.findOne(...args);
+	findOne(query = {}, options = {}) {
+		this._ensureDefaultFields(options);
+		return this.col.findOne(query, options);
 	}
 
 	findUsersInRoles() {
 		throw new Error('overwrite-function', 'You must overwrite this function in the extended classes');
 	}
 
-	find(...args) {
-		return this.col.find(...args);
+	find(query = {}, options = {}) {
+		this._ensureDefaultFields(options);
+		return this.col.find(query, options);
 	}
 
 	update(...args) {

app/models/server/raw/Users.js

@@ -1,6 +1,14 @@
 import { BaseRaw } from './BaseRaw';
 
 export class UsersRaw extends BaseRaw {
+	constructor(...args) {
+		super(...args);
+
+		this.defaultFields = {
+			__rooms: 0,
+		};
+	}
+
 	findUsersInRoles(roles, scope, options) {
 		roles = [].concat(roles);
 

app/theme/client/imports/general/base_old.css

@@ -1961,6 +1961,12 @@
 	background-size: contain;
 }
 
+.rc-old .popup-user-not_in_channel {
+	display: inline-block;
+
+	float: right;
+}
+
 .rc-old .popup-user-status {
 	display: inline-block;