From 819fcfb3929292cf894aa35a88ec0a7b4dff0726 Mon Sep 17 00:00:00 2001 From: Krzysztof Jablonski Date: Thu, 8 Jun 2017 14:06:35 +0200 Subject: [PATCH 1/2] Fix typo during refactoring During code refactoring for selectable unsubscription feature code: `!campaignId || status > 2` was wrongly refactored to: `subscription.status !== Status.SUBSCRIBED` Link: https://github.com/Mailtrain-org/mailtrain/commit/a6d25e668b6d9a31b90b05bb9bfe7d65f1d619a1#diff-5af9fe5dfae76c093530c92e3d7404e1R496 --- lib/models/subscriptions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/models/subscriptions.js b/lib/models/subscriptions.js index 5b2ab460..1ea574c6 100644 --- a/lib/models/subscriptions.js +++ b/lib/models/subscriptions.js @@ -495,7 +495,7 @@ module.exports.changeStatus = (listId, id, campaignId, status, callback) => { } // status change is not related to a campaign or it marks message as bounced etc. - if (!campaignId || status !== Status.SUBSCRIBED) { + if (!campaignId || status > Status.UNSUBSCRIBED) { return connection.commit(err => { if (err) { return helpers.rollbackAndReleaseConnection(connection, () => callback(err)); From 71ac4c64a5ec9c5b934dd6c7b4f2ba83833756fc Mon Sep 17 00:00:00 2001 From: Krzysztof Jablonski Date: Thu, 8 Jun 2017 14:22:34 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Avoid=20using=20>=20with=20=E2=80=9Eenums?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/models/subscriptions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/models/subscriptions.js b/lib/models/subscriptions.js index 1ea574c6..6760bda9 100644 --- a/lib/models/subscriptions.js +++ b/lib/models/subscriptions.js @@ -495,7 +495,7 @@ module.exports.changeStatus = (listId, id, campaignId, status, callback) => { } // status change is not related to a campaign or it marks message as bounced etc. - if (!campaignId || status > Status.UNSUBSCRIBED) { + if (!campaignId || status !== Status.SUBSCRIBED && status !== Status.UNSUBSCRIBED) { return connection.commit(err => { if (err) { return helpers.rollbackAndReleaseConnection(connection, () => callback(err));