The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Let recipients opt out of click tracking (#26639)
neo773e45ec807576b
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex 2b78c8b16d3..319e6128ca9 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -3140,6 +3140,7 @@ type CampaignAudiencePreviewDTO {hardSuppressed: Int!globallyUnsubscribed: Int!topicUnsubscribed: Int!+ trackingRefused: Int!sendable: Int!}@@ -3181,6 +3182,7 @@ enum MessageSuppressionReason {BOUNCECOMPLAINTUNSUBSCRIBE+ TRACKING}enum MessageSuppressionSource {diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex 1d7be5bf61c..c2c58af6cbe 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -2704,6 +2704,7 @@ export interface CampaignAudiencePreviewDTO {hardSuppressed: Scalars['Int']globallyUnsubscribed: Scalars['Int']topicUnsubscribed: Scalars['Int']+ trackingRefused: Scalars['Int']sendable: Scalars['Int']__typename: 'CampaignAudiencePreviewDTO'}@@ -2747,7 +2748,7 @@ export interface MessageSuppression {__typename: 'MessageSuppression'}-export type MessageSuppressionReason = 'BOUNCE' | 'COMPLAINT' | 'UNSUBSCRIBE'+export type MessageSuppressionReason = 'BOUNCE' | 'COMPLAINT' | 'UNSUBSCRIBE' | 'TRACKING'export type MessageSuppressionSource = 'WEBHOOK' | 'SYSTEM'@@ -6565,6 +6566,7 @@ export interface CampaignAudiencePreviewDTOGenqlSelection{hardSuppressed?: boolean | numbergloballyUnsubscribed?: boolean | numbertopicUnsubscribed?: boolean | number+ trackingRefused?: boolean | numbersendable?: boolean | number__typename?: boolean | number__scalar?: boolean | number@@ -11410,7 +11412,8 @@ export const enumMessageChannelSyncStage = {export const enumMessageSuppressionReason = {BOUNCE: 'BOUNCE' as const,COMPLAINT: 'COMPLAINT' as const,- UNSUBSCRIBE: 'UNSUBSCRIBE' as const+ UNSUBSCRIBE: 'UNSUBSCRIBE' as const,+ TRACKING: 'TRACKING' as const}export const enumMessageSuppressionSource = {diff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.tsindex f24219f30ff..1c770b27b74 100644--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts@@ -6082,6 +6082,9 @@ export default {"topicUnsubscribed": [30],+ "trackingRefused": [+ 30+ ],"sendable": [30],diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex 2b175679608..3eea4a564ef 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -1037,6 +1037,7 @@ export type CampaignAudiencePreviewDto = {sendable: Scalars['Int']['output'];topicUnsubscribed: Scalars['Int']['output'];totalMembers: Scalars['Int']['output'];+ trackingRefused: Scalars['Int']['output'];withoutEmail: Scalars['Int']['output'];};@@ -2921,6 +2922,7 @@ export type MessageSuppressionList = {export enum MessageSuppressionReason {BOUNCE = 'BOUNCE',COMPLAINT = 'COMPLAINT',+ TRACKING = 'TRACKING',UNSUBSCRIBE = 'UNSUBSCRIBE'}@@ -7811,7 +7813,7 @@ export type PreviewMessageCampaignAudienceQueryVariables = Exact<{}>;-export type PreviewMessageCampaignAudienceQuery = { __typename?: 'Query', previewMessageCampaignAudience: { __typename?: 'CampaignAudiencePreviewDTO', totalMembers: number, withoutEmail: number, duplicateEmails: number, hardSuppressed: number, globallyUnsubscribed: number, topicUnsubscribed: number, sendable: number } };+export type PreviewMessageCampaignAudienceQuery = { __typename?: 'Query', previewMessageCampaignAudience: { __typename?: 'CampaignAudiencePreviewDTO', totalMembers: number, withoutEmail: number, duplicateEmails: number, hardSuppressed: number, globallyUnsubscribed: number, topicUnsubscribed: number, trackingRefused: number, sendable: number } };export type UnsubscribeTopicsQueryVariables = Exact<{ [key: string]: never; }>;@@ -7837,7 +7839,7 @@ export type SendMessageCampaignMutationVariables = Exact<{}>;-export type SendMessageCampaignMutation = { __typename?: 'Mutation', sendMessageCampaign: { __typename?: 'SendMessageCampaignOutputDTO', campaignId: string, queuedCount: number, audience: { __typename?: 'CampaignAudiencePreviewDTO', totalMembers: number, withoutEmail: number, duplicateEmails: number, hardSuppressed: number, globallyUnsubscribed: number, topicUnsubscribed: number, sendable: number } } };+export type SendMessageCampaignMutation = { __typename?: 'Mutation', sendMessageCampaign: { __typename?: 'SendMessageCampaignOutputDTO', campaignId: string, queuedCount: number, audience: { __typename?: 'CampaignAudiencePreviewDTO', totalMembers: number, withoutEmail: number, duplicateEmails: number, hardSuppressed: number, globallyUnsubscribed: number, topicUnsubscribed: number, trackingRefused: number, sendable: number } } };export type SendMessageCampaignTestMutationVariables = Exact<{input: SendMessageCampaignTestInput;@@ -10473,11 +10475,11 @@ export const ViewSortFragmentFragmentDoc = {"kind":"Document","definitions":[{"kexport const ViewGroupFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewGroupFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewGroup"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"isVisible"}},{"kind":"Field","name":{"kind":"Name","value":"fieldValue"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}}]}}]} as unknown as DocumentNode<ViewGroupFragmentFragment, unknown>;export const ViewFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"View"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"objectMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"isCompact"}},{"kind":"Field","name":{"kind":"Name","value":"kanbanAggregateOperation"}},{"kind":"Field","name":{"kind":"Name","value":"kanbanAggregateOperationFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"mainGroupByFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"shouldHideEmptyGroups"}},{"kind":"Field","name":{"kind":"Name","value":"kanbanColumnWidth"}},{"kind":"Field","name":{"kind":"Name","value":"groupLoadLimit"}},{"kind":"Field","name":{"kind":"Name","value":"anyFieldFilterValue"}},{"kind":"Field","name":{"kind":"Name","value":"calendarFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"calendarEndFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"calendarLayout"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","name":{"kind":"Name","value":"createdByUserWorkspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"viewFields"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFieldFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"viewFieldGroups"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFieldGroupFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"viewFilters"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFilterFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"viewFilterGroups"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFilterGroupFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"viewSorts"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewSortFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"viewGroups"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewGroupFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewFieldFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewField"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"isVisible"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"aggregateOperation"}},{"kind":"Field","name":{"kind":"Name","value":"viewFieldGroupId"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewFieldGroupFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewFieldGroup"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"isVisible"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}},{"kind":"Field","name":{"kind":"Name","value":"viewFields"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFieldFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewFilterFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewFilter"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"operand"}},{"kind":"Field","name":{"kind":"Name","value":"value"}},{"kind":"Field","name":{"kind":"Name","value":"viewFilterGroupId"}},{"kind":"Field","name":{"kind":"Name","value":"positionInViewFilterGroup"}},{"kind":"Field","name":{"kind":"Name","value":"subFieldName"}},{"kind":"Field","name":{"kind":"Name","value":"relationTargetFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewFilterGroupFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewFilterGroup"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"parentViewFilterGroupId"}},{"kind":"Field","name":{"kind":"Name","value":"logicalOperator"}},{"kind":"Field","name":{"kind":"Name","value":"positionInViewFilterGroup"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewSortFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewSort"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"direction"}},{"kind":"Field","name":{"kind":"Name","value":"subFieldName"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewGroupFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewGroup"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"isVisible"}},{"kind":"Field","name":{"kind":"Name","value":"fieldValue"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}}]}}]} as unknown as DocumentNode<ViewFragmentFragment, unknown>;export const CreateCalendarEventDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateCalendarEvent"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateCalendarEventInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createCalendarEvent"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}},{"kind":"Field","name":{"kind":"Name","value":"error"}},{"kind":"Field","name":{"kind":"Name","value":"iCalUid"}},{"kind":"Field","name":{"kind":"Name","value":"calendarEventId"}},{"kind":"Field","name":{"kind":"Name","value":"conferenceLink"}}]}}]}}]} as unknown as DocumentNode<CreateCalendarEventMutation, CreateCalendarEventMutationVariables>;-export const PreviewMessageCampaignAudienceDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"PreviewMessageCampaignAudience"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"PreviewMessageCampaignAudienceInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"previewMessageCampaignAudience"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalMembers"}},{"kind":"Field","name":{"kind":"Name","value":"withoutEmail"}},{"kind":"Field","name":{"kind":"Name","value":"duplicateEmails"}},{"kind":"Field","name":{"kind":"Name","value":"hardSuppressed"}},{"kind":"Field","name":{"kind":"Name","value":"globallyUnsubscribed"}},{"kind":"Field","name":{"kind":"Name","value":"topicUnsubscribed"}},{"kind":"Field","name":{"kind":"Name","value":"sendable"}}]}}]}}]} as unknown as DocumentNode<PreviewMessageCampaignAudienceQuery, PreviewMessageCampaignAudienceQueryVariables>;+export const PreviewMessageCampaignAudienceDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"PreviewMessageCampaignAudience"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"PreviewMessageCampaignAudienceInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"previewMessageCampaignAudience"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalMembers"}},{"kind":"Field","name":{"kind":"Name","value":"withoutEmail"}},{"kind":"Field","name":{"kind":"Name","value":"duplicateEmails"}},{"kind":"Field","name":{"kind":"Name","value":"hardSuppressed"}},{"kind":"Field","name":{"kind":"Name","value":"globallyUnsubscribed"}},{"kind":"Field","name":{"kind":"Name","value":"topicUnsubscribed"}},{"kind":"Field","name":{"kind":"Name","value":"trackingRefused"}},{"kind":"Field","name":{"kind":"Name","value":"sendable"}}]}}]}}]} as unknown as DocumentNode<PreviewMessageCampaignAudienceQuery, PreviewMessageCampaignAudienceQueryVariables>;export const UnsubscribeTopicsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"UnsubscribeTopics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unsubscribeTopics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}}]}}]}}]} as unknown as DocumentNode<UnsubscribeTopicsQuery, UnsubscribeTopicsQueryVariables>;export const CancelMessageCampaignDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CancelMessageCampaign"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CancelMessageCampaignInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"cancelMessageCampaign"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"campaignId"}},{"kind":"Field","name":{"kind":"Name","value":"canceledMessageCount"}}]}}]}}]} as unknown as DocumentNode<CancelMessageCampaignMutation, CancelMessageCampaignMutationVariables>;export const SendEmailDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendEmail"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SendEmailInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"sendEmail"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}},{"kind":"Field","name":{"kind":"Name","value":"error"}},{"kind":"Field","name":{"kind":"Name","value":"messageThreadId"}}]}}]}}]} as unknown as DocumentNode<SendEmailMutation, SendEmailMutationVariables>;-export const SendMessageCampaignDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendMessageCampaign"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SendMessageCampaignInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"sendMessageCampaign"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"campaignId"}},{"kind":"Field","name":{"kind":"Name","value":"queuedCount"}},{"kind":"Field","name":{"kind":"Name","value":"audience"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalMembers"}},{"kind":"Field","name":{"kind":"Name","value":"withoutEmail"}},{"kind":"Field","name":{"kind":"Name","value":"duplicateEmails"}},{"kind":"Field","name":{"kind":"Name","value":"hardSuppressed"}},{"kind":"Field","name":{"kind":"Name","value":"globallyUnsubscribed"}},{"kind":"Field","name":{"kind":"Name","value":"topicUnsubscribed"}},{"kind":"Field","name":{"kind":"Name","value":"sendable"}}]}}]}}]}}]} as unknown as DocumentNode<SendMessageCampaignMutation, SendMessageCampaignMutationVariables>;+export const SendMessageCampaignDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendMessageCampaign"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SendMessageCampaignInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"sendMessageCampaign"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"campaignId"}},{"kind":"Field","name":{"kind":"Name","value":"queuedCount"}},{"kind":"Field","name":{"kind":"Name","value":"audience"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalMembers"}},{"kind":"Field","name":{"kind":"Name","value":"withoutEmail"}},{"kind":"Field","name":{"kind":"Name","value":"duplicateEmails"}},{"kind":"Field","name":{"kind":"Name","value":"hardSuppressed"}},{"kind":"Field","name":{"kind":"Name","value":"globallyUnsubscribed"}},{"kind":"Field","name":{"kind":"Name","value":"topicUnsubscribed"}},{"kind":"Field","name":{"kind":"Name","value":"trackingRefused"}},{"kind":"Field","name":{"kind":"Name","value":"sendable"}}]}}]}}]}}]} as unknown as DocumentNode<SendMessageCampaignMutation, SendMessageCampaignMutationVariables>;export const SendMessageCampaignTestDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendMessageCampaignTest"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SendMessageCampaignTestInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"sendMessageCampaignTest"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"messageId"}}]}}]}}]} as unknown as DocumentNode<SendMessageCampaignTestMutation, SendMessageCampaignTestMutationVariables>;export const ResetTimelineActivityTypeDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"ResetTimelineActivityType"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"resetTimelineActivityType"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}}]}}]}}]} as unknown as DocumentNode<ResetTimelineActivityTypeMutation, ResetTimelineActivityTypeMutationVariables>;export const UpdateTimelineActivityTypeIsActiveDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateTimelineActivityTypeIsActive"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateTimelineActivityTypeInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateTimelineActivityType"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}}]}}]}}]} as unknown as DocumentNode<UpdateTimelineActivityTypeIsActiveMutation, UpdateTimelineActivityTypeIsActiveMutationVariables>;diff --git a/packages/twenty-front/src/modules/activities/emails/graphql/metadata-queries/previewMessageCampaignAudience.ts b/packages/twenty-front/src/modules/activities/emails/graphql/metadata-queries/previewMessageCampaignAudience.tsindex eba121848fb..1ca70a6c2bc 100644--- a/packages/twenty-front/src/modules/activities/emails/graphql/metadata-queries/previewMessageCampaignAudience.ts+++ b/packages/twenty-front/src/modules/activities/emails/graphql/metadata-queries/previewMessageCampaignAudience.ts@@ -11,6 +11,7 @@ export const PREVIEW_MESSAGE_CAMPAIGN_AUDIENCE = gql`hardSuppressedgloballyUnsubscribedtopicUnsubscribed+ trackingRefusedsendable}}diff --git a/packages/twenty-front/src/modules/activities/emails/graphql/mutations/sendMessageCampaign.ts b/packages/twenty-front/src/modules/activities/emails/graphql/mutations/sendMessageCampaign.tsindex 5dafa15a081..e0e85b32777 100644--- a/packages/twenty-front/src/modules/activities/emails/graphql/mutations/sendMessageCampaign.ts+++ b/packages/twenty-front/src/modules/activities/emails/graphql/mutations/sendMessageCampaign.ts@@ -12,6 +12,7 @@ export const SEND_MESSAGE_CAMPAIGN = gql`hardSuppressedgloballyUnsubscribedtopicUnsubscribed+ trackingRefusedsendable}}diff --git a/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribePreview.tsx b/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribePreview.tsxindex ef8d98fa41e..252e46defe5 100644--- a/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribePreview.tsx+++ b/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribePreview.tsx@@ -3,7 +3,12 @@ import { useLingui } from '@lingui/react/macro';import { useUnsubscribeTopics } from '@/activities/emails/hooks/useUnsubscribeTopics';import { Section } from 'twenty-ui/components';-import { Button, Checkbox } from 'twenty-ui/primitives/input';+import {+ Button,+ Checkbox,+ Radio,+ RadioGroup,+} from 'twenty-ui/primitives/input';import { HorizontalSeparator } from 'twenty-ui/primitives/layout';import { Card } from 'twenty-ui/primitives/surfaces';import { themeCssVariables } from 'twenty-ui/theme';@@ -52,6 +57,23 @@ const StyledTopicRow = styled.div`gap: ${themeCssVariables.spacing[2]};`;+const StyledTrackingSection = styled.div`+ display: flex;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[2]};+ text-align: left;+`;++const StyledTrackingTitle = styled.span`+ color: ${themeCssVariables.font.color.primary};+ font-weight: ${themeCssVariables.font.weight.medium};+`;++const StyledTrackingHint = styled.span`+ color: ${themeCssVariables.font.color.secondary};+ font-size: ${themeCssVariables.font.size.sm};+`;+export const SettingsUnsubscribePreview = () => {const { t } = useLingui();const { unsubscribeTopics, loading } = useUnsubscribeTopics();@@ -66,11 +88,7 @@ export const SettingsUnsubscribePreview = () => {<Section.Root><Section.Headertitle={t`Unsubscribe page`}- description={- hasPublicTopics- ? t`Preview of the page recipients see when they unsubscribe`- : t`Recipients can only unsubscribe from everything. Add a public topic to let them choose what they keep receiving.`- }+ description={t`Preview of the page recipients see when they unsubscribe`}/><StyledViewport>{!loading && (@@ -78,45 +96,56 @@ export const SettingsUnsubscribePreview = () => {<StyledHeader><Section.Headertitle={t`Do you want to unsubscribe?`}- description={- hasPublicTopics- ? t`Confirm your preferences:`- : t`You will stop receiving these emails.`- }+ description={t`Confirm your preferences:`}/></StyledHeader>- {hasPublicTopics ? (- <>- <StyledTopics>- {publicTopics.map((topic) => (- <StyledTopicRow key={topic.id}>- <Checkbox- checked- onCheckedChange={() => {}}- aria-label={topic.name ?? t`Untitled topic`}- />- {topic.name ?? t`Untitled topic`}- </StyledTopicRow>- ))}- </StyledTopics>- <Button- fullWidth- variant="solid"- color="accent"- >{t`Update`}</Button>- <HorizontalSeparator text={t`Or`} noMargin />- <Button- fullWidth- variant="outline"- >{t`Unsubscribe all`}</Button>- </>- ) : (- <Button- fullWidth- variant="solid"- color="accent"- >{t`Unsubscribe`}</Button>+ {hasPublicTopics && (+ <StyledTopics>+ {publicTopics.map((topic) => (+ <StyledTopicRow key={topic.id}>+ <Checkbox+ checked+ onCheckedChange={() => {}}+ aria-label={topic.name ?? t`Untitled topic`}+ />+ {topic.name ?? t`Untitled topic`}+ </StyledTopicRow>+ ))}+ </StyledTopics>)}+ <StyledTrackingSection>+ <StyledTrackingTitle>{t`Email tracking`}</StyledTrackingTitle>+ <StyledTrackingHint>+ {t`This sender records which links you click in its emails. You can opt out for this email address.`}+ </StyledTrackingHint>+ <RadioGroup+ value="TRACKED"+ onValueChange={() => {}}+ aria-label={t`Email tracking`}+ >+ <StyledTopicRow>+ <Radio+ value="TRACKED"+ aria-label={t`Keep tracking my clicks`}+ />+ {t`Keep tracking my clicks`}+ </StyledTopicRow>+ <StyledTopicRow>+ <Radio+ value="OPTED_OUT"+ aria-label={t`Opt out of click tracking`}+ />+ {t`Opt out of click tracking`}+ </StyledTopicRow>+ </RadioGroup>+ </StyledTrackingSection>+ <Button fullWidth variant="solid" color="accent">+ {t`Update`}+ </Button>+ <HorizontalSeparator text={t`Or`} noMargin />+ <Button fullWidth variant="outline">+ {t`Unsubscribe all`}+ </Button></StyledCard>)}</StyledViewport>diff --git a/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribersList.tsx b/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribersList.tsxindex c3dcd7fb670..6dac057bed3 100644--- a/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribersList.tsx+++ b/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribersList.tsx@@ -105,12 +105,19 @@ export const SettingsUnsubscribersList = () => {]),);- const getScopeLabel = (topicId: string | null) => {- if (!isDefined(topicId)) {+ const getScopeLabel = ({+ reason,+ unsubscribeTopicId,+ }: Pick<MessageSuppression, 'reason' | 'unsubscribeTopicId'>) => {+ if (reason === MessageSuppressionReason.TRACKING) {+ return t`Clicks only`;+ }++ if (!isDefined(unsubscribeTopicId)) {return t`All emails`;}- return topicNameById.get(topicId) ?? t`Unknown topic`;+ return topicNameById.get(unsubscribeTopicId) ?? t`Unknown topic`;};const items = loading ? [] : messageSuppressions;@@ -124,8 +131,8 @@ export const SettingsUnsubscribersList = () => {return (<StyledContainer><SettingsTableListSection<MessageSuppression>- title={t`Unsubscribers`}- description={t`Email addresses that will no longer receive campaign emails`}+ title={t`Opt-outs`}+ description={t`Email addresses that opted out of campaign emails, a topic, or click tracking`}toolbar={<StyledToolbar><StyledSearch>@@ -155,9 +162,7 @@ export const SettingsUnsubscribersList = () => {},{label: t`Scope`,- Cell: ({ item }) => (- <>{getScopeLabel(item.unsubscribeTopicId ?? null)}</>- ),+ Cell: ({ item }) => <>{getScopeLabel(item)}</>,},{label: t`Reason`,diff --git a/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterDropdown.tsx b/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterDropdown.tsxindex 046474d80c5..85d92f90823 100644--- a/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterDropdown.tsx+++ b/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterDropdown.tsx@@ -72,7 +72,7 @@ export const SettingsUnsubscribersFilterDropdown = ({<ButtonstartIcon={<IconFilter />}size="md"- aria-label={t`Filter unsubscribers`}+ aria-label={t`Filter opt-outs`}variant="outline"/>}diff --git a/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/__stories__/SettingsUnsubscribersFilterDropdown.stories.tsx b/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/__stories__/SettingsUnsubscribersFilterDropdown.stories.tsxindex 96a0999e8e8..a027752ce4a 100644--- a/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/__stories__/SettingsUnsubscribersFilterDropdown.stories.tsx+++ b/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/__stories__/SettingsUnsubscribersFilterDropdown.stories.tsx@@ -58,12 +58,12 @@ export const PagesSelectionAndClear: Story = {const canvas = within(canvasElement);const body = within(canvasElement.ownerDocument.body);const trigger = canvas.getByRole('button', {- name: 'Filter unsubscribers',+ name: 'Filter opt-outs',});await userEvent.click(trigger);const popup = await body.findByRole('dialog', {- name: 'Filter unsubscribers',+ name: 'Filter opt-outs',});expect(@@ -81,7 +81,7 @@ export const PagesSelectionAndClear: Story = {await userEvent.click(trigger);const reopened = await body.findByRole('dialog', {- name: 'Filter unsubscribers',+ name: 'Filter opt-outs',});expect(diff --git a/packages/twenty-front/src/modules/settings/unsubscribers/utils/__tests__/getMessageSuppressionReasonBadge.test.ts b/packages/twenty-front/src/modules/settings/unsubscribers/utils/__tests__/getMessageSuppressionReasonBadge.test.tsindex e1239142f5a..d529627bbd3 100644--- a/packages/twenty-front/src/modules/settings/unsubscribers/utils/__tests__/getMessageSuppressionReasonBadge.test.ts+++ b/packages/twenty-front/src/modules/settings/unsubscribers/utils/__tests__/getMessageSuppressionReasonBadge.test.ts@@ -19,4 +19,10 @@ describe('getMessageSuppressionReasonBadge', () => {getMessageSuppressionReasonBadge(MessageSuppressionReason.BOUNCE),).toEqual({ color: 'orange', label: 'Bounce' });});++ it('should badge tracking opt-outs as blue', () => {+ expect(+ getMessageSuppressionReasonBadge(MessageSuppressionReason.TRACKING),+ ).toEqual({ color: 'blue', label: 'Tracking off' });+ });});diff --git a/packages/twenty-front/src/modules/settings/unsubscribers/utils/getMessageSuppressionReasonBadge.ts b/packages/twenty-front/src/modules/settings/unsubscribers/utils/getMessageSuppressionReasonBadge.tsindex 236c17a4841..c61d1ae0e46 100644--- a/packages/twenty-front/src/modules/settings/unsubscribers/utils/getMessageSuppressionReasonBadge.ts+++ b/packages/twenty-front/src/modules/settings/unsubscribers/utils/getMessageSuppressionReasonBadge.ts@@ -17,6 +17,8 @@ export const getMessageSuppressionReasonBadge = (return { color: 'red', label: t`Complaint` };case MessageSuppressionReason.BOUNCE:return { color: 'orange', label: t`Bounce` };+ case MessageSuppressionReason.TRACKING:+ return { color: 'blue', label: t`Tracking off` };default:return { color: 'gray', label: t`Unknown` };}diff --git a/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignForm.tsx b/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignForm.tsxindex 40d717a09b1..623347bf793 100644--- a/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignForm.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignForm.tsx@@ -206,6 +206,11 @@ export const SendCampaignForm = ({ campaign }: SendCampaignFormProps) => {{t`${formatNumber(audiencePreview.totalMembers)} in the list, skipping ${excludedReasons.join(', ')}`}</StyledHint>)}+ {audiencePreview.trackingRefused > 0 && (+ <StyledHint>+ {t`${formatNumber(audiencePreview.trackingRefused)} opted out of email tracking, their clicks are not recorded`}+ </StyledHint>+ )}{isScheduling && (<StyledHint>{t`Counted again when the campaign sends, so this can change.`}diff --git a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribe.tsx b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribe.tsxindex 68c4c82cc8c..01011826c0a 100644--- a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribe.tsx+++ b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribe.tsx@@ -25,7 +25,7 @@ export const SettingsWorkspaceUnsubscribe = () => {const tabs = [{id: SETTINGS_UNSUBSCRIBE_TAB_IDS.UNSUBSCRIBERS,- title: t`Unsubscribers`,+ title: t`Opt-outs`,Icon: IconForbid,},{diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/dtos/campaign-audience-preview.dto.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/dtos/campaign-audience-preview.dto.tsindex ba3e211b6fc..b666688d734 100644--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/dtos/campaign-audience-preview.dto.ts+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/dtos/campaign-audience-preview.dto.ts@@ -20,6 +20,9 @@ export class CampaignAudiencePreviewDTO {@Field(() => Int)topicUnsubscribed: number;+ @Field(() => Int)+ trackingRefused: number;+@Field(() => Int)sendable: number;}diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/types/campaign-audience-resolution.type.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/types/campaign-audience-resolution.type.tsindex 060791a04f6..dc26047aedf 100644--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/types/campaign-audience-resolution.type.ts+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/types/campaign-audience-resolution.type.ts@@ -9,6 +9,7 @@ export type CampaignAudienceResolution = {hardSuppressed: number;globallyUnsubscribed: number;topicUnsubscribed: number;+ trackingRefused: number;sendable: number;};};diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/types/message-suppression-reason.type.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/types/message-suppression-reason.type.tsindex 73aa0c24c6a..08a6a60a41a 100644--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/types/message-suppression-reason.type.ts+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/types/message-suppression-reason.type.ts@@ -2,4 +2,5 @@ export enum MessageSuppressionReason {BOUNCE = 'BOUNCE',COMPLAINT = 'COMPLAINT',UNSUBSCRIBE = 'UNSUBSCRIBE',+ TRACKING = 'TRACKING',}diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/__tests__/build-unsubscribe-preferences-page.util.spec.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/__tests__/build-unsubscribe-preferences-page.util.spec.tsindex f3258b7ddbd..568e08d75fb 100644--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/__tests__/build-unsubscribe-preferences-page.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/__tests__/build-unsubscribe-preferences-page.util.spec.ts@@ -5,6 +5,7 @@ const buildPage = (topics: TopicOptOutState[]) =>buildUnsubscribePreferencesPage({token: 'token-1',topics,+ isTrackingOptedOut: undefined,updatePath: '/unsubscribe/update',unsubscribeAllPath: '/unsubscribe/all',});@@ -74,10 +75,40 @@ describe('buildUnsubscribePreferencesPage', () => {topics: [{ unsubscribeTopicId: 'topic-1', topicName: 'News', optedOut: false },],+ isTrackingOptedOut: undefined,updatePath: '/unsubscribe/update',unsubscribeAllPath: '/unsubscribe/all',});expect(page).not.toContain('<script>');});++ describe('when the workspace tracks clicks', () => {+ it('offers the tracking choice even without topics', () => {+ const page = buildUnsubscribePreferencesPage({+ token: 'token-1',+ topics: [],+ isTrackingOptedOut: false,+ updatePath: '/unsubscribe/update',+ unsubscribeAllPath: '/unsubscribe/all',+ });++ expect(page).toContain('action="/unsubscribe/update"');+ expect(page).toContain('value="TRACKED" checked />');+ expect(page).toContain('value="OPTED_OUT" />');+ });++ it('preselects the refusal the recipient already made', () => {+ const page = buildUnsubscribePreferencesPage({+ token: 'token-1',+ topics: [],+ isTrackingOptedOut: true,+ updatePath: '/unsubscribe/update',+ unsubscribeAllPath: '/unsubscribe/all',+ });++ expect(page).toContain('value="TRACKED" />');+ expect(page).toContain('value="OPTED_OUT" checked />');+ });+ });});diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/__tests__/is-suppression-blocking-send.util.spec.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/__tests__/is-suppression-blocking-send.util.spec.tsindex 4af70f10f41..3d0fccf5ecb 100644--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/__tests__/is-suppression-blocking-send.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/__tests__/is-suppression-blocking-send.util.spec.ts@@ -96,4 +96,20 @@ describe('isSuppressionBlockingSend', () => {).toBe(false);});});++ describe('tracking opt-out', () => {+ const suppression = {+ reason: MessageSuppressionReason.TRACKING,+ unsubscribeTopicId: null,+ };++ it('should never block a send, the recipient only refused click tracking', () => {+ expect(+ isSuppressionBlockingSend({ sendKind: 'MARKETING', suppression }),+ ).toBe(false);+ expect(+ isSuppressionBlockingSend({ sendKind: 'TRANSACTIONAL', suppression }),+ ).toBe(false);+ });+ });});diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/__tests__/resolve-campaign-audience.util.spec.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/__tests__/resolve-campaign-audience.util.spec.tsindex b475078c42e..8ec8b9c2e75 100644--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/__tests__/resolve-campaign-audience.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/__tests__/resolve-campaign-audience.util.spec.ts@@ -20,6 +20,7 @@ describe('resolveCampaignAudience', () => {hardSuppressedEmails: new Set(),globallySuppressedEmails: new Set(['[email protected]']),topicSuppressedEmails: new Set(['[email protected]']),+ trackingRefusedEmails: new Set(),});expect(sendableRecipients).toEqual([@@ -32,10 +33,32 @@ describe('resolveCampaignAudience', () => {hardSuppressed: 0,globallyUnsubscribed: 1,topicUnsubscribed: 1,+ trackingRefused: 0,sendable: 1,});});+ it('should keep a recipient who refused tracking in the audience and count them', () => {+ const { sendableRecipients, audience } = resolveCampaignAudience({+ rawRecipients: buildRawRecipients([+ '[email protected]',+ '[email protected]',+ ]),+ totalMemberCount: 2,+ hardSuppressedEmails: new Set(),+ globallySuppressedEmails: new Set(),+ topicSuppressedEmails: new Set(),+ trackingRefusedEmails: new Set(['[email protected]']),+ });++ expect(sendableRecipients.map((recipient) => recipient.email)).toEqual([+ '[email protected]',+ '[email protected]',+ ]);+ expect(audience.trackingRefused).toBe(1);+ expect(audience.sendable).toBe(2);+ });+it('should report a bounced recipient as hard suppressed rather than unsubscribed', () => {const { audience } = resolveCampaignAudience({rawRecipients: buildRawRecipients([@@ -46,6 +69,7 @@ describe('resolveCampaignAudience', () => {hardSuppressedEmails: new Set(['[email protected]']),globallySuppressedEmails: new Set(['[email protected]']),topicSuppressedEmails: new Set(),+ trackingRefusedEmails: new Set(),});expect(audience.hardSuppressed).toBe(1);@@ -60,6 +84,7 @@ describe('resolveCampaignAudience', () => {hardSuppressedEmails: new Set(),globallySuppressedEmails: new Set(['[email protected]']),topicSuppressedEmails: new Set(['[email protected]']),+ trackingRefusedEmails: new Set(),});expect(audience.globallyUnsubscribed).toBe(1);@@ -74,6 +99,7 @@ describe('resolveCampaignAudience', () => {hardSuppressedEmails: new Set(),globallySuppressedEmails: new Set(),topicSuppressedEmails: new Set(),+ trackingRefusedEmails: new Set(),});expect(audience.totalMembers).toBe(4);@@ -87,6 +113,7 @@ describe('resolveCampaignAudience', () => {hardSuppressedEmails: new Set(),globallySuppressedEmails: new Set(),topicSuppressedEmails: new Set(),+ trackingRefusedEmails: new Set(),});expect(sendableRecipients).toEqual([]);diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/build-unsubscribe-preferences-page.util.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/build-unsubscribe-preferences-page.util.tsindex 77068359d1b..1d1c3b2efcf 100644--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/build-unsubscribe-preferences-page.util.ts+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/build-unsubscribe-preferences-page.util.ts@@ -1,14 +1,18 @@+import { isNonEmptyString } from '@sniptt/guards';+import { isDefined } from 'twenty-shared/utils';+import { type TopicOptOutState } from 'src/engine/core-modules/emailing-domain/types/topic-opt-out-state.type';import { escapeHtml } from 'src/engine/core-modules/emailing-domain/utils/escape-html.util';type BuildUnsubscribePreferencesPageArgs = {token: string;topics: TopicOptOutState[];+ isTrackingOptedOut: boolean | undefined;updatePath: string;unsubscribeAllPath: string;};-const PAGE_STYLE = `body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',sans-serif;background:#fafafa;margin:0;padding:48px 16px;color:#1a1a1a}.card{max-width:420px;margin:0 auto;background:#fff;border:1px solid #ededed;border-radius:16px;padding:40px 32px;text-align:center}h1{font-size:28px;font-weight:700;margin:0 0 8px}.subtitle{color:#888;margin:0 0 28px}.topics{text-align:left;margin:0 0 28px}.topic{display:flex;align-items:center;gap:12px;padding:10px 0;font-size:16px}.topic input{width:18px;height:18px;accent-color:#1a1a1a}button{width:100%;border-radius:10px;padding:14px;font-size:16px;font-weight:600;cursor:pointer;border:1px solid transparent}.primary{background:#1a1a1a;color:#fff}.divider{color:#aaa;margin:16px 0}.secondary{background:#fff;color:#1a1a1a;border:1px solid #ddd}`;+const PAGE_STYLE = `body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',sans-serif;background:#fafafa;margin:0;padding:48px 16px;color:#1a1a1a}.card{max-width:420px;margin:0 auto;background:#fff;border:1px solid #ededed;border-radius:16px;padding:40px 32px;text-align:center}h1{font-size:28px;font-weight:700;margin:0 0 8px}.subtitle{color:#888;margin:0 0 28px}.topics{text-align:left;margin:0 0 28px}.topic{display:flex;align-items:center;gap:12px;padding:10px 0;font-size:16px}.topic input{width:18px;height:18px;accent-color:#1a1a1a}.section-title{font-weight:600;margin:0 0 4px}.hint{color:#888;font-size:14px;margin:0 0 8px}button{width:100%;border-radius:10px;padding:14px;font-size:16px;font-weight:600;cursor:pointer;border:1px solid transparent}.primary{background:#1a1a1a;color:#fff}.divider{color:#aaa;margin:16px 0}.secondary{background:#fff;color:#1a1a1a;border:1px solid #ddd}`;const buildTopicCheckbox = (topic: TopicOptOutState): string => {const label = escapeHtml(topic.topicName ?? 'Untitled topic');@@ -18,24 +22,40 @@ const buildTopicCheckbox = (topic: TopicOptOutState): string => {return `<label class="topic"><input type="checkbox" name="unsubscribeTopicId" value="${value}"${checkedAttribute} />${label}</label>`;};+const buildTopicsSection = (topics: TopicOptOutState[]): string =>+ `<div class="topics">${topics.map(buildTopicCheckbox).join('')}</div>`;++const buildTrackingSection = (isTrackingOptedOut: boolean): string => {+ const trackedAttribute = isTrackingOptedOut ? '' : ' checked';+ const optedOutAttribute = isTrackingOptedOut ? ' checked' : '';++ return `<div class="topics"><p class="section-title">Email tracking</p><p class="hint">This sender records which links you click in its emails. You can opt out for this email address.</p><label class="topic"><input type="radio" name="tracking" value="TRACKED"${trackedAttribute} />Keep tracking my clicks</label><label class="topic"><input type="radio" name="tracking" value="OPTED_OUT"${optedOutAttribute} />Opt out of click tracking</label></div>`;+};+export const buildUnsubscribePreferencesPage = ({token,topics,+ isTrackingOptedOut,updatePath,unsubscribeAllPath,}: BuildUnsubscribePreferencesPageArgs): string => {const safeToken = escapeHtml(token);const tokenField = `<input type="hidden" name="t" value="${safeToken}" />`;- // Without topics there is nothing to pick from, so the page collapses to a- // single confirmation instead of offering an empty preferences form.+ const preferenceSections = [+ topics.length > 0 ? buildTopicsSection(topics) : '',+ isDefined(isTrackingOptedOut)+ ? buildTrackingSection(isTrackingOptedOut)+ : '',+ ].filter(isNonEmptyString);++ // Without anything to pick from, the page collapses to a single+ // confirmation instead of offering an empty preferences form.const body =- topics.length > 0- ? `<p class="subtitle">Confirm your preferences:</p><form method="post" action="${updatePath}">${tokenField}<div class="topics">${topics- .map(buildTopicCheckbox)- .join(- '',- )}</div><button type="submit" class="primary">Update</button></form><p class="divider">Or</p><form method="post" action="${unsubscribeAllPath}">${tokenField}<button type="submit" class="secondary">Unsubscribe all</button></form>`+ preferenceSections.length > 0+ ? `<p class="subtitle">Confirm your preferences:</p><form method="post" action="${updatePath}">${tokenField}${preferenceSections.join(+ '',+ )}<button type="submit" class="primary">Update</button></form><p class="divider">Or</p><form method="post" action="${unsubscribeAllPath}">${tokenField}<button type="submit" class="secondary">Unsubscribe all</button></form>`: `<p class="subtitle">You will stop receiving these emails.</p><form method="post" action="${unsubscribeAllPath}">${tokenField}<button type="submit" class="primary">Unsubscribe</button></form>`;return `<!doctype html><html><head><meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" /><title>Email preferences</title><style>${PAGE_STYLE}</style></head><body><div class="card"><h1>Do you want to unsubscribe?</h1>${body}</div></body></html>`;diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/is-suppression-blocking-send.util.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/is-suppression-blocking-send.util.tsindex 8eb2cde4eb1..9672ba28787 100644--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/is-suppression-blocking-send.util.ts+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/is-suppression-blocking-send.util.ts@@ -1,5 +1,6 @@import { isDefined } from 'twenty-shared/utils';+import { MessageSuppressionReason } from 'src/engine/core-modules/emailing-domain/types/message-suppression-reason.type';import { HARD_SUPPRESSION_REASONS } from 'src/engine/core-modules/emailing-domain/constants/hard-suppression-reasons.constant';import { type EmailingDomainSendKind } from 'src/engine/core-modules/emailing-domain/drivers/types/emailing-domain-send-kind.type';import { type MessageSuppressionWorkspaceEntity } from 'src/modules/emailing/standard-objects/message-suppression.workspace-entity';@@ -18,6 +19,10 @@ export const isSuppressionBlockingSend = ({suppression,unsubscribeTopicId,}: IsSuppressionBlockingSendArgs): boolean => {+ if (suppression.reason === MessageSuppressionReason.TRACKING) {+ return false;+ }+if (HARD_SUPPRESSION_REASONS.includes(suppression.reason)) {return true;}diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/resolve-campaign-audience.util.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/resolve-campaign-audience.util.tsindex 4e93a4cf8c3..d38d08cefce 100644--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/resolve-campaign-audience.util.ts+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/resolve-campaign-audience.util.ts@@ -9,12 +9,14 @@ export const resolveCampaignAudience = ({hardSuppressedEmails,globallySuppressedEmails,topicSuppressedEmails,+ trackingRefusedEmails,}: {rawRecipients: RawCampaignRecipient[];totalMemberCount: number;hardSuppressedEmails: Set<string>;globallySuppressedEmails: Set<string>;topicSuppressedEmails: Set<string>;+ trackingRefusedEmails: Set<string>;}): CampaignAudienceResolution => {const { recipients, skipped } = normalizeCampaignRecipients(rawRecipients);@@ -49,6 +51,9 @@ export const resolveCampaignAudience = ({hardSuppressed: excluded.hardSuppressed,globallyUnsubscribed: excluded.globally,topicUnsubscribed: excluded.byTopic,+ trackingRefused: sendableRecipients.filter((recipient) =>+ trackingRefusedEmails.has(recipient.email),+ ).length,sendable: sendableRecipients.length,},};diff --git a/packages/twenty-server/src/modules/emailing/controllers/unsubscribe.controller.ts b/packages/twenty-server/src/modules/emailing/controllers/unsubscribe.controller.tsindex 45bc19dd476..60fb3520fdf 100644--- a/packages/twenty-server/src/modules/emailing/controllers/unsubscribe.controller.ts+++ b/packages/twenty-server/src/modules/emailing/controllers/unsubscribe.controller.ts@@ -15,6 +15,7 @@ import {import { isNonEmptyString } from '@sniptt/guards';import { type Request } from 'express';import { ApiPath } from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';import { UnsubscribeTokenService } from 'src/engine/core-modules/emailing-domain/services/unsubscribe-token.service';import { type UnsubscribeTokenVerification } from 'src/engine/core-modules/emailing-domain/types/unsubscribe-token-verification.type';@@ -42,6 +43,7 @@ const PREVIEW_RESULT_PAGE = buildUnsubscribeResultPage(type UnsubscribeFormBody = {t?: string;unsubscribeTopicId?: string | string[];+ tracking?: string;};const RATE_LIMIT = { maxRequests: 120, windowMs: 60_000 };@@ -115,16 +117,23 @@ export class UnsubscribeController {const { payload, isExpired } = this.verifyTokenOrThrow(token);- const topics = isExpired- ? []- : await this.messageSuppressionService.getTopicOptOutState({- workspaceId: payload.workspaceId,- emailAddress: payload.emailAddress,- });+ const [topics, isTrackingOptedOut] = isExpired+ ? [[], undefined]+ : await Promise.all([+ this.messageSuppressionService.getTopicOptOutState({+ workspaceId: payload.workspaceId,+ emailAddress: payload.emailAddress,+ }),+ this.messageSuppressionService.isTrackingOptedOut({+ workspaceId: payload.workspaceId,+ emailAddress: payload.emailAddress,+ }),+ ]);return buildUnsubscribePreferencesPage({token,topics,+ isTrackingOptedOut,updatePath: UPDATE_PREFERENCES_PATH,unsubscribeAllPath: UNSUBSCRIBE_ALL_PATH,});@@ -159,6 +168,16 @@ export class UnsubscribeController {}),});+ const trackingChoice = this.parseTrackingChoice(body.tracking);++ if (isDefined(trackingChoice)) {+ await this.messageSuppressionService.setTrackingOptOut({+ workspaceId: payload.workspaceId,+ emailAddress: payload.emailAddress,+ isOptedOut: trackingChoice === 'OPTED_OUT',+ });+ }+return buildUnsubscribeResultPage('Preferences updated','Your email preferences have been saved.',@@ -190,6 +209,19 @@ export class UnsubscribeController {);}+ private parseTrackingChoice(+ tracking: string | undefined,+ ): 'TRACKED' | 'OPTED_OUT' | undefined {+ switch (tracking) {+ case 'TRACKED':+ return 'TRACKED';+ case 'OPTED_OUT':+ return 'OPTED_OUT';+ default:+ return undefined;+ }+ }+private normalizeTopicIds(unsubscribeTopicId: string | string[] | undefined,): string[] {diff --git a/packages/twenty-server/src/modules/emailing/services/campaign-engagement-recording.service.ts b/packages/twenty-server/src/modules/emailing/services/campaign-engagement-recording.service.tsindex b9b05648341..4176f036082 100644--- a/packages/twenty-server/src/modules/emailing/services/campaign-engagement-recording.service.ts+++ b/packages/twenty-server/src/modules/emailing/services/campaign-engagement-recording.service.ts@@ -7,6 +7,7 @@ import { isDefined } from 'twenty-shared/utils';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';+import { MessageSuppressionService } from 'src/modules/emailing/services/message-suppression.service';import { CampaignEngagementEventService } from 'src/modules/emailing/services/campaign-engagement-event.service';import { CampaignDeliveryWorkspaceEntity } from 'src/modules/emailing/standard-objects/campaign-delivery.workspace-entity';import { type CampaignEngagementObservation } from 'src/modules/emailing/types/campaign-engagement-observation.type';@@ -19,6 +20,7 @@ export class CampaignEngagementRecordingService {@InjectRepository(WorkspaceEntity)private readonly workspaceRepository: Repository<WorkspaceEntity>,private readonly campaignEngagementEventService: CampaignEngagementEventService,+ private readonly messageSuppressionService: MessageSuppressionService,) {}async record(observation: CampaignEngagementObservation): Promise<void> {@@ -36,6 +38,16 @@ export class CampaignEngagementRecordingService {return;}+ const isTrackingOptedOut =+ await this.messageSuppressionService.isTrackingOptedOut({+ workspaceId: observation.workspaceId,+ emailAddress: delivery.recipientEmail,+ });++ if (isTrackingOptedOut) {+ return;+ }+const workspace = await this.workspaceRepository.findOneBy({id: observation.workspaceId,});diff --git a/packages/twenty-server/src/modules/emailing/services/campaign-tracking-content.service.ts b/packages/twenty-server/src/modules/emailing/services/campaign-tracking-content.service.tsindex b7df7e5d75c..c6f2e58019b 100644--- a/packages/twenty-server/src/modules/emailing/services/campaign-tracking-content.service.ts+++ b/packages/twenty-server/src/modules/emailing/services/campaign-tracking-content.service.ts@@ -26,7 +26,9 @@ import { TRACKABLE_URL_PATTERN } from 'src/modules/emailing/constants/trackable-import { CAMPAIGN_BATCH_VARIABLE_TAG_PATTERN } from 'src/modules/emailing/constants/campaign-batch-variable-tag-pattern.constant';import { CAMPAIGN_TRACKING_TAG_PREFIX_BY_MESSAGE_PART } from 'src/modules/emailing/constants/campaign-tracking-tag-prefix-by-message-part.constant';import { CampaignEngagementEventService } from 'src/modules/emailing/services/campaign-engagement-event.service';+import { MessageSuppressionService } from 'src/modules/emailing/services/message-suppression.service';import { collectTrackableLinkUrls } from 'src/modules/emailing/utils/collect-trackable-link-urls.util';+import { normalizeCampaignRecipientEmailAddress } from 'src/modules/emailing/utils/normalize-campaign-recipient-email-address.util';import { replaceTrackableLinkUrls } from 'src/modules/emailing/utils/replace-trackable-link-urls.util';type CampaignMessagePart =@@ -39,6 +41,7 @@ type TrackedCampaignBatch = {type TrackingRecipient = {deliveryId: string;+ email: string;replacements: Record<string, string>;};@@ -61,6 +64,7 @@ export class CampaignTrackingContentService {private readonly shortLinkService: ShortLinkService,private readonly twentyConfigService: TwentyConfigService,private readonly campaignEngagementEventService: CampaignEngagementEventService,+ private readonly messageSuppressionService: MessageSuppressionService,) {}async prepareBatch({@@ -106,11 +110,21 @@ export class CampaignTrackingContentService {return untracked;}+ const optedOutEmailAddresses =+ await this.messageSuppressionService.findTrackingOptedOutEmailAddresses({+ workspaceId,+ emailAddresses: recipients.map(({ email }) => email),+ });+ const isTracked = (recipient: TrackingRecipient) =>+ !optedOutEmailAddresses.has(+ normalizeCampaignRecipientEmailAddress(recipient.email),+ );+const shortLinkIdByIdentity = await this.registerShortLinks({workspaceId,urlTemplates,variableNames,- recipients,+ recipients: recipients.filter(isTracked),});return {@@ -124,14 +138,16 @@ export class CampaignTrackingContentService {recipient.deliveryId,{...recipient.replacements,- ...this.buildTrackingReplacements({- workspaceId,- baseUrl,- recipient,- urlTemplates,- variableNames,- shortLinkIdByIdentity,- }),+ ...(isTracked(recipient)+ ? this.buildTrackingReplacements({+ workspaceId,+ baseUrl,+ recipient,+ urlTemplates,+ variableNames,+ shortLinkIdByIdentity,+ })+ : this.buildUntrackedReplacements({ recipient, urlTemplates })),},]),),@@ -264,6 +280,29 @@ export class CampaignTrackingContentService {return replacements;}+ private buildUntrackedReplacements({+ recipient,+ urlTemplates,+ }: {+ recipient: TrackingRecipient;+ urlTemplates: string[];+ }): Record<string, string> {+ const replacements: Record<string, string> = {};++ urlTemplates.forEach((urlTemplate, index) => {+ const { url } = this.resolveLinkUrl({+ urlTemplate,+ replacements: recipient.replacements,+ });++ replacements[this.buildLinkTag({ messagePart: 'HTML', index })] =+ escapeHtml(url);+ replacements[this.buildLinkTag({ messagePart: 'TEXT', index })] = url;+ });++ return replacements;+ }+private buildLinkTag({messagePart,index,diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-audience.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-audience.service.tsindex 8931b6333d1..5738fcd0690 100644--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-audience.service.ts+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-audience.service.ts@@ -6,6 +6,7 @@ import { In } from 'typeorm';import { type CampaignAudienceResolution } from 'src/engine/core-modules/emailing-domain/types/campaign-audience-resolution.type';import { resolveCampaignAudience } from 'src/engine/core-modules/emailing-domain/utils/resolve-campaign-audience.util';+import { MessageSuppressionReason } from 'src/engine/core-modules/emailing-domain/types/message-suppression-reason.type';import { HARD_SUPPRESSION_REASONS } from 'src/engine/core-modules/emailing-domain/constants/hard-suppression-reasons.constant';import { type RawCampaignRecipient } from 'src/engine/core-modules/emailing-domain/types/raw-campaign-recipient.type';import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';@@ -74,8 +75,14 @@ export class MessageCampaignAudienceService {const hardSuppressedEmails = new Set<string>();const globallySuppressedEmails = new Set<string>();const topicSuppressedEmails = new Set<string>();+ const trackingRefusedEmails = new Set<string>();for (const suppression of suppressions) {+ if (suppression.reason === MessageSuppressionReason.TRACKING) {+ trackingRefusedEmails.add(suppression.emailAddress);+ continue;+ }+if (isDefined(suppression.unsubscribeTopicId)) {topicSuppressedEmails.add(suppression.emailAddress);continue;@@ -95,6 +102,7 @@ export class MessageCampaignAudienceService {hardSuppressedEmails,globallySuppressedEmails,topicSuppressedEmails,+ trackingRefusedEmails,});}diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-batch-delivery.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-batch-delivery.service.tsindex a7c6c9cc5fa..be304337156 100644--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-batch-delivery.service.ts+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-batch-delivery.service.ts@@ -351,6 +351,7 @@ export class MessageCampaignBatchDeliveryService {variableNames,recipients: claimedRecipients.map((recipient) => ({deliveryId: recipient.messageId,+ email: recipient.email,replacements: replacementsByDeliveryId.get(recipient.messageId) ?? {},})),})diff --git a/packages/twenty-server/src/modules/emailing/services/message-suppression.service.ts b/packages/twenty-server/src/modules/emailing/services/message-suppression.service.tsindex e99a745c336..a95ee0416a9 100644--- a/packages/twenty-server/src/modules/emailing/services/message-suppression.service.ts+++ b/packages/twenty-server/src/modules/emailing/services/message-suppression.service.ts@@ -148,6 +148,95 @@ export class MessageSuppressionService {}, buildSystemAuthContext(workspaceId));}+ async findTrackingOptedOutEmailAddresses({+ workspaceId,+ emailAddresses,+ }: {+ workspaceId: string;+ emailAddresses: string[];+ }): Promise<Set<string>> {+ const normalizedAddresses = this.normalizeAddresses(emailAddresses);++ if (!isNonEmptyArray(normalizedAddresses)) {+ return new Set();+ }++ const optOuts = await this.workspaceOrmManager.executeInWorkspaceContext(+ async () => {+ const suppressionRepository = this.workspaceOrmManager.getRepository(+ MessageSuppressionWorkspaceEntity,+ { shouldBypassPermissionChecks: true },+ { shouldSkipEventEmission: true },+ );++ return suppressionRepository.find({+ where: {+ emailAddress: In(normalizedAddresses),+ reason: MessageSuppressionReason.TRACKING,+ },+ });+ },+ buildSystemAuthContext(workspaceId),+ );++ return new Set(optOuts.map(({ emailAddress }) => emailAddress));+ }++ async isTrackingOptedOut({+ workspaceId,+ emailAddress,+ }: {+ workspaceId: string;+ emailAddress: string;+ }): Promise<boolean> {+ const optedOut = await this.findTrackingOptedOutEmailAddresses({+ workspaceId,+ emailAddresses: [emailAddress],+ });++ return optedOut.size > 0;+ }++ async setTrackingOptOut({+ workspaceId,+ emailAddress,+ isOptedOut,+ }: {+ workspaceId: string;+ emailAddress: string;+ isOptedOut: boolean;+ }): Promise<void> {+ if (isOptedOut) {+ await this.suppress({+ workspaceId,+ emailAddress,+ reason: MessageSuppressionReason.TRACKING,+ source: MessageSuppressionSource.SYSTEM,+ });++ return;+ }++ const normalizedEmailAddress = this.normalizeEmailAddress(emailAddress);++ if (!isNonEmptyString(normalizedEmailAddress)) {+ return;+ }++ await this.workspaceOrmManager.executeInWorkspaceContext(async () => {+ const suppressionRepository = this.workspaceOrmManager.getRepository(+ MessageSuppressionWorkspaceEntity,+ { shouldBypassPermissionChecks: true },+ { shouldSkipEventEmission: true },+ );++ await suppressionRepository.delete({+ emailAddress: normalizedEmailAddress,+ reason: MessageSuppressionReason.TRACKING,+ });+ }, buildSystemAuthContext(workspaceId));+ }+async suppress({workspaceId,emailAddress,@@ -166,12 +255,16 @@ export class MessageSuppressionService {? null: unsubscribeTopicId;- const whereKey = {- emailAddress: normalizedEmailAddress,- unsubscribeTopicId: isDefined(effectiveTopicId)- ? effectiveTopicId- : IsNull(),- };+ const whereKey =+ reason === MessageSuppressionReason.TRACKING+ ? { emailAddress: normalizedEmailAddress, reason }+ : {+ emailAddress: normalizedEmailAddress,+ unsubscribeTopicId: isDefined(effectiveTopicId)+ ? effectiveTopicId+ : IsNull(),+ reason: Not(MessageSuppressionReason.TRACKING),+ };await this.workspaceOrmManager.executeInWorkspaceContext(async () => {const suppressionRepository = this.workspaceOrmManager.getRepository(diff --git a/packages/twenty-server/src/modules/emailing/utils/normalize-campaign-recipient-email-address.util.ts b/packages/twenty-server/src/modules/emailing/utils/normalize-campaign-recipient-email-address.util.tsnew file mode 100644index 00000000000..72cec141ff4--- /dev/null+++ b/packages/twenty-server/src/modules/emailing/utils/normalize-campaign-recipient-email-address.util.ts@@ -0,0 +1,3 @@+export const normalizeCampaignRecipientEmailAddress = (+ emailAddress: string,+): string => emailAddress.trim().toLowerCase();diff --git a/packages/twenty-server/test/integration/metadata/suites/emailing/message-suppression-tracking.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/emailing/message-suppression-tracking.integration-spec.tsnew file mode 100644index 00000000000..5ad7c7d78ad--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/emailing/message-suppression-tracking.integration-spec.ts@@ -0,0 +1,159 @@+import { gql } from 'graphql-tag';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';+import { FeatureFlagKey } from 'twenty-shared/types';+import { v4 } from 'uuid';++import { MessageSuppressionReason } from 'src/engine/core-modules/emailing-domain/types/message-suppression-reason.type';+import { isSuppressionBlockingSend } from 'src/engine/core-modules/emailing-domain/utils/is-suppression-blocking-send.util';+import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';+import { MessageSuppressionService } from 'src/modules/emailing/services/message-suppression.service';++const MESSAGE_SUPPRESSIONS = gql`+ query MessageSuppressions($input: FindMessageSuppressionsInput!) {+ messageSuppressions(input: $input) {+ totalCount+ records {+ emailAddress+ reason+ }+ }+ }+`;++const SUPPRESSION_TABLE = `"${getWorkspaceSchemaName(SEED_APPLE_WORKSPACE_ID)}"."messageSuppression"`;++describe('tracking opt-out as a suppression (integration)', () => {+ let messageSuppressionService: MessageSuppressionService;+ const usedEmailAddresses: string[] = [];++ beforeAll(async () => {+ messageSuppressionService =+ getAppProviderByClassName<MessageSuppressionService>(+ 'MessageSuppressionService',+ );++ await updateFeatureFlag({+ featureFlag: FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,+ value: true,+ expectToFail: false,+ });+ });++ afterAll(async () => {+ await updateFeatureFlag({+ featureFlag: FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,+ value: false,+ expectToFail: false,+ });+ });++ afterEach(async () => {+ for (const emailAddress of usedEmailAddresses) {+ await testDataSource+ .query(`DELETE FROM ${SUPPRESSION_TABLE} WHERE "emailAddress" = $1`, [+ emailAddress,+ ])+ .catch(() => {});+ }+ usedEmailAddresses.length = 0;+ });++ const newEmailAddress = (prefix: string) => {+ const emailAddress = `${prefix}-${v4()}@example.com`;++ usedEmailAddresses.push(emailAddress);++ return emailAddress;+ };++ it('should keep the address off the tracked list, show it in settings, and still let mail through', async () => {+ const emailAddress = newEmailAddress('opted-out');++ await messageSuppressionService.setTrackingOptOut({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ emailAddress: emailAddress.toUpperCase(),+ isOptedOut: true,+ });++ const trackingOptedOutEmailAddresses =+ await messageSuppressionService.findTrackingOptedOutEmailAddresses({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ emailAddresses: [emailAddress],+ });++ expect([...trackingOptedOutEmailAddresses]).toEqual([emailAddress]);++ const [suppression] =+ await messageSuppressionService.findApplicableSuppressions({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ emailAddresses: [emailAddress],+ });++ expect(suppression.reason).toBe(MessageSuppressionReason.TRACKING);+ expect(+ isSuppressionBlockingSend({ sendKind: 'MARKETING', suppression }),+ ).toBe(false);++ const listResponse = await makeMetadataApiRequest({+ query: MESSAGE_SUPPRESSIONS,+ variables: {+ input: { searchTerm: emailAddress, limit: 30, offset: 0 },+ },+ });++ expect(listResponse.body.data.messageSuppressions).toEqual({+ totalCount: 1,+ records: [{ emailAddress, reason: 'TRACKING' }],+ });+ });++ it('should let a recipient opt back in and leave nothing behind', async () => {+ const emailAddress = newEmailAddress('opted-back-in');++ await messageSuppressionService.setTrackingOptOut({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ emailAddress,+ isOptedOut: true,+ });+ await messageSuppressionService.setTrackingOptOut({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ emailAddress,+ isOptedOut: false,+ });++ await expect(+ messageSuppressionService.findApplicableSuppressions({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ emailAddresses: [emailAddress],+ }),+ ).resolves.toEqual([]);+ });++ it('should keep a tracking opt-out next to a global unsubscribe of the same address', async () => {+ const emailAddress = newEmailAddress('both');++ await messageSuppressionService.setTrackingOptOut({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ emailAddress,+ isOptedOut: true,+ });+ await messageSuppressionService.unsubscribeFromEverything({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ emailAddress,+ });++ const suppressions =+ await messageSuppressionService.findApplicableSuppressions({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ emailAddresses: [emailAddress],+ });++ expect(suppressions.map(({ reason }) => reason).sort()).toEqual([+ MessageSuppressionReason.TRACKING,+ MessageSuppressionReason.UNSUBSCRIBE,+ ]);+ });+});