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

Remove remnant comments about multi-upstream mode

Browse Source
This commit is contained in:
Simon Ser 2023-10-03 10:14:55 +02:00
parent 60b041419a
commit 73e594d59d
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
downstream.go
View File

@ -2491,8 +2491,8 @@ func (dc *downstreamConn) handleMessageRegistered(ctx context.Context, msg *irc.
uc.SendMessageLabeled(ctx, dc.id, msg) uc.SendMessageLabeled(ctx, dc.id, msg)
case "AUTHENTICATE": case "AUTHENTICATE":
// Post-connection-registration AUTHENTICATE is unsupported in // Post-connection-registration AUTHENTICATE is only supported if an
// multi-upstream mode, or if the upstream doesn't support SASL // upstream is bound and supports SASL
uc := dc.upstream() uc := dc.upstream()
if uc == nil || !uc.caps.IsEnabled("sasl") { if uc == nil || !uc.caps.IsEnabled("sasl") {
return ircError{&irc.Message{ return ircError{&irc.Message{
@ -2604,7 +2604,6 @@ func (dc *downstreamConn) handleMessageRegistered(ctx context.Context, msg *irc.
uc.SendMessageLabeled(ctx, dc.id, msg) uc.SendMessageLabeled(ctx, dc.id, msg)
} }
case "MONITOR": case "MONITOR":
// MONITOR is unsupported in multi-upstream mode
uc := dc.upstream() uc := dc.upstream()
if uc == nil { if uc == nil {
return newUnknownCommandError(msg.Command) return newUnknownCommandError(msg.Command)
@ -2719,8 +2718,6 @@ func (dc *downstreamConn) handleMessageRegistered(ctx context.Context, msg *irc.
} }
case "TARGETS": case "TARGETS":
if dc.network == nil { if dc.network == nil {
// Either an unbound bouncer network, in which case we should return no targets,
// or a multi-upstream downstream, but we don't support CHATHISTORY TARGETS for those yet.
dc.SendBatch(ctx, "draft/chathistory-targets", nil, nil, func(batchRef string) {}) dc.SendBatch(ctx, "draft/chathistory-targets", nil, nil, func(batchRef string) {})
return nil return nil
} }
@ -2810,7 +2807,6 @@ func (dc *downstreamConn) handleMessageRegistered(ctx context.Context, msg *irc.
history, err = store.LoadBeforeTime(ctx, bounds[0], bounds[1], &options) history, err = store.LoadBeforeTime(ctx, bounds[0], bounds[1], &options)
} }
case "TARGETS": case "TARGETS":
// TODO: support TARGETS in multi-upstream mode
targets, err := store.ListTargets(ctx, &network.Network, bounds[0], bounds[1], limit, eventPlayback) targets, err := store.ListTargets(ctx, &network.Network, bounds[0], bounds[1], limit, eventPlayback)
if err != nil { if err != nil {
dc.logger.Printf("failed fetching targets for chathistory: %v", err) dc.logger.Printf("failed fetching targets for chathistory: %v", err)