@@ -82,7 +82,7 @@ func (r *Room) HandleMsg(m message.Message) {
8282 user .Send (m )
8383 default :
8484 fromMsg , skip := m .(message.MessageFrom )
85- var skipUser * message. User
85+ var skipUser Member
8686 if skip {
8787 skipUser = fromMsg .From ()
8888 }
@@ -127,28 +127,28 @@ func (r *Room) Send(m message.Message) {
127127}
128128
129129// History feeds the room's recent message history to the user's handler.
130- func (r * Room ) History (u * message. User ) {
131- for _ , m := range r .history .Get (historyLen ) {
132- u .Send (m )
130+ func (r * Room ) History (m Member ) {
131+ for _ , msg := range r .history .Get (historyLen ) {
132+ m .Send (msg )
133133 }
134134}
135135
136136// Join the room as a user, will announce.
137- func (r * Room ) Join (u * message. User ) (* roomMember , error ) {
137+ func (r * Room ) Join (m Member ) (* roomMember , error ) {
138138 // TODO: Check if closed
139- if u .ID () == "" {
139+ if m .ID () == "" {
140140 return nil , ErrInvalidName
141141 }
142142 member := & roomMember {
143- Member : u ,
143+ Member : m ,
144144 Ignored : set .New (),
145145 }
146- err := r .Members .Add (set .Itemize (u .ID (), member ))
146+ err := r .Members .Add (set .Itemize (m .ID (), member ))
147147 if err != nil {
148148 return nil , err
149149 }
150- r .History (u )
151- s := fmt .Sprintf ("%s joined. (Connected: %d)" , u .Name (), r .Members .Len ())
150+ r .History (m )
151+ s := fmt .Sprintf ("%s joined. (Connected: %d)" , m .Name (), r .Members .Len ())
152152 r .Send (message .NewAnnounceMsg (s ))
153153 return member , nil
154154}
0 commit comments