From fdb4a6bdc6b91faf9dfa74ca2f7fb8213a5e736a Mon Sep 17 00:00:00 2001
From: KOUNOIKE Yuusuke <kounoike.yuusuke@gmail.com>
Date: Tue, 15 Aug 2017 03:22:25 +0900
Subject: [PATCH] change interface to textMsg: String, htmlMsg: Option[String].
 SystemSettingsController calls Mailer.send directly. fix it too.

---
 .../controller/SystemSettingsController.scala |  5 +++--
 .../scala/gitbucket/core/util/Notifier.scala  | 20 +++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
index 784172180..bc07e451b 100644
--- a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
@@ -174,8 +174,9 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
   post("/admin/system/sendmail", sendMailForm)(adminOnly { form =>
     try {
       new Mailer(form.smtp).send(form.testAddress,
-        "Test message from GitBucket", "This is a test message from GitBucket.",
-        context.loginAccount.get)
+        "Test message from GitBucket", context.loginAccount.get,
+        "This is a test message from GitBucket.", None
+        )
 
       "Test mail has been sent to: " + form.testAddress
 
diff --git a/src/main/scala/gitbucket/core/util/Notifier.scala b/src/main/scala/gitbucket/core/util/Notifier.scala
index 4b9a57013..61f3c6832 100644
--- a/src/main/scala/gitbucket/core/util/Notifier.scala
+++ b/src/main/scala/gitbucket/core/util/Notifier.scala
@@ -19,12 +19,12 @@ import SystemSettingsService.Smtp
  * Please see the plugin for details.
  */
 trait Notifier {
-  def toNotify(subject: String, htmlMsg: String)
+  def toNotify(subject: String, textMsg: String)
     (recipients: Account => Session => Seq[String])(implicit context: Context): Unit = {
-    toNotify(subject, htmlMsg, None)(recipients)
+    toNotify(subject, textMsg, None)(recipients)
   }
 
-  def toNotify(subject: String, htmlMsg: String, textMsg: Option[String])
+  def toNotify(subject: String, textMsg: String, htmlMsg: Option[String])
               (recipients: Account => Session => Seq[String])(implicit context: Context): Unit
 
 }
@@ -39,7 +39,7 @@ object Notifier {
 class Mailer(private val smtp: Smtp) extends Notifier {
   private val logger = LoggerFactory.getLogger(classOf[Mailer])
 
-  def toNotify(subject: String, htmlMsg: String, textMsg: Option[String] = None)
+  def toNotify(subject: String, textMsg: String, htmlMsg: Option[String] = None)
               (recipients: Account => Session => Seq[String])(implicit context: Context): Unit = {
     context.loginAccount.foreach { loginAccount =>
       val database = Database()
@@ -47,7 +47,7 @@ class Mailer(private val smtp: Smtp) extends Notifier {
       val f = Future {
         database withSession { session =>
           recipients(loginAccount)(session) foreach { to =>
-            send(to, subject, htmlMsg, loginAccount, textMsg)
+            send(to, subject, loginAccount, textMsg, htmlMsg)
           }
         }
         "Notifications Successful."
@@ -59,7 +59,7 @@ class Mailer(private val smtp: Smtp) extends Notifier {
     }
   }
 
-  def send(to: String, subject: String, htmlMsg: String, loginAccount: Account, textMsg: Option[String] = None): Unit = {
+  def send(to: String, subject: String, loginAccount: Account, textMsg: String, htmlMsg: Option[String] = None): Unit = {
     val email = new HtmlEmail
     email.setHostName(smtp.host)
     email.setSmtpPort(smtp.port.get)
@@ -84,9 +84,9 @@ class Mailer(private val smtp: Smtp) extends Notifier {
       }
     email.setCharset("UTF-8")
     email.setSubject(subject)
-    email.setHtmlMsg(htmlMsg)
-    textMsg.foreach{ msg =>
-      email.setTextMsg(msg)
+    email.setTextMsg(textMsg)
+    htmlMsg.foreach { msg =>
+      email.setHtmlMsg(msg)
     }
 
     email.addTo(to).send
@@ -94,6 +94,6 @@ class Mailer(private val smtp: Smtp) extends Notifier {
 
 }
 class MockMailer extends Notifier {
-  def toNotify(subject: String, htmlMsg: String, textMsg: Option[String] = None)
+  def toNotify(subject: String, textMsg: String, htmlMsg: Option[String] = None)
               (recipients: Account => Session => Seq[String])(implicit context: Context): Unit = ()
 }