Support for XEP-0128.

stanza/iq_disco.go

@@ -21,6 +21,7 @@ type DiscoInfo struct {
 	Identity  []Identity `xml:"identity"`
 	Features  []Feature  `xml:"feature"`
 	ResultSet *ResultSet `xml:"set,omitempty"`
+	Form      *Form      `xml:"x,omitempty"`
 }
 
 // Namespace lets DiscoInfo implement the IQPayload interface

stanza/iq_disco_test.go

@@ -16,6 +16,7 @@ func TestDiscoInfo_Builder(t *testing.T) {
 	disco := iq.DiscoInfo()
 	disco.AddIdentity("Test Component", "gateway", "service")
 	disco.AddFeatures(stanza.NSDiscoInfo, stanza.NSDiscoItems, "jabber:iq:version", "urn:xmpp:delegation:1")
+	disco.Form = stanza.NewForm([]*stanza.Field{}, "result")
 
 	parsedIQ, err := checkMarshalling(t, iq)
 	if err != nil {
@@ -48,6 +49,15 @@ func TestDiscoInfo_Builder(t *testing.T) {
 			t.Errorf("Incorrect identity name: %#v", pp.Identity[0].Name)
 		}
 	}
+
+	// Check form
+	if pp.Form == nil {
+		t.Errorf("Form is nil")
+	} else {
+		if len(pp.Form.Fields) != 0 {
+			t.Errorf("Form fields length mismatch: %#v", pp.Form.Fields)
+		}
+	}
 }
 
 // Implements XEP-0030 example 17

stanza/jid.go

@@ -51,12 +51,22 @@ func NewJid(sjid string) (*Jid, error) {
 }
 
 func (j *Jid) Full() string {
+	if j.Resource == "" {
+		return j.Bare()
+	} else if j.Node == "" {
+		return j.Node + "/" + j.Resource
+	} else {
 		return j.Node + "@" + j.Domain + "/" + j.Resource
 	}
+}
 
 func (j *Jid) Bare() string {
+	if j.Node == "" {
+		return j.Domain
+	} else {
 		return j.Node + "@" + j.Domain
 	}
+}
 
 // ============================================================================
 // Helpers, for parsing / validation

stanza/jid_test.go

@@ -61,26 +61,41 @@ func TestIncorrectJids(t *testing.T) {
 }
 
 func TestFull(t *testing.T) {
-	jid := "test@domain.com/my resource"
-	parsedJid, err := NewJid(jid)
+	fullJids := []string{
+		"test@domain.com/my resource",
+		"test@domain.com",
+		"domain.com",
+	}
+	for _, sjid := range fullJids {
+		parsedJid, err := NewJid(sjid)
 		if err != nil {
 			t.Errorf("could not parse jid: %v", err)
 		}
 		fullJid := parsedJid.Full()
-	if fullJid != jid {
+		if fullJid != sjid {
 			t.Errorf("incorrect full jid: %s", fullJid)
 		}
 	}
+}
 
 func TestBare(t *testing.T) {
-	jid := "test@domain.com"
-	fullJid := jid + "/my resource"
-	parsedJid, err := NewJid(fullJid)
+	tests := []struct {
+		jidstr   string
+		expected string
+	}{
+		{jidstr: "test@domain.com", expected: "test@domain.com"},
+		{jidstr: "test@domain.com/resource", expected: "test@domain.com"},
+		{jidstr: "domain.com", expected: "domain.com"},
+	}
+
+	for _, tt := range tests {
+		parsedJid, err := NewJid(tt.jidstr)
 		if err != nil {
 			t.Errorf("could not parse jid: %v", err)
 		}
 		bareJid := parsedJid.Bare()
-	if bareJid != jid {
+		if bareJid != tt.expected {
 			t.Errorf("incorrect bare jid: %s", bareJid)
 		}
 	}
+}