mirror of
https://github.com/ergochat/ergo.git
synced 2024-11-10 22:19:31 +01:00
simplify Replier
This commit is contained in:
parent
ac186a0669
commit
33b1e6c582
@ -64,10 +64,8 @@ func (channel *Channel) Command(command ChannelCommand) {
|
||||
channel.commands <- command
|
||||
}
|
||||
|
||||
func (channel *Channel) Reply(replies ...Reply) {
|
||||
for _, reply := range replies {
|
||||
func (channel *Channel) Reply(reply Reply) {
|
||||
channel.replies <- reply
|
||||
}
|
||||
}
|
||||
|
||||
func (channel *Channel) receiveCommands(commands <-chan ChannelCommand) {
|
||||
|
@ -181,16 +181,14 @@ func (client *Client) Destroy() {
|
||||
}
|
||||
}
|
||||
|
||||
func (client *Client) Reply(replies ...Reply) {
|
||||
for _, reply := range replies {
|
||||
func (client *Client) Reply(reply Reply) {
|
||||
if client.replies == nil {
|
||||
if DEBUG_CLIENT {
|
||||
log.Printf("%s dropped %s", client, reply)
|
||||
}
|
||||
continue
|
||||
return
|
||||
}
|
||||
client.replies <- reply
|
||||
}
|
||||
}
|
||||
|
||||
func (client *Client) HasNick() bool {
|
||||
|
@ -171,11 +171,10 @@ func (s *Server) tryRegister(c *Client) {
|
||||
if c.HasNick() && c.HasUsername() {
|
||||
c.phase = Normal
|
||||
c.loginTimer.Stop()
|
||||
c.Reply(
|
||||
RplWelcome(s, c),
|
||||
RplYourHost(s),
|
||||
RplCreated(s),
|
||||
RplMyInfo(s))
|
||||
c.Reply(RplWelcome(s, c))
|
||||
c.Reply(RplYourHost(s))
|
||||
c.Reply(RplCreated(s))
|
||||
c.Reply(RplMyInfo(s))
|
||||
s.MOTD(c)
|
||||
}
|
||||
}
|
||||
|
@ -125,7 +125,7 @@ type Identifier interface {
|
||||
}
|
||||
|
||||
type Replier interface {
|
||||
Reply(...Reply)
|
||||
Reply(Reply)
|
||||
}
|
||||
|
||||
type Reply interface {
|
||||
|
Loading…
Reference in New Issue
Block a user