Skip to content

update from pegdown to markedj #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 6, 2015
Merged

update from pegdown to markedj #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project/build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ object MyBuild extends Build {
"amateras-repo" at "http://amateras.sourceforge.jp/mvn/"
),
libraryDependencies ++= Seq(
"gitbucket" % "gitbucket-assembly" % "3.5.0" % "provided",
"gitbucket" % "gitbucket-assembly" % "3.7.0" % "provided",
"com.typesafe.play" %% "twirl-compiler" % "1.0.4" % "provided",
"javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided"
),
Expand Down
8 changes: 6 additions & 2 deletions src/main/scala/fr/brouillard/gitbucket/announce/controller/AnnounceController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import gitbucket.core.servlet.Database
import gitbucket.core.util.AdminAuthenticator
import jp.sf.amateras.scalatra.forms._
import org.apache.commons.mail.{DefaultAuthenticator, HtmlEmail}
import org.pegdown.PegDownProcessor
import io.github.gitbucket.markedj.Marked
import io.github.gitbucket.markedj.Options
import org.slf4j.LoggerFactory

class AnnounceController extends AnnounceControllerBase
Expand Down Expand Up @@ -58,7 +59,10 @@ trait AnnounceControllerBase extends ControllerBase with AccountService {
email.setCharset("UTF-8")
email.setSubject(form.subject)

email.setHtmlMsg(new PegDownProcessor().markdownToHtml(form.content))
val opts = new Options();
opts.setSanitize(true);

email.setHtmlMsg(Marked.marked(form.content, opts))

logger.info("sending email: {}", form.content)
val database = Database()
Expand Down