organize like a proper go package

src/irc/client.go

@@ -1,151 +0,0 @@
-package irc
-
-import (
-	"fmt"
-	"log"
-	"net"
-	"time"
-)
-
-const (
-	DEBUG_CLIENT = false
-)
-
-type ClientCommand interface {
-	Command
-	HandleClient(*Client)
-}
-
-type Client struct {
-	atime      time.Time
-	away       bool
-	channels   ChannelSet
-	commands   chan<- ClientCommand
-	conn       net.Conn
-	hostname   string
-	nick       string
-	realname   string
-	registered bool
-	replies    chan<- Reply
-	server     *Server
-	serverPass bool
-	username   string
-}
-
-type ClientSet map[*Client]bool
-
-func NewClient(server *Server, conn net.Conn) *Client {
-	read := StringReadChan(conn)
-	write := StringWriteChan(conn)
-	commands := make(chan ClientCommand)
-	replies := make(chan Reply)
-
-	client := &Client{
-		channels: make(ChannelSet),
-		commands: commands,
-		conn:     conn,
-		hostname: LookupHostname(conn.RemoteAddr()),
-		replies:  replies,
-		server:   server,
-	}
-
-	go client.readConn(read)
-	go client.writeConn(write, replies)
-	go client.receiveCommands(commands)
-
-	return client
-}
-
-func (c *Client) readConn(recv <-chan string) {
-	for str := range recv {
-		m, err := ParseCommand(str)
-		if err != nil {
-			if err == NotEnoughArgsError {
-				c.replies <- ErrNeedMoreParams(c.server, str)
-			} else {
-				c.replies <- ErrUnknownCommand(c.server, str)
-			}
-			continue
-		}
-
-		m.SetBase(c)
-		c.server.commands <- m
-	}
-}
-
-func (c *Client) writeConn(write chan<- string, replies <-chan Reply) {
-	for reply := range replies {
-		if DEBUG_CLIENT {
-			log.Printf("%s ← %s : %s", c, reply.Source(), reply)
-		}
-		reply.Format(c, write)
-	}
-}
-
-func (client *Client) receiveCommands(commands <-chan ClientCommand) {
-	for command := range commands {
-		if DEBUG_CLIENT {
-			log.Printf("%s → %s : %s", command.Client(), client, command)
-		}
-		command.HandleClient(client)
-	}
-}
-
-func (c *Client) Replies() chan<- Reply {
-	return c.replies
-}
-
-func (c *Client) Server() *Server {
-	return c.server
-}
-
-func (c *Client) Nick() string {
-	if c.HasNick() {
-		return c.nick
-	}
-
-	return "guest"
-}
-
-func (c *Client) UModeString() string {
-	return ""
-}
-
-func (c *Client) HasNick() bool {
-	return c.nick != ""
-}
-
-func (c *Client) HasUsername() bool {
-	return c.username != ""
-}
-
-func (c *Client) Username() string {
-	if c.HasUsername() {
-		return c.username
-	}
-	return "guest"
-}
-
-func (c *Client) UserHost() string {
-	return fmt.Sprintf("%s!%s@%s", c.Nick(), c.Username(), c.hostname)
-}
-
-func (c *Client) Id() string {
-	return c.UserHost()
-}
-
-func (c *Client) String() string {
-	return c.hostname
-}
-
-func (c *Client) PublicId() string {
-	return fmt.Sprintf("%s!%s@%s", c.Nick(), c.Nick(), c.server.Id())
-}
-
-//
-// commands
-//
-
-func (m *PrivMsgCommand) HandleClient(client *Client) {
-	client.replies <- RplPrivMsg(m.Client(), client, m.message)
-}