Merge remote-tracking branch 'origin/master' into user-mask

Conflicts:
	irc/types.go
This commit is contained in:
Jeremy Latt 2014-03-08 19:23:10 -08:00
commit 465313c9ac
4 changed files with 26 additions and 16 deletions

View file

@ -13,6 +13,10 @@ type CapSubCommand string
type Capability string
func (capability Capability) String() string {
return string(capability)
}
type CapModifier rune
func (mod CapModifier) String() string {
@ -33,6 +37,16 @@ func (set CapabilitySet) String() string {
return strings.Join(strs, " ")
}
func (set CapabilitySet) DisableString() string {
parts := make([]string, len(set))
index := 0
for capability := range set {
parts[index] = Disable.String() + capability.String()
index += 1
}
return strings.Join(parts, " ")
}
// add, remove, list modes
type ModeOp rune