falloutBot/go-mc
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复了§设置的格式不恢复的问题

Browse Source
This commit is contained in:
Tnze
2019-06-19 02:01:04 +08:00
parent 840e4b1cf8
commit ff7439c28e
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
chat/chatMsg.go
View File

@ -96,7 +96,8 @@ var colors = map[string]string{
// ClearString return the message without escape sequence for ansi color. // ClearString return the message without escape sequence for ansi color.
func (m Message) ClearString() string { func (m Message) ClearString() string {
var msg strings.Builder var msg strings.Builder
msg.WriteString(transf(m.Text, false)) text, _ := transf(m.Text, false)
msg.WriteString(text)
//handle translate //handle translate
if m.Translate != "" { if m.Translate != "" {
@ -141,7 +142,9 @@ func (m Message) String() string {
if format.Len() > 0 { if format.Len() > 0 {
msg.WriteString("\033[" + format.String()[:format.Len()-1] + "m") msg.WriteString("\033[" + format.String()[:format.Len()-1] + "m")
} }
msg.WriteString(transf(m.Text, true))
text, ok := transf(m.Text, true)
msg.WriteString(text)
//handle translate //handle translate
if m.Translate != "" { if m.Translate != "" {
@ -161,7 +164,7 @@ func (m Message) String() string {
} }
} }
if format.Len() > 0 { if format.Len() > 0 || ok {
msg.WriteString("\033[0m") msg.WriteString("\033[0m")
} }
return msg.String() return msg.String()
@ -169,13 +172,14 @@ func (m Message) String() string {
var fmtPat = regexp.MustCompile("(?i)§[0-9A-FK-OR]") var fmtPat = regexp.MustCompile("(?i)§[0-9A-FK-OR]")
func transf(str string, ansi bool) string { func transf(str string, ansi bool) (dst string, change bool) {
return fmtPat.ReplaceAllStringFunc( dst = fmtPat.ReplaceAllStringFunc(
str, str,
func(str string) string { func(str string) string {
f, ok := fmtCode[str[2]] f, ok := fmtCode[str[2]]
if ok { if ok {
if ansi { if ansi {
change = true
return "\033[" + f + "m" // enable, add ANSI code return "\033[" + f + "m" // enable, add ANSI code
} }
return "" //disable, remove the § code return "" //disable, remove the § code
@ -183,4 +187,5 @@ func transf(str string, ansi bool) string {
return str //not a § code return str //not a § code
}, },
) )
return
} }

4
chat/chatMsg_test.go
View File

@ -43,8 +43,8 @@ var texts = []string{
"world", "world",
"Tnze", "Tnze",
"\033[30mTnze", "\033[30mTnze\033[0m",
"\033[1mist", "\033[1mist\033[0m",
} }
var ctexts = []string{ var ctexts = []string{