External/ergo
1
0
Fork 1
mirror of https://github.com/ergochat/ergo.git synced 2025-12-20 02:00:11 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix #1240

Browse source
This commit is contained in:
Shivaram Lingamneni 2020-09-16 12:03:06 -04:00
parent 6a0d11d449
commit 498d76b131
2 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

22
irc/handlers.go
View file

@ -2194,15 +2194,7 @@ func npcHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Respo
fakeSource := msg.Params[1]
message := msg.Params[2:]
_, err := CasefoldName(fakeSource)
if err != nil {
client.Send(nil, client.server.name, ERR_CANNOTSENDRP, target, client.t("Fake source must be a valid nickname"))
return false
}
sourceString := fmt.Sprintf(npcNickMask, fakeSource, client.nick)
sendRoleplayMessage(server, client, sourceString, target, false, message, rb)
sendRoleplayMessage(server, client, fakeSource, target, false, false, message, rb)
return false
}
@ -2212,15 +2204,8 @@ func npcaHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Resp
target := msg.Params[0]
fakeSource := msg.Params[1]
message := msg.Params[2:]
sourceString := fmt.Sprintf(npcNickMask, fakeSource, client.nick)
_, err := CasefoldName(fakeSource)
if err != nil {
client.Send(nil, client.server.name, ERR_CANNOTSENDRP, target, client.t("Fake source must be a valid nickname"))
return false
}
sendRoleplayMessage(server, client, sourceString, target, true, message, rb)
sendRoleplayMessage(server, client, fakeSource, target, false, true, message, rb)
return false
}
@ -2623,9 +2608,8 @@ func sanickHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Re
func sceneHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool {
target := msg.Params[0]
message := msg.Params[1:]
sourceString := fmt.Sprintf(sceneNickMask, client.nick)
sendRoleplayMessage(server, client, sourceString, target, false, message, rb)
sendRoleplayMessage(server, client, "", target, true, false, message, rb)
return false
}