tyler.durden/ssh-chat
1
0
Fork 0
mirror of https://github.com/shazow/ssh-chat.git synced 2025-07-02 19:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Remove mentions of message.User from chat.

Browse Source
This commit is contained in:
Andrey Petrov 2016-09-01 16:35:09 -04:00
parent 4bca1f0294
commit a838ee2cad
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
chat/room.go
View File

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