Solve conflicts

Author: julio-rocketchat

.changeset/cuddly-garlics-cover.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes unused `i18nTitle` provided by the app in message composer popup previewer

.changeset/proud-mayflies-invite.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Includes attachments metadata in JSON export if type is file when exporting messages

.changeset/twenty-camels-worry.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Adds wrapExceptions to handle an unhandled promise rejection when adding and/or updating OAuth apps

.changeset/yellow-cars-change.md

@@ -0,0 +1,8 @@
+---
+'@rocket.chat/fuselage-ui-kit': patch
+'@rocket.chat/ui-video-conf': patch
+'@rocket.chat/i18n': patch
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue where video conf message block wasn't considering display avatars preference

.github/CODEOWNERS

@@ -20,7 +20,7 @@
 /apps/meteor/app/voip @RocketChat/omnichannel
 /apps/meteor/app/sms @RocketChat/omnichannel
 /apps/meteor/server @RocketChat/backend
-/apps/meteor/server/models @RocketChat/Architecture
+/packages/models @RocketChat/Architecture
 apps/meteor/server/startup/migrations @RocketChat/Architecture
 /apps/meteor/packages/rocketchat-livechat @RocketChat/omnichannel
 /apps/meteor/server/services/voip-asterisk @RocketChat/omnichannel

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

@@ -3,6 +3,7 @@ import { Logger } from '@rocket.chat/logger';
 import { Users } from '@rocket.chat/models';
 import { Random } from '@rocket.chat/random';
 import type { JoinPathPattern, Method } from '@rocket.chat/rest-typings';
+import { wrapExceptions } from '@rocket.chat/tools';
 import express from 'express';
 import type { Request, Response } from 'express';
 import { Accounts } from 'meteor/accounts-base';
@@ -404,10 +405,14 @@ export class APIClass<TBasePath extends string = ''> {
 	public reloadRoutesToRefreshRateLimiter(): void {
 		this._routes.forEach((route) => {
 			if (this.shouldAddRateLimitToRoute(route.options)) {
-				this.addRateLimiterRuleForRoutes({
-					routes: [route.path],
-					rateLimiterOptions: route.options.rateLimiterOptions || defaultRateLimiterOptions,
-					endpoints: Object.keys(route.endpoints).filter((endpoint) => endpoint !== 'options'),
+				wrapExceptions(() =>
+					this.addRateLimiterRuleForRoutes({
+						routes: [route.path],
+						rateLimiterOptions: route.options.rateLimiterOptions || defaultRateLimiterOptions,
+						endpoints: Object.keys(route.endpoints).filter((endpoint) => endpoint !== 'options'),
+					}),
+				).catch((error) => {
+					console.error(error.message);
 				});
 			}
 		});
@@ -426,10 +431,10 @@ export class APIClass<TBasePath extends string = ''> {
 			throw new Meteor.Error('"rateLimiterOptions" must be an object');
 		}
 		if (!rateLimiterOptions.numRequestsAllowed) {
-			throw new Meteor.Error('You must set "numRequestsAllowed" property in rateLimiter for REST API endpoint');
+			throw new Meteor.Error(`You must set "numRequestsAllowed" property in rateLimiter for REST API endpoint: ${routes}`);
 		}
 		if (!rateLimiterOptions.intervalTimeInMS) {
-			throw new Meteor.Error('You must set "intervalTimeInMS" property in rateLimiter for REST API endpoint');
+			throw new Meteor.Error(`You must set "intervalTimeInMS" property in rateLimiter for REST API endpoint: ${routes}`);
 		}
 		const addRateLimitRuleToEveryRoute = (routes: string[]) => {
 			routes.forEach((route) => {

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

@@ -623,7 +623,7 @@ API.v1.addRoute(
 		authRequired: false,
 		rateLimiterOptions: {
 			numRequestsAllowed: settings.get('Rate_Limiter_Limit_RegisterUser') ?? 1,
-			intervalTimeInMS: settings.get('API_Enable_Rate_Limiter_Limit_Time_Default'),
+			intervalTimeInMS: settings.get('API_Enable_Rate_Limiter_Limit_Time_Default') ?? 600000,
 		},
 		validateParams: isUserRegisterParamsPOST,
 	},

apps/meteor/app/lib/client/index.ts

@@ -1,4 +1,3 @@
-import './startup/settingsOnLoadSiteUrl';
 import '../lib/MessageTypes';
 import './OAuthProxy';
 import './methods/sendMessage';

apps/meteor/app/lib/client/startup/settingsOnLoadSiteUrl.ts

@@ -1,13 +1,13 @@
+import apn from '@parse/node-apn';
 import type { IAppsTokens, RequiredField } from '@rocket.chat/core-typings';
-import apn from 'apn';
 import EJSON from 'ejson';
 
 import type { PushOptions, PendingPushNotification } from './definition';
 import { logger } from './logger';
 
 let apnConnection: apn.Provider | undefined;
 
-declare module 'apn' {
+declare module '@parse/node-apn' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface Notification {
 		setContentAvailable: (value: boolean | 1 | 0) => void;
@@ -72,7 +72,7 @@ export const sendAPN = ({
 		response.failed.forEach((failure) => {
 			logger.debug(`Got error code ${failure.status} for token ${userToken}`);
 
-			if (['400', '410'].includes(failure.status ?? '')) {
+			if (['400', '410'].includes(String(failure.status))) {
 				logger.debug(`Removing token ${userToken}`);
 				_removeToken({
 					apn: userToken,