From 7c4d016fcb250a7f2cfa5d9e4933c6e9d5f852c4 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Sun, 27 Dec 2020 20:17:24 -0500 Subject: [PATCH] fix incorrect sprintf-before-unescape --- irc/server.go | 2 +- irc/services.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/irc/server.go b/irc/server.go index 695c81a3..eed41a3e 100644 --- a/irc/server.go +++ b/irc/server.go @@ -488,7 +488,7 @@ func (client *Client) getWhoisOf(target *Client, hasPrivs bool, rb *ResponseBuff rb.Add(nil, client.server.name, RPL_WHOISACCOUNT, cnick, tnick, targetInfo.accountName, client.t("is logged in as")) } if target.HasMode(modes.Bot) { - rb.Add(nil, client.server.name, RPL_WHOISBOT, cnick, tnick, ircfmt.Unescape(fmt.Sprintf(client.t("is a $bBot$b on %s"), client.server.Config().Network.Name))) + rb.Add(nil, client.server.name, RPL_WHOISBOT, cnick, tnick, fmt.Sprintf(ircfmt.Unescape(client.t("is a $bBot$b on %s")), client.server.Config().Network.Name)) } if client == target || hasPrivs { diff --git a/irc/services.go b/irc/services.go index c4451c34..5dc20077 100644 --- a/irc/services.go +++ b/irc/services.go @@ -235,14 +235,14 @@ func serviceHelpHandler(service *ircService, server *Server, client *Client, par rb.Add(nil, service.prefix, "NOTICE", nick, notice) } - sendNotice(ircfmt.Unescape(fmt.Sprintf("*** $b%s HELP$b ***", service.Name))) + sendNotice(fmt.Sprintf(ircfmt.Unescape("*** $b%s HELP$b ***"), service.Name)) if len(params) == 0 { helpBannerLines := strings.Split(client.t(service.HelpBanner), "\n") helpBannerLines = append(helpBannerLines, []string{ "", client.t("To see in-depth help for a specific command, try:"), - ircfmt.Unescape(fmt.Sprintf(client.t(" $b/msg %s HELP $b"), service.Name)), + fmt.Sprintf(ircfmt.Unescape(client.t(" $b/msg %s HELP $b")), service.Name), "", client.t("Here are the commands you can use:"), }...) @@ -262,7 +262,7 @@ func serviceHelpHandler(service *ircService, server *Server, client *Client, par continue } - shownHelpLines = append(shownHelpLines, ircfmt.Unescape(" "+client.t(commandInfo.helpShort))) + shownHelpLines = append(shownHelpLines, " "+ircfmt.Unescape(client.t(commandInfo.helpShort))) } if disabledCommands { @@ -301,7 +301,7 @@ func serviceHelpHandler(service *ircService, server *Server, client *Client, par } } - sendNotice(ircfmt.Unescape(fmt.Sprintf(client.t("*** $bEnd of %s HELP$b ***"), service.Name))) + sendNotice(fmt.Sprintf(ircfmt.Unescape(client.t("*** $bEnd of %s HELP$b ***")), service.Name)) } func makeServiceHelpTextGenerator(cmd string, banner string) func(*Client) string {