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

extract bounce scores into site settings

Browse Source
This commit is contained in:
Régis Hanol
2016-07-25 17:27:28 +02:00
parent 9971e62254
commit d2e22ab215
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/controllers/webhooks_controller.rb
View File

@ -29,9 +29,9 @@ class WebhooksController < ActionController::Base
# by the "dropped" event and we don't want to increase bounce score twice
# for the same message
if event == "bounced".freeze && params["error"]["4."]
process_bounce(message_id, Email::Receiver::SOFT_BOUNCE_SCORE)
process_bounce(message_id, SiteSetting.soft_bounce_score)
elsif event == "dropped".freeze
process_bounce(message_id, Email::Receiver::HARD_BOUNCE_SCORE)
process_bounce(message_id, SiteSetting.hard_bounce_score)
end
mailgun_success
@ -43,12 +43,12 @@ class WebhooksController < ActionController::Base
message_id = (event["smtp-id"] || "").tr("<>", "")
if event["event"] == "bounce".freeze
if event["status"]["4."]
process_bounce(message_id, Email::Receiver::SOFT_BOUNCE_SCORE)
process_bounce(message_id, SiteSetting.soft_bounce_score)
else
process_bounce(message_id, Email::Receiver::HARD_BOUNCE_SCORE)
process_bounce(message_id, SiteSetting.hard_bounce_score)
end
elsif event["event"] == "dropped".freeze
process_bounce(message_id, Email::Receiver::HARD_BOUNCE_SCORE)
process_bounce(message_id, SiteSetting.hard_bounce_score)
end
end
@ -61,9 +61,9 @@ class WebhooksController < ActionController::Base
message_id = event["CustomID"]
if event["event"] == "bounce".freeze
if event["hard_bounce"]
process_bounce(message_id, Email::Receiver::HARD_BOUNCE_SCORE)
process_bounce(message_id, SiteSetting.hard_bounce_score)
else
process_bounce(message_id, Email::Receiver::SOFT_BOUNCE_SCORE)
process_bounce(message_id, SiteSetting.soft_bounce_score)
end
end
end
@ -79,9 +79,9 @@ class WebhooksController < ActionController::Base
case event["event"]
when "hard_bounce"
process_bounce(message_id, Email::Receiver::HARD_BOUNCE_SCORE)
process_bounce(message_id, SiteSetting.hard_bounce_score)
when "soft_bounce"
process_bounce(message_id, Email::Receiver::SOFT_BOUNCE_SCORE)
process_bounce(message_id, SiteSetting.soft_bounce_score)
end
end