GitHub
/
ergo
mirror of https://github.com/ergochat/ergo.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1039 from slingamn/account_notify_again 

clean up account-notify logout notification
This commit is contained in:
Shivaram Lingamneni 2020-05-21 10:49:48 -07:00 committed by GitHub
parent 9d8b71b920 c45e76460a
commit aab9d19696
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
irc/accounts.go
View File

@ -15,7 +15,6 @@ import (
"time" "time"
"unicode" "unicode"
"github.com/oragono/oragono/irc/caps"
"github.com/oragono/oragono/irc/connection_limits" "github.com/oragono/oragono/irc/connection_limits"
"github.com/oragono/oragono/irc/email" "github.com/oragono/oragono/irc/email"
"github.com/oragono/oragono/irc/ldap" "github.com/oragono/oragono/irc/ldap"
@ -1937,6 +1936,7 @@ type rawClientAccount struct {
} }
// logoutOfAccount logs the client out of their current account. // logoutOfAccount logs the client out of their current account.
// TODO(#1027) delete this entire method and just use client.Logout()
func (am *AccountManager) logoutOfAccount(client *Client) { func (am *AccountManager) logoutOfAccount(client *Client) {
if client.Account() == "" { if client.Account() == "" {
// already logged out // already logged out
@ -1945,12 +1945,4 @@ func (am *AccountManager) logoutOfAccount(client *Client) {
client.Logout() client.Logout()
go client.nickTimer.Touch(nil) go client.nickTimer.Touch(nil)
// dispatch account-notify
// TODO: doing the I/O here is kind of a kludge, let's move this somewhere else
go func() {
for friend := range client.Friends(caps.AccountNotify) {
friend.Send(nil, client.NickMaskString(), "ACCOUNT", "*")
}
}()
} }