github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 11:01:11 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: don't create staged user(s) when receiving a bounce (mailer-deamon begone)

Browse Source
This commit is contained in:
Régis Hanol
2016-08-01 23:37:59 +02:00
parent 829143bf88
commit 7d0dc7cb7a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/email/receiver.rb
View File

@ -62,6 +62,7 @@ module Email
end end
def process_internal def process_internal
raise BouncedEmailError if is_bounce?
raise ScreenedEmailError if ScreenedEmail.should_block?(@from_email) raise ScreenedEmailError if ScreenedEmail.should_block?(@from_email)
user = find_or_create_user(@from_email, @from_display_name) user = find_or_create_user(@from_email, @from_display_name)
@ -70,7 +71,6 @@ module Email
@incoming_email.update_columns(user_id: user.id) @incoming_email.update_columns(user_id: user.id)
raise BouncedEmailError if is_bounce?
raise InactiveUserError if !user.active && !user.staged raise InactiveUserError if !user.active && !user.staged
raise BlockedUserError if user.blocked raise BlockedUserError if user.blocked