Skip to content

The open alternative to Salesforce, designed for AI.

Honor exclude group emails on shared mailboxes (#26060)

neo77381546a67866b
diff --git a/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/message-channel.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/message-channel.resolver.ts
index 33063cd164c..7cffbe178c4 100644
--- a/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/message-channel.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/message-channel/resolvers/message-channel.resolver.ts
@@ -193,6 +193,7 @@ export class MessageChannelResolver {
}
if (
+ messageChannel.type === MessageChannelType.EMAIL &&
messageChannel.syncStage !==
MessageChannelSyncStage.PENDING_CONFIGURATION &&
isDefined(input.update.excludeGroupEmails) &&
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/services/inbound-email-import.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/services/inbound-email-import.service.ts
index 9940f5c4505..8498048c151 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/services/inbound-email-import.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/services/inbound-email-import.service.ts
@@ -19,6 +19,7 @@ import { type MessageWithParticipants } from 'src/modules/messaging/message-impo
import { type MessageChannelMessageAssociationWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity';
import { type MessageWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message.workspace-entity';
import { MessagingSaveMessagesAndEnqueueContactCreationService } from 'src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service';
+import { isExcludedGroupEmailMessage } from 'src/modules/messaging/message-import-manager/utils/is-excluded-group-email-message.util';
type ImportInboundMessageParams = {
messageReference: InboundEmailMessageReference;
@@ -110,6 +111,19 @@ export class InboundEmailImportService {
);
}
+ if (
+ messageChannel.excludeGroupEmails &&
+ isExcludedGroupEmailMessage(message, [connectedAccount.handle])
+ ) {
+ await messageSource.cleanup(messageReference.reference);
+
+ return {
+ kind: 'excluded',
+ workspaceId,
+ messageChannelId: messageChannel.id,
+ };
+ }
+
await this.workspaceOrmManager.executeInWorkspaceContext(
async () => {
const existingThreadExternalId =
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/types/inbound-email-import-outcome.type.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/types/inbound-email-import-outcome.type.ts
index 6e7acbf0db9..32f8ff136ce 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/types/inbound-email-import-outcome.type.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/inbound-email/types/inbound-email-import-outcome.type.ts
@@ -1,4 +1,5 @@
export type InboundEmailImportOutcome =
| { kind: 'imported'; workspaceId: string; messageChannelId: string }
+ | { kind: 'excluded'; workspaceId: string; messageChannelId: string }
| { kind: 'unmatched'; recipient: string | null }
| { kind: 'unconfigured' };
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-emails.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-emails.util.ts
index e9b5e7bfc7f..7a7bb6b2fb6 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-emails.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-emails.util.ts
@@ -1,14 +1,9 @@
-import { MessageParticipantRole } from 'twenty-shared/types';
-import { isDefined } from 'twenty-shared/utils';
-
import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
import { filterOutBlocklistedMessages } from 'src/modules/messaging/message-import-manager/utils/filter-out-blocklisted-messages.util';
import { filterOutIcsAttachments } from 'src/modules/messaging/message-import-manager/utils/filter-out-ics-attachments.util';
import { filterOutInternals } from 'src/modules/messaging/message-import-manager/utils/filter-out-internals.util';
import { filterOutUnsubscribeRequests } from 'src/modules/messaging/message-import-manager/utils/filter-out-unsubscribe-requests.util';
-import { isBulkMail } from 'src/modules/messaging/message-import-manager/utils/is-bulk-mail.util';
-import { isGroupEmail } from 'src/modules/messaging/message-import-manager/utils/is-group-email';
-import { isMessageSenderMatchingHandles } from 'src/modules/messaging/message-import-manager/utils/is-message-sender-matching-handles.util';
+import { isExcludedGroupEmailMessage } from 'src/modules/messaging/message-import-manager/utils/is-excluded-group-email-message.util';
import { isWorkEmail } from 'src/utils/is-work-email';
export const filterEmails = (
@@ -45,31 +40,7 @@ export const filterEmails = (
const userHandles = [primaryHandle, ...handleAliases];
- return messagesWithoutInternals.filter((message) => {
- const isSentByUser = isMessageSenderMatchingHandles(message, userHandles);
-
- if (isSentByUser) {
- return true;
- }
-
- if (isBulkMail(message.messageHeaders ?? [])) {
- return false;
- }
-
- const senderHandle = message.participants?.find(
- (participant) => participant.role === MessageParticipantRole.FROM,
- )?.handle;
-
- if (!isDefined(senderHandle)) {
- return true;
- }
-
- const isSenderGroupEmail = isGroupEmail(senderHandle);
-
- if (!isSenderGroupEmail) {
- return true;
- }
-
- return false;
- });
+ return messagesWithoutInternals.filter(
+ (message) => !isExcludedGroupEmailMessage(message, userHandles),
+ );
};
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/is-excluded-group-email-message.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/is-excluded-group-email-message.util.ts
new file mode 100644
index 00000000000..8ba7da5979e
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/is-excluded-group-email-message.util.ts
@@ -0,0 +1,30 @@
+import { MessageParticipantRole } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
+
+import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { isBulkMail } from 'src/modules/messaging/message-import-manager/utils/is-bulk-mail.util';
+import { isGroupEmail } from 'src/modules/messaging/message-import-manager/utils/is-group-email';
+import { isMessageSenderMatchingHandles } from 'src/modules/messaging/message-import-manager/utils/is-message-sender-matching-handles.util';
+
+export const isExcludedGroupEmailMessage = (
+ message: MessageWithParticipants,
+ userHandles: string[],
+): boolean => {
+ if (isMessageSenderMatchingHandles(message, userHandles)) {
+ return false;
+ }
+
+ if (isBulkMail(message.messageHeaders ?? [])) {
+ return true;
+ }
+
+ const senderHandle = message.participants?.find(
+ (participant) => participant.role === MessageParticipantRole.FROM,
+ )?.handle;
+
+ if (!isDefined(senderHandle)) {
+ return false;
+ }
+
+ return isGroupEmail(senderHandle);
+};
diff --git a/packages/twenty-server/test/integration/metadata/suites/message-channel/message-channel-resolver.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/message-channel/message-channel-resolver.integration-spec.ts
index 15f8ced00ac..6943d43153d 100644
--- a/packages/twenty-server/test/integration/metadata/suites/message-channel/message-channel-resolver.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/message-channel/message-channel-resolver.integration-spec.ts
@@ -174,6 +174,44 @@ describe('messageChannelResolver (e2e)', () => {
expect(response.body.errors?.[0]?.extensions?.code).toBe('FORBIDDEN');
});
+ it('should not queue a group emails cleanup on a group channel', async () => {
+ try {
+ const response = await makeMetadataAPIRequest({
+ query: gql`
+ mutation UpdateMessageChannel($input: UpdateMessageChannelInput!) {
+ updateMessageChannel(input: $input) {
+ id
+ excludeGroupEmails
+ }
+ }
+ `,
+ variables: {
+ input: {
+ id: MESSAGE_CHANNEL_DATA_SEED_IDS.SUPPORT_GROUP,
+ update: { excludeGroupEmails: true },
+ },
+ },
+ });
+
+ expect(response.body.errors).toBeUndefined();
+ expect(response.body.data.updateMessageChannel.excludeGroupEmails).toBe(
+ true,
+ );
+
+ const [messageChannel] = await global.testDataSource.query(
+ `SELECT "pendingGroupEmailsAction" FROM core."messageChannel" WHERE id = $1`,
+ [MESSAGE_CHANNEL_DATA_SEED_IDS.SUPPORT_GROUP],
+ );
+
+ expect(messageChannel.pendingGroupEmailsAction).toBe('NONE');
+ } finally {
+ await global.testDataSource.query(
+ `UPDATE core."messageChannel" SET "excludeGroupEmails" = false, "pendingGroupEmailsAction" = 'NONE' WHERE id = $1`,
+ [MESSAGE_CHANNEL_DATA_SEED_IDS.SUPPORT_GROUP],
+ );
+ }
+ });
+
it('should deny a member updating a workspace-shared group channel', async () => {
const response = await makeMetadataAPIRequestWithMemberRole({
query: gql`
diff --git a/packages/twenty-server/test/integration/resend/suites/inbound-email-exclude-group-emails.integration-spec.ts b/packages/twenty-server/test/integration/resend/suites/inbound-email-exclude-group-emails.integration-spec.ts
new file mode 100644
index 00000000000..77d0995c23e
--- /dev/null
+++ b/packages/twenty-server/test/integration/resend/suites/inbound-email-exclude-group-emails.integration-spec.ts
@@ -0,0 +1,160 @@
+import { randomUUID } from 'node:crypto';
+
+import { http, HttpResponse } from 'msw';
+
+import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.entity';
+import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
+import { type WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
+import { MESSAGE_CHANNEL_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/core/constants/message-channel-seed-ids.constant';
+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
+import { type MessageWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message.workspace-entity';
+import { type InboundEmailImportService } from 'src/modules/messaging/message-import-manager/drivers/inbound-email/services/inbound-email-import.service';
+
+import { updateConfigVariable } from 'test/integration/twenty-config/utils/update-config-variable.util';
+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
+import { getCoreRepository } from 'test/integration/utils/get-core-repository.util';
+import { setupHttpMock } from 'test/integration/utils/http-mock.util';
+
+const INBOUND_EMAIL_DOMAIN = 'inbound.exclude-group.test';
+
+const RAW_EMAIL_DOWNLOAD_BASE_URL = 'https://resend-raw.exclude-group.test';
+
+const buildRawEmail = ({
+ from,
+ groupHandle,
+ headerMessageId,
+}: {
+ from: string;
+ groupHandle: string;
+ headerMessageId: string;
+}) =>
+ [
+ `From: ${from}`,
+ `To: ${groupHandle}`,
+ 'Subject: Your order',
+ `Message-ID: ${headerMessageId}`,
+ 'Date: Mon, 14 Sep 2026 11:19:21 +0000',
+ 'MIME-Version: 1.0',
+ 'Content-Type: text/plain; charset=UTF-8',
+ '',
+ 'Hello',
+ ].join('\r\n');
+
+describe('Inbound email exclude group emails (integration)', () => {
+ const httpMock = setupHttpMock();
+
+ const messageChannelRepository =
+ getCoreRepository<MessageChannelEntity>(MessageChannelEntity);
+
+ let groupChannelId: string;
+ let groupHandle: string;
+
+ const importEmail = async (rawEmail: string) => {
+ const receivedEmailId = randomUUID();
+ const downloadUrl = `${RAW_EMAIL_DOWNLOAD_BASE_URL}/${receivedEmailId}`;
+
+ httpMock.use(
+ http.get(
+ `https://api.resend.com/emails/receiving/${receivedEmailId}`,
+ () =>
+ HttpResponse.json({
+ id: receivedEmailId,
+ to: [groupHandle],
+ raw: { download_url: downloadUrl, expires_at: '2099-01-01' },
+ }),
+ ),
+ http.get(downloadUrl, () => HttpResponse.text(rawEmail)),
+ );
+
+ return getAppProviderByClassName<InboundEmailImportService>(
+ 'InboundEmailImportService',
+ ).importInboundMessage({
+ messageReference: { source: 'RESEND', reference: receivedEmailId },
+ envelopeRecipients: [groupHandle],
+ });
+ };
+
+ const findMessage = (headerMessageId: string) => {
+ const workspaceOrmManager = getAppProviderByClassName<WorkspaceOrmManager>(
+ 'WorkspaceOrmManager',
+ );
+
+ return workspaceOrmManager.executeInWorkspaceContext(
+ () =>
+ workspaceOrmManager
+ .getRepository<MessageWorkspaceEntity>('message')
+ .createQueryBuilder('message')
+ .where('message.headerMessageId = :headerMessageId', {
+ headerMessageId,
+ })
+ .getOne<MessageWorkspaceEntity>(),
+ buildSystemAuthContext(SEED_APPLE_WORKSPACE_ID),
+ { lite: true },
+ );
+ };
+
+ beforeAll(async () => {
+ await updateConfigVariable({
+ input: { key: 'INBOUND_EMAIL_DOMAIN', value: INBOUND_EMAIL_DOMAIN },
+ });
+ await updateConfigVariable({
+ input: { key: 'RESEND_API_KEY', value: 're_integration_test' },
+ });
+
+ const seededGroupChannel = await messageChannelRepository.findOneByOrFail({
+ id: MESSAGE_CHANNEL_DATA_SEED_IDS.SUPPORT_GROUP,
+ });
+
+ const { id: _id, ...groupChannelColumns } = seededGroupChannel;
+
+ groupHandle = `ch_${randomUUID().replace(/-/g, '')}@${INBOUND_EMAIL_DOMAIN}`;
+
+ const groupChannel = await messageChannelRepository.save({
+ ...groupChannelColumns,
+ handle: groupHandle,
+ excludeGroupEmails: true,
+ });
+
+ groupChannelId = groupChannel.id;
+ }, 60000);
+
+ afterAll(async () => {
+ await messageChannelRepository
+ .delete({ id: groupChannelId })
+ .catch(() => undefined);
+ });
+
+ it('skips an email sent from a group address', async () => {
+ const headerMessageId = `<${randomUUID()}@shop.test>`;
+
+ const outcome = await importEmail(
+ buildRawEmail({
+ from: 'Shop <[email protected]>',
+ groupHandle,
+ headerMessageId,
+ }),
+ );
+
+ expect(outcome.kind).toBe('excluded');
+ expect(
+ (await findMessage(headerMessageId))?.headerMessageId,
+ ).toBeUndefined();
+ }, 60000);
+
+ it('imports an email sent from a person', async () => {
+ const headerMessageId = `<${randomUUID()}@customer.test>`;
+
+ const outcome = await importEmail(
+ buildRawEmail({
+ from: 'Customer <[email protected]>',
+ groupHandle,
+ headerMessageId,
+ }),
+ );
+
+ expect(outcome.kind).toBe('imported');
+ expect((await findMessage(headerMessageId))?.headerMessageId).toBe(
+ headerMessageId,
+ );
+ }, 60000);
+});