From a5e023ac204251192f9cb722c0d98695cb3b8400 Mon Sep 17 00:00:00 2001 From: George Claghorn Date: Sat, 6 Oct 2018 22:18:53 -0400 Subject: Incinerate after bouncing --- app/models/action_mailbox/inbound_email/incineratable.rb | 2 +- app/models/action_mailbox/inbound_email/incineratable/incineration.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/action_mailbox/inbound_email/incineratable.rb b/app/models/action_mailbox/inbound_email/incineratable.rb index e85f3e264d..8a82b87a99 100644 --- a/app/models/action_mailbox/inbound_email/incineratable.rb +++ b/app/models/action_mailbox/inbound_email/incineratable.rb @@ -16,7 +16,7 @@ module ActionMailbox::InboundEmail::Incineratable private # TODO: Use enum change tracking once merged into Active Support def remember_to_incinerate_later - if status_changed? && (delivered? || failed?) + if status_changed? && (delivered? || bounced? || failed?) @incinerating_later = true end end diff --git a/app/models/action_mailbox/inbound_email/incineratable/incineration.rb b/app/models/action_mailbox/inbound_email/incineratable/incineration.rb index bd2bf7d91e..5dd9be5a3d 100644 --- a/app/models/action_mailbox/inbound_email/incineratable/incineration.rb +++ b/app/models/action_mailbox/inbound_email/incineratable/incineration.rb @@ -13,6 +13,6 @@ class ActionMailbox::InboundEmail::Incineratable::Incineration end def processed? - @inbound_email.delivered? || @inbound_email.failed? + @inbound_email.delivered? || @inbound_email.bounced? || @inbound_email.failed? end end -- cgit v1.2.3