Merge branch 'develop' into fix/error-exporting-channel

.changeset/cool-zoos-move.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fixed threads breaking when sending messages too fast

.changeset/cyan-mangos-do.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fix: UI issue on marketplace filters

.changeset/empty-files-know.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fix unnecessary username validation on accounts profile form

.changeset/long-cars-dream.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed intermittent errors caused by the removal of subscriptions and inquiries when lacking permissions.

.changeset/old-zoos-hang.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+fix: mobile ringing notification missing call id

.changeset/perfect-onions-develop.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fix i18n translations using sprintf post processor

.changeset/perfect-pianos-yawn.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/presence': minor
+---
+
+Add peak connections monitoring and methods to get and reset the counter

.changeset/rich-dogs-smell.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Fix typing indicator of Apps user

.changeset/slow-coats-shout.md

@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": minor
+---
+
+Add the daily and monthly peaks of concurrent connections to statistics
+ - Added `dailyPeakConnections` statistic for monitoring the daily peak of concurrent connections in a workspace;
+ - Added `maxMonthlyPeakConnections` statistic for monitoring the last 30 days peak of concurrent connections in a workspace;

.changeset/stale-masks-learn.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/server-fetch': patch
+---
+
+Fixed an issue where the payload of an HTTP request made by an app wouldn't be correctly encoded in some cases

.changeset/thick-spoons-compete.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Added new Omnichannel setting 'Hide conversation after closing'

.changeset/tidy-cows-destroy.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+feat: Community users will now be able to customize their Business hour timezone

.changeset/tough-apples-turn.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Forward headers when using proxy for file uploads

.changeset/weak-cameras-pay.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed issue with message read receipts not being created when accessing a room the first time

FEATURES.md

@@ -1,10 +1,10 @@
 # Features
 
 - Self Host
-  - Docker  
-  - Multiple Deployment Options (Heroku, Digital Ocean, Sandstorm, etc.)  
+  - Docker
+  - Multiple Deployment Options (Heroku, Digital Ocean, Sandstorm, etc.)
 - Authentication Options
-  - OAuth 
+  - OAuth
   - SAML
   - LDAP
   - CAS (1.0, 2.0 + attribute sync)
@@ -19,7 +19,7 @@
 - Rich Media
   - Audio Calls
   - Video Conferencing
-  - Screensharing
+  - Screen Sharing
 - Notifications
   - Desktop and Mobile
   - Use your own gateway

apps/meteor/app/apps/server/bridges/livechat.ts

@@ -44,7 +44,7 @@ export class AppLivechatBridge extends LivechatBridge {
 			throw new Error('Invalid token for livechat message');
 		}
 
-		const msg = await Livechat.sendMessage({
+		const msg = await LivechatTyped.sendMessage({
 			guest: this.orch.getConverters()?.get('visitors').convertAppVisitor(message.visitor),
 			message: await this.orch.getConverters()?.get('messages').convertAppMessage(message),
 			agent: undefined,
@@ -74,7 +74,8 @@ export class AppLivechatBridge extends LivechatBridge {
 			message: await this.orch.getConverters()?.get('messages').convertAppMessage(message),
 		};
 
-		await Livechat.updateMessage(data);
+		// @ts-expect-error IVisitor vs ILivechatVisitor :(
+		await LivechatTyped.updateMessage(data);
 	}
 
 	protected async createRoom(visitor: IVisitor, agent: IUser, appId: string, extraParams?: IExtraRoomParams): Promise<ILivechatRoom> {
@@ -208,7 +209,7 @@ export class AppLivechatBridge extends LivechatBridge {
 			userId = transferredTo._id;
 		}
 
-		return Livechat.transfer(
+		return LivechatTyped.transfer(
 			await this.orch.getConverters()?.get('rooms').convertAppRoom(currentRoom),
 			this.orch.getConverters()?.get('visitors').convertAppVisitor(visitor),
 			{ userId, departmentId, transferredBy, transferredTo },
@@ -288,7 +289,7 @@ export class AppLivechatBridge extends LivechatBridge {
 			throw new Error('Could not get the message converter to process livechat room messages');
 		}
 
-		const livechatMessages = await Livechat.getRoomMessages({ rid: roomId });
+		const livechatMessages = await LivechatTyped.getRoomMessages({ rid: roomId });
 
 		return Promise.all(livechatMessages.map((message) => messageConverter.convertMessage(message) as Promise<IAppsEngineMesage>));
 	}

apps/meteor/app/apps/server/bridges/messages.ts

@@ -103,7 +103,11 @@ export class AppMessageBridge extends MessageBridge {
 	protected async typing({ scope, id, username, isTyping }: ITypingDescriptor): Promise<void> {
 		switch (scope) {
 			case 'room':
-				notifications.notifyRoom(id, 'typing', username!, isTyping);
+				if (!username) {
+					throw new Error('Invalid username');
+				}
+
+				notifications.notifyRoom(id, 'user-activity', username, isTyping ? ['user-typing'] : []);
 				return;
 			default:
 				throw new Error('Unrecognized typing scope provided');

apps/meteor/app/apps/server/bridges/uiInteraction.ts

@@ -1,11 +1,12 @@
 import type { IUIKitInteraction } from '@rocket.chat/apps-engine/definition/uikit';
 import type { IUser } from '@rocket.chat/apps-engine/definition/users';
-import { UiInteractionBridge as UiIntBridge } from '@rocket.chat/apps-engine/server/bridges/UiInteractionBridge';
+import { UiInteractionBridge as AppsEngineUiInteractionBridge } from '@rocket.chat/apps-engine/server/bridges/UiInteractionBridge';
 import { api } from '@rocket.chat/core-services';
+import type { UiKit } from '@rocket.chat/core-typings';
 
 import type { AppServerOrchestrator } from '../../../../ee/server/apps/orchestrator';
 
-export class UiInteractionBridge extends UiIntBridge {
+export class UiInteractionBridge extends AppsEngineUiInteractionBridge {
 	constructor(private readonly orch: AppServerOrchestrator) {
 		super();
 	}
@@ -19,6 +20,6 @@ export class UiInteractionBridge extends UiIntBridge {
 			throw new Error('Invalid app provided');
 		}
 
-		void api.broadcast('notify.uiInteraction', user.id, interaction);
+		void api.broadcast('notify.uiInteraction', user.id, interaction as UiKit.ServerInteraction);
 	}
 }

apps/meteor/app/cas/server/cas_server.js

@@ -257,7 +257,7 @@ Accounts.registerLoginHandler('cas', async (options) => {
 				if (roomName) {
 					let room = await Rooms.findOneByNameAndType(roomName, 'c');
 					if (!room) {
-						room = await createRoom('c', roomName, user.username);
+						room = await createRoom('c', roomName, user);
 					}
 				}
 			}

apps/meteor/app/federation/server/lib/getFederationDiscoveryMethod.ts

@@ -0,0 +1,3 @@
+import { settings } from '../../../settings/server';
+
+export const getFederationDiscoveryMethod = () => settings.get<string>('FEDERATION_Discovery_Method');

apps/meteor/app/federation/server/lib/getFederationDomain.ts

@@ -0,0 +1,3 @@
+import { settings } from '../../../settings/server';
+
+export const getFederationDomain = () => settings.get<string>('FEDERATION_Domain').replace('@', '');

apps/meteor/app/federation/server/lib/isFederationEnabled.ts

@@ -0,0 +1,3 @@
+import { settings } from '../../../settings/server';
+
+export const isFederationEnabled = () => settings.get<boolean>('FEDERATION_Enabled');

apps/meteor/app/file-upload/server/lib/FileUpload.ts

@@ -562,7 +562,32 @@ export const FileUpload = {
 	) {
 		res.setHeader('Content-Disposition', `${forceDownload ? 'attachment' : 'inline'}; filename="${encodeURI(fileName)}"`);
 
-		request.get(fileUrl, (fileRes) => fileRes.pipe(res));
+		request.get(fileUrl, (fileRes) => {
+			if (fileRes.statusCode !== 200) {
+				res.setHeader('x-rc-proxyfile-status', String(fileRes.statusCode));
+				res.setHeader('content-length', 0);
+				res.writeHead(500);
+				res.end();
+				return;
+			}
+
+			// eslint-disable-next-line prettier/prettier
+			const headersToProxy = [
+				'age',
+				'cache-control',
+				'content-length',
+				'content-type',
+				'date',
+				'expired',
+				'last-modified',
+			];
+
+			headersToProxy.forEach((header) => {
+				fileRes.headers[header] && res.setHeader(header, String(fileRes.headers[header]));
+			});
+
+			fileRes.pipe(res);
+		});
 	},
 
 	generateJWTToFileUrls({ rid, userId, fileId }: { rid: string; userId: string; fileId: string }) {

apps/meteor/app/file-upload/ufs/AmazonS3/server.ts

@@ -80,7 +80,7 @@ class AmazonS3Store extends UploadFS.Store {
 				ResponseContentDisposition: `${forceDownload ? 'attachment' : 'inline'}; filename="${encodeURI(file.name || '')}"`,
 			};
 
-			return s3.getSignedUrl('getObject', params);
+			return s3.getSignedUrlPromise('getObject', params);
 		};
 
 		/**

apps/meteor/app/irc/server/irc-bridge/peerHandlers/joinedChannel.js

@@ -16,7 +16,7 @@ export default async function handleJoinedChannel(args) {
 	let room = await Rooms.findOneByName(args.roomName);
 
 	if (!room) {
-		const createdRoom = await createRoom('c', args.roomName, user.username, []);
+		const createdRoom = await createRoom('c', args.roomName, user, []);
 		room = await Rooms.findOne({ _id: createdRoom.rid });
 
 		this.log(`${user.username} created room ${args.roomName}`);

apps/meteor/app/livechat/client/lib/stream/queueManager.ts

@@ -8,18 +8,34 @@ import { LivechatInquiry } from '../../collections/LivechatInquiry';
 const departments = new Set();
 
 const events = {
-	added: (inquiry: ILivechatInquiryRecord) => {
-		departments.has(inquiry.department) && LivechatInquiry.insert({ ...inquiry, alert: true, _updatedAt: new Date(inquiry._updatedAt) });
+	added: async (inquiry: ILivechatInquiryRecord) => {
+		if (!departments.has(inquiry.department)) {
+			return;
+		}
+
+		LivechatInquiry.insert({ ...inquiry, alert: true, _updatedAt: new Date(inquiry._updatedAt) });
+		await invalidateRoomQueries(inquiry.rid);
 	},
 	changed: async (inquiry: ILivechatInquiryRecord) => {
 		if (inquiry.status !== 'queued' || (inquiry.department && !departments.has(inquiry.department))) {
-			return LivechatInquiry.remove(inquiry._id);
+			return removeInquiry(inquiry);
 		}
 
 		LivechatInquiry.upsert({ _id: inquiry._id }, { ...inquiry, alert: true, _updatedAt: new Date(inquiry._updatedAt) });
-		await queryClient.invalidateQueries(['/v1/rooms.info', inquiry.rid]);
+		await invalidateRoomQueries(inquiry.rid);
 	},
-	removed: (inquiry: ILivechatInquiryRecord) => LivechatInquiry.remove(inquiry._id),
+	removed: (inquiry: ILivechatInquiryRecord) => removeInquiry(inquiry),
+};
+
+const invalidateRoomQueries = async (rid: string) => {
+	await queryClient.invalidateQueries(['rooms', { reference: rid, type: 'l' }]);
+	await queryClient.removeQueries(['rooms', rid]);
+	await queryClient.removeQueries(['/v1/rooms.info', rid]);
+};
+
+const removeInquiry = async (inquiry: ILivechatInquiryRecord) => {
+	await LivechatInquiry.remove(inquiry._id);
+	return queryClient.invalidateQueries(['rooms', { reference: inquiry.rid, type: 'l' }]);
 };
 
 const getInquiriesFromAPI = async () => {

apps/meteor/app/livechat/client/views/app/business-hours/BusinessHours.ts

@@ -29,10 +29,6 @@ class BusinessHoursManager {
 	showBackButton(): boolean {
 		return this.behavior.showBackButton();
 	}
-
-	showTimezoneTemplate(): boolean {
-		return this.behavior.showTimezoneTemplate();
-	}
 }
 
 export const businessHourManager = new BusinessHoursManager(new SingleBusinessHourBehavior());

apps/meteor/app/livechat/client/views/app/business-hours/IBusinessHourBehavior.ts

@@ -4,5 +4,4 @@ export interface IBusinessHourBehavior {
 	getView(): string;
 	showCustomTemplate(businessHourData: ILivechatBusinessHour): boolean;
 	showBackButton(): boolean;
-	showTimezoneTemplate(): boolean;
 }

apps/meteor/app/livechat/client/views/app/business-hours/Single.ts

@@ -12,8 +12,4 @@ export class SingleBusinessHourBehavior implements IBusinessHourBehavior {
 	showBackButton(): boolean {
 		return false;
 	}
-
-	showTimezoneTemplate(): boolean {
-		return false;
-	}
 }

apps/meteor/app/livechat/imports/server/rest/departments.ts

@@ -17,6 +17,7 @@ import {
 } from '../../../server/api/lib/departments';
 import { DepartmentHelper } from '../../../server/lib/Departments';
 import { Livechat } from '../../../server/lib/Livechat';
+import { Livechat as LivechatTs } from '../../../server/lib/LivechatTyped';
 
 API.v1.addRoute(
 	'livechat/department',
@@ -192,7 +193,7 @@ API.v1.addRoute(
 	},
 	{
 		async post() {
-			await Livechat.archiveDepartment(this.urlParams._id);
+			await LivechatTs.archiveDepartment(this.urlParams._id);
 
 			return API.v1.success();
 		},
@@ -207,11 +208,8 @@ API.v1.addRoute(
 	},
 	{
 		async post() {
-			if (await Livechat.unarchiveDepartment(this.urlParams._id)) {
-				return API.v1.success();
-			}
-
-			return API.v1.failure();
+			await LivechatTs.unarchiveDepartment(this.urlParams._id);
+			return API.v1.success();
 		},
 	},
 );

apps/meteor/app/livechat/imports/server/rest/sms.js

@@ -182,7 +182,7 @@ API.v1.addRoute('livechat/sms-incoming/:service', {
 		};
 
 		try {
-			const msg = SMSService.response.call(this, await Livechat.sendMessage(sendMessage));
+			const msg = SMSService.response.call(this, await LivechatTyped.sendMessage(sendMessage));
 			setImmediate(async () => {
 				if (sms.extra) {
 					if (sms.extra.fromCountry) {

apps/meteor/app/livechat/server/api/lib/livechat.ts

@@ -13,7 +13,6 @@ import { Meteor } from 'meteor/meteor';
 import { callbacks } from '../../../../../lib/callbacks';
 import { i18n } from '../../../../../server/lib/i18n';
 import { normalizeAgent } from '../../lib/Helper';
-import { Livechat } from '../../lib/Livechat';
 import { Livechat as LivechatTyped } from '../../lib/LivechatTyped';
 
 export function online(department: string, skipSettingCheck = false, skipFallbackCheck = false): Promise<boolean> {
@@ -139,7 +138,7 @@ export function normalizeHttpHeaderData(headers: Record<string, string | string[
 
 export async function settings({ businessUnit = '' }: { businessUnit?: string } = {}): Promise<Record<string, string | number | any>> {
 	// Putting this ugly conversion while we type the livechat service
-	const initSettings = (await Livechat.getInitSettings()) as unknown as Record<string, string | number | any>;
+	const initSettings = await LivechatTyped.getInitSettings();
 	const triggers = await findTriggers();
 	const departments = await findDepartments(businessUnit);
 	const sound = `${Meteor.absoluteUrl()}sounds/chime.mp3`;