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

Split unmarshalEntity into two functions

Browse Source 
Some command handlers need to unmarshal without requiring the
upstream to be connected.
This commit is contained in:
Simon Ser 2021-09-13 11:14:47 +02:00
parent 79b0fe5de5
commit cd64a7ffda
1 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
downstream.go
View File

@ -304,41 +304,54 @@ func (dc *downstreamConn) marshalUserPrefix(net *network, prefix *irc.Prefix) *i
} }
} }
// unmarshalEntity converts a downstream entity name (ie. channel or nick) into // unmarshalEntityNetwork converts a downstream entity name (ie. channel or
// an upstream entity name. // nick) into an upstream entity name.
// //
// This involves removing the "/<network>" suffix. // This involves removing the "/<network>" suffix.
func (dc *downstreamConn) unmarshalEntity(name string) (*upstreamConn, string, error) { func (dc *downstreamConn) unmarshalEntityNetwork(name string) (*network, string, error) {
if uc := dc.upstream(); uc != nil {
return uc, name, nil
}
if dc.network != nil { if dc.network != nil {
return dc.network, name, nil
}
var net *network
if i := strings.LastIndexByte(name, '/'); i >= 0 {
network := name[i+1:]
name = name[:i]
for _, n := range dc.user.networks {
if network == n.GetName() {
net = n
break
}
}
}
if net == nil {
return nil, "", ircError{&irc.Message{
Command: irc.ERR_NOSUCHCHANNEL,
Params: []string{name, "Missing network suffix in name"},
}}
}
return net, name, nil
}
// unmarshalEntity is the same as unmarshalEntityNetwork, but returns the
// upstream connection and fails if the upstream is disconnected.
func (dc *downstreamConn) unmarshalEntity(name string) (*upstreamConn, string, error) {
net, name, err := dc.unmarshalEntityNetwork(name)
if err != nil {
return nil, "", err
}
if net.conn == nil {
return nil, "", ircError{&irc.Message{ return nil, "", ircError{&irc.Message{
Command: irc.ERR_NOSUCHCHANNEL, Command: irc.ERR_NOSUCHCHANNEL,
Params: []string{name, "Disconnected from upstream network"}, Params: []string{name, "Disconnected from upstream network"},
}} }}
} }
var conn *upstreamConn return net.conn, name, nil
if i := strings.LastIndexByte(name, '/'); i >= 0 {
network := name[i+1:]
name = name[:i]
dc.forEachUpstream(func(uc *upstreamConn) {
if network != uc.network.GetName() {
return
}
conn = uc
})
}
if conn == nil {
return nil, "", ircError{&irc.Message{
Command: irc.ERR_NOSUCHCHANNEL,
Params: []string{name, "Missing network suffix in channel name"},
}}
}
return conn, name, nil
} }
func (dc *downstreamConn) unmarshalText(uc *upstreamConn, text string) string { func (dc *downstreamConn) unmarshalText(uc *upstreamConn, text string) string {