From 7b3818acc1cf13cf9fce74bc51a7997482cf8ac8 Mon Sep 17 00:00:00 2001 From: Andrey Petrov Date: Sat, 17 Sep 2016 11:27:11 -0400 Subject: [PATCH] refactor: host.UserMember{chat.Member} -> host.Member{chat.Member} --- client.go | 6 +++--- host.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client.go b/client.go index b43d571..996171a 100644 --- a/client.go +++ b/client.go @@ -10,7 +10,7 @@ import ( ) type client struct { - UserMember + Member sync.Mutex conns []sshd.Connection } @@ -27,7 +27,7 @@ func (cl *client) Close() error { return nil } -type UserMember interface { +type Member interface { chat.Member Joined() time.Time @@ -38,7 +38,7 @@ type UserMember interface { } type User interface { - UserMember + Member Connections() []sshd.Connection Close() error diff --git a/host.go b/host.go index 4bf97b2..9c43599 100644 --- a/host.go +++ b/host.go @@ -77,8 +77,8 @@ func (h *Host) Connect(term *sshd.Terminal) { requestedName := term.Conn.Name() screen := message.BufferedScreen(requestedName, term) user := &client{ - UserMember: screen, - conns: []sshd.Connection{term.Conn}, + Member: screen, + conns: []sshd.Connection{term.Conn}, } h.mu.Lock() @@ -316,7 +316,7 @@ func (h *Host) InitCommands(c *chat.Commands) { return errors.New("must specify message") } - target := msg.From().(UserMember).ReplyTo() + target := msg.From().(Member).ReplyTo() if target == nil { return errors.New("no message to reply to") }