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

return Presence messages in Recv

Browse Source
This commit is contained in:
Flo Lauber 2013-01-18 19:48:50 -05:00
parent 99516ec31f
commit 1e9dc674d1
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xmpp.go
View File

@ -222,15 +222,25 @@ type Chat struct {
Text string Text string
} }
type Presence struct {
From string
To string
Type string
Show string
}
// Recv wait next token of chat. // Recv wait next token of chat.
func (c *Client) Recv() (chat Chat, err error) { func (c *Client) Recv() (event interface{}, err error) {
for { for {
_, val, err := next(c.p) _, val, err := next(c.p)
if err != nil { if err != nil {
return Chat{}, err return Chat{}, err
} }
if v, ok := val.(*clientMessage); ok { switch v := val.(type) {
case *clientMessage:
return Chat{v.From, v.Type, v.Body}, nil return Chat{v.From, v.Type, v.Body}, nil
case *clientPresence:
return Presence{v.From, v.To, v.Type, v.Show}, nil
} }
} }
panic("unreachable") panic("unreachable")
@ -340,7 +350,7 @@ type clientPresence struct {
Type string `xml:"type,attr"` // error, probe, subscribe, subscribed, unavailable, unsubscribe, unsubscribed Type string `xml:"type,attr"` // error, probe, subscribe, subscribed, unavailable, unsubscribe, unsubscribed
Lang string `xml:"lang,attr"` Lang string `xml:"lang,attr"`
Show string `xml:"show,attr"`// away, chat, dnd, xa Show string `xml:"show"` // away, chat, dnd, xa
Status string `xml:"status,attr"` // sb []clientText Status string `xml:"status,attr"` // sb []clientText
Priority string `xml:"priority,attr"` Priority string `xml:"priority,attr"`
Error *clientError Error *clientError