Skip to content
Snippets Groups Projects
Unverified Commit f65781d0 authored by Guilherme Gazzo's avatar Guilherme Gazzo Committed by GitHub
Browse files

fix: Direct message notification (#29578)

parent fc6fb237
No related branches found
No related tags found
No related merge requests found
---
"@rocket.chat/meteor": patch
---
fix: Direct message notification
import { Meteor } from 'meteor/meteor'; import { Meteor } from 'meteor/meteor';
import type { IRoom, AtLeast } from '@rocket.chat/core-typings'; import type { IRoom } from '@rocket.chat/core-typings';
import { isRoomFederated } from '@rocket.chat/core-typings'; import { isRoomFederated, AtLeast } from '@rocket.chat/core-typings';
import { Subscriptions } from '@rocket.chat/models'; import { Subscriptions } from '@rocket.chat/models';
import { settings } from '../../../../app/settings/server'; import { settings } from '../../../../app/settings/server';
import type { IRoomTypeServerDirectives } from '../../../../definition/IRoomTypeConfig'; import { IRoomTypeServerDirectives, RoomSettingsEnum, RoomMemberActions } from '../../../../definition/IRoomTypeConfig';
import { RoomSettingsEnum, RoomMemberActions } from '../../../../definition/IRoomTypeConfig';
import { getDirectMessageRoomType } from '../../../../lib/rooms/roomTypes/direct'; import { getDirectMessageRoomType } from '../../../../lib/rooms/roomTypes/direct';
import { roomCoordinator } from '../roomCoordinator'; import { roomCoordinator } from '../roomCoordinator';
import { Federation } from '../../../services/federation/Federation'; import { Federation } from '../../../services/federation/Federation';
...@@ -96,7 +95,7 @@ roomCoordinator.add(DirectMessageRoomType, { ...@@ -96,7 +95,7 @@ roomCoordinator.add(DirectMessageRoomType, {
if (this.isGroupChat(room)) { if (this.isGroupChat(room)) {
return { return {
title: this.roomName(room, userId), title: await this.roomName(room, userId),
text: `${(useRealName && sender.name) || sender.username}: ${notificationMessage}`, text: `${(useRealName && sender.name) || sender.username}: ${notificationMessage}`,
}; };
} }
...@@ -110,4 +109,4 @@ roomCoordinator.add(DirectMessageRoomType, { ...@@ -110,4 +109,4 @@ roomCoordinator.add(DirectMessageRoomType, {
includeInDashboard() { includeInDashboard() {
return true; return true;
}, },
} as AtLeast<IRoomTypeServerDirectives, 'isGroupChat' | 'roomName'>); } satisfies AtLeast<IRoomTypeServerDirectives, 'isGroupChat' | 'roomName'>);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment