Replace multiple replaces with one regex replace.
This commit is contained in:
parent
aede29500f
commit
96bcdc00a5
1 changed files with 2 additions and 5 deletions
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue