[pull] develop from RocketChat:develop

apps/meteor/app/api/server/lib/eraseTeam.spec.ts

@@ -40,12 +40,10 @@ describe('eraseTeam (TypeScript) module', () => {
 					IPostRoomDeleted: 'IPostRoomDeleted',
 				},
 				Apps: {
-					self: { isLoaded: () => false },
-					getBridges: () => ({
-						getListenerBridge: () => ({
-							roomEvent: sandbox.stub().resolves(false),
-						}),
-					}),
+					self: {
+						isLoaded: () => false,
+						triggerEvent: sandbox.stub().resolves(false),
+					},
 				},
 			},
 			'@rocket.chat/models': {
@@ -194,8 +192,10 @@ describe('eraseTeam (TypeScript) module', () => {
 			const AppsStub = {
 				AppEvents: stubs['@rocket.chat/apps'].AppEvents,
 				Apps: {
-					self: { isLoaded: () => true },
-					getBridges: () => ({ getListenerBridge: () => ({ roomEvent: listenerStub }) }),
+					self: {
+						isLoaded: () => true,
+						triggerEvent: listenerStub,
+					},
 				},
 			};
 
@@ -244,8 +244,10 @@ describe('eraseTeam (TypeScript) module', () => {
 			const AppsStub = {
 				AppEvents: stubs['@rocket.chat/apps'].AppEvents,
 				Apps: {
-					self: { isLoaded: () => true },
-					getBridges: () => ({ getListenerBridge: () => ({ roomEvent: roomEventStub }) }),
+					self: {
+						isLoaded: () => true,
+						triggerEvent: roomEventStub,
+					},
 				},
 			};
 

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

@@ -75,7 +75,7 @@ export async function eraseRoomLooseValidation(rid: string): Promise<boolean> {
 	}
 
 	if (Apps.self?.isLoaded()) {
-		const prevent = await Apps.getBridges()?.getListenerBridge().roomEvent(AppEvents.IPreRoomDeletePrevent, room);
+		const prevent = await Apps.self?.triggerEvent(AppEvents.IPreRoomDeletePrevent, room);
 		if (prevent) {
 			return false;
 		}
@@ -89,7 +89,7 @@ export async function eraseRoomLooseValidation(rid: string): Promise<boolean> {
 	}
 
 	if (Apps.self?.isLoaded()) {
-		void Apps.getBridges()?.getListenerBridge().roomEvent(AppEvents.IPostRoomDeleted, room);
+		void Apps.self?.triggerEvent(AppEvents.IPostRoomDeleted, room);
 	}
 
 	return true;