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

Merge pull request #1081 from slingamn/restricted_nicknames

Browse Source 
fix #1080
This commit is contained in:
Shivaram Lingamneni 2020-05-30 20:16:39 -07:00 committed by GitHub
commit 9775b7d318
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
irc/handlers.go
View File

@ -2724,6 +2724,8 @@ func whoisHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Res
} }
clientNick := client.Nick() 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, "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 // hehe
if client.HasMode(modes.TLS) { if client.HasMode(modes.TLS) {
rb.Add(nil, client.server.name, RPL_WHOISSECURE, clientNick, service.Name, client.t("is using a secure connection")) rb.Add(nil, client.server.name, RPL_WHOISSECURE, clientNick, service.Name, client.t("is using a secure connection"))

3
irc/nickname.go
View File

@ -18,6 +18,9 @@ import (
var ( var (
restrictedNicknames = []string{ restrictedNicknames = []string{
"=scene=", // used for rp commands "=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) restrictedCasefoldedNicks = make(map[string]bool)