From 1477dab6042021de1374b831111d94f61299a364 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Thu, 28 May 2020 13:16:17 -0400 Subject: [PATCH] fix #1080 --- irc/handlers.go | 2 ++ irc/nickname.go | 3 +++ 2 files changed, 5 insertions(+) diff --git a/irc/handlers.go b/irc/handlers.go index 53fa2486..b9810b25 100644 --- a/irc/handlers.go +++ b/irc/handlers.go @@ -2724,6 +2724,8 @@ func whoisHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Res } 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)) + // #1080: + rb.Add(nil, client.server.name, RPL_WHOISOPERATOR, clientNick, service.Name, client.t("is a network service")) // hehe if client.HasMode(modes.TLS) { rb.Add(nil, client.server.name, RPL_WHOISSECURE, clientNick, service.Name, client.t("is using a secure connection")) diff --git a/irc/nickname.go b/irc/nickname.go index 9c54120f..718c948c 100644 --- a/irc/nickname.go +++ b/irc/nickname.go @@ -18,6 +18,9 @@ import ( var ( restrictedNicknames = []string{ "=scene=", // used for rp commands + "Global", // global announcements on some networks + // common services not implemented by us: + "MemoServ", "BotServ", "OperServ", } restrictedCasefoldedNicks = make(map[string]bool)