fix: Seat counter including apps (#29489)

RocketChat · Jun 7, 2023 · cd86eb2 · cd86eb2
1 parent 90d310a
commit cd86eb2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/.changeset/sixty-owls-shout.md b/.changeset/sixty-owls-shout.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fix seats counter including apps
diff --git a/apps/meteor/server/models/raw/Users.js b/apps/meteor/server/models/raw/Users.js
@@ -2794,9 +2794,19 @@ export class UsersRaw extends BaseRaw {
 	// here
 	getActiveLocalUserCount() {
 		return Promise.all([
-			this.col.countDocuments({ active: true }),
-			this.col.countDocuments({ federated: true }),
-			this.col.countDocuments({ isRemote: true }),
+			this.col.countDocuments({
+				active: true,
+				type: {
+					$nin: ['app'],
+				},
+				roles: { $ne: ['guest'] },
+			}),
+			this.col.countDocuments({ federated: true, active: true }),
+			this.col.countDocuments({
+				isRemote: true,
+				active: true,
+				roles: { $ne: ['guest'] },
+			}),
 		]).then((results) => results.reduce((a, b) => a - b));
 	}