Skip to content
Merged
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
957fda2
chore: add a flag to disable db watchers on the message collection
Sep 13, 2023
5e61b10
Merge branch 'develop' into chore/remove-message-db-watcher-1
Sep 13, 2023
fef4fb0
chore: enable message event listeners depending on the event
Sep 15, 2023
da806dd
chore: dispatch new event on send message
Sep 15, 2023
66435f5
chore: dispatch new event on update message
Sep 15, 2023
c85ab7e
chore: dispatch new event on delete message
Sep 15, 2023
67b075b
chore: dispatch new event on send system message through svc
Sep 15, 2023
28419b8
chore: adapt discussion feat to work without message events watcher
Sep 15, 2023
be538b1
Merge branch 'develop' into chore/remove-message-db-watcher-1
Sep 15, 2023
b6327ff
Merge branch 'develop' into chore/remove-message-db-watcher-1
Sep 18, 2023
2d77cfb
Merge branch 'chore/remove-message-db-watcher-1' into chore/adapt-mes…
Sep 18, 2023
ef450c8
Merge branch 'develop' into chore/remove-message-db-watcher-1
Oct 26, 2023
95c99ef
Merge branch 'chore/remove-message-db-watcher-1' into chore/adapt-mes…
Oct 26, 2023
1126a8a
Merge branch 'develop' into chore/remove-message-db-watcher-1
sampaiodiego Nov 3, 2023
de50690
Merge branch 'develop' into chore/remove-message-db-watcher-1
sampaiodiego Nov 7, 2023
c28e22f
Merge branch 'chore/remove-message-db-watcher-1' into chore/adapt-mes…
Nov 7, 2023
23b67e3
Merge branch 'develop' into chore/remove-message-db-watcher-1
Nov 8, 2023
9f59186
Merge branch 'chore/remove-message-db-watcher-1' into chore/adapt-mes…
Nov 9, 2023
ce94c2a
Merge branch 'develop' into chore/remove-message-db-watcher-1
Nov 10, 2023
13e4a99
chore: remove unnecessary fn
Nov 10, 2023
4504415
chore: publish events directly using broadcast
Nov 10, 2023
717ca5e
Merge branch 'chore/remove-message-db-watcher-1' into chore/adapt-mes…
Nov 10, 2023
9ac4f19
chore: removing old references
Nov 10, 2023
4a92a42
chore: useless param
Nov 10, 2023
62965d3
Merge branch 'develop' into chore/remove-message-db-watcher-1
Nov 10, 2023
d54a3db
Merge branch 'chore/remove-message-db-watcher-1' into chore/adapt-mes…
Nov 10, 2023
62a7f29
chore: undo param change
Nov 10, 2023
c4e25ba
Merge branch 'chore/remove-message-db-watcher-1' into chore/adapt-mes…
Nov 10, 2023
5312f05
chore: reverting param
Nov 10, 2023
040c1af
chore: delete user working without relying on msg db watcher (#30435)
Nov 10, 2023
076c56c
Merge branch 'chore/remove-message-db-watcher-1' into chore/adapt-mes…
Nov 10, 2023
95c58b6
chore: send updates to client about the thread message as well
Nov 17, 2023
a7a264e
Merge branch 'develop' into chore/remove-message-db-watcher-1
Nov 20, 2023
289cb22
Merge branch 'chore/remove-message-db-watcher-1' into chore/adapt-mes…
Nov 20, 2023
c2a01bf
chore: send streaming msg update on livechat decline
Nov 20, 2023
3ddfb04
Merge branch 'develop' into chore/video-conference-msg-update
Nov 24, 2023
2953850
Merge branch 'develop' into chore/video-conference-msg-update
Nov 30, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions apps/meteor/server/services/video-conference/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ import { readSecondaryPreferred } from '../../database/readSecondaryPreferred';
import { i18n } from '../../lib/i18n';
import { videoConfProviders } from '../../lib/videoConfProviders';
import { videoConfTypes } from '../../lib/videoConfTypes';
import { broadcastMessageSentEvent } from '../../modules/watchers/lib/messages';

const { db } = MongoInternals.defaultRemoteCollectionDriver().mongo;

Expand Down Expand Up @@ -326,6 +327,11 @@ export class VideoConfService extends ServiceClassInternal implements IVideoConf
(settings.get<boolean>('UI_Use_Real_Name') ? call.createdBy.name : call.createdBy.username) || call.createdBy.username || '';
const text = i18n.t('video_livechat_missed', { username: name });
await Messages.setBlocksById(call.messages.started, [this.buildMessageBlock(text)]);

await broadcastMessageSentEvent({
id: call.messages.started,
broadcastCallback: (message) => api.broadcast('message.sent', message),
});
}

await VideoConferenceModel.setDataById(call._id, {
Expand Down