simplify Replier

irc/channel.go

@@ -64,11 +64,9 @@ 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) {
 	for command := range commands {

irc/client.go

@@ -181,17 +181,15 @@ 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 {
 	return client.nick != ""

irc/server.go

@@ -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)
 	}
 }

irc/types.go

@@ -125,7 +125,7 @@ type Identifier interface {
 }
 
 type Replier interface {
-	Reply(...Reply)
+	Reply(Reply)
 }
 
 type Reply interface {