GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-10 22:19:31 +01:00
Code Issues Projects Releases Wiki Activity

fix #375

Browse Source
This commit is contained in:
Shivaram Lingamneni 2019-02-13 15:29:36 -05:00
parent e2e07c0eee
commit c019fa3ab2
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
irc/handlers.go
View File

@ -555,19 +555,21 @@ func chathistoryHandler(server *Server, client *Client, msg ircmsg.IrcMessage, r
newRb := NewResponseBuffer(client) newRb := NewResponseBuffer(client)
newRb.Label = rb.Label // same label, new batch newRb.Label = rb.Label // same label, new batch
// TODO: send `WARN CHATHISTORY MAX_MESSAGES_EXCEEDED` when appropriate // TODO: send `WARN CHATHISTORY MAX_MESSAGES_EXCEEDED` when appropriate
if !success { if hist == nil {
newRb.Add(nil, server.name, "ERR", "CHATHISTORY", "NEED_MORE_PARAMS")
} else if hist == nil {
newRb.Add(nil, server.name, "ERR", "CHATHISTORY", "NO_SUCH_CHANNEL") newRb.Add(nil, server.name, "ERR", "CHATHISTORY", "NO_SUCH_CHANNEL")
} else if len(items) == 0 { } else if len(items) == 0 {
newRb.Add(nil, server.name, "ERR", "CHATHISTORY", "NO_TEXT_TO_SEND") newRb.Add(nil, server.name, "ERR", "CHATHISTORY", "NO_TEXT_TO_SEND")
} else if !success {
newRb.Add(nil, server.name, "ERR", "CHATHISTORY", "NEED_MORE_PARAMS")
} }
newRb.Send(true) newRb.Send(true)
}() }()
target := msg.Params[0] target := msg.Params[0]
channel = server.channels.Get(target) channel = server.channels.Get(target)
if channel != nil { if channel != nil && channel.hasClient(client) {
// "If [...] the user does not have permission to view the requested content, [...]
// NO_SUCH_CHANNEL SHOULD be returned"
hist = &channel.history hist = &channel.history
} else { } else {
targetClient := server.clients.Get(target) targetClient := server.clients.Get(target)
@ -1019,7 +1021,7 @@ func historyHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *R
target := msg.Params[0] target := msg.Params[0]
var hist *history.Buffer var hist *history.Buffer
channel := server.channels.Get(target) channel := server.channels.Get(target)
if channel != nil { if channel != nil && channel.hasClient(client) {
hist = &channel.history hist = &channel.history
} else { } else {
if strings.ToLower(target) == "me" { if strings.ToLower(target) == "me" {
@ -1036,7 +1038,11 @@ func historyHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *R
} }
if hist == nil { if hist == nil {
rb.Add(nil, server.name, ERR_NOSUCHCHANNEL, client.Nick(), target, client.t("No such channel")) if channel == nil {
rb.Add(nil, server.name, ERR_NOSUCHCHANNEL, client.Nick(), target, client.t("No such channel"))
} else {
rb.Add(nil, server.name, ERR_NOTONCHANNEL, client.Nick(), target, client.t("You're not on that channel"))
}
return false return false
} }