mirror of https://github.com/FluuxIO/go-xmpp
Added Roster IQs
Added an overly primitive "disconnect" for the client to use in the chat client examplepull/139/head
parent
f0179ad90e
commit
390336b894
@ -0,0 +1,115 @@
|
|||||||
|
package stanza
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/xml"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// Roster
|
||||||
|
|
||||||
|
const (
|
||||||
|
// NSRoster is the Roster IQ namespace
|
||||||
|
NSRoster = "jabber:iq:roster"
|
||||||
|
// SubscriptionNone indicates the user does not have a subscription to
|
||||||
|
// the contact's presence, and the contact does not have a subscription
|
||||||
|
// to the user's presence; this is the default value, so if the subscription
|
||||||
|
// attribute is not included then the state is to be understood as "none"
|
||||||
|
SubscriptionNone = "none"
|
||||||
|
|
||||||
|
// SubscriptionTo indicates the user has a subscription to the contact's
|
||||||
|
// presence, but the contact does not have a subscription to the user's presence.
|
||||||
|
SubscriptionTo = "to"
|
||||||
|
|
||||||
|
// SubscriptionFrom indicates the contact has a subscription to the user's
|
||||||
|
// presence, but the user does not have a subscription to the contact's presence
|
||||||
|
SubscriptionFrom = "from"
|
||||||
|
|
||||||
|
// SubscriptionBoth indicates the user and the contact have subscriptions to each
|
||||||
|
// other's presence (also called a "mutual subscription")
|
||||||
|
SubscriptionBoth = "both"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ----------
|
||||||
|
// Namespaces
|
||||||
|
|
||||||
|
// Roster struct represents Roster IQs
|
||||||
|
type Roster struct {
|
||||||
|
XMLName xml.Name `xml:"jabber:iq:roster query"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Namespace defines the namespace for the RosterIQ
|
||||||
|
func (r *Roster) Namespace() string {
|
||||||
|
return r.XMLName.Space
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------
|
||||||
|
// Builder helpers
|
||||||
|
|
||||||
|
// RosterIQ builds a default Roster payload
|
||||||
|
func (iq *IQ) RosterIQ() *Roster {
|
||||||
|
r := Roster{
|
||||||
|
XMLName: xml.Name{
|
||||||
|
Space: NSRoster,
|
||||||
|
Local: "query",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
iq.Payload = &r
|
||||||
|
return &r
|
||||||
|
}
|
||||||
|
|
||||||
|
// -----------
|
||||||
|
// SubElements
|
||||||
|
|
||||||
|
// RosterItems represents the list of items in a roster IQ
|
||||||
|
type RosterItems struct {
|
||||||
|
XMLName xml.Name `xml:"jabber:iq:roster query"`
|
||||||
|
Items []RosterItem `xml:"item"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Namespace lets RosterItems implement the IQPayload interface
|
||||||
|
func (r *RosterItems) Namespace() string {
|
||||||
|
return r.XMLName.Space
|
||||||
|
}
|
||||||
|
|
||||||
|
// RosterItem represents an item in the roster iq
|
||||||
|
type RosterItem struct {
|
||||||
|
XMLName xml.Name `xml:"jabber:iq:roster item"`
|
||||||
|
Jid string `xml:"jid,attr"`
|
||||||
|
Ask string `xml:"ask,attr,omitempty"`
|
||||||
|
Name string `xml:"name,attr,omitempty"`
|
||||||
|
Subscription string `xml:"subscription,attr,omitempty"`
|
||||||
|
Groups []string `xml:"group"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------
|
||||||
|
// Builder helpers
|
||||||
|
|
||||||
|
// RosterItems builds a default RosterItems payload
|
||||||
|
func (iq *IQ) RosterItems() *RosterItems {
|
||||||
|
ri := RosterItems{
|
||||||
|
XMLName: xml.Name{Space: "jabber:iq:roster", Local: "query"},
|
||||||
|
}
|
||||||
|
iq.Payload = &ri
|
||||||
|
return &ri
|
||||||
|
}
|
||||||
|
|
||||||
|
// AddItem builds an item and ads it to the roster IQ
|
||||||
|
func (r *RosterItems) AddItem(jid, subscription, ask, name string, groups []string) *RosterItems {
|
||||||
|
item := RosterItem{
|
||||||
|
Jid: jid,
|
||||||
|
Name: name,
|
||||||
|
Groups: groups,
|
||||||
|
Subscription: subscription,
|
||||||
|
Ask: ask,
|
||||||
|
}
|
||||||
|
r.Items = append(r.Items, item)
|
||||||
|
return r
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// Registry init
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
TypeRegistry.MapExtension(PKTIQ, xml.Name{Space: NSRoster, Local: "query"}, Roster{})
|
||||||
|
TypeRegistry.MapExtension(PKTIQ, xml.Name{Space: NSRoster, Local: "query"}, RosterItems{})
|
||||||
|
}
|
@ -0,0 +1,109 @@
|
|||||||
|
package stanza
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/xml"
|
||||||
|
"reflect"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestRosterBuilder(t *testing.T) {
|
||||||
|
iq := NewIQ(Attrs{Type: IQTypeResult, From: "romeo@montague.net/orchard"})
|
||||||
|
var noGroup []string
|
||||||
|
|
||||||
|
iq.RosterItems().AddItem("xl8ceawrfu8zdneomw1h6h28d@crypho.com",
|
||||||
|
SubscriptionBoth,
|
||||||
|
"",
|
||||||
|
"xl8ceaw",
|
||||||
|
[]string{"0flucpm8i2jtrjhxw01uf1nd2",
|
||||||
|
"bm2bajg9ex4e1swiuju9i9nu5",
|
||||||
|
"rvjpanomi4ejpx42fpmffoac0"}).
|
||||||
|
AddItem("9aynsym60zbu78jbdvpho7s68@crypho.com",
|
||||||
|
SubscriptionBoth,
|
||||||
|
"",
|
||||||
|
"9aynsym60",
|
||||||
|
[]string{"mzaoy73i6ra5k502182zi1t97"}).
|
||||||
|
AddItem("admin@crypho.com",
|
||||||
|
SubscriptionBoth,
|
||||||
|
"",
|
||||||
|
"admin",
|
||||||
|
noGroup)
|
||||||
|
|
||||||
|
parsedIQ, err := checkMarshalling(t, iq)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check result
|
||||||
|
pp, ok := parsedIQ.Payload.(*RosterItems)
|
||||||
|
if !ok {
|
||||||
|
t.Errorf("Parsed stanza does not contain correct IQ payload")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check items
|
||||||
|
items := []RosterItem{
|
||||||
|
{
|
||||||
|
XMLName: xml.Name{},
|
||||||
|
Name: "xl8ceaw",
|
||||||
|
Ask: "",
|
||||||
|
Jid: "xl8ceawrfu8zdneomw1h6h28d@crypho.com",
|
||||||
|
Subscription: SubscriptionBoth,
|
||||||
|
Groups: []string{"0flucpm8i2jtrjhxw01uf1nd2",
|
||||||
|
"bm2bajg9ex4e1swiuju9i9nu5",
|
||||||
|
"rvjpanomi4ejpx42fpmffoac0"},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
XMLName: xml.Name{},
|
||||||
|
Name: "9aynsym60",
|
||||||
|
Ask: "",
|
||||||
|
Jid: "9aynsym60zbu78jbdvpho7s68@crypho.com",
|
||||||
|
Subscription: SubscriptionBoth,
|
||||||
|
Groups: []string{"mzaoy73i6ra5k502182zi1t97"},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
XMLName: xml.Name{},
|
||||||
|
Name: "admin",
|
||||||
|
Ask: "",
|
||||||
|
Jid: "admin@crypho.com",
|
||||||
|
Subscription: SubscriptionBoth,
|
||||||
|
Groups: noGroup,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
if len(pp.Items) != len(items) {
|
||||||
|
t.Errorf("Items length mismatch: %#v", pp.Items)
|
||||||
|
} else {
|
||||||
|
for i, item := range pp.Items {
|
||||||
|
if item.Jid != items[i].Jid {
|
||||||
|
t.Errorf("JID Mismatch (expected: %s): %s", items[i].Jid, item.Jid)
|
||||||
|
}
|
||||||
|
if !reflect.DeepEqual(item.Groups, items[i].Groups) {
|
||||||
|
t.Errorf("Node Mismatch (expected: %s): %s", items[i].Jid, item.Jid)
|
||||||
|
}
|
||||||
|
if item.Name != items[i].Name {
|
||||||
|
t.Errorf("Name Mismatch (expected: %s): %s", items[i].Jid, item.Jid)
|
||||||
|
}
|
||||||
|
if item.Ask != items[i].Ask {
|
||||||
|
t.Errorf("Name Mismatch (expected: %s): %s", items[i].Jid, item.Jid)
|
||||||
|
}
|
||||||
|
if item.Subscription != items[i].Subscription {
|
||||||
|
t.Errorf("Name Mismatch (expected: %s): %s", items[i].Jid, item.Jid)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func checkMarshalling(t *testing.T, iq IQ) (*IQ, error) {
|
||||||
|
// Marshall
|
||||||
|
data, err := xml.Marshal(iq)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("cannot marshal iq: %s\n%#v", err, iq)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Unmarshall
|
||||||
|
var parsedIQ IQ
|
||||||
|
err = xml.Unmarshal(data, &parsedIQ)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Unmarshal returned error: %s\n%s", err, data)
|
||||||
|
}
|
||||||
|
return &parsedIQ, err
|
||||||
|
}
|
Loading…
Reference in New Issue