CEF/ergo
1
0
Fork 0
forked from External/ergo
Code Pull requests Activity

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

Browse source 
Conflicts:
	irc/client.go
	irc/commands.go
	irc/constants.go
	irc/reply.go
	irc/server.go
	irc/types.go
This commit is contained in:
Jeremy Latt 2014-03-13 12:38:44 -07:00
commit 39b7c2a915
12 changed files with 323 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

18
irc/types.go
View file

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