upstream: remove heuristic to marshal nick in errors
This commit is contained in:
parent
8a2f544806
commit
b78d8be490
15
upstream.go
15
upstream.go
@ -1614,20 +1614,7 @@ func (uc *upstreamConn) handleMessage(ctx context.Context, msg *irc.Message) err
|
|||||||
uc.logger.Printf("unhandled message: %v", msg)
|
uc.logger.Printf("unhandled message: %v", msg)
|
||||||
|
|
||||||
uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
|
uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
|
||||||
// best effort marshaling for unknown messages, replies and errors:
|
dc.SendMessage(msg)
|
||||||
// most numerics start with the user nick, marshal it if that's the case
|
|
||||||
// otherwise, conservately keep the params without marshaling
|
|
||||||
params := msg.Params
|
|
||||||
if _, err := strconv.Atoi(msg.Command); err == nil { // numeric
|
|
||||||
if len(msg.Params) > 0 && isOurNick(uc.network, msg.Params[0]) {
|
|
||||||
params[0] = dc.nick
|
|
||||||
}
|
|
||||||
}
|
|
||||||
dc.SendMessage(&irc.Message{
|
|
||||||
Prefix: uc.srv.prefix(),
|
|
||||||
Command: msg.Command,
|
|
||||||
Params: params,
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
Loading…
Reference in New Issue
Block a user