Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into fix/…

…chat.postMessage

* 'develop' of github.com:RocketChat/Rocket.Chat:
  docs: Fixed typo in FEATURES.md (#30683)
  refactor(uikit): uikit interactions (#30534)
  feat: add trial flag to licenses.info endpoint (#30662)
  refactor: Small files to typescript (#30665)
  feat: Added new setting 'Hide conversation after closing' (#30591)

.changeset/thick-spoons-compete.md

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

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/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/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');