From da2d4ca1303c5b2b9b969d9afb3f7b767119e2a0 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Mon, 7 Dec 2020 02:15:44 -0500 Subject: [PATCH] make overridden services hostname appear in chanserv --- irc/handlers.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/irc/handlers.go b/irc/handlers.go index 52991d62..8bf96e35 100644 --- a/irc/handlers.go +++ b/irc/handlers.go @@ -3262,11 +3262,16 @@ func whoisHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Res handleService := func(nick string) bool { cfnick, _ := CasefoldName(nick) service, ok := OragonoServices[cfnick] + hostname := "localhost" + config := server.Config() + if config.Server.OverrideServicesHostname != "" { + hostname = config.Server.OverrideServicesHostname + } if !ok { return false } clientNick := client.Nick() - rb.Add(nil, client.server.name, RPL_WHOISUSER, clientNick, service.Name, service.Name, "localhost", "*", fmt.Sprintf(client.t("Network service, for more info /msg %s HELP"), service.Name)) + rb.Add(nil, client.server.name, RPL_WHOISUSER, clientNick, service.Name, service.Name, hostname, "*", fmt.Sprintf(client.t("Network service, for more info /msg %s HELP"), service.Name)) // #1080: rb.Add(nil, client.server.name, RPL_WHOISOPERATOR, clientNick, service.Name, client.t("is a network service")) // hehe