snapshot of https://github.com/RocketChat/Rocket.Chat.git (develop, 2026-09-16; blobs > 131072B omitted)
Some checks failed
Create issues from TODOs / todos (push) Failing after 3s
Close inactive issues / close-issues (push) Has been cancelled
Deploy GitHub Pages / deploy-preview (push) Has been cancelled
CI / ⚙️ Variables Setup (push) Has been cancelled
CI / ⚙️ Test Guard (push) Has been cancelled
CI / 🚀 Notify external services - draft (push) Has been cancelled
CI / 📦 Build Packages (push) Has been cancelled
CI / 📦 Meteor Build (coverage) (push) Has been cancelled
CI / 📦 Meteor Build (production) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [account-service presence-service omnichannel-transcript-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [account-service presence-service omnichannel-transcript-service], fips) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [authorization-service queue-worker-service ddp-streamer-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [authorization-service queue-worker-service ddp-streamer-service], fips) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], coverage) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], fips) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [account-service presence-service omnichannel-transcript-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [authorization-service queue-worker-service ddp-streamer-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [rocketchat], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [rocketchat], coverage) (push) Has been cancelled
CI / 🚢 Publish Docker Images (ghcr.io) (push) Has been cancelled
CI / 📦 Track Image Sizes (push) Has been cancelled
CI / 🔎 Code Check - Action Lint (push) Has been cancelled
CI / 🔎 Code Check (push) Has been cancelled
CI / 🔨 Test Storybook (push) Has been cancelled
CI / 🔨 Test Unit (push) Has been cancelled
CI / 🔨 Test API (CE) (push) Has been cancelled
CI / 🔨 Test API Livechat (CE) (push) Has been cancelled
CI / 🔨 Test UI (CE) (push) Has been cancelled
CI / 🔨 Test API (EE) (push) Has been cancelled
CI / 🔨 Test API Livechat (EE) (push) Has been cancelled
CI / 🔨 Test API Apps (deno-runtime - EE) (push) Has been cancelled
CI / 🔨 Test UI (EE) (push) Has been cancelled
CI / 🔨 Test API (FIPS) (push) Has been cancelled
CI / 🔨 Test API Livechat (FIPS) (push) Has been cancelled
CI / 🔨 Test UI (FIPS) (push) Has been cancelled
CI / 🔨 Test Federation Matrix (push) Has been cancelled
CI / 📊 Report Coverage (push) Has been cancelled
CI / ✅ Tests Done (push) Has been cancelled
CI / 🚀 Publish build assets (push) Has been cancelled
CI / 🚀 Publish Docker Images (DockerHub) (push) Has been cancelled
CI / 🚀 Notify external services (push) Has been cancelled
CI / Update Version Durability (push) Has been cancelled
Release / Release (push) Has been cancelled
Auto-close duplicate issues / auto-close-duplicates (push) Failing after 1s
Code scanning - action / CodeQL-Build (push) Failing after 1s
Some checks failed
Create issues from TODOs / todos (push) Failing after 3s
Close inactive issues / close-issues (push) Has been cancelled
Deploy GitHub Pages / deploy-preview (push) Has been cancelled
CI / ⚙️ Variables Setup (push) Has been cancelled
CI / ⚙️ Test Guard (push) Has been cancelled
CI / 🚀 Notify external services - draft (push) Has been cancelled
CI / 📦 Build Packages (push) Has been cancelled
CI / 📦 Meteor Build (coverage) (push) Has been cancelled
CI / 📦 Meteor Build (production) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [account-service presence-service omnichannel-transcript-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [account-service presence-service omnichannel-transcript-service], fips) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [authorization-service queue-worker-service ddp-streamer-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [authorization-service queue-worker-service ddp-streamer-service], fips) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], coverage) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], fips) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [account-service presence-service omnichannel-transcript-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [authorization-service queue-worker-service ddp-streamer-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [rocketchat], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [rocketchat], coverage) (push) Has been cancelled
CI / 🚢 Publish Docker Images (ghcr.io) (push) Has been cancelled
CI / 📦 Track Image Sizes (push) Has been cancelled
CI / 🔎 Code Check - Action Lint (push) Has been cancelled
CI / 🔎 Code Check (push) Has been cancelled
CI / 🔨 Test Storybook (push) Has been cancelled
CI / 🔨 Test Unit (push) Has been cancelled
CI / 🔨 Test API (CE) (push) Has been cancelled
CI / 🔨 Test API Livechat (CE) (push) Has been cancelled
CI / 🔨 Test UI (CE) (push) Has been cancelled
CI / 🔨 Test API (EE) (push) Has been cancelled
CI / 🔨 Test API Livechat (EE) (push) Has been cancelled
CI / 🔨 Test API Apps (deno-runtime - EE) (push) Has been cancelled
CI / 🔨 Test UI (EE) (push) Has been cancelled
CI / 🔨 Test API (FIPS) (push) Has been cancelled
CI / 🔨 Test API Livechat (FIPS) (push) Has been cancelled
CI / 🔨 Test UI (FIPS) (push) Has been cancelled
CI / 🔨 Test Federation Matrix (push) Has been cancelled
CI / 📊 Report Coverage (push) Has been cancelled
CI / ✅ Tests Done (push) Has been cancelled
CI / 🚀 Publish build assets (push) Has been cancelled
CI / 🚀 Publish Docker Images (DockerHub) (push) Has been cancelled
CI / 🚀 Notify external services (push) Has been cancelled
CI / Update Version Durability (push) Has been cancelled
Release / Release (push) Has been cancelled
Auto-close duplicate issues / auto-close-duplicates (push) Failing after 1s
Code scanning - action / CodeQL-Build (push) Failing after 1s
This commit is contained in:
@@ -0,0 +1,93 @@
|
||||
import { isILivechatVisitor, isOmnichannelRoom } from '@rocket.chat/core-typings';
|
||||
import type { IMessage, IRoom, IUser } from '@rocket.chat/core-typings';
|
||||
import { LivechatVisitors, Users } from '@rocket.chat/models';
|
||||
import get from 'lodash.get';
|
||||
import mem from 'mem';
|
||||
|
||||
const placeholderFields = {
|
||||
'contact.name': {
|
||||
from: 'visitor',
|
||||
dataKey: 'name',
|
||||
},
|
||||
'contact.email': {
|
||||
from: 'visitor',
|
||||
dataKey: 'visitorEmails[0].address',
|
||||
},
|
||||
'contact.phone': {
|
||||
from: 'visitor',
|
||||
dataKey: 'phone[0].phoneNumber',
|
||||
},
|
||||
'agent.name': {
|
||||
from: 'agent',
|
||||
dataKey: 'name',
|
||||
},
|
||||
'agent.email': {
|
||||
from: 'agent',
|
||||
dataKey: 'emails[0].address',
|
||||
},
|
||||
};
|
||||
|
||||
export class BeforeSaveCannedResponse {
|
||||
static enabled = false;
|
||||
|
||||
private getUser = mem((userId: string) => Users.findOneById(userId, { projection: { name: 1, _id: 1, emails: 1 } }), {
|
||||
maxAge: 1000 * 30,
|
||||
});
|
||||
|
||||
private getVisitor = mem((visitorId: string) => LivechatVisitors.findOneEnabledById(visitorId), {
|
||||
maxAge: 1000 * 30,
|
||||
});
|
||||
|
||||
async replacePlaceholders({
|
||||
message,
|
||||
room,
|
||||
user,
|
||||
}: {
|
||||
message: IMessage;
|
||||
room: IRoom;
|
||||
user: Pick<IUser, '_id' | 'username' | 'name' | 'emails' | 'language'>;
|
||||
}): Promise<IMessage> {
|
||||
// If the feature is disabled, return the message as is
|
||||
if (!BeforeSaveCannedResponse.enabled) {
|
||||
return message;
|
||||
}
|
||||
|
||||
if (!message.msg || message.msg === '') {
|
||||
return message;
|
||||
}
|
||||
|
||||
if (!isOmnichannelRoom(room)) {
|
||||
return message;
|
||||
}
|
||||
|
||||
// do not replace placeholders for visitors
|
||||
if (!user || isILivechatVisitor(user)) {
|
||||
return message;
|
||||
}
|
||||
|
||||
const agentId = room?.servedBy?._id;
|
||||
if (!agentId) {
|
||||
return message;
|
||||
}
|
||||
|
||||
const getAgent = (agentId: string) => {
|
||||
if (agentId === user._id) {
|
||||
return user;
|
||||
}
|
||||
|
||||
return this.getUser(agentId);
|
||||
};
|
||||
|
||||
message.msg = await Object.keys(placeholderFields).reduce(async (messageText, field) => {
|
||||
const placeholderConfig = placeholderFields[field as keyof typeof placeholderFields];
|
||||
|
||||
const from = placeholderConfig.from === 'agent' ? await getAgent(agentId) : await this.getVisitor(room.v._id);
|
||||
|
||||
const data = get(from, placeholderConfig.dataKey, '');
|
||||
|
||||
return (await messageText).replace(new RegExp(`{{${field}}}`, 'g'), data);
|
||||
}, Promise.resolve(message.msg));
|
||||
|
||||
return message;
|
||||
}
|
||||
}
|
||||
14
apps/meteor/ee/server/hooks/messages/afterDeleteRoom.ts
Normal file
14
apps/meteor/ee/server/hooks/messages/afterDeleteRoom.ts
Normal file
@@ -0,0 +1,14 @@
|
||||
import { ReadReceipts, ReadReceiptsArchive } from '@rocket.chat/models';
|
||||
|
||||
import { callbacks } from '../../../../server/lib/callbacks';
|
||||
|
||||
callbacks.add(
|
||||
'afterDeleteRoom',
|
||||
async (rid) => {
|
||||
await ReadReceipts.removeByRoomId(rid);
|
||||
await ReadReceiptsArchive.removeByRoomId(rid);
|
||||
return rid;
|
||||
},
|
||||
callbacks.priority.LOW,
|
||||
'DeleteReadReceipts',
|
||||
);
|
||||
25
apps/meteor/ee/server/hooks/messages/afterReadMessages.ts
Normal file
25
apps/meteor/ee/server/hooks/messages/afterReadMessages.ts
Normal file
@@ -0,0 +1,25 @@
|
||||
import { MessageReads } from '@rocket.chat/core-services';
|
||||
import { type IUser, type IRoom, type IMessage } from '@rocket.chat/core-typings';
|
||||
|
||||
import { callbacks } from '../../../../server/lib/callbacks';
|
||||
import { settings } from '../../../../server/settings';
|
||||
import { ReadReceipt } from '../../lib/message-read-receipt/ReadReceipt';
|
||||
|
||||
callbacks.add(
|
||||
'afterReadMessages',
|
||||
async (room: IRoom, params: { uid: IUser['_id']; lastSeen?: Date; tmid?: IMessage['_id'] }) => {
|
||||
if (!settings.get('Message_Read_Receipt_Enabled')) {
|
||||
return;
|
||||
}
|
||||
|
||||
const { uid, lastSeen, tmid } = params;
|
||||
|
||||
if (tmid) {
|
||||
await MessageReads.readThread(uid, tmid);
|
||||
} else if (lastSeen) {
|
||||
await ReadReceipt.markMessagesAsRead(room._id, uid, lastSeen);
|
||||
}
|
||||
},
|
||||
callbacks.priority.MEDIUM,
|
||||
'message-read-receipt-afterReadMessages',
|
||||
);
|
||||
21
apps/meteor/ee/server/hooks/messages/afterSaveMessage.ts
Normal file
21
apps/meteor/ee/server/hooks/messages/afterSaveMessage.ts
Normal file
@@ -0,0 +1,21 @@
|
||||
import { isEditedMessage } from '@rocket.chat/core-typings';
|
||||
|
||||
import { callbacks } from '../../../../server/lib/callbacks';
|
||||
import { ReadReceipt } from '../../lib/message-read-receipt/ReadReceipt';
|
||||
|
||||
callbacks.add(
|
||||
'afterSaveMessage',
|
||||
async (message, { room }) => {
|
||||
// skips this callback if the message was edited
|
||||
if (isEditedMessage(message)) {
|
||||
return message;
|
||||
}
|
||||
|
||||
// mark message as read as well
|
||||
await ReadReceipt.markMessageAsReadBySender(message, room, message.u._id);
|
||||
|
||||
return message;
|
||||
},
|
||||
callbacks.priority.MEDIUM,
|
||||
'message-read-receipt-afterSaveMessage',
|
||||
);
|
||||
Reference in New Issue
Block a user