LordMZTE/mautrix-whatsapp
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use inline code tags for single-line whatsapp monospace blocks

Browse source
This commit is contained in:
Tulir Asokan 2018-08-25 17:00:31 +03:00
parent 7f91d91f1b
commit 6d08a5ff6c
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
portal.go
View file

@ -309,7 +309,6 @@ var boldRegex = regexp.MustCompile("([\\s>_~]|^)\\*(.+?)\\*([^a-zA-Z\\d]|$)")
var strikethroughRegex = regexp.MustCompile("([\\s>_*]|^)~(.+?)~([^a-zA-Z\\d]|$)") var strikethroughRegex = regexp.MustCompile("([\\s>_*]|^)~(.+?)~([^a-zA-Z\\d]|$)")
var whatsAppFormat = map[*regexp.Regexp]string{ var whatsAppFormat = map[*regexp.Regexp]string{
codeBlockRegex: "<pre>$1</pre>",
italicRegex: "$1<em>$2</em>$3", italicRegex: "$1<em>$2</em>$3",
boldRegex: "$1<strong>$2</strong>$3", boldRegex: "$1<strong>$2</strong>$3",
strikethroughRegex: "$1<del>$2</del>$3", strikethroughRegex: "$1<del>$2</del>$3",
@ -320,6 +319,13 @@ func (portal *Portal) ParseWhatsAppFormat(input string) string {
for regex, replacement := range whatsAppFormat { for regex, replacement := range whatsAppFormat {
output = regex.ReplaceAllString(output, replacement) output = regex.ReplaceAllString(output, replacement)
} }
output = codeBlockRegex.ReplaceAllStringFunc(output, func(str string) string {
str = str[3 : len(str)-3]
if strings.ContainsRune(str, '\n') {
return fmt.Sprintf("<pre><code>%s</code></pre>", str)
}
return fmt.Sprintf("<code>%s</code>", str)
})
return output return output
} }