i farted2

go-xmpp/stanza/message.go

@@ -39,6 +39,7 @@ func NewMessage(a Attrs) Message {
 // It will return false if the extension is not found on the message.
 //
 // Example usage:
+//
 //	  var oob xmpp.OOB
 //	  if ok := msg.Get(&oob); ok {
 //	    // oob extension has been found
@@ -124,14 +125,17 @@ func (msg *Message) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
 			} else {
 				// Decode standard message sub-elements
 				var err error
-				switch tt.Name.Local {
+				switch {
-				case "body":
+				case tt.Name.Space == "jabber:client" && tt.Name.Local == "body":
 					err = d.DecodeElement(&msg.Body, &tt)
-				case "thread":
+
+				case tt.Name.Space == "jabber:client" && tt.Name.Local == "thread":
 					err = d.DecodeElement(&msg.Thread, &tt)
-				case "subject":
+
+				case tt.Name.Space == "jabber:client" && tt.Name.Local == "subject":
 					err = d.DecodeElement(&msg.Subject, &tt)
-				case "error":
+
+				case tt.Name.Space == "jabber:client" && tt.Name.Local == "error":
 					err = d.DecodeElement(&msg.Error, &tt)
 				}
 				if err != nil {