From 855eb786af508395850409d23f6c4b8d2050d0d1 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Sun, 17 May 2020 11:52:32 -0400 Subject: [PATCH] include account-notify in the response batch --- irc/handlers.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/irc/handlers.go b/irc/handlers.go index 467881e8..6b2881ae 100644 --- a/irc/handlers.go +++ b/irc/handlers.go @@ -102,7 +102,12 @@ func sendSuccessfulAccountAuth(client *Client, rb *ResponseBuffer, forNS, forSAS // dispatch account-notify for friend := range client.Friends(caps.AccountNotify) { - friend.Send(nil, details.nickMask, "ACCOUNT", details.accountName) + if friend != rb.session { + friend.Send(nil, details.nickMask, "ACCOUNT", details.accountName) + } + } + if rb.session.capabilities.Has(caps.AccountNotify) { + rb.Add(nil, details.nickMask, "ACCOUNT", details.accountName) } client.server.snomasks.Send(sno.LocalAccounts, fmt.Sprintf(ircfmt.Unescape("Client $c[grey][$r%s$c[grey]] logged into account $c[grey][$r%s$c[grey]]"), details.nickMask, details.accountName))