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

Send RPL_LOGGEDIN with bouncer account in multi-upstream mode

Browse Source
This commit is contained in:
Simon Ser 2021-11-21 11:00:57 +01:00
parent c2a5461cb8
commit 4e84b41592
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
downstream.go
View File

@ -1038,16 +1038,24 @@ func (dc *downstreamConn) updateRealname() {
} }
func (dc *downstreamConn) updateAccount() { func (dc *downstreamConn) updateAccount() {
uc := dc.upstream() var account string
if uc == nil || uc.account == dc.account || !dc.caps["sasl"] { if dc.network == nil {
account = dc.user.Username
} else if uc := dc.upstream(); uc != nil {
account = uc.account
} else {
return return
} }
if uc.account != "" { if dc.account == account || !dc.caps["sasl"] {
return
}
if account != "" {
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
Prefix: dc.srv.prefix(), Prefix: dc.srv.prefix(),
Command: irc.RPL_LOGGEDIN, Command: irc.RPL_LOGGEDIN,
Params: []string{dc.nick, dc.prefix().String(), uc.account, "You are logged in as " + uc.account}, Params: []string{dc.nick, dc.prefix().String(), account, "You are logged in as " + account},
}) })
} else { } else {
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
@ -1057,7 +1065,7 @@ func (dc *downstreamConn) updateAccount() {
}) })
} }
dc.account = uc.account dc.account = account
} }
func sanityCheckServer(ctx context.Context, addr string) error { func sanityCheckServer(ctx context.Context, addr string) error {