From 0d7c3a0bb7926eca7ad152cf2012c883b4f7284e Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Sun, 22 Nov 2020 22:44:48 +0000 Subject: [PATCH] Use strings.ReplaceAll in gateway.modifyUsername Fixes a warning from gocritic linter. --- gateway/gateway.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gateway/gateway.go b/gateway/gateway.go index 3a638547..d321711a 100644 --- a/gateway/gateway.go +++ b/gateway/gateway.go @@ -337,21 +337,21 @@ func (gw *Gateway) modifyUsername(msg *config.Message, dest *bridge.Bridge) stri } i++ } - nick = strings.Replace(nick, "{NOPINGNICK}", msg.Username[:i]+"​"+msg.Username[i:], -1) + nick = strings.ReplaceAll(nick, "{NOPINGNICK}", msg.Username[:i]+"​"+msg.Username[i:]) } - nick = strings.Replace(nick, "{BRIDGE}", br.Name, -1) - nick = strings.Replace(nick, "{PROTOCOL}", br.Protocol, -1) - nick = strings.Replace(nick, "{GATEWAY}", gw.Name, -1) - nick = strings.Replace(nick, "{LABEL}", br.GetString("Label"), -1) - nick = strings.Replace(nick, "{NICK}", msg.Username, -1) - nick = strings.Replace(nick, "{USERID}", msg.UserID, -1) - nick = strings.Replace(nick, "{CHANNEL}", msg.Channel, -1) + nick = strings.ReplaceAll(nick, "{BRIDGE}", br.Name) + nick = strings.ReplaceAll(nick, "{PROTOCOL}", br.Protocol) + nick = strings.ReplaceAll(nick, "{GATEWAY}", gw.Name) + nick = strings.ReplaceAll(nick, "{LABEL}", br.GetString("Label")) + nick = strings.ReplaceAll(nick, "{NICK}", msg.Username) + nick = strings.ReplaceAll(nick, "{USERID}", msg.UserID) + nick = strings.ReplaceAll(nick, "{CHANNEL}", msg.Channel) tengoNick, err := gw.modifyUsernameTengo(msg, br) if err != nil { gw.logger.Errorf("modifyUsernameTengo error: %s", err) } - nick = strings.Replace(nick, "{TENGO}", tengoNick, -1) //nolint:gocritic + nick = strings.ReplaceAll(nick, "{TENGO}", tengoNick) return nick }