allow Markdown with Source property (not from file)

Author: cooper

irc/irc.go

@@ -20,12 +20,24 @@ func main() {
 			return mes.Command == "PRIVMSG" && strings.HasPrefix(mes.Content, "quiki")
 		},
 		Action: func(irc *hbot.Bot, mes *hbot.Message) bool {
-			lines := strings.TrimLeft(strings.TrimPrefix(mes.Content, "quiki"), " ,:")
-			page := wikifier.NewPageSource(strings.Replace(lines, "_NL_", "\n", -1))
+			line := strings.TrimLeft(strings.TrimPrefix(mes.Content, "quiki"), " ,:")
 
+			// markdown if starts with "md: "
+			md := false
+			withoutMd := strings.TrimPrefix(line, "md: ")
+			if withoutMd != line {
+				line = withoutMd
+				md = true
+			}
+
+			// create page
+			page := wikifier.NewPageSource(strings.Replace(line, "_NL_", "\n", -1))
+			if md {
+				page.Markdown = true
+			}
 			var reply string
 
-			// html
+			// parse/generate html
 			if err := page.Parse(); err != nil {
 				reply = err.Error()
 			} else {
@@ -49,6 +61,9 @@ func main() {
 
 			// reply
 			for _, line := range strings.Split(reply, "\n") {
+				if line == "" {
+					line = " "
+				}
 				irc.Send("PRIVMSG " + mes.To + " :" + line)
 			}
 

wikifier/page.go

@@ -35,7 +35,7 @@ type Page struct {
 	name       string
 	headingIDs map[string]int
 	Wiki       interface{} // only available during Parse() and HTML()
-	markdown   bool        // true if FilePath points to a markdown source
+	Markdown   bool        // true if this is a markdown source
 	model      bool        // true if this is a model being generated
 	Warnings   []Warning   // parser warnings
 	Error      *Warning    // parser error, as an encodable Warning
@@ -83,7 +83,7 @@ func NewPage(filePath string) *Page {
 		Models:        make(map[string]ModelInfo),
 		PageLinks:     make(map[string][]int),
 		headingIDs:    make(map[string]int),
-		markdown:      strings.HasSuffix(filePath, ".md"),
+		Markdown:      strings.HasSuffix(filePath, ".md"),
 	}
 }
 
@@ -137,9 +137,12 @@ func (p *Page) _parse() error {
 
 	// create reader from file path or source code provided
 	var reader io.Reader
-	if p.Source != "" {
+	if p.Markdown && p.Source != "" {
+		d := markdown.Run([]byte(p.Source))
+		reader = bytes.NewReader(d)
+	} else if p.Source != "" {
 		reader = strings.NewReader(p.Source)
-	} else if p.markdown && p.FilePath != "" {
+	} else if p.Markdown && p.FilePath != "" {
 		md, err := ioutil.ReadFile(p.FilePath)
 		if err != nil {
 			return err