From 7d0dc7cb7a704428ff90a5e1ff9ec3cee1622a56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 1 Aug 2016 23:37:59 +0200 Subject: [PATCH] FIX: don't create staged user(s) when receiving a bounce (mailer-deamon begone) --- lib/email/receiver.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb index df1aacf2139..dc8fbd2ffae 100644 --- a/lib/email/receiver.rb +++ b/lib/email/receiver.rb @@ -62,6 +62,7 @@ module Email end def process_internal + raise BouncedEmailError if is_bounce? raise ScreenedEmailError if ScreenedEmail.should_block?(@from_email) user = find_or_create_user(@from_email, @from_display_name) @@ -70,7 +71,6 @@ module Email @incoming_email.update_columns(user_id: user.id) - raise BouncedEmailError if is_bounce? raise InactiveUserError if !user.active && !user.staged raise BlockedUserError if user.blocked