diff options
| author | George Claghorn <george@basecamp.com> | 2018-10-06 22:18:53 -0400 |
|---|---|---|
| committer | George Claghorn <george@basecamp.com> | 2018-10-06 22:20:25 -0400 |
| commit | a5e023ac204251192f9cb722c0d98695cb3b8400 (patch) | |
| tree | 89aa8b1ded2df20f143dfb9fecb13a2d50c3ca8a /app/models/action_mailbox | |
| parent | 40fcc1ea95795b0a69fe4ee690c031b5ea974042 (diff) | |
| download | rails-a5e023ac204251192f9cb722c0d98695cb3b8400.tar.gz rails-a5e023ac204251192f9cb722c0d98695cb3b8400.tar.bz2 rails-a5e023ac204251192f9cb722c0d98695cb3b8400.zip | |
Incinerate after bouncing
Diffstat (limited to 'app/models/action_mailbox')
| -rw-r--r-- | app/models/action_mailbox/inbound_email/incineratable.rb | 2 | ||||
| -rw-r--r-- | 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 |