migan/discordmuffin
1
0
Fork 0
forked from pothtonswer/discordmuffin
Code Pull requests Activity

Merge pull request #190 from iopred/develop

Browse source 
Replace multiple replaces with one regex replace.
This commit is contained in:
Bruce 2016-05-08 11:35:43 -05:00
commit f089de0541
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
message.go
View file

@ -11,7 +11,7 @@ package discordgo
import ( import (
"fmt" "fmt"
"strings" "regexp"
) )
// A Message stores all data related to a specific Discord message. // A Message stores all data related to a specific Discord message.
@ -76,10 +76,7 @@ func (m *Message) ContentWithMentionsReplaced() string {
} }
content := m.Content content := m.Content
for _, user := range m.Mentions { for _, user := range m.Mentions {
content = strings.Replace(content, fmt.Sprintf("<@%s>", user.ID), content = regexp.MustCompile(fmt.Sprintf("<@!?(%s)>", user.ID)).ReplaceAllString(content, "@"+user.Username)
fmt.Sprintf("@%s", user.Username), -1)
content = strings.Replace(content, fmt.Sprintf("<@!%s>", user.ID),
fmt.Sprintf("@%s", user.Username), -1)
} }
return content return content
} }