cr

RocketChat · Oct 20, 2023 · 64cc881 · 64cc881
1 parent e8f30cb
commit 64cc881
Showing 1 changed file with 8 additions and 29 deletions.
diff --git a/apps/meteor/app/livechat/server/api/lib/users.ts b/apps/meteor/app/livechat/server/api/lib/users.ts
@@ -24,47 +24,26 @@ async function findUsers({
 	pagination: { offset: number; count: number; sort: any };
 }): Promise<{ users: ILivechatAgent[]; count: number; offset: number; total: number }> {
 	const query: FilterOperators<ILivechatAgent> = {};
+	const orConditions: FilterOperators<ILivechatAgent>['$or'] = [];
 	if (text) {
 		const filterReg = new RegExp(escapeRegExp(text), 'i');
-		Object.assign(query, {
-			$or: [{ username: filterReg }, { name: filterReg }, { 'emails.address': filterReg }],
-		});
+		orConditions.push({ $or: [{ username: filterReg }, { name: filterReg }, { 'emails.address': filterReg }] });
 	}
 
 	if (onlyAvailable) {
-		Object.assign(query, {
-			statusLivechat: 'available',
-		});
+		query.statusLivechat = 'available';
 	}
 
 	if (excludeId) {
-		Object.assign(query, {
-			_id: { $ne: excludeId },
-		});
+		query._id = { $ne: excludeId };
 	}
 
 	if (!showIdleAgents) {
-		const oldOr = query.$or;
-
-		const newOr = [{ status: { $exists: true, $ne: 'offline' }, roles: { $ne: 'bot' } }, { roles: 'bot' }];
+		orConditions.push({ $or: [{ status: { $exists: true, $ne: 'offline' }, roles: { $ne: 'bot' } }, { roles: 'bot' }] });
+	}
 
-		if (oldOr) {
-			delete query.$or;
-			Object.assign(query, {
-				$and: [
-					{
-						$or: oldOr,
-					},
-					{
-						$or: newOr,
-					},
-				],
-			});
-		} else {
-			Object.assign(query, {
-				$or: newOr,
-			});
-		}
+	if (orConditions.length) {
+		query.$and = orConditions;
 	}
 
 	const [