Skip to content

Commit

Permalink
修复了§设置的格式不恢复的问题
Browse files Browse the repository at this point in the history
  • Loading branch information
Tnze committed Jun 18, 2019
1 parent 840e4b1 commit ff7439c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
15 changes: 10 additions & 5 deletions chat/chatMsg.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ var colors = map[string]string{
// ClearString return the message without escape sequence for ansi color.
func (m Message) ClearString() string {
var msg strings.Builder
msg.WriteString(transf(m.Text, false))
text, _ := transf(m.Text, false)
msg.WriteString(text)

//handle translate
if m.Translate != "" {
Expand Down Expand Up @@ -141,7 +142,9 @@ func (m Message) String() string {
if format.Len() > 0 {
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
if m.Translate != "" {
Expand All @@ -161,26 +164,28 @@ func (m Message) String() string {
}
}

if format.Len() > 0 {
if format.Len() > 0 || ok {
msg.WriteString("\033[0m")
}
return msg.String()
}

var fmtPat = regexp.MustCompile("(?i)§[0-9A-FK-OR]")

func transf(str string, ansi bool) string {
return fmtPat.ReplaceAllStringFunc(
func transf(str string, ansi bool) (dst string, change bool) {
dst = fmtPat.ReplaceAllStringFunc(
str,
func(str string) string {
f, ok := fmtCode[str[2]]
if ok {
if ansi {
change = true
return "\033[" + f + "m" // enable, add ANSI code
}
return "" //disable, remove the § code
}
return str //not a § code
},
)
return
}
4 changes: 2 additions & 2 deletions chat/chatMsg_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ var texts = []string{
"world",

"Tnze",
"\033[30mTnze",
"\033[1mist",
"\033[30mTnze\033[0m",
"\033[1mist\033[0m",
}

var ctexts = []string{
Expand Down

0 comments on commit ff7439c

Please sign in to comment.