mirror of https://github.com/fluffle/goirc
Add defaultCaps, including capabilites requested by default. Add helpers to capSet to improve readability of code
This commit is contained in:
parent
e8eaf9285b
commit
b92d052130
|
@ -22,6 +22,9 @@ var intHandlers = map[string]HandlerFunc{
|
||||||
CAP: (*Conn).h_CAP,
|
CAP: (*Conn).h_CAP,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// set up the ircv3 capabilities supported by this client which will be requested by default to the server.
|
||||||
|
var defaultCaps = []string{}
|
||||||
|
|
||||||
func (conn *Conn) addIntHandlers() {
|
func (conn *Conn) addIntHandlers() {
|
||||||
for n, h := range intHandlers {
|
for n, h := range intHandlers {
|
||||||
// internal handlers are essential for the IRC client
|
// internal handlers are essential for the IRC client
|
||||||
|
@ -48,21 +51,26 @@ func (conn *Conn) h_REGISTER(line *Line) {
|
||||||
conn.User(conn.cfg.Me.Ident, conn.cfg.Me.Name)
|
conn.User(conn.cfg.Me.Ident, conn.cfg.Me.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (conn *Conn) getRequestCapabilities() *capSet {
|
||||||
|
s := capabilitySet()
|
||||||
|
|
||||||
|
// add capabilites supported by the client
|
||||||
|
s.Add(defaultCaps...)
|
||||||
|
|
||||||
|
// add capabilites requested by the user
|
||||||
|
s.Add(conn.cfg.Capabilites...)
|
||||||
|
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
||||||
func (conn *Conn) negotiateCapabilities(supportedCaps []string) {
|
func (conn *Conn) negotiateCapabilities(supportedCaps []string) {
|
||||||
for _, cap := range supportedCaps {
|
conn.supportedCaps.Add(supportedCaps...)
|
||||||
conn.supportedCaps.Add(cap)
|
|
||||||
}
|
|
||||||
|
|
||||||
// intersect capabilities supported by server with those requested
|
reqCaps := conn.getRequestCapabilities()
|
||||||
reqCaps := make([]string, 0)
|
reqCaps.Intersect(conn.supportedCaps)
|
||||||
for _, cap := range conn.cfg.Capabilites {
|
|
||||||
if conn.supportedCaps.Has(cap) {
|
|
||||||
reqCaps = append(reqCaps, cap)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(reqCaps) > 0 {
|
if reqCaps.Size() > 0 {
|
||||||
conn.Cap(CAP_REQ, reqCaps...)
|
conn.Cap(CAP_REQ, reqCaps.Slice()...)
|
||||||
} else {
|
} else {
|
||||||
conn.Cap(CAP_END)
|
conn.Cap(CAP_END)
|
||||||
}
|
}
|
||||||
|
@ -98,9 +106,11 @@ func capabilitySet() *capSet {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *capSet) Add(cap string) {
|
func (c *capSet) Add(caps ...string) {
|
||||||
c.mu.Lock()
|
c.mu.Lock()
|
||||||
c.caps[cap] = true
|
for _, cap := range caps {
|
||||||
|
c.caps[cap] = true
|
||||||
|
}
|
||||||
c.mu.Unlock()
|
c.mu.Unlock()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -110,6 +120,37 @@ func (c *capSet) Has(cap string) bool {
|
||||||
return c.caps[cap]
|
return c.caps[cap]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Intersect computes the intersection of two sets.
|
||||||
|
func (c *capSet) Intersect(other *capSet) {
|
||||||
|
c.mu.Lock()
|
||||||
|
|
||||||
|
for cap := range c.caps {
|
||||||
|
if !other.Has(cap) {
|
||||||
|
delete(c.caps, cap)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
c.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *capSet) Slice() []string {
|
||||||
|
c.mu.RLock()
|
||||||
|
defer c.mu.RUnlock()
|
||||||
|
|
||||||
|
capSlice := make([]string, 0, len(c.caps))
|
||||||
|
for cap := range c.caps {
|
||||||
|
capSlice = append(capSlice, cap)
|
||||||
|
}
|
||||||
|
|
||||||
|
return capSlice
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *capSet) Size() int {
|
||||||
|
c.mu.RLock()
|
||||||
|
defer c.mu.RUnlock()
|
||||||
|
return len(c.caps)
|
||||||
|
}
|
||||||
|
|
||||||
// Handler for capability negotiation commands.
|
// Handler for capability negotiation commands.
|
||||||
// Note that even if multiple CAP_END commands may be sent to the server during negotiation,
|
// Note that even if multiple CAP_END commands may be sent to the server during negotiation,
|
||||||
// only the first will be considered.
|
// only the first will be considered.
|
||||||
|
|
Loading…
Reference in New Issue