From 37e0b5f5b88d3eef9ec67a6ddd1b45dcbb6cc8a8 Mon Sep 17 00:00:00 2001
From: Henne Vogelsang <hvogel@opensuse.org>
Date: Thu, 21 Apr 2016 16:36:53 +0200
Subject: [PATCH] Get rid of build_email

It's always easy to add another layer of indirection...
---
 app/mailers/mailbot.rb | 52 +++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/app/mailers/mailbot.rb b/app/mailers/mailbot.rb
index c112f9cb..9a6e3980 100644
--- a/app/mailers/mailbot.rb
+++ b/app/mailers/mailbot.rb
@@ -1,38 +1,41 @@
 class Mailbot < ActionMailer::Base
   default from: 'no-reply@example.com'
 
-  def registration_mail(conference, person)
-    build_email(conference,
-                person.email,
-                conference.email_settings.registration_subject,
-                conference.email_settings.generate_email_on_conf_updates(conference, person, conference.email_settings.registration_body))
+  def registration_mail(conference, user)
+    mail(to: user.email,
+         from: conference.contact.email,
+         subject: conference.email_settings.registration_subject,
+         body: conference.email_settings.generate_email_on_conf_updates(conference,
+                                                                        user,
+                                                                        conference.email_settings.registration_body))
   end
 
   def acceptance_mail(event)
     conference = event.program.conference
-    person = event.submitter
-    build_email(conference,
-                person.email,
-                conference.email_settings.accepted_subject,
-                conference.email_settings.generate_event_mail(event, conference.email_settings.accepted_body))
+
+    mail(to: event.submitter.email,
+         from: conference.contact.email,
+         subject: conference.email_settings.accepted_subject,
+         body: conference.email_settings.generate_event_mail(event, conference.email_settings.accepted_body))
   end
 
   def rejection_mail(event)
     conference = event.program.conference
-    person = event.submitter
-    build_email(conference,
-                person.email,
-                conference.email_settings.rejected_subject,
-                conference.email_settings.generate_event_mail(event, conference.email_settings.rejected_body))
+
+    mail(to: event.submitter.email,
+         from: conference.contact.email,
+         subject: conference.email_settings.rejected_subject,
+         body: conference.email_settings.generate_event_mail(event, conference.email_settings.rejected_body))
   end
 
   def confirm_reminder_mail(event)
     conference = event.program.conference
-    person = event.submitter
-    build_email(conference,
-                person.email,
-                conference.email_settings.confirmed_without_registration_subject,
-                conference.email_settings.generate_event_mail(event, conference.email_settings.confirmed_without_registration_body))
+
+    mail(to: event.submitter.email,
+         from: conference.contact.email,
+         subject: conference.email_settings.confirmed_without_registration_subject,
+         body: conference.email_settings.generate_event_mail(event,
+                                                             conference.email_settings.confirmed_without_registration_body))
   end
 
   def conference_date_update_mail(conference, user)
@@ -95,13 +98,4 @@ class Mailbot < ActionMailer::Base
            subject: "New comment has been posted for #{@event.title}")
     end
   end
-
-  def build_email(conference, to, subject, body)
-    logger.debug "Sending mail about #{subject} to #{to}"
-    mail(to: to,
-         from: conference.contact.email,
-         reply_to: conference.contact.email,
-         subject: subject,
-         body: body)
-  end
 end