diff --git a/app/apps/server/bridges/messages.js b/app/apps/server/bridges/messages.js index 2e65ff8033b09303b399c9b06dec1134e70a21fc..d40c1dde82f050693b26e4dd105331c20cd7c4b8 100644 --- a/app/apps/server/bridges/messages.js +++ b/app/apps/server/bridges/messages.js @@ -51,7 +51,7 @@ export class AppMessageBridge { return; } - api.broadcast('stream.ephemeralMessage', user.id, msg.rid, { + api.broadcast('notify.ephemeralMessage', user.id, msg.rid, { ...msg, }); } @@ -72,7 +72,7 @@ export class AppMessageBridge { Users.findByIds(users, { fields: { _id: 1 } }) .fetch() .forEach(({ _id }) => - api.broadcast('stream.ephemeralMessage', _id, room.id, { + api.broadcast('notify.ephemeralMessage', _id, room.id, { ...msg, }), ); diff --git a/ee/server/services/ddp-streamer/DDPStreamer.ts b/ee/server/services/ddp-streamer/DDPStreamer.ts index 3eacaee44a1fc8b986099315a3eb43ee94aac4bc..e54791213f23c1336bca78629e1b2b631965d10b 100644 --- a/ee/server/services/ddp-streamer/DDPStreamer.ts +++ b/ee/server/services/ddp-streamer/DDPStreamer.ts @@ -114,16 +114,6 @@ export class DDPStreamer extends ServiceClass { this.onEvent('meteor.autoUpdateClientVersionChanged', ({ record }): void => { events.emit('meteor.autoUpdateClientVersionChanged', record); }); - - this.onEvent('stream.ephemeralMessage', (uid, rid, message): void => { - notifications.notifyUser(uid, 'message', { - groupable: false, - ...message, - _id: String(Date.now()), - rid, - ts: new Date(), - }); - }); } async created(): Promise<void> { diff --git a/server/sdk/lib/Events.ts b/server/sdk/lib/Events.ts index 579efa31fe3725efa0a9f8a245c0b642c0a631a4..38982672534877f7be3d71e5f129abd3528b7464 100644 --- a/server/sdk/lib/Events.ts +++ b/server/sdk/lib/Events.ts @@ -28,7 +28,6 @@ export type EventSignatures = { 'room.avatarUpdate'(room: Partial<IRoom>): void; 'setting'(data: { action: string; setting: Partial<ISetting> }): void; 'stream'([streamer, eventName, payload]: [string, string, string]): void; - 'stream.ephemeralMessage'(uid: string, rid: string, message: Partial<IMessage>): void; 'subscription'(data: { action: string; subscription: Partial<ISubscription> }): void; 'user.avatarUpdate'(user: Partial<IUser>): void; 'user.deleted'(user: Partial<IUser>): void;