Skip to content

The open alternative to Salesforce, designed for AI.

Keep preferences-page unsubscribes scoped to the unticked topics (#26308)

neo773710f1632ae96
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.ts
index a3d6d1b0e7a..9841f4f3f0c 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
@@ -332,12 +332,6 @@ export class MessageSuppressionService {
keptTopicIds.filter((topicId) => visibleTopicIds.has(topicId)),
);
- if (keptTopicIdSet.size === 0) {
- await this.unsubscribeFromEverything({ workspaceId, emailAddress });
-
- return;
- }
-
await this.suppressTopicsNotKept({
workspaceId,
emailAddress,
@@ -345,7 +339,7 @@ export class MessageSuppressionService {
keptTopicIdSet,
});
- if (!canResubscribe) {
+ if (!canResubscribe || keptTopicIdSet.size === 0) {
return;
}