|
@@ -1816,9 +1816,13 @@ func absorbBatchedMessage(server *Server, client *Client, msg ircmsg.IrcMessage,
|
1816
|
1816
|
errorCode, errorMessage = "MULTILINE_INVALID", client.t("Cannot send a blank line with the multiline concat tag")
|
1817
|
1817
|
return
|
1818
|
1818
|
}
|
|
1819
|
+ if !isConcat && len(rb.session.batch.message.Split) != 0 {
|
|
1820
|
+ rb.session.batch.lenBytes++ // bill for the newline
|
|
1821
|
+ }
|
1819
|
1822
|
rb.session.batch.message.Append(msg.Params[1], isConcat)
|
|
1823
|
+ rb.session.batch.lenBytes += len(msg.Params[1])
|
1820
|
1824
|
config := server.Config()
|
1821
|
|
- if config.Limits.Multiline.MaxBytes < rb.session.batch.message.LenBytes() {
|
|
1825
|
+ if config.Limits.Multiline.MaxBytes < rb.session.batch.lenBytes {
|
1822
|
1826
|
errorCode, errorMessage = "MULTILINE_MAX_BYTES", strconv.Itoa(config.Limits.Multiline.MaxBytes)
|
1823
|
1827
|
} else if config.Limits.Multiline.MaxLines != 0 && config.Limits.Multiline.MaxLines < rb.session.batch.message.LenLines() {
|
1824
|
1828
|
errorCode, errorMessage = "MULTILINE_MAX_LINES", strconv.Itoa(config.Limits.Multiline.MaxLines)
|