uwaru/go-xmpp
1
0
Fork 0
forked from jshiffer/go-xmpp
Code Pull Requests Activity

Merge pull request #64 from psilva261/recv_client_iq

Browse Source 
Recv: handle clientIQ
This commit is contained in:
mattn 2016-01-15 11:57:42 +09:00
commit e810b2faca
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xmpp.go
View File

@ -173,6 +173,7 @@ func (o Options) NewClient() (*Client, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
if strings.LastIndex(o.Host, ":") > 0 { if strings.LastIndex(o.Host, ":") > 0 {
host = host[:strings.LastIndex(o.Host, ":")] host = host[:strings.LastIndex(o.Host, ":")]
} }
@ -555,6 +556,13 @@ type Presence struct {
Status string Status string
} }
type IQ struct {
ID string
From string
To string
Type string
}
// Recv waits to receive the next XMPP stanza. // Recv waits to receive the next XMPP stanza.
// Return type is either a presence notification or a chat message. // Return type is either a presence notification or a chat message.
func (c *Client) Recv() (stanza interface{}, err error) { func (c *Client) Recv() (stanza interface{}, err error) {
@ -585,6 +593,8 @@ func (c *Client) Recv() (stanza interface{}, err error) {
return Chat{Type: "roster", Roster: r}, nil return Chat{Type: "roster", Roster: r}, nil
case *clientPresence: case *clientPresence:
return Presence{v.From, v.To, v.Type, v.Show, v.Status}, nil return Presence{v.From, v.To, v.Type, v.Show, v.Status}, nil
case *clientIQ:
return IQ{v.ID, v.From, v.To, v.Type}, nil
} }
} }
} }
@ -724,10 +734,10 @@ type clientPresence struct {
type clientIQ struct { // info/query type clientIQ struct { // info/query
XMLName xml.Name `xml:"jabber:client iq"` XMLName xml.Name `xml:"jabber:client iq"`
From string `xml:",attr"` From string `xml:"from,attr"`
ID string `xml:",attr"` ID string `xml:"id,attr"`
To string `xml:",attr"` To string `xml:"to,attr"`
Type string `xml:",attr"` // error, get, result, set Type string `xml:"type,attr"` // error, get, result, set
Error clientError Error clientError
Bind bindBind Bind bindBind
} }