Merge remote-tracking branch 'origin/master' into cleanup

Conflicts:
	irc/client.go
	irc/commands.go
	irc/constants.go
	irc/reply.go
	irc/server.go
	irc/types.go

irc/channel.go

@@ -3,27 +3,22 @@ package irc
 import (
 	"log"
 	"strconv"
-	"strings"
 )
 
 type Channel struct {
 	flags     ChannelModeSet
 	lists     map[ChannelMode]*UserMaskSet
-	key       string
+	key       Text
 	members   MemberSet
-	name      string
+	name      Name
 	server    *Server
-	topic     string
+	topic     Text
 	userLimit uint64
 }
 
-func IsChannel(target string) bool {
-	return ChannelNameExpr.MatchString(target)
-}
-
 // NewChannel creates a new channel from a `Server` and a `name`
 // string, which must be unique on the server.
-func NewChannel(s *Server, name string) *Channel {
+func NewChannel(s *Server, name Name) *Channel {
 	channel := &Channel{
 		flags: make(ChannelModeSet),
 		lists: map[ChannelMode]*UserMaskSet{
@@ -32,7 +27,7 @@ func NewChannel(s *Server, name string) *Channel {
 			InviteMask: NewUserMaskSet(),
 		},
 		members: make(MemberSet),
-		name:    strings.ToLower(name),
+		name:    name,
 		server:  s,
 	}
 
@@ -73,22 +68,22 @@ func (channel *Channel) Nicks(target *Client) []string {
 				nicks[i] += "+"
 			}
 		}
-		nicks[i] += client.Nick()
+		nicks[i] += client.Nick().String()
 		i += 1
 	}
 	return nicks
 }
 
-func (channel *Channel) Id() string {
+func (channel *Channel) Id() Name {
 	return channel.name
 }
 
-func (channel *Channel) Nick() string {
+func (channel *Channel) Nick() Name {
 	return channel.name
 }
 
 func (channel *Channel) String() string {
-	return channel.Id()
+	return channel.Id().String()
 }
 
 // <mode> <mode params>
@@ -117,7 +112,7 @@ func (channel *Channel) ModeString(client *Client) (str string) {
 	// args for flags with args: The order must match above to keep
 	// positional arguments in place.
 	if showKey {
-		str += " " + channel.key
+		str += " " + channel.key.String()
 	}
 	if showUserLimit {
 		str += " " + strconv.FormatUint(channel.userLimit, 10)
@@ -131,11 +126,11 @@ func (channel *Channel) IsFull() bool {
 		(uint64(len(channel.members)) >= channel.userLimit)
 }
 
-func (channel *Channel) CheckKey(key string) bool {
+func (channel *Channel) CheckKey(key Text) bool {
 	return (channel.key == "") || (channel.key == key)
 }
 
-func (channel *Channel) Join(client *Client, key string) {
+func (channel *Channel) Join(client *Client, key Text) {
 	if channel.members.Has(client) {
 		// already joined, no message?
 		return
@@ -179,7 +174,7 @@ func (channel *Channel) Join(client *Client, key string) {
 	channel.Names(client)
 }
 
-func (channel *Channel) Part(client *Client, message string) {
+func (channel *Channel) Part(client *Client, message Text) {
 	if !channel.members.Has(client) {
 		client.ErrNotOnChannel(channel)
 		return
@@ -207,7 +202,7 @@ func (channel *Channel) GetTopic(client *Client) {
 	client.RplTopic(channel)
 }
 
-func (channel *Channel) SetTopic(client *Client, topic string) {
+func (channel *Channel) SetTopic(client *Client, topic Text) {
 	if !(client.flags[Operator] || channel.members.Has(client)) {
 		client.ErrNotOnChannel(channel)
 		return
@@ -244,7 +239,7 @@ func (channel *Channel) CanSpeak(client *Client) bool {
 	return true
 }
 
-func (channel *Channel) PrivMsg(client *Client, message string) {
+func (channel *Channel) PrivMsg(client *Client, message Text) {
 	if !channel.CanSpeak(client) {
 		client.ErrCannotSendToChan(channel)
 		return
@@ -283,7 +278,7 @@ func (channel *Channel) applyModeFlag(client *Client, mode ChannelMode,
 }
 
 func (channel *Channel) applyModeMember(client *Client, mode ChannelMode,
-	op ModeOp, nick string) bool {
+	op ModeOp, nick Name) bool {
 	if !channel.ClientIsOperator(client) {
 		client.ErrChanOPrivIsNeeded(channel)
 		return false
@@ -331,7 +326,7 @@ func (channel *Channel) ShowMaskList(client *Client, mode ChannelMode) {
 }
 
 func (channel *Channel) applyModeMask(client *Client, mode ChannelMode, op ModeOp,
-	mask string) bool {
+	mask Name) bool {
 	list := channel.lists[mode]
 	if list == nil {
 		// This should never happen, but better safe than panicky.
@@ -362,7 +357,8 @@ func (channel *Channel) applyModeMask(client *Client, mode ChannelMode, op ModeO
 func (channel *Channel) applyMode(client *Client, change *ChannelModeChange) bool {
 	switch change.mode {
 	case BanMask, ExceptMask, InviteMask:
-		return channel.applyModeMask(client, change.mode, change.op, change.arg)
+		return channel.applyModeMask(client, change.mode, change.op,
+			NewName(change.arg))
 
 	case InviteOnly, Moderated, NoOutside, OpOnlyTopic, Persistent, Private:
 		return channel.applyModeFlag(client, change.mode, change.op)
@@ -379,11 +375,12 @@ func (channel *Channel) applyMode(client *Client, change *ChannelModeChange) boo
 				client.ErrNeedMoreParams("MODE")
 				return false
 			}
-			if change.arg == channel.key {
+			key := NewText(change.arg)
+			if key == channel.key {
 				return false
 			}
 
-			channel.key = change.arg
+			channel.key = key
 			return true
 
 		case Remove:
@@ -405,7 +402,8 @@ func (channel *Channel) applyMode(client *Client, change *ChannelModeChange) boo
 		return true
 
 	case ChannelOperator, Voice:
-		return channel.applyModeMember(client, change.mode, change.op, change.arg)
+		return channel.applyModeMember(client, change.mode, change.op,
+			NewName(change.arg))
 
 	default:
 		client.ErrUnknownMode(change.mode, channel)
@@ -456,7 +454,7 @@ func (channel *Channel) Persist() (err error) {
 	return
 }
 
-func (channel *Channel) Notice(client *Client, message string) {
+func (channel *Channel) Notice(client *Client, message Text) {
 	if !channel.CanSpeak(client) {
 		client.ErrCannotSendToChan(channel)
 		return
@@ -478,7 +476,7 @@ func (channel *Channel) Quit(client *Client) {
 	}
 }
 
-func (channel *Channel) Kick(client *Client, target *Client, comment string) {
+func (channel *Channel) Kick(client *Client, target *Client, comment Text) {
 	if !(client.flags[Operator] || channel.members.Has(client)) {
 		client.ErrNotOnChannel(channel)
 		return

irc/client.go

@@ -12,14 +12,10 @@ const (
 	QUIT_TIMEOUT  = time.Minute     // how long after idle before a client is kicked
 )
 
-func IsNickname(nick string) bool {
-	return NicknameExpr.MatchString(nick)
-}
-
 type Client struct {
 	atime        time.Time
 	authorized   bool
-	awayMessage  string
+	awayMessage  Text
 	capabilities CapabilitySet
 	capState     CapState
 	channels     ChannelSet
@@ -28,16 +24,16 @@ type Client struct {
 	flags        map[UserMode]bool
 	hasQuit      bool
 	hops         uint
-	hostname     string
+	hostname     Name
 	idleTimer    *time.Timer
 	loginTimer   *time.Timer
-	nick         string
+	nick         Name
 	quitTimer    *time.Timer
-	realname     string
+	realname     Text
 	registered   bool
 	server       *Server
 	socket       *Socket
-	username     string
+	username     Name
 }
 
 func NewClient(server *Server, conn net.Conn) *Client {
@@ -191,27 +187,27 @@ func (c *Client) ModeString() (str string) {
 	return
 }
 
-func (c *Client) UserHost() string {
+func (c *Client) UserHost() Name {
 	username := "*"
 	if c.HasUsername() {
-		username = c.username
+		username = c.username.String()
 	}
-	return fmt.Sprintf("%s!%s@%s", c.Nick(), username, c.hostname)
+	return Name(fmt.Sprintf("%s!%s@%s", c.Nick(), username, c.hostname))
 }
 
-func (c *Client) Nick() string {
+func (c *Client) Nick() Name {
 	if c.HasNick() {
 		return c.nick
 	}
-	return "*"
+	return Name("*")
 }
 
-func (c *Client) Id() string {
+func (c *Client) Id() Name {
 	return c.UserHost()
 }
 
 func (c *Client) String() string {
-	return c.Id()
+	return c.Id().String()
 }
 
 func (client *Client) Friends() ClientSet {
@@ -225,12 +221,12 @@ func (client *Client) Friends() ClientSet {
 	return friends
 }
 
-func (client *Client) SetNickname(nickname string) {
+func (client *Client) SetNickname(nickname Name) {
 	client.nick = nickname
 	client.server.clients.Add(client)
 }
 
-func (client *Client) ChangeNickname(nickname string) {
+func (client *Client) ChangeNickname(nickname Name) {
 	// Make reply before changing nick to capture original source id.
 	reply := RplNick(client, nickname)
 	client.server.clients.Remove(client)
@@ -249,7 +245,7 @@ func (client *Client) Reply(reply string, args ...interface{}) {
 	client.socket.Write(reply)
 }
 
-func (client *Client) Quit(message string) {
+func (client *Client) Quit(message Text) {
 	if client.hasQuit {
 		return
 	}

irc/client_lookup_set.go

@@ -25,36 +25,36 @@ func HasWildcards(mask string) bool {
 	return wildMaskExpr.MatchString(mask)
 }
 
-func ExpandUserHost(userhost string) (expanded string) {
+func ExpandUserHost(userhost Name) (expanded Name) {
 	expanded = userhost
 	// fill in missing wildcards for nicks
-	if !strings.Contains(expanded, "!") {
+	if !strings.Contains(expanded.String(), "!") {
 		expanded += "!*"
 	}
-	if !strings.Contains(expanded, "@") {
+	if !strings.Contains(expanded.String(), "@") {
 		expanded += "@*"
 	}
 	return
 }
 
-func QuoteLike(userhost string) string {
-	return likeQuoter.Replace(userhost)
+func QuoteLike(userhost Name) Name {
+	return Name(likeQuoter.Replace(userhost.String()))
 }
 
 type ClientLookupSet struct {
-	byNick map[string]*Client
+	byNick map[Name]*Client
 	db     *ClientDB
 }
 
 func NewClientLookupSet() *ClientLookupSet {
 	return &ClientLookupSet{
-		byNick: make(map[string]*Client),
+		byNick: make(map[Name]*Client),
 		db:     NewClientDB(),
 	}
 }
 
-func (clients *ClientLookupSet) Get(nick string) *Client {
-	return clients.byNick[strings.ToLower(nick)]
+func (clients *ClientLookupSet) Get(nick Name) *Client {
+	return clients.byNick[nick.ToLower()]
 }
 
 func (clients *ClientLookupSet) Add(client *Client) error {
@@ -64,7 +64,7 @@ func (clients *ClientLookupSet) Add(client *Client) error {
 	if clients.Get(client.nick) != nil {
 		return ErrNicknameInUse
 	}
-	clients.byNick[strings.ToLower(client.nick)] = client
+	clients.byNick[client.Nick().ToLower()] = client
 	clients.db.Add(client)
 	return nil
 }
@@ -76,12 +76,12 @@ func (clients *ClientLookupSet) Remove(client *Client) error {
 	if clients.Get(client.nick) != client {
 		return ErrNicknameMismatch
 	}
-	delete(clients.byNick, strings.ToLower(client.nick))
+	delete(clients.byNick, client.nick.ToLower())
 	clients.db.Remove(client)
 	return nil
 }
 
-func (clients *ClientLookupSet) FindAll(userhost string) (set ClientSet) {
+func (clients *ClientLookupSet) FindAll(userhost Name) (set ClientSet) {
 	userhost = ExpandUserHost(userhost)
 	set = make(ClientSet)
 	rows, err := clients.db.db.Query(
@@ -92,7 +92,7 @@ func (clients *ClientLookupSet) FindAll(userhost string) (set ClientSet) {
 		return
 	}
 	for rows.Next() {
-		var nickname string
+		var nickname Name
 		err := rows.Scan(&nickname)
 		if err != nil {
 			Log.error.Println("ClientLookupSet.FindAll.Scan:", err)
@@ -108,12 +108,12 @@ func (clients *ClientLookupSet) FindAll(userhost string) (set ClientSet) {
 	return
 }
 
-func (clients *ClientLookupSet) Find(userhost string) *Client {
+func (clients *ClientLookupSet) Find(userhost Name) *Client {
 	userhost = ExpandUserHost(userhost)
 	row := clients.db.db.QueryRow(
 		`SELECT nickname FROM client WHERE userhost LIKE ? ESCAPE '\' LIMIT 1`,
 		QuoteLike(userhost))
-	var nickname string
+	var nickname Name
 	err := row.Scan(&nickname)
 	if err != nil {
 		Log.error.Println("ClientLookupSet.Find:", err)
@@ -172,17 +172,17 @@ func (db *ClientDB) Remove(client *Client) {
 //
 
 type UserMaskSet struct {
-	masks  map[string]bool
+	masks  map[Name]bool
 	regexp *regexp.Regexp
 }
 
 func NewUserMaskSet() *UserMaskSet {
 	return &UserMaskSet{
-		masks: make(map[string]bool),
+		masks: make(map[Name]bool),
 	}
 }
 
-func (set *UserMaskSet) Add(mask string) bool {
+func (set *UserMaskSet) Add(mask Name) bool {
 	if set.masks[mask] {
 		return false
 	}
@@ -191,7 +191,7 @@ func (set *UserMaskSet) Add(mask string) bool {
 	return true
 }
 
-func (set *UserMaskSet) AddAll(masks []string) (added bool) {
+func (set *UserMaskSet) AddAll(masks []Name) (added bool) {
 	for _, mask := range masks {
 		if !added && !set.masks[mask] {
 			added = true
@@ -202,7 +202,7 @@ func (set *UserMaskSet) AddAll(masks []string) (added bool) {
 	return
 }
 
-func (set *UserMaskSet) Remove(mask string) bool {
+func (set *UserMaskSet) Remove(mask Name) bool {
 	if !set.masks[mask] {
 		return false
 	}
@@ -211,18 +211,18 @@ func (set *UserMaskSet) Remove(mask string) bool {
 	return true
 }
 
-func (set *UserMaskSet) Match(userhost string) bool {
+func (set *UserMaskSet) Match(userhost Name) bool {
 	if set.regexp == nil {
 		return false
 	}
-	return set.regexp.MatchString(userhost)
+	return set.regexp.MatchString(userhost.String())
 }
 
 func (set *UserMaskSet) String() string {
 	masks := make([]string, len(set.masks))
 	index := 0
 	for mask := range set.masks {
-		masks[index] = mask
+		masks[index] = mask.String()
 		index += 1
 	}
 	return strings.Join(masks, " ")
@@ -243,7 +243,7 @@ func (set *UserMaskSet) setRegexp() {
 	maskExprs := make([]string, len(set.masks))
 	index := 0
 	for mask := range set.masks {
-		manyParts := strings.Split(mask, "*")
+		manyParts := strings.Split(mask.String(), "*")
 		manyExprs := make([]string, len(manyParts))
 		for mindex, manyPart := range manyParts {
 			oneParts := strings.Split(manyPart, "?")

irc/commands.go

@@ -1,7 +1,6 @@
 package irc
 
 import (
-	"code.google.com/p/go.text/unicode/norm"
 	"errors"
 	"fmt"
 	"regexp"
@@ -115,14 +114,14 @@ func ParseLine(line string) (command StringCode, args []string) {
 		_, line = splitArg(line)
 	}
 	arg, line := splitArg(line)
-	command = StringCode(strings.ToUpper(arg))
+	command = StringCode(NewName(strings.ToUpper(arg)))
 	for len(line) > 0 {
 		if strings.HasPrefix(line, ":") {
-			args = append(args, norm.NFC.String(line[len(":"):]))
+			args = append(args, line[len(":"):])
 			break
 		}
 		arg, line = splitArg(line)
-		args = append(args, norm.NFKC.String(arg))
+		args = append(args, arg)
 	}
 	return
 }
@@ -148,8 +147,8 @@ func NewUnknownCommand(args []string) *UnknownCommand {
 
 type PingCommand struct {
 	BaseCommand
-	server  string
-	server2 string
+	server  Name
+	server2 Name
 }
 
 func (cmd *PingCommand) String() string {
@@ -161,10 +160,10 @@ func NewPingCommand(args []string) (Command, error) {
 		return nil, NotEnoughArgsError
 	}
 	msg := &PingCommand{
-		server: args[0],
+		server: NewName(args[0]),
 	}
 	if len(args) > 1 {
-		msg.server2 = args[1]
+		msg.server2 = NewName(args[1])
 	}
 	return msg, nil
 }
@@ -173,8 +172,8 @@ func NewPingCommand(args []string) (Command, error) {
 
 type PongCommand struct {
 	BaseCommand
-	server1 string
-	server2 string
+	server1 Name
+	server2 Name
 }
 
 func (cmd *PongCommand) String() string {
@@ -186,10 +185,10 @@ func NewPongCommand(args []string) (Command, error) {
 		return nil, NotEnoughArgsError
 	}
 	message := &PongCommand{
-		server1: args[0],
+		server1: NewName(args[0]),
 	}
 	if len(args) > 1 {
-		message.server2 = args[1]
+		message.server2 = NewName(args[1])
 	}
 	return message, nil
 }
@@ -231,7 +230,7 @@ func NewPassCommand(args []string) (Command, error) {
 
 type NickCommand struct {
 	BaseCommand
-	nickname string
+	nickname Name
 }
 
 func (m *NickCommand) String() string {
@@ -243,21 +242,21 @@ func NewNickCommand(args []string) (Command, error) {
 		return nil, NotEnoughArgsError
 	}
 	return &NickCommand{
-		nickname: args[0],
+		nickname: NewName(args[0]),
 	}, nil
 }
 
 type UserCommand struct {
 	BaseCommand
-	username string
-	realname string
+	username Name
+	realname Text
 }
 
 // USER <username> <hostname> <servername> <realname>
 type RFC1459UserCommand struct {
 	UserCommand
-	hostname   string
-	servername string
+	hostname   Name
+	servername Name
 }
 
 func (cmd *RFC1459UserCommand) String() string {
@@ -298,17 +297,17 @@ func NewUserCommand(args []string) (Command, error) {
 			mode:   uint8(mode),
 			unused: args[2],
 		}
-		msg.username = args[0]
-		msg.realname = args[3]
+		msg.username = NewName(args[0])
+		msg.realname = NewText(args[3])
 		return msg, nil
 	}
 
 	msg := &RFC1459UserCommand{
-		hostname:   args[1],
-		servername: args[2],
+		hostname:   NewName(args[1]),
+		servername: NewName(args[2]),
 	}
-	msg.username = args[0]
-	msg.realname = args[3]
+	msg.username = NewName(args[0])
+	msg.realname = NewText(args[3])
 	return msg, nil
 }
 
@@ -316,7 +315,7 @@ func NewUserCommand(args []string) (Command, error) {
 
 type QuitCommand struct {
 	BaseCommand
-	message string
+	message Text
 }
 
 func (cmd *QuitCommand) String() string {
@@ -326,7 +325,7 @@ func (cmd *QuitCommand) String() string {
 func NewQuitCommand(args []string) (Command, error) {
 	msg := &QuitCommand{}
 	if len(args) > 0 {
-		msg.message = args[0]
+		msg.message = NewText(args[0])
 	}
 	return msg, nil
 }
@@ -335,7 +334,7 @@ func NewQuitCommand(args []string) (Command, error) {
 
 type JoinCommand struct {
 	BaseCommand
-	channels map[string]string
+	channels map[Name]Text
 	zero     bool
 }
 
@@ -345,7 +344,7 @@ func (cmd *JoinCommand) String() string {
 
 func NewJoinCommand(args []string) (Command, error) {
 	msg := &JoinCommand{
-		channels: make(map[string]string),
+		channels: make(map[Name]Text),
 	}
 
 	if len(args) == 0 {
@@ -365,7 +364,7 @@ func NewJoinCommand(args []string) (Command, error) {
 		}
 	}
 	for i, channel := range channels {
-		msg.channels[channel] = keys[i]
+		msg.channels[NewName(channel)] = NewText(keys[i])
 	}
 
 	return msg, nil
@@ -375,13 +374,13 @@ func NewJoinCommand(args []string) (Command, error) {
 
 type PartCommand struct {
 	BaseCommand
-	channels []string
-	message  string
+	channels []Name
+	message  Text
 }
 
-func (cmd *PartCommand) Message() string {
+func (cmd *PartCommand) Message() Text {
 	if cmd.message == "" {
-		return cmd.Client().Nick()
+		return cmd.Client().Nick().Text()
 	}
 	return cmd.message
 }
@@ -395,10 +394,10 @@ func NewPartCommand(args []string) (Command, error) {
 		return nil, NotEnoughArgsError
 	}
 	msg := &PartCommand{
-		channels: strings.Split(args[0], ","),
+		channels: NewNames(strings.Split(args[0], ",")),
 	}
 	if len(args) > 1 {
-		msg.message = args[1]
+		msg.message = NewText(args[1])
 	}
 	return msg, nil
 }
@@ -407,8 +406,8 @@ func NewPartCommand(args []string) (Command, error) {
 
 type PrivMsgCommand struct {
 	BaseCommand
-	target  string
-	message string
+	target  Name
+	message Text
 }
 
 func (cmd *PrivMsgCommand) String() string {
@@ -420,8 +419,8 @@ func NewPrivMsgCommand(args []string) (Command, error) {
 		return nil, NotEnoughArgsError
 	}
 	return &PrivMsgCommand{
-		target:  args[0],
-		message: args[1],
+		target:  NewName(args[0]),
+		message: NewText(args[1]),
 	}, nil
 }
 
@@ -429,9 +428,9 @@ func NewPrivMsgCommand(args []string) (Command, error) {
 
 type TopicCommand struct {
 	BaseCommand
-	channel  string
+	channel  Name
 	setTopic bool
-	topic    string
+	topic    Text
 }
 
 func (cmd *TopicCommand) String() string {
@@ -443,11 +442,11 @@ func NewTopicCommand(args []string) (Command, error) {
 		return nil, NotEnoughArgsError
 	}
 	msg := &TopicCommand{
-		channel: args[0],
+		channel: NewName(args[0]),
 	}
 	if len(args) > 1 {
 		msg.setTopic = true
-		msg.topic = args[1]
+		msg.topic = NewText(args[1])
 	}
 	return msg, nil
 }
@@ -483,18 +482,18 @@ func (changes ModeChanges) String() string {
 
 type ModeCommand struct {
 	BaseCommand
-	nickname string
+	nickname Name
 	changes  ModeChanges
 }
 
 // MODE <nickname> *( ( "+" / "-" ) *( "i" / "w" / "o" / "O" / "r" ) )
-func NewUserModeCommand(args []string) (Command, error) {
+func NewUserModeCommand(nickname Name, args []string) (Command, error) {
 	cmd := &ModeCommand{
-		nickname: args[0],
+		nickname: nickname,
 		changes:  make(ModeChanges, 0),
 	}
 
-	for _, modeChange := range args[1:] {
+	for _, modeChange := range args {
 		if len(modeChange) == 0 {
 			continue
 		}
@@ -560,17 +559,16 @@ func (changes ChannelModeChanges) String() (str string) {
 
 type ChannelModeCommand struct {
 	BaseCommand
-	channel string
+	channel Name
 	changes ChannelModeChanges
 }
 
 // MODE <channel> *( ( "-" / "+" ) *<modes> *<modeparams> )
-func NewChannelModeCommand(args []string) (Command, error) {
+func NewChannelModeCommand(channel Name, args []string) (Command, error) {
 	cmd := &ChannelModeCommand{
-		channel: args[0],
+		channel: channel,
 		changes: make(ChannelModeChanges, 0),
 	}
-	args = args[1:]
 
 	for len(args) > 0 {
 		if len(args[0]) == 0 {
@@ -617,17 +615,18 @@ func NewModeCommand(args []string) (Command, error) {
 		return nil, NotEnoughArgsError
 	}
 
-	if IsChannel(args[0]) {
-		return NewChannelModeCommand(args)
+	name := NewName(args[0])
+	if name.IsChannel() {
+		return NewChannelModeCommand(name, args[1:])
 	} else {
-		return NewUserModeCommand(args)
+		return NewUserModeCommand(name, args[1:])
 	}
 }
 
 type WhoisCommand struct {
 	BaseCommand
-	target string
-	masks  []string
+	target Name
+	masks  []Name
 }
 
 // WHOIS [ <target> ] <mask> *( "," <mask> )
@@ -647,8 +646,8 @@ func NewWhoisCommand(args []string) (Command, error) {
 	}
 
 	return &WhoisCommand{
-		target: target,
-		masks:  strings.Split(masks, ","),
+		target: NewName(target),
+		masks:  NewNames(strings.Split(masks, ",")),
 	}, nil
 }
 
@@ -658,7 +657,7 @@ func (msg *WhoisCommand) String() string {
 
 type WhoCommand struct {
 	BaseCommand
-	mask         string
+	mask         Name
 	operatorOnly bool
 }
 
@@ -667,7 +666,7 @@ func NewWhoCommand(args []string) (Command, error) {
 	cmd := &WhoCommand{}
 
 	if len(args) > 0 {
-		cmd.mask = args[0]
+		cmd.mask = NewName(args[0])
 	}
 
 	if (len(args) > 1) && (args[1] == "o") {
@@ -683,7 +682,7 @@ func (msg *WhoCommand) String() string {
 
 type OperCommand struct {
 	PassCommand
-	name string
+	name Name
 }
 
 func (msg *OperCommand) String() string {
@@ -701,7 +700,7 @@ func NewOperCommand(args []string) (Command, error) {
 	}
 
 	cmd := &OperCommand{
-		name: args[0],
+		name: NewName(args[0]),
 	}
 	cmd.password = []byte(args[1])
 	return cmd, nil
@@ -740,12 +739,12 @@ func NewCapCommand(args []string) (Command, error) {
 // HAPROXY support
 type ProxyCommand struct {
 	BaseCommand
-	net        string
-	sourceIP   string
-	destIP     string
-	sourcePort string
-	destPort   string
-	hostname   string // looked up in socket thread
+	net        Name
+	sourceIP   Name
+	destIP     Name
+	sourcePort Name
+	destPort   Name
+	hostname   Name // looked up in socket thread
 }
 
 func (msg *ProxyCommand) String() string {
@@ -757,18 +756,18 @@ func NewProxyCommand(args []string) (Command, error) {
 		return nil, NotEnoughArgsError
 	}
 	return &ProxyCommand{
-		net:        args[0],
-		sourceIP:   args[1],
-		destIP:     args[2],
-		sourcePort: args[3],
-		destPort:   args[4],
-		hostname:   LookupHostname(args[1]),
+		net:        NewName(args[0]),
+		sourceIP:   NewName(args[1]),
+		destIP:     NewName(args[2]),
+		sourcePort: NewName(args[3]),
+		destPort:   NewName(args[4]),
+		hostname:   LookupHostname(NewName(args[1])),
 	}, nil
 }
 
 type AwayCommand struct {
 	BaseCommand
-	text string
+	text Text
 	away bool
 }
 
@@ -780,7 +779,7 @@ func NewAwayCommand(args []string) (Command, error) {
 	cmd := &AwayCommand{}
 
 	if len(args) > 0 {
-		cmd.text = args[0]
+		cmd.text = NewText(args[0])
 		cmd.away = true
 	}
 
@@ -789,7 +788,7 @@ func NewAwayCommand(args []string) (Command, error) {
 
 type IsOnCommand struct {
 	BaseCommand
-	nicks []string
+	nicks []Name
 }
 
 func (msg *IsOnCommand) String() string {
@@ -802,27 +801,27 @@ func NewIsOnCommand(args []string) (Command, error) {
 	}
 
 	return &IsOnCommand{
-		nicks: args,
+		nicks: NewNames(args),
 	}, nil
 }
 
 type MOTDCommand struct {
 	BaseCommand
-	target string
+	target Name
 }
 
 func NewMOTDCommand(args []string) (Command, error) {
 	cmd := &MOTDCommand{}
 	if len(args) > 0 {
-		cmd.target = args[0]
+		cmd.target = NewName(args[0])
 	}
 	return cmd, nil
 }
 
 type NoticeCommand struct {
 	BaseCommand
-	target  string
-	message string
+	target  Name
+	message Text
 }
 
 func (cmd *NoticeCommand) String() string {
@@ -834,20 +833,20 @@ func NewNoticeCommand(args []string) (Command, error) {
 		return nil, NotEnoughArgsError
 	}
 	return &NoticeCommand{
-		target:  args[0],
-		message: args[1],
+		target:  NewName(args[0]),
+		message: NewText(args[1]),
 	}, nil
 }
 
 type KickCommand struct {
 	BaseCommand
-	kicks   map[string]string
-	comment string
+	kicks   map[Name]Name
+	comment Text
 }
 
-func (msg *KickCommand) Comment() string {
+func (msg *KickCommand) Comment() Text {
 	if msg.comment == "" {
-		return msg.Client().Nick()
+		return msg.Client().Nick().Text()
 	}
 	return msg.comment
 }
@@ -856,13 +855,13 @@ func NewKickCommand(args []string) (Command, error) {
 	if len(args) < 2 {
 		return nil, NotEnoughArgsError
 	}
-	channels := strings.Split(args[0], ",")
-	users := strings.Split(args[1], ",")
+	channels := NewNames(strings.Split(args[0], ","))
+	users := NewNames(strings.Split(args[1], ","))
 	if (len(channels) != len(users)) && (len(users) != 1) {
 		return nil, NotEnoughArgsError
 	}
 	cmd := &KickCommand{
-		kicks: make(map[string]string),
+		kicks: make(map[Name]Name),
 	}
 	for index, channel := range channels {
 		if len(users) == 1 {
@@ -872,48 +871,48 @@ func NewKickCommand(args []string) (Command, error) {
 		}
 	}
 	if len(args) > 2 {
-		cmd.comment = args[2]
+		cmd.comment = NewText(args[2])
 	}
 	return cmd, nil
 }
 
 type ListCommand struct {
 	BaseCommand
-	channels []string
-	target   string
+	channels []Name
+	target   Name
 }
 
 func NewListCommand(args []string) (Command, error) {
 	cmd := &ListCommand{}
 	if len(args) > 0 {
-		cmd.channels = strings.Split(args[0], ",")
+		cmd.channels = NewNames(strings.Split(args[0], ","))
 	}
 	if len(args) > 1 {
-		cmd.target = args[1]
+		cmd.target = NewName(args[1])
 	}
 	return cmd, nil
 }
 
 type NamesCommand struct {
 	BaseCommand
-	channels []string
-	target   string
+	channels []Name
+	target   Name
 }
 
 func NewNamesCommand(args []string) (Command, error) {
 	cmd := &NamesCommand{}
 	if len(args) > 0 {
-		cmd.channels = strings.Split(args[0], ",")
+		cmd.channels = NewNames(strings.Split(args[0], ","))
 	}
 	if len(args) > 1 {
-		cmd.target = args[1]
+		cmd.target = NewName(args[1])
 	}
 	return cmd, nil
 }
 
 type DebugCommand struct {
 	BaseCommand
-	subCommand string
+	subCommand Name
 }
 
 func NewDebugCommand(args []string) (Command, error) {
@@ -922,27 +921,27 @@ func NewDebugCommand(args []string) (Command, error) {
 	}
 
 	return &DebugCommand{
-		subCommand: strings.ToUpper(args[0]),
+		subCommand: NewName(strings.ToUpper(args[0])),
 	}, nil
 }
 
 type VersionCommand struct {
 	BaseCommand
-	target string
+	target Name
 }
 
 func NewVersionCommand(args []string) (Command, error) {
 	cmd := &VersionCommand{}
 	if len(args) > 0 {
-		cmd.target = args[0]
+		cmd.target = NewName(args[0])
 	}
 	return cmd, nil
 }
 
 type InviteCommand struct {
 	BaseCommand
-	nickname string
-	channel  string
+	nickname Name
+	channel  Name
 }
 
 func NewInviteCommand(args []string) (Command, error) {
@@ -951,28 +950,28 @@ func NewInviteCommand(args []string) (Command, error) {
 	}
 
 	return &InviteCommand{
-		nickname: args[0],
-		channel:  args[1],
+		nickname: NewName(args[0]),
+		channel:  NewName(args[1]),
 	}, nil
 }
 
 type TimeCommand struct {
 	BaseCommand
-	target string
+	target Name
 }
 
 func NewTimeCommand(args []string) (Command, error) {
 	cmd := &TimeCommand{}
 	if len(args) > 0 {
-		cmd.target = args[0]
+		cmd.target = NewName(args[0])
 	}
 	return cmd, nil
 }
 
 type KillCommand struct {
 	BaseCommand
-	nickname string
-	comment  string
+	nickname Name
+	comment  Text
 }
 
 func NewKillCommand(args []string) (Command, error) {
@@ -980,16 +979,16 @@ func NewKillCommand(args []string) (Command, error) {
 		return nil, NotEnoughArgsError
 	}
 	return &KillCommand{
-		nickname: args[0],
-		comment:  args[1],
+		nickname: NewName(args[0]),
+		comment:  NewText(args[1]),
 	}, nil
 }
 
 type WhoWasCommand struct {
 	BaseCommand
-	nicknames []string
+	nicknames []Name
 	count     int64
-	target    string
+	target    Name
 }
 
 func NewWhoWasCommand(args []string) (Command, error) {
@@ -997,13 +996,13 @@ func NewWhoWasCommand(args []string) (Command, error) {
 		return nil, NotEnoughArgsError
 	}
 	cmd := &WhoWasCommand{
-		nicknames: strings.Split(args[0], ","),
+		nicknames: NewNames(strings.Split(args[0], ",")),
 	}
 	if len(args) > 1 {
 		cmd.count, _ = strconv.ParseInt(args[1], 10, 64)
 	}
 	if len(args) > 2 {
-		cmd.target = args[2]
+		cmd.target = NewName(args[2])
 	}
 	return cmd, nil
 }

irc/config.go

@@ -31,10 +31,10 @@ type Config struct {
 	Operator map[string]*PassConfig
 }
 
-func (conf *Config) Operators() map[string][]byte {
-	operators := make(map[string][]byte)
+func (conf *Config) Operators() map[Name][]byte {
+	operators := make(map[Name][]byte)
 	for name, opConf := range conf.Operator {
-		operators[name] = opConf.PasswordBytes()
+		operators[NewName(name)] = opConf.PasswordBytes()
 	}
 	return operators
 }

irc/constants.go

@@ -2,17 +2,11 @@ package irc
 
 import (
 	"errors"
-	"regexp"
 )
 
 var (
 	// errors
 	ErrAlreadyDestroyed = errors.New("already destroyed")
-
-	// regexps
-	ChannelNameExpr = regexp.MustCompile(`^[&!#+][\pL\pN]{1,63}$`)
-	NicknameExpr    = regexp.MustCompile(
-		"^[\\pL\\pN\\pP\\pS]{1,32}$")
 )
 
 const (

irc/net.go

@@ -5,25 +5,25 @@ import (
 	"strings"
 )
 
-func IPString(addr net.Addr) string {
+func IPString(addr net.Addr) Name {
 	addrStr := addr.String()
 	ipaddr, _, err := net.SplitHostPort(addrStr)
 	if err != nil {
-		return addrStr
+		return Name(addrStr)
 	}
-	return ipaddr
+	return Name(ipaddr)
 }
 
-func AddrLookupHostname(addr net.Addr) string {
+func AddrLookupHostname(addr net.Addr) Name {
 	return LookupHostname(IPString(addr))
 }
 
-func LookupHostname(addr string) string {
-	names, err := net.LookupAddr(addr)
+func LookupHostname(addr Name) Name {
+	names, err := net.LookupAddr(addr.String())
 	if err != nil {
-		return addr
+		return Name(addr)
 	}
 
 	hostname := strings.TrimSuffix(names[0], ".")
-	return hostname
+	return Name(hostname)
 }

irc/reply.go

@@ -95,23 +95,23 @@ func (target *Client) MultilineReply(names []string, code NumericCode, format st
 // messaging replies
 //
 
-func RplPrivMsg(source Identifiable, target Identifiable, message string) string {
+func RplPrivMsg(source Identifiable, target Identifiable, message Text) string {
 	return NewStringReply(source, PRIVMSG, "%s :%s", target.Nick(), message)
 }
 
-func RplNotice(source Identifiable, target Identifiable, message string) string {
+func RplNotice(source Identifiable, target Identifiable, message Text) string {
 	return NewStringReply(source, NOTICE, "%s :%s", target.Nick(), message)
 }
 
-func RplNick(source Identifiable, newNick string) string {
-	return NewStringReply(source, NICK, newNick)
+func RplNick(source Identifiable, newNick Name) string {
+	return NewStringReply(source, NICK, newNick.String())
 }
 
 func RplJoin(client *Client, channel *Channel) string {
-	return NewStringReply(client, JOIN, channel.name)
+	return NewStringReply(client, JOIN, channel.name.String())
 }
 
-func RplPart(client *Client, channel *Channel, message string) string {
+func RplPart(client *Client, channel *Channel, message Text) string {
 	return NewStringReply(client, PART, "%s :%s", channel, message)
 }
 
@@ -133,10 +133,10 @@ func RplPing(target Identifiable) string {
 }
 
 func RplPong(client *Client) string {
-	return NewStringReply(nil, PONG, client.Nick())
+	return NewStringReply(nil, PONG, client.Nick().String())
 }
 
-func RplQuit(client *Client, message string) string {
+func RplQuit(client *Client, message Text) string {
 	return NewStringReply(client, QUIT, ":%s", message)
 }
 
@@ -144,16 +144,16 @@ func RplError(message string) string {
 	return NewStringReply(nil, ERROR, ":%s", message)
 }
 
-func RplInviteMsg(inviter *Client, invitee *Client, channel string) string {
+func RplInviteMsg(inviter *Client, invitee *Client, channel Name) string {
 	return NewStringReply(inviter, INVITE, "%s :%s", invitee.Nick(), channel)
 }
 
-func RplKick(channel *Channel, client *Client, target *Client, comment string) string {
+func RplKick(channel *Channel, client *Client, target *Client, comment Text) string {
 	return NewStringReply(client, KICK, "%s %s :%s",
 		channel, target.Nick(), comment)
 }
 
-func RplKill(client *Client, target *Client, comment string) string {
+func RplKill(client *Client, target *Client, comment Text) string {
 	return NewStringReply(client, KICK,
 		"%s :%s", target.Nick(), comment)
 }
@@ -200,7 +200,7 @@ func (target *Client) RplTopic(channel *Channel) {
 
 // <nick> <channel>
 // NB: correction in errata
-func (target *Client) RplInvitingMsg(invitee *Client, channel string) {
+func (target *Client) RplInvitingMsg(invitee *Client, channel Name) {
 	target.NumericReply(RPL_INVITING,
 		"%s %s", invitee.Nick(), channel)
 }
@@ -269,7 +269,7 @@ func (target *Client) RplWhoReply(channel *Channel, client *Client) {
 	}
 
 	if channel != nil {
-		channelName = channel.name
+		channelName = channel.name.String()
 		if target.capabilities[MultiPrefix] {
 			if channel.members[client][ChannelOperator] {
 				flags += "@"
@@ -291,12 +291,12 @@ func (target *Client) RplWhoReply(channel *Channel, client *Client) {
 }
 
 // <name> :End of WHO list
-func (target *Client) RplEndOfWho(name string) {
+func (target *Client) RplEndOfWho(name Name) {
 	target.NumericReply(RPL_ENDOFWHO,
 		"%s :End of WHO list", name)
 }
 
-func (target *Client) RplMaskList(mode ChannelMode, channel *Channel, mask string) {
+func (target *Client) RplMaskList(mode ChannelMode, channel *Channel, mask Name) {
 	switch mode {
 	case BanMask:
 		target.RplBanList(channel, mask)
@@ -322,7 +322,7 @@ func (target *Client) RplEndOfMaskList(mode ChannelMode, channel *Channel) {
 	}
 }
 
-func (target *Client) RplBanList(channel *Channel, mask string) {
+func (target *Client) RplBanList(channel *Channel, mask Name) {
 	target.NumericReply(RPL_BANLIST,
 		"%s %s", channel, mask)
 }
@@ -332,7 +332,7 @@ func (target *Client) RplEndOfBanList(channel *Channel) {
 		"%s :End of channel ban list", channel)
 }
 
-func (target *Client) RplExceptList(channel *Channel, mask string) {
+func (target *Client) RplExceptList(channel *Channel, mask Name) {
 	target.NumericReply(RPL_EXCEPTLIST,
 		"%s %s", channel, mask)
 }
@@ -342,7 +342,7 @@ func (target *Client) RplEndOfExceptList(channel *Channel) {
 		"%s :End of channel exception list", channel)
 }
 
-func (target *Client) RplInviteList(channel *Channel, mask string) {
+func (target *Client) RplInviteList(channel *Channel, mask Name) {
 	target.NumericReply(RPL_INVITELIST,
 		"%s %s", channel, mask)
 }
@@ -412,7 +412,7 @@ func (target *Client) RplVersion() {
 		"%s %s", SEM_VER, target.server.name)
 }
 
-func (target *Client) RplInviting(invitee *Client, channel string) {
+func (target *Client) RplInviting(invitee *Client, channel Name) {
 	target.NumericReply(RPL_INVITING,
 		"%s %s", invitee.Nick(), channel)
 }
@@ -428,7 +428,7 @@ func (target *Client) RplWhoWasUser(whoWas *WhoWas) {
 		whoWas.nickname, whoWas.username, whoWas.hostname, whoWas.realname)
 }
 
-func (target *Client) RplEndOfWhoWas(nickname string) {
+func (target *Client) RplEndOfWhoWas(nickname Name) {
 	target.NumericReply(RPL_ENDOFWHOWAS,
 		"%s :End of WHOWAS", nickname)
 }
@@ -442,7 +442,7 @@ func (target *Client) ErrAlreadyRegistered() {
 		":You may not reregister")
 }
 
-func (target *Client) ErrNickNameInUse(nick string) {
+func (target *Client) ErrNickNameInUse(nick Name) {
 	target.NumericReply(ERR_NICKNAMEINUSE,
 		"%s :Nickname is already in use", nick)
 }
@@ -457,12 +457,12 @@ func (target *Client) ErrUsersDontMatch() {
 		":Cannot change mode for other users")
 }
 
-func (target *Client) ErrNeedMoreParams(command string) {
+func (target *Client) ErrNeedMoreParams(command StringCode) {
 	target.NumericReply(ERR_NEEDMOREPARAMS,
 		"%s :Not enough parameters", command)
 }
 
-func (target *Client) ErrNoSuchChannel(channel string) {
+func (target *Client) ErrNoSuchChannel(channel Name) {
 	target.NumericReply(ERR_NOSUCHCHANNEL,
 		"%s :No such channel", channel)
 }
@@ -487,7 +487,7 @@ func (target *Client) ErrBadChannelKey(channel *Channel) {
 		"%s :Cannot join channel (+k)", channel.name)
 }
 
-func (target *Client) ErrNoSuchNick(nick string) {
+func (target *Client) ErrNoSuchNick(nick Name) {
 	target.NumericReply(ERR_NOSUCHNICK,
 		"%s :No such nick/channel", nick)
 }
@@ -509,7 +509,7 @@ func (target *Client) ErrRestricted() {
 	target.NumericReply(ERR_RESTRICTED, ":Your connection is restricted!")
 }
 
-func (target *Client) ErrNoSuchServer(server string) {
+func (target *Client) ErrNoSuchServer(server Name) {
 	target.NumericReply(ERR_NOSUCHSERVER, "%s :No such server", server)
 }
 
@@ -537,7 +537,7 @@ func (target *Client) ErrNoNicknameGiven() {
 	target.NumericReply(ERR_NONICKNAMEGIVEN, ":No nickname given")
 }
 
-func (target *Client) ErrErroneusNickname(nick string) {
+func (target *Client) ErrErroneusNickname(nick Name) {
 	target.NumericReply(ERR_ERRONEUSNICKNAME,
 		"%s :Erroneous nickname", nick)
 }
@@ -552,7 +552,7 @@ func (target *Client) ErrChannelIsFull(channel *Channel) {
 		"%s :Cannot join channel (+l)", channel)
 }
 
-func (target *Client) ErrWasNoSuchNick(nickname string) {
+func (target *Client) ErrWasNoSuchNick(nickname Name) {
 	target.NumericReply(ERR_WASNOSUCHNICK,
 		"%s :There was no such nickname", nickname)
 }

irc/server.go

@@ -34,9 +34,9 @@ type Server struct {
 	db        *sql.DB
 	idle      chan *Client
 	motdFile  string
-	name      string
+	name      Name
 	newConns  chan net.Conn
-	operators map[string][]byte
+	operators map[Name][]byte
 	password  []byte
 	signals   chan os.Signal
 	whoWas    *WhoWasList
@@ -56,7 +56,7 @@ func NewServer(config *Config) *Server {
 		db:        OpenDB(config.Server.Database),
 		idle:      make(chan *Client),
 		motdFile:  config.Server.MOTD,
-		name:      config.Server.Name,
+		name:      NewName(config.Server.Name),
 		newConns:  make(chan net.Conn),
 		operators: config.Operators(),
 		signals:   make(chan os.Signal, len(SERVER_SIGNALS)),
@@ -82,7 +82,7 @@ func loadChannelList(channel *Channel, list string, maskMode ChannelMode) {
 	if list == "" {
 		return
 	}
-	channel.lists[maskMode].AddAll(strings.Split(list, " "))
+	channel.lists[maskMode].AddAll(NewNames(strings.Split(list, " ")))
 }
 
 func (server *Server) loadChannels() {
@@ -94,7 +94,9 @@ func (server *Server) loadChannels() {
 		log.Fatal("error loading channels: ", err)
 	}
 	for rows.Next() {
-		var name, flags, key, topic string
+		var name Name
+		var flags string
+		var key, topic Text
 		var userLimit uint64
 		var banList, exceptList, inviteList string
 		err = rows.Scan(&name, &flags, &key, &topic, &userLimit, &banList,
@@ -256,15 +258,15 @@ func (server *Server) MOTD(client *Client) {
 	client.RplMOTDEnd()
 }
 
-func (s *Server) Id() string {
+func (s *Server) Id() Name {
 	return s.name
 }
 
 func (s *Server) String() string {
-	return s.name
+	return s.name.String()
 }
 
-func (s *Server) Nick() string {
+func (s *Server) Nick() Name {
 	return s.Id()
 }
 
@@ -309,7 +311,7 @@ func (m *NickCommand) HandleRegServer(s *Server) {
 		return
 	}
 
-	if !IsNickname(m.nickname) {
+	if !m.nickname.IsNickname() {
 		client.ErrErroneusNickname(m.nickname)
 		return
 	}
@@ -386,7 +388,7 @@ func (msg *NickCommand) HandleServer(server *Server) {
 		return
 	}
 
-	if !IsNickname(msg.nickname) {
+	if !msg.nickname.IsNickname() {
 		client.ErrErroneusNickname(msg.nickname)
 		return
 	}
@@ -417,13 +419,13 @@ func (m *JoinCommand) HandleServer(s *Server) {
 
 	if m.zero {
 		for channel := range client.channels {
-			channel.Part(client, client.Nick())
+			channel.Part(client, client.Nick().Text())
 		}
 		return
 	}
 
 	for name, key := range m.channels {
-		if !IsChannel(name) {
+		if !name.IsChannel() {
 			client.ErrNoSuchChannel(name)
 			continue
 		}
@@ -467,7 +469,7 @@ func (msg *TopicCommand) HandleServer(server *Server) {
 
 func (msg *PrivMsgCommand) HandleServer(server *Server) {
 	client := msg.Client()
-	if IsChannel(msg.target) {
+	if msg.target.IsChannel() {
 		channel := server.channels.Get(msg.target)
 		if channel == nil {
 			client.ErrNoSuchChannel(msg.target)
@@ -547,13 +549,13 @@ func (client *Client) WhoisChannelsNames() []string {
 	for channel := range client.channels {
 		switch {
 		case channel.members[client][ChannelOperator]:
-			chstrs[index] = "@" + channel.name
+			chstrs[index] = "@" + channel.name.String()
 
 		case channel.members[client][Voice]:
-			chstrs[index] = "+" + channel.name
+			chstrs[index] = "+" + channel.name.String()
 
 		default:
-			chstrs[index] = channel.name
+			chstrs[index] = channel.name.String()
 		}
 		index += 1
 	}
@@ -605,7 +607,7 @@ func (msg *WhoCommand) HandleServer(server *Server) {
 		for _, channel := range server.channels {
 			whoChannel(client, channel, friends)
 		}
-	} else if IsChannel(mask) {
+	} else if mask.IsChannel() {
 		// TODO implement wildcard matching
 		channel := server.channels.Get(mask)
 		if channel != nil {
@@ -655,7 +657,7 @@ func (msg *IsOnCommand) HandleServer(server *Server) {
 	ison := make([]string, 0)
 	for _, nick := range msg.nicks {
 		if iclient := server.clients.Get(nick); iclient != nil {
-			ison = append(ison, iclient.Nick())
+			ison = append(ison, iclient.Nick().String())
 		}
 	}
 
@@ -668,7 +670,7 @@ func (msg *MOTDCommand) HandleServer(server *Server) {
 
 func (msg *NoticeCommand) HandleServer(server *Server) {
 	client := msg.Client()
-	if IsChannel(msg.target) {
+	if msg.target.IsChannel() {
 		channel := server.channels.Get(msg.target)
 		if channel == nil {
 			client.ErrNoSuchChannel(msg.target)
@@ -755,7 +757,7 @@ func (msg *NamesCommand) HandleServer(server *Server) {
 }
 
 func (server *Server) Reply(target *Client, format string, args ...interface{}) {
-	target.Reply(RplPrivMsg(server, target, fmt.Sprintf(format, args...)))
+	target.Reply(RplPrivMsg(server, target, NewText(fmt.Sprintf(format, args...))))
 }
 
 func (msg *DebugCommand) HandleServer(server *Server) {
@@ -850,7 +852,7 @@ func (msg *KillCommand) HandleServer(server *Server) {
 	}
 
 	quitMsg := fmt.Sprintf("KILLed by %s: %s", client.Nick(), msg.comment)
-	target.Quit(quitMsg)
+	target.Quit(NewText(quitMsg))
 }
 
 func (msg *WhoWasCommand) HandleServer(server *Server) {

irc/strings.go

@@ -0,0 +1,66 @@
+package irc
+
+import (
+	"code.google.com/p/go.text/unicode/norm"
+	"regexp"
+	"strings"
+)
+
+var (
+	// regexps
+	ChannelNameExpr = regexp.MustCompile(`^[&!#+][\pL\pN]{1,63}$`)
+	NicknameExpr    = regexp.MustCompile("^[\\pL\\pN\\pP\\pS]{1,32}$")
+)
+
+// Names are normalized and canonicalized to remove formatting marks
+// and simplify usage. They are things like hostnames and usermasks.
+type Name string
+
+func NewName(str string) Name {
+	return Name(norm.NFKC.String(str))
+}
+
+func NewNames(strs []string) []Name {
+	names := make([]Name, len(strs))
+	for index, str := range strs {
+		names[index] = NewName(str)
+	}
+	return names
+}
+
+// tests
+
+func (name Name) IsChannel() bool {
+	return ChannelNameExpr.MatchString(name.String())
+}
+
+func (name Name) IsNickname() bool {
+	return NicknameExpr.MatchString(name.String())
+}
+
+// conversions
+
+func (name Name) String() string {
+	return string(name)
+}
+
+func (name Name) ToLower() Name {
+	return Name(strings.ToLower(name.String()))
+}
+
+// It's safe to coerce a Name to Text. Name is a strict subset of Text.
+func (name Name) Text() Text {
+	return Text(name)
+}
+
+// Text is PRIVMSG, NOTICE, or TOPIC data. It's canonicalized UTF8
+// data to simplify but keeps all formatting.
+type Text string
+
+func NewText(str string) Text {
+	return Text(norm.NFC.String(str))
+}
+
+func (text Text) String() string {
+	return string(text)
+}

irc/types.go

@@ -30,25 +30,25 @@ func (mode ChannelMode) String() string {
 	return string(mode)
 }
 
-type ChannelNameMap map[string]*Channel
+type ChannelNameMap map[Name]*Channel
 
-func (channels ChannelNameMap) Get(name string) *Channel {
-	return channels[strings.ToLower(name)]
+func (channels ChannelNameMap) Get(name Name) *Channel {
+	return channels[name.ToLower()]
 }
 
 func (channels ChannelNameMap) Add(channel *Channel) error {
-	if channels[channel.name] != nil {
+	if channels[channel.name.ToLower()] != nil {
 		return fmt.Errorf("%s: already set", channel.name)
 	}
-	channels[channel.name] = channel
+	channels[channel.name.ToLower()] = channel
 	return nil
 }
 
 func (channels ChannelNameMap) Remove(channel *Channel) error {
-	if channel != channels[channel.name] {
+	if channel != channels[channel.name.ToLower()] {
 		return fmt.Errorf("%s: mismatch", channel.name)
 	}
-	delete(channels, channel.name)
+	delete(channels, channel.name.ToLower())
 	return nil
 }
 
@@ -126,6 +126,6 @@ func (channels ChannelSet) First() *Channel {
 //
 
 type Identifiable interface {
-	Id() string
-	Nick() string
+	Id() Name
+	Nick() Name
 }

irc/whowas.go

@@ -7,10 +7,10 @@ type WhoWasList struct {
 }
 
 type WhoWas struct {
-	nickname string
-	username string
-	hostname string
-	realname string
+	nickname Name
+	username Name
+	hostname Name
+	realname Text
 }
 
 func NewWhoWasList(size uint) *WhoWasList {
@@ -32,7 +32,7 @@ func (list *WhoWasList) Append(client *Client) {
 	}
 }
 
-func (list *WhoWasList) Find(nickname string, limit int64) []*WhoWas {
+func (list *WhoWasList) Find(nickname Name, limit int64) []*WhoWas {
 	results := make([]*WhoWas, 0)
 	for whoWas := range list.Each() {
 		if nickname != whoWas.nickname {