x

Author: ricardogarim

apps/meteor/app/api/server/helpers/getUserFromParams.ts

@@ -10,10 +10,16 @@ export async function getUserFromParams<T extends boolean = false>(
 		user?: string;
 	},
 	full?: T,
-): Promise<T extends true ? IUser : Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'statusText' | 'roles'>> {
+): Promise<
+	T extends true
+		? IUser
+		: Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'statusText' | 'statusSource' | 'statusEmoji' | 'statusExpiresAt' | 'roles'>
+> {
 	let user;
 
-	const projection = full ? {} : { username: 1, name: 1, status: 1, statusText: 1, roles: 1 };
+	const projection = full
+		? {}
+		: { username: 1, name: 1, status: 1, statusText: 1, statusSource: 1, statusEmoji: 1, statusExpiresAt: 1, roles: 1 };
 	if (params.userId?.trim()) {
 		user = await Users.findOneById(params.userId, { projection });
 	} else if (params.username?.trim()) {

apps/meteor/app/api/server/v1/users.ts

@@ -1,5 +1,6 @@
-import { MeteorError, Team, api, Calendar } from '@rocket.chat/core-services';
-import type { IExportOperation, ILoginToken, IPersonalAccessToken, IUser, UserStatus } from '@rocket.chat/core-typings';
+import { MeteorError, Presence, Team } from '@rocket.chat/core-services';
+import type { IExportOperation, ILoginToken, IPersonalAccessToken, IUser } from '@rocket.chat/core-typings';
+import { UserStatus } from '@rocket.chat/core-typings';
 import { Users, Subscriptions, Sessions } from '@rocket.chat/models';
 import {
 	isUserCreateParamsPOST,
@@ -29,7 +30,7 @@ import {
 	validateForbiddenErrorResponse,
 } from '@rocket.chat/rest-typings';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
-import { getLoginExpirationInMs, wrapExceptions } from '@rocket.chat/tools';
+import { getLoginExpirationInMs } from '@rocket.chat/tools';
 import { Accounts } from 'meteor/accounts-base';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
@@ -66,7 +67,6 @@ import { saveCustomFieldsWithoutValidation } from '../../../lib/server/functions
 import { saveUser } from '../../../lib/server/functions/saveUser';
 import { sendWelcomeEmail } from '../../../lib/server/functions/saveUser/sendUserEmail';
 import { canEditExtension } from '../../../lib/server/functions/saveUser/validateUserEditing';
-import { setStatusText } from '../../../lib/server/functions/setStatusText';
 import { setUserAvatar } from '../../../lib/server/functions/setUserAvatar';
 import { setUsernameWithValidation } from '../../../lib/server/functions/setUsername';
 import { validateCustomFields } from '../../../lib/server/functions/validateCustomFields';
@@ -649,7 +649,7 @@ API.v1.addRoute(
 				if (!canViewFullOtherUserInfo) {
 					return API.v1.forbidden();
 				}
-				const escapedEmail = escapeRegExp(this.queryParams.email as string);
+				const escapedEmail = escapeRegExp(this.queryParams.email);
 				nonEmptyQuery['emails.address'] = {
 					$regex: `^${escapedEmail}$`,
 					$options: 'i',
@@ -1870,6 +1870,28 @@ API.v1
 
 const statusType = { type: 'string', enum: ['online', 'offline', 'away', 'busy'] } as const;
 
+const getStatusResponseSchema = ajv.compile<{
+	_id: string;
+	status: string;
+	connectionStatus?: string;
+	statusSource?: string;
+	statusEmoji?: string;
+	statusExpiresAt?: string;
+}>({
+	type: 'object',
+	properties: {
+		_id: { type: 'string' },
+		status: statusType,
+		connectionStatus: { type: 'string', nullable: true },
+		statusSource: { type: 'string', nullable: true },
+		statusEmoji: { type: 'string', nullable: true },
+		statusExpiresAt: { type: 'string', nullable: true },
+		success: { type: 'boolean', enum: [true] },
+	},
+	required: ['_id', 'status', 'success'],
+	additionalProperties: false,
+});
+
 API.v1
 	.get(
 		'users.getPresence',
@@ -1920,6 +1942,7 @@ API.v1
 			body: ajv.compile<{
 				status?: UserStatus;
 				message?: string;
+				expiresAt?: string;
 				userId?: string;
 				username?: string;
 				user?: string;
@@ -1928,6 +1951,7 @@ API.v1
 				properties: {
 					status: { type: 'string', enum: ['online', 'away', 'offline', 'busy'] },
 					message: { type: 'string', nullable: true },
+					expiresAt: { type: 'string', format: 'date-time', nullable: true },
 					userId: { type: 'string' },
 					username: { type: 'string' },
 					user: { type: 'string' },
@@ -1975,48 +1999,29 @@ API.v1
 				return API.v1.forbidden();
 			}
 
-			const { _id, username, roles, name } = user;
-			let { statusText, status } = user;
-
-			if (this.bodyParams.message || this.bodyParams.message === '') {
-				await setStatusText(user, this.bodyParams.message, { emit: false });
-				statusText = this.bodyParams.message;
+			if (this.bodyParams.status === UserStatus.OFFLINE && !settings.get('Accounts_AllowInvisibleStatusOption')) {
+				throw new Meteor.Error('error-status-not-allowed', 'Invisible status is disabled', {
+					method: 'users.setStatus',
+				});
 			}
 
-			if (this.bodyParams.status) {
-				const validStatus = ['online', 'away', 'offline', 'busy'];
-				if (validStatus.includes(this.bodyParams.status)) {
-					status = this.bodyParams.status;
-
-					if (status === 'offline' && !settings.get('Accounts_AllowInvisibleStatusOption')) {
-						throw new Meteor.Error('error-status-not-allowed', 'Invisible status is disabled', {
-							method: 'users.setStatus',
-						});
-					}
-
-					await Users.updateOne(
-						{ _id: user._id },
-						{
-							$set: {
-								status,
-								statusDefault: status,
-							},
-						},
-					);
-
-					void wrapExceptions(() => Calendar.cancelUpcomingStatusChanges(user._id)).suppress();
-				} else {
-					throw new Meteor.Error('error-invalid-status', 'Valid status types include online, away, offline, and busy.', {
-						method: 'users.setStatus',
-					});
-				}
+			const finalStatus = this.bodyParams.status ?? user.status ?? UserStatus.ONLINE;
+			const finalText = this.bodyParams.message ?? user.statusText ?? '';
+			const expiresAt = this.bodyParams.expiresAt ? new Date(this.bodyParams.expiresAt) : undefined;
+
+			// "Online" with no text is a status reset — removes the active claim
+			// and lets the system manage presence automatically (auto-away, connection-based)
+			if (finalStatus === UserStatus.ONLINE && !finalText) {
+				await Presence.clearActiveState(user._id);
+			} else {
+				await Presence.setActiveState(user._id, {
+					statusDefault: finalStatus,
+					statusText: finalText,
+					statusSource: 'manual',
+					...(expiresAt && { statusExpiresAt: expiresAt }),
+				});
 			}
 
-			void api.broadcast('presence.status', {
-				user: { status, _id, username, statusText, roles, name },
-				previousStatus: user.status,
-			});
-
 			return API.v1.success();
 		},
 	)
@@ -2026,17 +2031,7 @@ API.v1
 			authRequired: true,
 			query: isUsersGetStatusParamsGET,
 			response: {
-				200: ajv.compile<{ _id: string; status: string; connectionStatus?: string }>({
-					type: 'object',
-					properties: {
-						_id: { type: 'string' },
-						status: statusType,
-						connectionStatus: { type: 'string', nullable: true },
-						success: { type: 'boolean', enum: [true] },
-					},
-					required: ['_id', 'status', 'success'],
-					additionalProperties: false,
-				}),
+				200: getStatusResponseSchema,
 				400: validateBadRequestErrorResponse,
 				401: validateUnauthorizedErrorResponse,
 			},
@@ -2045,18 +2040,22 @@ API.v1
 			if (isUserFromParams(this.queryParams, this.userId, this.user)) {
 				return API.v1.success({
 					_id: this.userId,
-					// message: user.statusText,
-					connectionStatus: (this.user.statusConnection || 'offline') as 'online' | 'offline' | 'away' | 'busy',
-					status: (this.user.status || 'offline') as 'online' | 'offline' | 'away' | 'busy',
+					connectionStatus: this.user.statusConnection || 'offline',
+					status: this.user.status || 'offline',
+					statusSource: this.user.statusSource,
+					statusEmoji: this.user.statusEmoji,
+					statusExpiresAt: this.user.statusExpiresAt?.toISOString(),
 				});
 			}
 
 			const user = await getUserFromParams(this.queryParams);
 
 			return API.v1.success({
 				_id: user._id,
-				// message: user.statusText,
-				status: (user.status || 'offline') as 'online' | 'offline' | 'away' | 'busy',
+				status: user.status || 'offline',
+				statusSource: user.statusSource,
+				statusEmoji: user.statusEmoji,
+				statusExpiresAt: user.statusExpiresAt?.toISOString(),
 			});
 		},
 	);

apps/meteor/app/lib/server/functions/getFullUserData.ts

@@ -18,6 +18,9 @@ export const defaultFields = {
 	bio: 1,
 	reason: 1,
 	statusText: 1,
+	statusEmoji: 1,
+	statusSource: 1,
+	statusExpiresAt: 1,
 	avatarETag: 1,
 	federated: 1,
 	statusLivechat: 1,

apps/meteor/app/user-status/server/methods/setUserStatus.ts

@@ -1,11 +1,11 @@
 import { Presence } from '@rocket.chat/core-services';
 import type { IUser } from '@rocket.chat/core-typings';
+import { UserStatus } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
 import { RateLimiter } from '../../../lib/server';
-import { setStatusText } from '../../../lib/server/functions/setStatusText';
 import { settings } from '../../../settings/server';
 
 declare module '@rocket.chat/ddp-client' {
@@ -20,26 +20,37 @@ export const setUserStatusMethod = async (
 	statusType: IUser['status'],
 	statusText: IUser['statusText'],
 ): Promise<void> => {
-	if (statusType) {
-		if (statusType === 'offline' && !settings.get('Accounts_AllowInvisibleStatusOption')) {
-			throw new Meteor.Error('error-status-not-allowed', 'Invisible status is disabled', {
-				method: 'setUserStatus',
-			});
-		}
-		await Presence.setStatus(user._id, statusType);
+	if (statusType === 'offline' && !settings.get('Accounts_AllowInvisibleStatusOption')) {
+		throw new Meteor.Error('error-status-not-allowed', 'Invisible status is disabled', {
+			method: 'setUserStatus',
+		});
 	}
 
-	if (statusText || statusText === '') {
+	if (statusText != null) {
 		check(statusText, String);
 
 		if (!settings.get('Accounts_AllowUserStatusMessageChange')) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', {
 				method: 'setUserStatus',
 			});
 		}
+	}
+
+	const finalStatus = statusType ?? user.status ?? UserStatus.ONLINE;
+	const finalText = statusText ?? user.statusText ?? '';
 
-		await setStatusText(user, statusText);
+	// "Online" with no text is a status reset — removes the active claim
+	// and lets the system manage presence automatically (auto-away, connection-based)
+	if (finalStatus === UserStatus.ONLINE && !finalText) {
+		await Presence.clearActiveState(user._id);
+		return;
 	}
+
+	await Presence.setActiveState(user._id, {
+		statusDefault: finalStatus,
+		statusText: finalText,
+		statusSource: 'manual',
+	});
 };
 
 Meteor.methods<ServerMethods>({

apps/meteor/server/services/calendar/service.ts

@@ -1,11 +1,10 @@
 import type { ICalendarService } from '@rocket.chat/core-services';
-import { ServiceClassInternal, api } from '@rocket.chat/core-services';
+import { Presence, ServiceClassInternal, api } from '@rocket.chat/core-services';
 import type { IUser, ICalendarEvent } from '@rocket.chat/core-typings';
-import { UserStatus } from '@rocket.chat/core-typings';
 import { cronJobs } from '@rocket.chat/cron';
 import { Logger } from '@rocket.chat/logger';
 import type { InsertionModel } from '@rocket.chat/model-typings';
-import { CalendarEvent, Users } from '@rocket.chat/models';
+import { CalendarEvent } from '@rocket.chat/models';
 import type { UpdateResult, DeleteResult } from 'mongodb';
 
 import { applyStatusChange } from './statusEvents/applyStatusChange';
@@ -285,26 +284,10 @@ export class CalendarService extends ServiceClassInternal implements ICalendarSe
 			return;
 		}
 
-		const user = await Users.findOneById(event.uid, { projection: { statusDefault: 1 } });
-		if (!user || user.statusDefault === UserStatus.OFFLINE) {
-			return;
-		}
-
-		const overlappingEvents = await CalendarEvent.findOverlappingEvents(event._id, event.uid, event.startTime, event.endTime)
-			.sort({ startTime: -1 })
-			.toArray();
-		const previousStatus = overlappingEvents.at(0)?.previousStatus ?? user.statusDefault;
-
-		if (previousStatus) {
-			await CalendarEvent.updateEvent(event._id, { previousStatus });
-		}
-
 		await applyStatusChange({
 			eventId: event._id,
 			uid: event.uid,
-			startTime: event.startTime,
 			endTime: event.endTime,
-			status: UserStatus.BUSY,
 		});
 	}
 
@@ -313,31 +296,7 @@ export class CalendarService extends ServiceClassInternal implements ICalendarSe
 			return;
 		}
 
-		const user = await Users.findOneById(event.uid, { projection: { statusDefault: 1 } });
-		if (!user) {
-			return;
-		}
-
-		// Only restore status if:
-		// 1. The current statusDefault is BUSY (meaning it was set by our system, not manually changed by user)
-		// 2. We have a previousStatus stored from before the event started
-
-		if (user.statusDefault === UserStatus.BUSY && event.previousStatus && event.previousStatus !== user.statusDefault) {
-			await applyStatusChange({
-				eventId: event._id,
-				uid: event.uid,
-				startTime: event.startTime,
-				endTime: event.endTime,
-				status: event.previousStatus,
-			});
-		} else {
-			logger.debug({
-				msg: 'Not restoring status for user',
-				userId: event.uid,
-				currentStatusDefault: user.statusDefault,
-				previousStatus: event.previousStatus,
-			});
-		}
+		await Presence.endActiveState(event.uid);
 	}
 
 	private async sendCurrentNotifications(date: Date): Promise<void> {