From a0815a6f3de6ed4063fcdcf6c7af3f946bbf52f8 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 14 Nov 2018 00:28:53 +0200 Subject: Fix named colors and remove HTML from plaintext body when sending --- ui/messages/parser/colormap.go | 156 +++++++++++++++++++++++++++++++++++++++ ui/messages/parser/htmlparser.go | 31 +++++--- 2 files changed, 177 insertions(+), 10 deletions(-) create mode 100644 ui/messages/parser/colormap.go (limited to 'ui/messages/parser') diff --git a/ui/messages/parser/colormap.go b/ui/messages/parser/colormap.go new file mode 100644 index 0000000..19cdf06 --- /dev/null +++ b/ui/messages/parser/colormap.go @@ -0,0 +1,156 @@ +// From https://github.com/golang/image/blob/master/colornames/colornames.go +package parser + +import ( + "image/color" +) + +var ColorMap = map[string]color.RGBA{ + "aliceblue": {0xf0, 0xf8, 0xff, 0xff}, // rgb(240, 248, 255) + "antiquewhite": {0xfa, 0xeb, 0xd7, 0xff}, // rgb(250, 235, 215) + "aqua": {0x00, 0xff, 0xff, 0xff}, // rgb(0, 255, 255) + "aquamarine": {0x7f, 0xff, 0xd4, 0xff}, // rgb(127, 255, 212) + "azure": {0xf0, 0xff, 0xff, 0xff}, // rgb(240, 255, 255) + "beige": {0xf5, 0xf5, 0xdc, 0xff}, // rgb(245, 245, 220) + "bisque": {0xff, 0xe4, 0xc4, 0xff}, // rgb(255, 228, 196) + "black": {0x00, 0x00, 0x00, 0xff}, // rgb(0, 0, 0) + "blanchedalmond": {0xff, 0xeb, 0xcd, 0xff}, // rgb(255, 235, 205) + "blue": {0x00, 0x00, 0xff, 0xff}, // rgb(0, 0, 255) + "blueviolet": {0x8a, 0x2b, 0xe2, 0xff}, // rgb(138, 43, 226) + "brown": {0xa5, 0x2a, 0x2a, 0xff}, // rgb(165, 42, 42) + "burlywood": {0xde, 0xb8, 0x87, 0xff}, // rgb(222, 184, 135) + "cadetblue": {0x5f, 0x9e, 0xa0, 0xff}, // rgb(95, 158, 160) + "chartreuse": {0x7f, 0xff, 0x00, 0xff}, // rgb(127, 255, 0) + "chocolate": {0xd2, 0x69, 0x1e, 0xff}, // rgb(210, 105, 30) + "coral": {0xff, 0x7f, 0x50, 0xff}, // rgb(255, 127, 80) + "cornflowerblue": {0x64, 0x95, 0xed, 0xff}, // rgb(100, 149, 237) + "cornsilk": {0xff, 0xf8, 0xdc, 0xff}, // rgb(255, 248, 220) + "crimson": {0xdc, 0x14, 0x3c, 0xff}, // rgb(220, 20, 60) + "cyan": {0x00, 0xff, 0xff, 0xff}, // rgb(0, 255, 255) + "darkblue": {0x00, 0x00, 0x8b, 0xff}, // rgb(0, 0, 139) + "darkcyan": {0x00, 0x8b, 0x8b, 0xff}, // rgb(0, 139, 139) + "darkgoldenrod": {0xb8, 0x86, 0x0b, 0xff}, // rgb(184, 134, 11) + "darkgray": {0xa9, 0xa9, 0xa9, 0xff}, // rgb(169, 169, 169) + "darkgreen": {0x00, 0x64, 0x00, 0xff}, // rgb(0, 100, 0) + "darkgrey": {0xa9, 0xa9, 0xa9, 0xff}, // rgb(169, 169, 169) + "darkkhaki": {0xbd, 0xb7, 0x6b, 0xff}, // rgb(189, 183, 107) + "darkmagenta": {0x8b, 0x00, 0x8b, 0xff}, // rgb(139, 0, 139) + "darkolivegreen": {0x55, 0x6b, 0x2f, 0xff}, // rgb(85, 107, 47) + "darkorange": {0xff, 0x8c, 0x00, 0xff}, // rgb(255, 140, 0) + "darkorchid": {0x99, 0x32, 0xcc, 0xff}, // rgb(153, 50, 204) + "darkred": {0x8b, 0x00, 0x00, 0xff}, // rgb(139, 0, 0) + "darksalmon": {0xe9, 0x96, 0x7a, 0xff}, // rgb(233, 150, 122) + "darkseagreen": {0x8f, 0xbc, 0x8f, 0xff}, // rgb(143, 188, 143) + "darkslateblue": {0x48, 0x3d, 0x8b, 0xff}, // rgb(72, 61, 139) + "darkslategray": {0x2f, 0x4f, 0x4f, 0xff}, // rgb(47, 79, 79) + "darkslategrey": {0x2f, 0x4f, 0x4f, 0xff}, // rgb(47, 79, 79) + "darkturquoise": {0x00, 0xce, 0xd1, 0xff}, // rgb(0, 206, 209) + "darkviolet": {0x94, 0x00, 0xd3, 0xff}, // rgb(148, 0, 211) + "deeppink": {0xff, 0x14, 0x93, 0xff}, // rgb(255, 20, 147) + "deepskyblue": {0x00, 0xbf, 0xff, 0xff}, // rgb(0, 191, 255) + "dimgray": {0x69, 0x69, 0x69, 0xff}, // rgb(105, 105, 105) + "dimgrey": {0x69, 0x69, 0x69, 0xff}, // rgb(105, 105, 105) + "dodgerblue": {0x1e, 0x90, 0xff, 0xff}, // rgb(30, 144, 255) + "firebrick": {0xb2, 0x22, 0x22, 0xff}, // rgb(178, 34, 34) + "floralwhite": {0xff, 0xfa, 0xf0, 0xff}, // rgb(255, 250, 240) + "forestgreen": {0x22, 0x8b, 0x22, 0xff}, // rgb(34, 139, 34) + "fuchsia": {0xff, 0x00, 0xff, 0xff}, // rgb(255, 0, 255) + "gainsboro": {0xdc, 0xdc, 0xdc, 0xff}, // rgb(220, 220, 220) + "ghostwhite": {0xf8, 0xf8, 0xff, 0xff}, // rgb(248, 248, 255) + "gold": {0xff, 0xd7, 0x00, 0xff}, // rgb(255, 215, 0) + "goldenrod": {0xda, 0xa5, 0x20, 0xff}, // rgb(218, 165, 32) + "gray": {0x80, 0x80, 0x80, 0xff}, // rgb(128, 128, 128) + "green": {0x00, 0x80, 0x00, 0xff}, // rgb(0, 128, 0) + "greenyellow": {0xad, 0xff, 0x2f, 0xff}, // rgb(173, 255, 47) + "grey": {0x80, 0x80, 0x80, 0xff}, // rgb(128, 128, 128) + "honeydew": {0xf0, 0xff, 0xf0, 0xff}, // rgb(240, 255, 240) + "hotpink": {0xff, 0x69, 0xb4, 0xff}, // rgb(255, 105, 180) + "indianred": {0xcd, 0x5c, 0x5c, 0xff}, // rgb(205, 92, 92) + "indigo": {0x4b, 0x00, 0x82, 0xff}, // rgb(75, 0, 130) + "ivory": {0xff, 0xff, 0xf0, 0xff}, // rgb(255, 255, 240) + "khaki": {0xf0, 0xe6, 0x8c, 0xff}, // rgb(240, 230, 140) + "lavender": {0xe6, 0xe6, 0xfa, 0xff}, // rgb(230, 230, 250) + "lavenderblush": {0xff, 0xf0, 0xf5, 0xff}, // rgb(255, 240, 245) + "lawngreen": {0x7c, 0xfc, 0x00, 0xff}, // rgb(124, 252, 0) + "lemonchiffon": {0xff, 0xfa, 0xcd, 0xff}, // rgb(255, 250, 205) + "lightblue": {0xad, 0xd8, 0xe6, 0xff}, // rgb(173, 216, 230) + "lightcoral": {0xf0, 0x80, 0x80, 0xff}, // rgb(240, 128, 128) + "lightcyan": {0xe0, 0xff, 0xff, 0xff}, // rgb(224, 255, 255) + "lightgoldenrodyellow": {0xfa, 0xfa, 0xd2, 0xff}, // rgb(250, 250, 210) + "lightgray": {0xd3, 0xd3, 0xd3, 0xff}, // rgb(211, 211, 211) + "lightgreen": {0x90, 0xee, 0x90, 0xff}, // rgb(144, 238, 144) + "lightgrey": {0xd3, 0xd3, 0xd3, 0xff}, // rgb(211, 211, 211) + "lightpink": {0xff, 0xb6, 0xc1, 0xff}, // rgb(255, 182, 193) + "lightsalmon": {0xff, 0xa0, 0x7a, 0xff}, // rgb(255, 160, 122) + "lightseagreen": {0x20, 0xb2, 0xaa, 0xff}, // rgb(32, 178, 170) + "lightskyblue": {0x87, 0xce, 0xfa, 0xff}, // rgb(135, 206, 250) + "lightslategray": {0x77, 0x88, 0x99, 0xff}, // rgb(119, 136, 153) + "lightslategrey": {0x77, 0x88, 0x99, 0xff}, // rgb(119, 136, 153) + "lightsteelblue": {0xb0, 0xc4, 0xde, 0xff}, // rgb(176, 196, 222) + "lightyellow": {0xff, 0xff, 0xe0, 0xff}, // rgb(255, 255, 224) + "lime": {0x00, 0xff, 0x00, 0xff}, // rgb(0, 255, 0) + "limegreen": {0x32, 0xcd, 0x32, 0xff}, // rgb(50, 205, 50) + "linen": {0xfa, 0xf0, 0xe6, 0xff}, // rgb(250, 240, 230) + "magenta": {0xff, 0x00, 0xff, 0xff}, // rgb(255, 0, 255) + "maroon": {0x80, 0x00, 0x00, 0xff}, // rgb(128, 0, 0) + "mediumaquamarine": {0x66, 0xcd, 0xaa, 0xff}, // rgb(102, 205, 170) + "mediumblue": {0x00, 0x00, 0xcd, 0xff}, // rgb(0, 0, 205) + "mediumorchid": {0xba, 0x55, 0xd3, 0xff}, // rgb(186, 85, 211) + "mediumpurple": {0x93, 0x70, 0xdb, 0xff}, // rgb(147, 112, 219) + "mediumseagreen": {0x3c, 0xb3, 0x71, 0xff}, // rgb(60, 179, 113) + "mediumslateblue": {0x7b, 0x68, 0xee, 0xff}, // rgb(123, 104, 238) + "mediumspringgreen": {0x00, 0xfa, 0x9a, 0xff}, // rgb(0, 250, 154) + "mediumturquoise": {0x48, 0xd1, 0xcc, 0xff}, // rgb(72, 209, 204) + "mediumvioletred": {0xc7, 0x15, 0x85, 0xff}, // rgb(199, 21, 133) + "midnightblue": {0x19, 0x19, 0x70, 0xff}, // rgb(25, 25, 112) + "mintcream": {0xf5, 0xff, 0xfa, 0xff}, // rgb(245, 255, 250) + "mistyrose": {0xff, 0xe4, 0xe1, 0xff}, // rgb(255, 228, 225) + "moccasin": {0xff, 0xe4, 0xb5, 0xff}, // rgb(255, 228, 181) + "navajowhite": {0xff, 0xde, 0xad, 0xff}, // rgb(255, 222, 173) + "navy": {0x00, 0x00, 0x80, 0xff}, // rgb(0, 0, 128) + "oldlace": {0xfd, 0xf5, 0xe6, 0xff}, // rgb(253, 245, 230) + "olive": {0x80, 0x80, 0x00, 0xff}, // rgb(128, 128, 0) + "olivedrab": {0x6b, 0x8e, 0x23, 0xff}, // rgb(107, 142, 35) + "orange": {0xff, 0xa5, 0x00, 0xff}, // rgb(255, 165, 0) + "orangered": {0xff, 0x45, 0x00, 0xff}, // rgb(255, 69, 0) + "orchid": {0xda, 0x70, 0xd6, 0xff}, // rgb(218, 112, 214) + "palegoldenrod": {0xee, 0xe8, 0xaa, 0xff}, // rgb(238, 232, 170) + "palegreen": {0x98, 0xfb, 0x98, 0xff}, // rgb(152, 251, 152) + "paleturquoise": {0xaf, 0xee, 0xee, 0xff}, // rgb(175, 238, 238) + "palevioletred": {0xdb, 0x70, 0x93, 0xff}, // rgb(219, 112, 147) + "papayawhip": {0xff, 0xef, 0xd5, 0xff}, // rgb(255, 239, 213) + "peachpuff": {0xff, 0xda, 0xb9, 0xff}, // rgb(255, 218, 185) + "peru": {0xcd, 0x85, 0x3f, 0xff}, // rgb(205, 133, 63) + "pink": {0xff, 0xc0, 0xcb, 0xff}, // rgb(255, 192, 203) + "plum": {0xdd, 0xa0, 0xdd, 0xff}, // rgb(221, 160, 221) + "powderblue": {0xb0, 0xe0, 0xe6, 0xff}, // rgb(176, 224, 230) + "purple": {0x80, 0x00, 0x80, 0xff}, // rgb(128, 0, 128) + "red": {0xff, 0x00, 0x00, 0xff}, // rgb(255, 0, 0) + "rosybrown": {0xbc, 0x8f, 0x8f, 0xff}, // rgb(188, 143, 143) + "royalblue": {0x41, 0x69, 0xe1, 0xff}, // rgb(65, 105, 225) + "saddlebrown": {0x8b, 0x45, 0x13, 0xff}, // rgb(139, 69, 19) + "salmon": {0xfa, 0x80, 0x72, 0xff}, // rgb(250, 128, 114) + "sandybrown": {0xf4, 0xa4, 0x60, 0xff}, // rgb(244, 164, 96) + "seagreen": {0x2e, 0x8b, 0x57, 0xff}, // rgb(46, 139, 87) + "seashell": {0xff, 0xf5, 0xee, 0xff}, // rgb(255, 245, 238) + "sienna": {0xa0, 0x52, 0x2d, 0xff}, // rgb(160, 82, 45) + "silver": {0xc0, 0xc0, 0xc0, 0xff}, // rgb(192, 192, 192) + "skyblue": {0x87, 0xce, 0xeb, 0xff}, // rgb(135, 206, 235) + "slateblue": {0x6a, 0x5a, 0xcd, 0xff}, // rgb(106, 90, 205) + "slategray": {0x70, 0x80, 0x90, 0xff}, // rgb(112, 128, 144) + "slategrey": {0x70, 0x80, 0x90, 0xff}, // rgb(112, 128, 144) + "snow": {0xff, 0xfa, 0xfa, 0xff}, // rgb(255, 250, 250) + "springgreen": {0x00, 0xff, 0x7f, 0xff}, // rgb(0, 255, 127) + "steelblue": {0x46, 0x82, 0xb4, 0xff}, // rgb(70, 130, 180) + "tan": {0xd2, 0xb4, 0x8c, 0xff}, // rgb(210, 180, 140) + "teal": {0x00, 0x80, 0x80, 0xff}, // rgb(0, 128, 128) + "thistle": {0xd8, 0xbf, 0xd8, 0xff}, // rgb(216, 191, 216) + "tomato": {0xff, 0x63, 0x47, 0xff}, // rgb(255, 99, 71) + "turquoise": {0x40, 0xe0, 0xd0, 0xff}, // rgb(64, 224, 208) + "violet": {0xee, 0x82, 0xee, 0xff}, // rgb(238, 130, 238) + "wheat": {0xf5, 0xde, 0xb3, 0xff}, // rgb(245, 222, 179) + "white": {0xff, 0xff, 0xff, 0xff}, // rgb(255, 255, 255) + "whitesmoke": {0xf5, 0xf5, 0xf5, 0xff}, // rgb(245, 245, 245) + "yellow": {0xff, 0xff, 0x00, 0xff}, // rgb(255, 255, 0) + "yellowgreen": {0x9a, 0xcd, 0x32, 0xff}, // rgb(154, 205, 50) +} diff --git a/ui/messages/parser/htmlparser.go b/ui/messages/parser/htmlparser.go index b2deeba..850dc52 100644 --- a/ui/messages/parser/htmlparser.go +++ b/ui/messages/parser/htmlparser.go @@ -43,22 +43,28 @@ type taggedTString struct { tag string } -var AdjustStyleBold = func(style tcell.Style) tcell.Style { +func AdjustStyleBold(style tcell.Style) tcell.Style { return style.Bold(true) } -var AdjustStyleItalic = func(style tcell.Style) tcell.Style { +func AdjustStyleItalic(style tcell.Style) tcell.Style { return style.Italic(true) } -var AdjustStyleUnderline = func(style tcell.Style) tcell.Style { +func AdjustStyleUnderline(style tcell.Style) tcell.Style { return style.Underline(true) } -var AdjustStyleStrikethrough = func(style tcell.Style) tcell.Style { +func AdjustStyleStrikethrough(style tcell.Style) tcell.Style { return style.Strikethrough(true) } +func AdjustStyleColor(color tcell.Color) func(tcell.Style) tcell.Style { + return func(style tcell.Style) tcell.Style { + return style.Foreground(color) + } +} + func (parser *htmlParser) getAttribute(node *html.Node, attribute string) string { for _, attr := range node.Attr { if attr.Key == attribute { @@ -131,21 +137,26 @@ func (parser *htmlParser) basicFormatToTString(node *html.Node, stripLinebreak b func (parser *htmlParser) fontToTString(node *html.Node, stripLinebreak bool) tstring.TString { str := parser.nodeToTagAwareTString(node.FirstChild, stripLinebreak) - hex := parser.getAttribute(node, "color") + hex := parser.getAttribute(node, "data-mx-color") if len(hex) == 0 { - return str + hex = parser.getAttribute(node, "color") + if len(hex) == 0 { + return str + } } color, err := colorful.Hex(hex) if err != nil { - return str + color2, ok := ColorMap[strings.ToLower(hex)] + if !ok { + return str + } + color, _ = colorful.MakeColor(color2) } r, g, b := color.RGB255() tcellColor := tcell.NewRGBColor(int32(r), int32(g), int32(b)) - str.AdjustStyleFull(func(style tcell.Style) tcell.Style { - return style.Foreground(tcellColor) - }) + str.AdjustStyleFull(AdjustStyleColor(tcellColor)) return str } -- cgit v1.2.3