Merge branch 'develop' into chore/openapi-migrate-mailer-endpoints

Author: vivekyarra

.changeset/eighty-experts-sort.md

@@ -0,0 +1,6 @@
+---
+'@rocket.chat/ui-voip': patch
+'@rocket.chat/meteor': patch
+---
+
+Fixes empty notifications sent when a voice call ends

.changeset/nasty-tomatoes-bake.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue where the outlook calendar action isn't being reactive based on the setting

.changeset/tidy-pillows-eat.md

@@ -0,0 +1,6 @@
+---
+'@rocket.chat/i18n': patch
+'@rocket.chat/meteor': patch
+---
+
+Adds error feedback when clicking on a mentioned room you don't have access to

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

@@ -6,7 +6,7 @@ import type {
 	TwitterOAuthConfiguration,
 	OAuthConfiguration,
 } from '@rocket.chat/core-typings';
-import { isSettingAction, isSettingColor } from '@rocket.chat/core-typings';
+import { isActionSettingWithEndpoint, isSettingAction, isSettingColor } from '@rocket.chat/core-typings';
 import { LoginServiceConfiguration as LoginServiceConfigurationModel, Settings } from '@rocket.chat/models';
 import {
 	ajv,
@@ -348,7 +348,12 @@ API.v1.post(
 
 		const { bodyParams } = this;
 
-		if (isSettingAction(setting) && isSettingsUpdatePropsActions(bodyParams) && bodyParams.execute) {
+		if (
+			isSettingAction(setting) &&
+			isSettingsUpdatePropsActions(bodyParams) &&
+			bodyParams.execute &&
+			!isActionSettingWithEndpoint(setting.value)
+		) {
 			await Meteor.callAsync(setting.value);
 			return API.v1.success();
 		}

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

@@ -13,9 +13,10 @@ import { afterSaveMessage } from '../lib/afterSaveMessage';
 import { notifyOnRoomChangedById } from '../lib/notifyListener';
 import { validateCustomMessageFields } from '../lib/validateCustomMessageFields';
 
-type SendMessageOptions = {
+export type SendMessageOptions = {
 	upsert?: boolean;
 	previewUrls?: string[];
+	skipNotifications?: boolean;
 };
 
 // TODO: most of the types here are wrong, but I don't want to change them now
@@ -289,7 +290,7 @@ export const sendMessage = async function (user: any, message: any, room: any, o
 		void Apps.self?.triggerEvent(messageEvent, message);
 	}
 
-	await afterSaveMessage(message, room, user);
+	await afterSaveMessage(message, room, user, { options });
 
 	void notifyOnRoomChangedById(message.rid);
 

apps/meteor/app/lib/server/lib/afterSaveMessage.ts

@@ -4,10 +4,28 @@ import type { Updater } from '@rocket.chat/models';
 import { Rooms } from '@rocket.chat/models';
 
 import { callbacks } from '../../../../server/lib/callbacks';
-
-export async function afterSaveMessage(message: IMessage, room: IRoom, user: IUser, roomUpdater?: Updater<IRoom>): Promise<IMessage> {
+import type { SendMessageOptions } from '../functions/sendMessage';
+
+export async function afterSaveMessage(
+	message: IMessage,
+	room: IRoom,
+	user: IUser,
+	{
+		roomUpdater,
+		options,
+	}: {
+		roomUpdater?: Updater<IRoom>;
+		options?: SendMessageOptions;
+	} = {},
+): Promise<IMessage> {
 	const updater = roomUpdater ?? Rooms.getUpdater();
-	const data: IMessage = (await callbacks.run('afterSaveMessage', message, { room, user, roomUpdater: updater })) as unknown as IMessage;
+
+	const data: IMessage = (await callbacks.run('afterSaveMessage', message, {
+		room,
+		user,
+		roomUpdater: updater,
+		options,
+	})) as unknown as IMessage;
 
 	if (!roomUpdater && updater.hasChanges()) {
 		await Rooms.updateFromUpdater({ _id: room._id }, updater);
@@ -19,8 +37,21 @@ export async function afterSaveMessage(message: IMessage, room: IRoom, user: IUs
 	return data;
 }
 
-export function afterSaveMessageAsync(message: IMessage, room: IRoom, user: IUser, roomUpdater: Updater<IRoom> = Rooms.getUpdater()): void {
-	callbacks.runAsync('afterSaveMessage', message, { room, user, roomUpdater });
+export function afterSaveMessageAsync(
+	message: IMessage,
+	room: IRoom,
+	user: IUser,
+	{
+		roomUpdater: updater,
+		options,
+	}: {
+		roomUpdater?: Updater<IRoom>;
+		options?: SendMessageOptions;
+	} = {},
+): void {
+	const roomUpdater = updater ?? Rooms.getUpdater();
+
+	callbacks.runAsync('afterSaveMessage', message, { room, user, roomUpdater, options });
 
 	if (roomUpdater.hasChanges()) {
 		void Rooms.updateFromUpdater({ _id: room._id }, roomUpdater);

apps/meteor/app/lib/server/lib/sendNotificationsOnMessage.ts

@@ -417,7 +417,13 @@ settings.watch('Troubleshoot_Disable_Notifications', (value) => {
 
 	callbacks.add(
 		'afterSaveMessage',
-		(message, { room }) => sendAllNotifications(message, room),
+		(message, { room, options }) => {
+			if (options?.skipNotifications) {
+				return message;
+			}
+
+			return sendAllNotifications(message, room);
+		},
 		callbacks.priority.LOW,
 		'sendNotificationsOnMessage',
 	);

apps/meteor/app/threads/server/hooks/aftersavemessage.ts

@@ -4,6 +4,7 @@ import { Messages } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
 import { callbacks } from '../../../../server/lib/callbacks';
+import type { SendMessageOptions } from '../../../lib/server/functions/sendMessage';
 import { notifyOnMessageChange } from '../../../lib/server/lib/notifyListener';
 import { updateThreadUsersSubscriptions, getMentions } from '../../../lib/server/lib/notifyUsersOnMessage';
 import { sendMessageNotifications } from '../../../lib/server/lib/sendNotificationsOnMessage';
@@ -39,7 +40,7 @@ const notification = async (message: IMessage, room: IRoom, replies: string[]) =
 	return message;
 };
 
-export async function processThreads(message: IMessage, room: IRoom) {
+export async function processThreads(message: IMessage, room: IRoom, options?: SendMessageOptions) {
 	if (!message.tmid) {
 		return message;
 	}
@@ -61,7 +62,9 @@ export async function processThreads(message: IMessage, room: IRoom) {
 
 	await notifyUsersOnReply(message, replies);
 	await metaData(message, parentMessage, replies);
-	await notification(message, room, replies);
+	if (!options?.skipNotifications) {
+		await notification(message, room, replies);
+	}
 	void notifyOnMessageChange({
 		id: message.tmid,
 	});
@@ -77,8 +80,8 @@ Meteor.startup(() => {
 		}
 		callbacks.add(
 			'afterSaveMessage',
-			async (message, { room }) => {
-				return processThreads(message, room);
+			async (message, { room, options }) => {
+				return processThreads(message, room, options);
 			},
 			callbacks.priority.LOW,
 			'threads-after-save-message',

apps/meteor/client/components/ImageGallery/ImageGallery.tsx

@@ -1,6 +1,6 @@
 import type { IUpload } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
-import { Box, ButtonGroup, IconButton, Palette, PaletteStyleTag, Throbber, padding } from '@rocket.chat/fuselage';
+import { Box, ButtonGroup, IconButton, Palette, PaletteStyleTag, Throbber, spacing } from '@rocket.chat/fuselage';
 import { useRef, useState } from 'react';
 import { FocusScope } from 'react-aria';
 import { createPortal } from 'react-dom';
@@ -33,7 +33,7 @@ const swiperStyle = css`
 	}
 
 	.swiper-slide {
-		padding: ${padding('x144')} ${padding('x60')} ${padding('x96')};
+		padding: ${spacing('x144')} ${spacing('x60')} ${spacing('x96')};
 	}
 
 	.rcx-swiper-prev-button,

apps/meteor/client/components/UserInfo/UserInfo.tsx

@@ -14,7 +14,7 @@ import {
 } from '@rocket.chat/ui-client';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
-import { memo } from 'react';
+import { memo, useId } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useTimeAgo } from '../../hooks/useTimeAgo';
@@ -84,6 +84,8 @@ const UserInfo = ({
 	const userDisplayName = useUserDisplayName({ name, username });
 	const userCustomFields = useUserCustomFields(customFields);
 
+	const usernameId = useId();
+
 	return (
 		<ContextualbarScrollableContent p={24} {...props}>
 			<InfoPanel>
@@ -128,9 +130,13 @@ const UserInfo = ({
 					)}
 
 					{username && username !== name && (
-						<InfoPanelField>
-							<InfoPanelLabel>{t('Username')}</InfoPanelLabel>
-							<InfoPanelText data-qa='UserInfoUserName'>{username}</InfoPanelText>
+						<InfoPanelField is='dl'>
+							<InfoPanelLabel is='dt' id={usernameId}>
+								{t('Username')}
+							</InfoPanelLabel>
+							<InfoPanelText is='dd' aria-labelledby={usernameId}>
+								{username}
+							</InfoPanelText>
 						</InfoPanelField>
 					)}