From 58c866404942e8152507113277f03fb0c8f79316 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Fri, 6 Nov 2020 10:23:30 -0300
Subject: [PATCH] Unify ephemeral message events (#19464)
---
app/apps/server/bridges/messages.js | 4 ++--
ee/server/services/ddp-streamer/DDPStreamer.ts | 10 ----------
server/sdk/lib/Events.ts | 1 -
3 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/app/apps/server/bridges/messages.js b/app/apps/server/bridges/messages.js
index 2e65ff8033b..d40c1dde82f 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 3eacaee44a1..e54791213f2 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 579efa31fe3..38982672534 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;
--
GitLab