From 344a1d7e4804e0c84fc41e94af762bb88a9df76c Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Sun, 17 Feb 2019 06:51:48 -0500 Subject: [PATCH] fix #392 --- irc/channel.go | 4 ++-- irc/chanserv.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/irc/channel.go b/irc/channel.go index ba93a452..0e07d96a 100644 --- a/irc/channel.go +++ b/irc/channel.go @@ -855,7 +855,7 @@ func (channel *Channel) applyModeToMember(client *Client, mode modes.Mode, op mo casefoldedName, err := CasefoldName(nick) target := channel.server.clients.Get(casefoldedName) if err != nil || target == nil { - rb.Add(nil, client.server.name, ERR_NOSUCHNICK, client.nick, nick, client.t("No such nick")) + rb.Add(nil, client.server.name, ERR_NOSUCHNICK, client.Nick(), nick, client.t("No such nick")) return nil } @@ -873,7 +873,7 @@ func (channel *Channel) applyModeToMember(client *Client, mode modes.Mode, op mo channel.stateMutex.Unlock() if !exists { - rb.Add(nil, client.server.name, ERR_USERNOTINCHANNEL, client.nick, channel.name, client.t("They aren't on that channel")) + rb.Add(nil, client.server.name, ERR_USERNOTINCHANNEL, client.Nick(), channel.Name(), client.t("They aren't on that channel")) } return } diff --git a/irc/chanserv.go b/irc/chanserv.go index 9b502161..d91022cf 100644 --- a/irc/chanserv.go +++ b/irc/chanserv.go @@ -189,10 +189,10 @@ func csOpHandler(server *Server, client *Client, command string, params []string // give them privs givenMode := modes.ChannelOperator - if client == target { + if clientAccount == target.Account() { givenMode = modes.ChannelFounder } - change := channelInfo.applyModeToMember(target, givenMode, modes.Add, client.NickCasefolded(), rb) + change := channelInfo.applyModeToMember(client, givenMode, modes.Add, target.NickCasefolded(), rb) if change != nil { //TODO(dan): we should change the name of String and make it return a slice here //TODO(dan): unify this code with code in modes.go