From d32ccdc572da2cd0f32c3e90d3fc1620715a9182 Mon Sep 17 00:00:00 2001 From: Daniel Oaks Date: Wed, 2 Nov 2016 00:42:25 +1000 Subject: [PATCH] roleplay: More fixes and checks --- irc/numerics.go | 1 + irc/roleplay.go | 26 +++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/irc/numerics.go b/irc/numerics.go index 237e8c54..60452bbb 100644 --- a/irc/numerics.go +++ b/irc/numerics.go @@ -150,6 +150,7 @@ const ( ERR_UMODEUNKNOWNFLAG = "501" ERR_USERSDONTMATCH = "502" ERR_HELPNOTFOUND = "524" + ERR_CANNOTSENDRP = "573" RPL_HELPSTART = "704" RPL_HELPTXT = "705" RPL_ENDOFHELP = "706" diff --git a/irc/roleplay.go b/irc/roleplay.go index 8d23d891..3f964944 100644 --- a/irc/roleplay.go +++ b/irc/roleplay.go @@ -10,7 +10,7 @@ import ( ) const ( - npcNickMask = "%s!%s@npc.fakeuser.invalid" + npcNickMask = "*%s*!%s@npc.fakeuser.invalid" sceneNickMask = "=Scene=!%s@npc.fakeuser.invalid" ) @@ -30,6 +30,13 @@ func npcHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool { target := msg.Params[0] fakeSource := msg.Params[1] message := msg.Params[2] + + _, err := CasefoldName(fakeSource) + if err != nil { + client.Send(nil, client.server.name, ERR_CANNOTSENDRP, target, "Fake source must be a valid nickname") + return false + } + sourceString := fmt.Sprintf(npcNickMask, fakeSource, client.nick) sendRoleplayMessage(server, client, sourceString, target, false, message) @@ -44,6 +51,12 @@ func npcaHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool { 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, "Fake source must be a valid nickname") + return false + } + sendRoleplayMessage(server, client, sourceString, target, true, message) return false @@ -69,6 +82,11 @@ func sendRoleplayMessage(server *Server, client *Client, source string, targetSt return } + if !channel.flags[ChanRoleplaying] { + client.Send(nil, client.server.name, ERR_CANNOTSENDRP, channel.name, "Channel doesn't have roleplaying mode available") + return + } + for member := range channel.members { if member == client && !client.capabilities[EchoMessage] { continue @@ -82,6 +100,12 @@ func sendRoleplayMessage(server *Server, client *Client, source string, targetSt client.Send(nil, server.name, ERR_NOSUCHNICK, target, "No such nick") return } + + if !user.flags[UserRoleplaying] { + client.Send(nil, client.server.name, ERR_CANNOTSENDRP, user.nick, "User doesn't have roleplaying mode enabled") + return + } + user.Send(nil, source, "PRIVMSG", user.nick, message) if client.capabilities[EchoMessage] { client.Send(nil, source, "PRIVMSG", user.nick, message)