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

downstream: take irc.Message in handleCap

Browse Source
This commit is contained in:
Simon Ser 2023-04-05 14:35:51 +02:00
parent de02cb98fe
commit 1df1ccf91e
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
downstream.go
View File

@ -642,15 +642,9 @@ func (dc *downstreamConn) handleMessageUnregistered(ctx context.Context, msg *ir
return err return err
} }
case "CAP": case "CAP":
var subCmd string return dc.handleCap(msg)
if err := parseMessageParams(msg, &subCmd); err != nil {
return err
}
if err := dc.handleCapCommand(subCmd, msg.Params[1:]); err != nil {
return err
}
case "AUTHENTICATE": case "AUTHENTICATE":
credentials, err := dc.handleAuthenticateCommand(msg) credentials, err := dc.handleAuthenticate(msg)
if err != nil { if err != nil {
return err return err
} else if credentials == nil { } else if credentials == nil {
@ -756,10 +750,14 @@ func (dc *downstreamConn) handleMessageUnregistered(ctx context.Context, msg *ir
return nil return nil
} }
func (dc *downstreamConn) handleCapCommand(cmd string, args []string) error { func (dc *downstreamConn) handleCap(msg *irc.Message) error {
cmd = strings.ToUpper(cmd) var cmd string
if err := parseMessageParams(msg, &cmd); err != nil {
return err
}
args := msg.Params[1:]
switch cmd { switch cmd = strings.ToUpper(cmd); cmd {
case "LS": case "LS":
if len(args) > 0 { if len(args) > 0 {
var err error var err error
@ -887,7 +885,7 @@ func (dc *downstreamConn) handleCapCommand(cmd string, args []string) error {
return nil return nil
} }
func (dc *downstreamConn) handleAuthenticateCommand(msg *irc.Message) (result *downstreamSASL, err error) { func (dc *downstreamConn) handleAuthenticate(msg *irc.Message) (result *downstreamSASL, err error) {
defer func() { defer func() {
if err != nil { if err != nil {
dc.sasl = nil dc.sasl = nil
@ -1724,13 +1722,7 @@ func (dc *downstreamConn) runUntilRegistered() error {
func (dc *downstreamConn) handleMessageRegistered(ctx context.Context, msg *irc.Message) error { func (dc *downstreamConn) handleMessageRegistered(ctx context.Context, msg *irc.Message) error {
switch msg.Command { switch msg.Command {
case "CAP": case "CAP":
var subCmd string return dc.handleCap(msg)
if err := parseMessageParams(msg, &subCmd); err != nil {
return err
}
if err := dc.handleCapCommand(subCmd, msg.Params[1:]); err != nil {
return err
}
case "PING": case "PING":
var source, destination string var source, destination string
if err := parseMessageParams(msg, &source); err != nil { if err := parseMessageParams(msg, &source); err != nil {
@ -2516,7 +2508,7 @@ func (dc *downstreamConn) handleMessageRegistered(ctx context.Context, msg *irc.
}} }}
} }
credentials, err := dc.handleAuthenticateCommand(msg) credentials, err := dc.handleAuthenticate(msg)
if err != nil { if err != nil {
return err return err
} }