Skip to content
Merged
22 changes: 12 additions & 10 deletions apps/meteor/app/api/server/lib/eraseTeam.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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': {
Expand Down Expand Up @@ -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,
},
},
};

Expand Down Expand Up @@ -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,
},
},
};

Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/app/api/server/lib/eraseTeam.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
Expand Down
248 changes: 0 additions & 248 deletions apps/meteor/app/apps/server/bridges/listeners.js

This file was deleted.

Loading
Loading