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

Rename network to upstreamName

Browse Source
This commit is contained in:
Simon Ser 2020-03-04 16:02:45 +01:00
parent 03c546e8bf
commit eacd4e6f0c
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
downstream.go
View File

@ -301,9 +301,9 @@ func (dc *downstreamConn) handleMessageUnregistered(msg *irc.Message) error {
func (dc *downstreamConn) register() error { func (dc *downstreamConn) register() error {
username := strings.TrimPrefix(dc.username, "~") username := strings.TrimPrefix(dc.username, "~")
var network string var upstreamName string
if i := strings.LastIndexAny(username, "/@"); i >= 0 { if i := strings.LastIndexAny(username, "/@"); i >= 0 {
network = username[i+1:] upstreamName = username[i+1:]
} }
if i := strings.IndexAny(username, "/@"); i >= 0 { if i := strings.IndexAny(username, "/@"); i >= 0 {
username = username[:i] username = username[:i]
@ -320,14 +320,14 @@ func (dc *downstreamConn) register() error {
return nil return nil
} }
if network != "" { if upstreamName != "" {
dc.upstream = dc.user.getUpstream(network) dc.upstream = dc.user.getUpstream(upstreamName)
if dc.upstream == nil { if dc.upstream == nil {
dc.logger.Printf("failed registration: unknown upstream %q", network) dc.logger.Printf("failed registration: unknown upstream %q", upstreamName)
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
Prefix: dc.srv.prefix(), Prefix: dc.srv.prefix(),
Command: irc.ERR_PASSWDMISMATCH, Command: irc.ERR_PASSWDMISMATCH,
Params: []string{"*", fmt.Sprintf("Unknown upstream server %q", network)}, Params: []string{"*", fmt.Sprintf("Unknown upstream server %q", upstreamName)},
}) })
return nil return nil
} }