diff options
| -rw-r--r-- | vendor/github.com/mattn/go-xmpp/xmpp.go | 67 | ||||
| -rw-r--r-- | vendor/github.com/mattn/go-xmpp/xmpp_ping.go | 6 | ||||
| -rw-r--r-- | vendor/manifest | 2 |
3 files changed, 62 insertions, 13 deletions
diff --git a/vendor/github.com/mattn/go-xmpp/xmpp.go b/vendor/github.com/mattn/go-xmpp/xmpp.go index a792e5a3..e20b57a8 100644 --- a/vendor/github.com/mattn/go-xmpp/xmpp.go +++ b/vendor/github.com/mattn/go-xmpp/xmpp.go @@ -536,12 +536,13 @@ func (c *Client) IsEncrypted() bool { // Chat is an incoming or outgoing XMPP chat message. type Chat struct { - Remote string - Type string - Text string - Roster Roster - Other []string - Stamp time.Time + Remote string + Type string + Text string + Roster Roster + Other []string + OtherElem []XMLElement + Stamp time.Time } type Roster []Contact @@ -584,11 +585,12 @@ func (c *Client) Recv() (stanza interface{}, err error) { v.Delay.Stamp, ) chat := Chat{ - Remote: v.From, - Type: v.Type, - Text: v.Body, - Other: v.Other, - Stamp: stamp, + Remote: v.From, + Type: v.Type, + Text: v.Body, + Other: v.OtherStrings(), + OtherElem: v.Other, + Stamp: stamp, } return chat, nil case *clientQuery: @@ -600,6 +602,12 @@ func (c *Client) Recv() (stanza interface{}, err error) { case *clientPresence: return Presence{v.From, v.To, v.Type, v.Show, v.Status}, nil case *clientIQ: + if bytes.Equal(v.Query, []byte(`<ping xmlns='urn:xmpp:ping'/>`)) { + err := c.SendResultPing(v.ID, v.From) + if err != nil { + return Chat{}, err + } + } return IQ{ID: v.ID, From: v.From, To: v.To, Type: v.Type, Query: v.Query}, nil } } @@ -714,11 +722,46 @@ type clientMessage struct { Thread string `xml:"thread"` // Any hasn't matched element - Other []string `xml:",any"` + Other []XMLElement `xml:",any"` Delay Delay `xml:"delay"` } +func (m *clientMessage) OtherStrings() []string { + a := make([]string, len(m.Other)) + for i, e := range m.Other { + a[i] = e.String() + } + return a +} + +type XMLElement struct { + XMLName xml.Name + InnerXML string `xml:",innerxml"` +} + +func (e *XMLElement) String() string { + r := bytes.NewReader([]byte(e.InnerXML)) + d := xml.NewDecoder(r) + var buf bytes.Buffer + for { + tok, err := d.Token() + if err != nil { + break + } + switch v := tok.(type) { + case xml.StartElement: + err = d.Skip() + case xml.CharData: + _, err = buf.Write(v) + } + if err != nil { + break + } + } + return buf.String() +} + type Delay struct { Stamp string `xml:"stamp,attr"` } diff --git a/vendor/github.com/mattn/go-xmpp/xmpp_ping.go b/vendor/github.com/mattn/go-xmpp/xmpp_ping.go index 26d056e9..39269d80 100644 --- a/vendor/github.com/mattn/go-xmpp/xmpp_ping.go +++ b/vendor/github.com/mattn/go-xmpp/xmpp_ping.go @@ -25,3 +25,9 @@ func (c *Client) PingS2S(fromServer, toServer string) error { xmlEscape(fromServer), xmlEscape(toServer)) return err } + +func (c *Client) SendResultPing(id, toServer string) error { + _, err := fmt.Fprintf(c.conn, "<iq type='result' to='%s' id='%s'/>", + xmlEscape(toServer), xmlEscape(id)) + return err +} diff --git a/vendor/manifest b/vendor/manifest index 4e5f5d11..b7ee7bda 100644 --- a/vendor/manifest +++ b/vendor/manifest @@ -113,7 +113,7 @@ "importpath": "github.com/mattn/go-xmpp", "repository": "https://github.com/mattn/go-xmpp", "vcs": "git", - "revision": "e44d1877bb457f5c3991903e9934a31e55c3a2ad", + "revision": "f4550b5399387339df5ce4c3f88c1ef85333bdd5", "branch": "master", "notests": true }, |