Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-05-07 20:36:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add Mailer.send() method without login account

Browse Source
This commit is contained in:
Naoki Takezoe
2017-09-15 20:57:50 +09:00
parent 1b46651c32
commit 106f7a41d8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/gitbucket/core/util/Notifier.scala
View File

@@ -60,6 +60,10 @@ class Mailer(private val smtp: Smtp) extends Notifier {
}
def send(to: String, subject: String, loginAccount: Account, textMsg: String, htmlMsg: Option[String] = None): Unit = {
send(to, subject, textMsg, htmlMsg, Some(loginAccount))
}
def send(to: String, subject: String, textMsg: String, htmlMsg: Option[String] = None, loginAccount: Option[Account] = None): Unit = {
val email = new HtmlEmail
email.setHostName(smtp.host)
email.setSmtpPort(smtp.port.get)
@@ -77,8 +81,8 @@ class Mailer(private val smtp: Smtp) extends Notifier {
email.setStartTLSRequired(starttls)
}
smtp.fromAddress
.map (_ -> smtp.fromName.getOrElse(loginAccount.userName))
.orElse (Some("notifications@gitbucket.com" -> loginAccount.userName))
.map (_ -> smtp.fromName.getOrElse(loginAccount.map(_.userName).getOrElse("GitBucket")))
.orElse (Some("notifications@gitbucket.com" -> loginAccount.map(_.userName).getOrElse("GitBucket")))
.foreach { case (address, name) =>
email.setFrom(address, name)
}