From 8a0043468c247a94143583fa6314199f6f52902d Mon Sep 17 00:00:00 2001 From: Kirill Danshin Date: Thu, 27 Apr 2017 17:08:18 +0300 Subject: [PATCH] working on gfm compat (helps #1224) (#1342) * fix gfm compat Signed-off-by: Kirill Danshin * fix .travis.yml Signed-off-by: Kirill Danshin * requested changes Signed-off-by: Kirill Danshin --- .travis.yml | 5 +---- repo.go | 36 ++---------------------------------- 2 files changed, 3 insertions(+), 38 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3595f1cb..6c8461ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,4 @@ go: sudo: false install: - - go get github.com/russross/blackfriday - - go get github.com/PuerkitoBio/goquery - - go get github.com/gorilla/mux - - go get github.com/microcosm-cc/bluemonday + - go get -t -v ./... diff --git a/repo.go b/repo.go index 40d9bec0..d04831cc 100644 --- a/repo.go +++ b/repo.go @@ -8,8 +8,7 @@ import ( "text/template" "github.com/gorilla/mux" - "github.com/microcosm-cc/bluemonday" - "github.com/russross/blackfriday" + gfm "github.com/shurcooL/github_flavored_markdown" ) // memory usage optimizations @@ -24,25 +23,6 @@ const ( readmePath = "./README.md" tplPath = "tmpl/tmpl.html" idxPath = "tmpl/index.html" - - bfHTMLRendererOpts = 0 | - blackfriday.HTML_USE_XHTML | - blackfriday.HTML_USE_SMARTYPANTS | - blackfriday.HTML_SMARTYPANTS_FRACTIONS | - blackfriday.HTML_SMARTYPANTS_DASHES | - blackfriday.HTML_SMARTYPANTS_LATEX_DASHES - - bfMDOpts = 0 | - blackfriday.EXTENSION_NO_INTRA_EMPHASIS | - blackfriday.EXTENSION_TABLES | - blackfriday.EXTENSION_FENCED_CODE | - blackfriday.EXTENSION_AUTOLINK | - blackfriday.EXTENSION_STRIKETHROUGH | - blackfriday.EXTENSION_SPACE_HEADERS | - blackfriday.EXTENSION_HEADER_IDS | - blackfriday.EXTENSION_BACKSLASH_LINE_BREAK | - blackfriday.EXTENSION_DEFINITION_LISTS | - blackfriday.EXTENSION_AUTO_HEADER_IDS ) var ( @@ -59,19 +39,7 @@ func generateHTML() { exec.Command(git, pull).Output() input, _ := ioutil.ReadFile(readmePath) - body := string( - bluemonday.UGCPolicy().SanitizeBytes( - blackfriday.Markdown( - input, - blackfriday.HtmlRenderer( - bfHTMLRendererOpts, - emtyStr, - emtyStr, - ), - bfMDOpts, - ), - ), - ) + body := string(gfm.Markdown(input)) c := &content{Body: body} t := template.Must(template.ParseFiles(tplPath))