From 53190ef13146e7e79764d90d35030e511fd6792a Mon Sep 17 00:00:00 2001 From: Daniel Oaks Date: Sun, 28 May 2017 12:43:09 -0600 Subject: [PATCH] Send a whole lot more snomasks --- irc/accountreg.go | 3 +++ irc/accounts.go | 3 +++ irc/chanserv.go | 3 +++ irc/client.go | 3 +++ irc/server.go | 2 ++ 5 files changed, 14 insertions(+) diff --git a/irc/accountreg.go b/irc/accountreg.go index 4313f1a9..b4c53a5a 100644 --- a/irc/accountreg.go +++ b/irc/accountreg.go @@ -12,7 +12,9 @@ import ( "strings" "time" + "github.com/DanielOaks/girc-go/ircfmt" "github.com/DanielOaks/girc-go/ircmsg" + "github.com/DanielOaks/oragono/irc/sno" "github.com/tidwall/buntdb" ) @@ -262,6 +264,7 @@ func accRegisterHandler(server *Server, client *Client, msg ircmsg.IrcMessage) b client.Send(nil, server.name, RPL_REGISTRATION_SUCCESS, client.nick, account.Name, "Account created") client.Send(nil, server.name, RPL_LOGGEDIN, client.nick, client.nickMaskString, account.Name, fmt.Sprintf("You are now logged in as %s", account.Name)) client.Send(nil, server.name, RPL_SASLSUCCESS, client.nick, "Authentication successful") + server.snomasks.Send(sno.LocalAccounts, fmt.Sprintf(ircfmt.Unescape("Account registered $c[grey][$r%s$c[grey]] by $c[grey][$r%s$c[grey]]"), account.Name, client.nickMaskString)) return nil }) if err != nil { diff --git a/irc/accounts.go b/irc/accounts.go index 7797a6ee..7bb0b624 100644 --- a/irc/accounts.go +++ b/irc/accounts.go @@ -13,7 +13,9 @@ import ( "strings" "time" + "github.com/DanielOaks/girc-go/ircfmt" "github.com/DanielOaks/girc-go/ircmsg" + "github.com/DanielOaks/oragono/irc/sno" "github.com/tidwall/buntdb" ) @@ -263,6 +265,7 @@ func (client *Client) LoginToAccount(account *ClientAccount) { account.Clients = append(account.Clients, client) client.account = account + 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]]"), client.nickMaskString, account.Name)) } // authExternalHandler parses the SASL EXTERNAL mechanism. diff --git a/irc/chanserv.go b/irc/chanserv.go index ee3d05c4..8d4a042e 100644 --- a/irc/chanserv.go +++ b/irc/chanserv.go @@ -8,7 +8,9 @@ import ( "strings" "time" + "github.com/DanielOaks/girc-go/ircfmt" "github.com/DanielOaks/girc-go/ircmsg" + "github.com/DanielOaks/oragono/irc/sno" "github.com/tidwall/buntdb" ) @@ -101,6 +103,7 @@ func (server *Server) chanservReceivePrivmsg(client *Client, message string) { client.ChanServNotice(fmt.Sprintf("Channel %s successfully registered", channelName)) server.logger.Info("chanserv", fmt.Sprintf("Client %s registered channel %s", client.nick, channelName)) + server.snomasks.Send(sno.LocalChannels, fmt.Sprintf(ircfmt.Unescape("Channel registered $c[grey][$r%s$c[grey]] by $c[grey][$r%s$c[grey]]"), channelName, client.nickMaskString)) channelInfo.membersMutex.Lock() defer channelInfo.membersMutex.Unlock() diff --git a/irc/client.go b/irc/client.go index 89d7de56..fdad1981 100644 --- a/irc/client.go +++ b/irc/client.go @@ -16,8 +16,10 @@ import ( "sync" "time" + "github.com/DanielOaks/girc-go/ircfmt" "github.com/DanielOaks/girc-go/ircmsg" "github.com/DanielOaks/go-ident" + "github.com/DanielOaks/oragono/irc/sno" ) const ( @@ -435,6 +437,7 @@ func (client *Client) ChangeNickname(nickname string) error { err := client.server.clients.Replace(client.nick, nickname, client) if err == nil { client.server.logger.Debug("nick", fmt.Sprintf("%s changed nickname to %s", client.nick, nickname)) + client.server.snomasks.Send(sno.LocalNicks, fmt.Sprintf(ircfmt.Unescape("Nick changed $c[grey][$r%s$c[grey]] to [$r%s$c[grey]]"), client.nick, nickname)) client.server.whoWas.Append(client) client.nick = nickname client.updateNickMask() diff --git a/irc/server.go b/irc/server.go index bac2bfd9..591c11fc 100644 --- a/irc/server.go +++ b/irc/server.go @@ -1298,6 +1298,8 @@ func operHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool { op: Add, }) client.Send(nil, server.name, "MODE", client.nick, applied.String()) + + server.snomasks.Send(sno.LocalOpers, fmt.Sprintf(ircfmt.Unescape("Client opered up $c[grey][$r%s$c[grey], $r%s$c[grey]]"), client.nickMaskString, client.operName)) return false }