Introduce a user.events channel

This allows to easily add new events, and also guarantees ordering
between different event types.

downstream.go

@@ -227,7 +227,7 @@ func (dc *downstreamConn) isClosed() bool {
 	}
 }
 
-func (dc *downstreamConn) readMessages(ch chan<- downstreamIncomingMessage) error {
+func (dc *downstreamConn) readMessages(ch chan<- event) error {
 	for {
 		msg, err := dc.irc.ReadMessage()
 		if err == io.EOF {
@@ -240,7 +240,7 @@ func (dc *downstreamConn) readMessages(ch chan<- downstreamIncomingMessage) erro
 			dc.logger.Printf("received: %v", msg)
 		}
 
-		ch <- downstreamIncomingMessage{msg, dc}
+		ch <- eventDownstreamMessage{msg, dc}
 	}
 
 	return nil

server.go

@@ -119,7 +119,7 @@ func (s *Server) Serve(ln net.Listener) error {
 			if err := dc.runUntilRegistered(); err != nil {
 				dc.logger.Print(err)
 			} else {
-				if err := dc.readMessages(dc.user.downstreamIncoming); err != nil {
+				if err := dc.readMessages(dc.user.events); err != nil {
 					dc.logger.Print(err)
 				}
 			}

upstream.go

@@ -1167,7 +1167,7 @@ func (uc *upstreamConn) handleCapAck(name string, ok bool) error {
 	return nil
 }
 
-func (uc *upstreamConn) readMessages(ch chan<- upstreamIncomingMessage) error {
+func (uc *upstreamConn) readMessages(ch chan<- event) error {
 	for {
 		msg, err := uc.irc.ReadMessage()
 		if err == io.EOF {
@@ -1180,7 +1180,7 @@ func (uc *upstreamConn) readMessages(ch chan<- upstreamIncomingMessage) error {
 			uc.logger.Printf("received: %v", msg)
 		}
 
-		ch <- upstreamIncomingMessage{msg, uc}
+		ch <- eventUpstreamMessage{msg, uc}
 	}
 
 	return nil

user.go

@@ -7,12 +7,14 @@ import (
 	"gopkg.in/irc.v3"
 )
 
-type upstreamIncomingMessage struct {
+type event interface{}
+
+type eventUpstreamMessage struct {
 	msg *irc.Message
 	uc  *upstreamConn
 }
 
-type downstreamIncomingMessage struct {
+type eventDownstreamMessage struct {
 	msg *irc.Message
 	dc  *downstreamConn
 }
@@ -58,7 +60,7 @@ func (net *network) run() {
 		net.conn = uc
 		net.lock.Unlock()
 
-		if err := uc.readMessages(net.user.upstreamIncoming); err != nil {
+		if err := uc.readMessages(net.user.events); err != nil {
 			uc.logger.Printf("failed to handle messages: %v", err)
 		}
 		uc.Close()
@@ -79,8 +81,7 @@ type user struct {
 	User
 	srv *Server
 
-	upstreamIncoming   chan upstreamIncomingMessage
-	downstreamIncoming chan downstreamIncomingMessage
+	events chan event
 
 	lock            sync.Mutex
 	networks        []*network
@@ -91,8 +92,7 @@ func newUser(srv *Server, record *User) *user {
 	return &user{
 		User:   *record,
 		srv:    srv,
-		upstreamIncoming:   make(chan upstreamIncomingMessage, 64),
-		downstreamIncoming: make(chan downstreamIncomingMessage, 64),
+		events: make(chan event, 64),
 	}
 }
 
@@ -149,10 +149,10 @@ func (u *user) run() {
 	}
 	u.lock.Unlock()
 
-	for {
-		select {
-		case upstreamMsg := <-u.upstreamIncoming:
-			msg, uc := upstreamMsg.msg, upstreamMsg.uc
+	for e := range u.events {
+		switch e := e.(type) {
+		case eventUpstreamMessage:
+			msg, uc := e.msg, e.uc
 			if uc.closed {
 				uc.logger.Printf("ignoring message on closed connection: %v", msg)
 				break
@@ -160,8 +160,8 @@ func (u *user) run() {
 			if err := uc.handleMessage(msg); err != nil {
 				uc.logger.Printf("failed to handle message %q: %v", msg, err)
 			}
-		case downstreamMsg := <-u.downstreamIncoming:
-			msg, dc := downstreamMsg.msg, downstreamMsg.dc
+		case eventDownstreamMessage:
+			msg, dc := e.msg, e.dc
 			if dc.isClosed() {
 				dc.logger.Printf("ignoring message on closed connection: %v", msg)
 				break
@@ -174,6 +174,8 @@ func (u *user) run() {
 				dc.logger.Printf("failed to handle message %q: %v", msg, err)
 				dc.Close()
 			}
+		default:
+			u.srv.Logger.Printf("received unknown event type: %T", e)
 		}
 	}
 }