justin/irc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Now supports client registration tracking

Browse Source 
Added flag for client that is set when registration is completed.
Providing middleware/wrapper for CommandHandlers to check if client is registered.
This commit is contained in:
Justin 2015-08-10 08:31:44 -07:00
parent 0491f08d73
commit ca503377dc
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client.go
View File

@ -24,7 +24,8 @@ type Client struct {
Prefix *irc.Prefix Prefix *irc.Prefix
Server *Server Server *Server
authorized bool Authorized bool
Registered bool
idleTimer *time.Timer idleTimer *time.Timer
quitTimer *time.Timer quitTimer *time.Timer
@ -39,7 +40,7 @@ type Client struct {
func (s *Server) newClient(ircConn *irc.Conn, conn net.Conn) *Client { func (s *Server) newClient(ircConn *irc.Conn, conn net.Conn) *Client {
client := &Client{Conn: ircConn, conn: conn, Server: s} client := &Client{Conn: ircConn, conn: conn, Server: s}
client.authorized = len(s.Config.Password) == 0 client.Authorized = len(s.Config.Password) == 0
client.idleTimer = time.AfterFunc(time.Minute*1, client.quit) client.idleTimer = time.AfterFunc(time.Minute*1, client.quit)
client.channels = map[string]*Channel{} client.channels = map[string]*Channel{}
client.UserModeSet = NewUserModeSet() client.UserModeSet = NewUserModeSet()
@ -84,7 +85,13 @@ func (c *Client) handleIncoming() {
} }
c.idleTimer.Stop() c.idleTimer.Stop()
c.idleTimer = time.AfterFunc(time.Minute*3, c.idle)
if !c.Registered { // if client isn't registered don't bother with PINGs
c.idleTimer = time.AfterFunc(time.Minute*1, c.quit)
} else {
c.idleTimer = time.AfterFunc(time.Minute*3, c.idle)
}
if c.quitTimer != nil { if c.quitTimer != nil {
c.quitTimer.Stop() c.quitTimer.Stop()
c.quitTimer = nil c.quitTimer = nil
@ -124,6 +131,7 @@ func (c *Client) Welcome() {
// Have all client info now // Have all client info now
c.Prefix = &irc.Prefix{Name: c.Nickname, User: c.Name, Host: c.Host} c.Prefix = &irc.Prefix{Name: c.Nickname, User: c.Name, Host: c.Host}
c.Registered = true
m := irc.Message{Prefix: c.Server.Prefix, Command: irc.RPL_WELCOME, m := irc.Message{Prefix: c.Server.Prefix, Command: irc.RPL_WELCOME,
Params: []string{c.Nickname, "Welcome to the Internet Relay Network", c.Prefix.String()}} Params: []string{c.Nickname, "Welcome to the Internet Relay Network", c.Prefix.String()}}