GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-25 21:39:25 +01:00
Code Issues Projects Releases Wiki Activity

don't overwrite base command

Browse Source
This commit is contained in:
Jeremy Latt 2014-02-08 23:51:51 -08:00
parent 04f881a617
commit 55d3d6e946
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
irc/client.go
View File

@ -55,7 +55,7 @@ func (c *Client) readConn(recv <-chan string) {
continue continue
} }
m.SetBase(c) m.SetClient(c)
c.server.commands <- m c.server.commands <- m
} }
} }

6
irc/commands.go
View File

@ -9,7 +9,7 @@ import (
type editableCommand interface { type editableCommand interface {
Command Command
SetBase(*Client) SetClient(*Client)
} }
type parseCommandFunc func([]string) (editableCommand, error) type parseCommandFunc func([]string) (editableCommand, error)
@ -42,8 +42,8 @@ func (command *BaseCommand) Client() *Client {
return command.client return command.client
} }
func (command *BaseCommand) SetBase(c *Client) { func (command *BaseCommand) SetClient(c *Client) {
*command = BaseCommand{c} command.client = c
} }
func (command *BaseCommand) Source() Identifier { func (command *BaseCommand) Source() Identifier {

5
irc/server.go
View File

@ -202,9 +202,8 @@ func (m *JoinCommand) HandleServer(s *Server) {
c := m.Client() c := m.Client()
if m.zero { if m.zero {
cmd := &PartCommand{ cmd := &PartCommand{}
BaseCommand: BaseCommand{c}, cmd.SetClient(c)
}
for channel := range c.channels { for channel := range c.channels {
channel.commands <- cmd channel.commands <- cmd
} }