From a838ee2cadbb3b0919f33d2bc9d1f28ac3415d6d Mon Sep 17 00:00:00 2001
From: Andrey Petrov <andrey.petrov@shazow.net>
Date: Thu, 1 Sep 2016 16:35:09 -0400
Subject: [PATCH] refactor: Remove mentions of message.User from chat.

---
 chat/room.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/chat/room.go b/chat/room.go
index fdc118d..a7a70c0 100644
--- a/chat/room.go
+++ b/chat/room.go
@@ -82,7 +82,7 @@ func (r *Room) HandleMsg(m message.Message) {
 		user.Send(m)
 	default:
 		fromMsg, skip := m.(message.MessageFrom)
-		var skipUser *message.User
+		var skipUser Member
 		if skip {
 			skipUser = fromMsg.From()
 		}
@@ -127,28 +127,28 @@ func (r *Room) Send(m message.Message) {
 }
 
 // History feeds the room's recent message history to the user's handler.
-func (r *Room) History(u *message.User) {
-	for _, m := range r.history.Get(historyLen) {
-		u.Send(m)
+func (r *Room) History(m Member) {
+	for _, msg := range r.history.Get(historyLen) {
+		m.Send(msg)
 	}
 }
 
 // Join the room as a user, will announce.
-func (r *Room) Join(u *message.User) (*roomMember, error) {
+func (r *Room) Join(m Member) (*roomMember, error) {
 	// TODO: Check if closed
-	if u.ID() == "" {
+	if m.ID() == "" {
 		return nil, ErrInvalidName
 	}
 	member := &roomMember{
-		Member:  u,
+		Member:  m,
 		Ignored: set.New(),
 	}
-	err := r.Members.Add(set.Itemize(u.ID(), member))
+	err := r.Members.Add(set.Itemize(m.ID(), member))
 	if err != nil {
 		return nil, err
 	}
-	r.History(u)
-	s := fmt.Sprintf("%s joined. (Connected: %d)", u.Name(), r.Members.Len())
+	r.History(m)
+	s := fmt.Sprintf("%s joined. (Connected: %d)", m.Name(), r.Members.Len())
 	r.Send(message.NewAnnounceMsg(s))
 	return member, nil
 }