Improve Markdown rendering
* Remove paragraphs from output HTML * Remove mention link wrapper from text (leaving only mention name)
This commit is contained in:
parent
d147fc7579
commit
7da1555c84
2
lib/bfhtml/doc.go
Normal file
2
lib/bfhtml/doc.go
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
// Package bfhtml contains an extension to the Blackfriday HTML renderer to disable paragraph tags.
|
||||||
|
package bfhtml
|
34
lib/bfhtml/html.go
Normal file
34
lib/bfhtml/html.go
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
// gomuks - A terminal Matrix client written in Go.
|
||||||
|
// Copyright (C) 2018 Tulir Asokan
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package bfhtml
|
||||||
|
|
||||||
|
import (
|
||||||
|
"io"
|
||||||
|
|
||||||
|
bf "gopkg.in/russross/blackfriday.v2"
|
||||||
|
)
|
||||||
|
|
||||||
|
type HTMLRenderer struct {
|
||||||
|
*bf.HTMLRenderer
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *HTMLRenderer) RenderNode(w io.Writer, node *bf.Node, entering bool) bf.WalkStatus {
|
||||||
|
if node.Type == bf.Paragraph {
|
||||||
|
return bf.GoToNext
|
||||||
|
}
|
||||||
|
return r.HTMLRenderer.RenderNode(w, node, entering)
|
||||||
|
}
|
@ -36,6 +36,7 @@ import (
|
|||||||
"maunium.net/go/gomuks/config"
|
"maunium.net/go/gomuks/config"
|
||||||
"maunium.net/go/gomuks/debug"
|
"maunium.net/go/gomuks/debug"
|
||||||
"maunium.net/go/gomuks/interface"
|
"maunium.net/go/gomuks/interface"
|
||||||
|
"maunium.net/go/gomuks/lib/bfhtml"
|
||||||
"maunium.net/go/gomuks/matrix/pushrules"
|
"maunium.net/go/gomuks/matrix/pushrules"
|
||||||
"maunium.net/go/gomuks/matrix/rooms"
|
"maunium.net/go/gomuks/matrix/rooms"
|
||||||
)
|
)
|
||||||
@ -327,14 +328,46 @@ func (c *Container) SendMessage(roomID, msgtype, text string) (string, error) {
|
|||||||
return resp.EventID, nil
|
return resp.EventID, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *Container) RenderMarkdown(text string) string {
|
||||||
|
parser := blackfriday.New(
|
||||||
|
blackfriday.WithExtensions(blackfriday.NoIntraEmphasis |
|
||||||
|
blackfriday.Tables |
|
||||||
|
blackfriday.FencedCode |
|
||||||
|
blackfriday.Strikethrough |
|
||||||
|
blackfriday.SpaceHeadings |
|
||||||
|
blackfriday.DefinitionLists))
|
||||||
|
ast := parser.Parse([]byte(text))
|
||||||
|
|
||||||
|
renderer := bfhtml.HTMLRenderer{
|
||||||
|
HTMLRenderer: blackfriday.NewHTMLRenderer(blackfriday.HTMLRendererParameters{
|
||||||
|
Flags: blackfriday.UseXHTML,
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
|
||||||
|
var buf strings.Builder
|
||||||
|
renderer.RenderHeader(&buf, ast)
|
||||||
|
ast.Walk(func(node *blackfriday.Node, entering bool) blackfriday.WalkStatus {
|
||||||
|
return renderer.RenderNode(&buf, node, entering)
|
||||||
|
})
|
||||||
|
renderer.RenderFooter(&buf, ast)
|
||||||
|
return buf.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
var mentionRegex = regexp.MustCompile("\\[(.+?)]\\(https://matrix.to/#/@.+?:.+?\\)")
|
||||||
|
var roomRegex = regexp.MustCompile("\\[.+?]\\(https://matrix.to/#/(#.+?:[^/]+?)\\)")
|
||||||
|
|
||||||
func (c *Container) SendMarkdownMessage(roomID, msgtype, text string) (string, error) {
|
func (c *Container) SendMarkdownMessage(roomID, msgtype, text string) (string, error) {
|
||||||
defer debug.Recover()
|
defer debug.Recover()
|
||||||
|
|
||||||
html := string(blackfriday.Run([]byte(text)))
|
html := c.RenderMarkdown(text)
|
||||||
if html == text {
|
if html == text {
|
||||||
return c.SendMessage(roomID, msgtype, text)
|
return c.SendMessage(roomID, msgtype, text)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Remove markdown link stuff from plaintext mentions and room links
|
||||||
|
text = mentionRegex.ReplaceAllString(text, "$1")
|
||||||
|
text = roomRegex.ReplaceAllString(text, "$1")
|
||||||
|
|
||||||
c.SendTyping(roomID, false)
|
c.SendTyping(roomID, false)
|
||||||
resp, err := c.client.SendMessageEvent(roomID, "m.room.message",
|
resp, err := c.client.SendMessageEvent(roomID, "m.room.message",
|
||||||
map[string]interface{}{
|
map[string]interface{}{
|
||||||
|
@ -242,10 +242,7 @@ type completion struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (view *RoomView) AutocompleteUser(existingText string) (completions []completion) {
|
func (view *RoomView) AutocompleteUser(existingText string) (completions []completion) {
|
||||||
textWithoutPrefix := existingText
|
textWithoutPrefix := strings.TrimPrefix(existingText, "@")
|
||||||
if strings.HasPrefix(existingText, "@") {
|
|
||||||
textWithoutPrefix = existingText[1:]
|
|
||||||
}
|
|
||||||
for _, user := range view.Room.GetMembers() {
|
for _, user := range view.Room.GetMembers() {
|
||||||
if user.DisplayName == textWithoutPrefix || user.UserID == existingText {
|
if user.DisplayName == textWithoutPrefix || user.UserID == existingText {
|
||||||
// Exact match, return that.
|
// Exact match, return that.
|
||||||
|
Loading…
Reference in New Issue
Block a user