GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-25 05:19:25 +01:00
Code Issues Projects Releases Wiki Activity

fix incorrect sprintf-before-unescape

Browse Source
This commit is contained in:
Shivaram Lingamneni 2020-12-27 20:17:24 -05:00
parent 5342ab1bb1
commit 7c4d016fcb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
irc/server.go
View File

@ -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")) rb.Add(nil, client.server.name, RPL_WHOISACCOUNT, cnick, tnick, targetInfo.accountName, client.t("is logged in as"))
} }
if target.HasMode(modes.Bot) { 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 { if client == target || hasPrivs {

8
irc/services.go
View File

@ -235,14 +235,14 @@ func serviceHelpHandler(service *ircService, server *Server, client *Client, par
rb.Add(nil, service.prefix, "NOTICE", nick, notice) 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 { if len(params) == 0 {
helpBannerLines := strings.Split(client.t(service.HelpBanner), "\n") helpBannerLines := strings.Split(client.t(service.HelpBanner), "\n")
helpBannerLines = append(helpBannerLines, []string{ helpBannerLines = append(helpBannerLines, []string{
"", "",
client.t("To see in-depth help for a specific command, try:"), client.t("To see in-depth help for a specific command, try:"),
ircfmt.Unescape(fmt.Sprintf(client.t(" $b/msg %s HELP <command>$b"), service.Name)), fmt.Sprintf(ircfmt.Unescape(client.t(" $b/msg %s HELP <command>$b")), service.Name),
"", "",
client.t("Here are the commands you can use:"), client.t("Here are the commands you can use:"),
}...) }...)
@ -262,7 +262,7 @@ func serviceHelpHandler(service *ircService, server *Server, client *Client, par
continue continue
} }
shownHelpLines = append(shownHelpLines, ircfmt.Unescape(" "+client.t(commandInfo.helpShort))) shownHelpLines = append(shownHelpLines, " "+ircfmt.Unescape(client.t(commandInfo.helpShort)))
} }
if disabledCommands { 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 { func makeServiceHelpTextGenerator(cmd string, banner string) func(*Client) string {