Merge pull request #29498 from RocketChat/release-6.2.5

HISTORY.md

@@ -1,3 +1,22 @@
+# 6.2.5
+
+`2023-06-07  ·  1 🐛  ·  1 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `14.21.3`
+- NPM: `6.14.17`
+- MongoDB: `4.4, 5.0, 6.0`
+- Apps-Engine: `1.39.1`
+
+### 🐛 Bug fixes
+
+
+- Seat counter including apps ([#29489](https://github.com/RocketChat/Rocket.Chat/pull/29489))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+
 # 6.2.4
 
 `2023-06-07  ·  2 🐛  ·  2 🔍  ·  5 👩‍💻👨‍💻`

apps/meteor/.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8/nodejs-12
 
-ENV RC_VERSION 6.2.4
+ENV RC_VERSION 6.2.5
 
 MAINTAINER buildmaster@rocket.chat
 

apps/meteor/app/utils/rocketchat.info

@@ -1,3 +1,3 @@
 {
-	"version": "6.2.4"
+	"version": "6.2.5"
 }

apps/meteor/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/meteor",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "6.2.4",
+	"version": "6.2.5",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",

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));
 	}
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.2.4",
+	"version": "6.2.5",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,