sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve ERR_NOSUCHCHANNEL error messages

Browse Source 
References: https://todo.sr.ht/~emersion/soju/63
This commit is contained in:
Simon Ser 2021-03-16 09:13:46 +01:00
parent fa047123b9
commit 26c5c11caf
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
downstream.go
View File

@ -244,6 +244,12 @@ func (dc *downstreamConn) unmarshalEntity(name string) (*upstreamConn, string, e
if uc := dc.upstream(); uc != nil { if uc := dc.upstream(); uc != nil {
return uc, name, nil return uc, name, nil
} }
if dc.network != nil {
return nil, "", ircError{&irc.Message{
Command: irc.ERR_NOSUCHCHANNEL,
Params: []string{name, "Disconnected from upstream network"},
}}
}
var conn *upstreamConn var conn *upstreamConn
if i := strings.LastIndexByte(name, '/'); i >= 0 { if i := strings.LastIndexByte(name, '/'); i >= 0 {
@ -261,7 +267,7 @@ func (dc *downstreamConn) unmarshalEntity(name string) (*upstreamConn, string, e
if conn == nil { if conn == nil {
return nil, "", ircError{&irc.Message{ return nil, "", ircError{&irc.Message{
Command: irc.ERR_NOSUCHCHANNEL, Command: irc.ERR_NOSUCHCHANNEL,
Params: []string{name, "No such channel"}, Params: []string{name, "Missing network suffix in channel name"},
}} }}
} }
return conn, name, nil return conn, name, nil