Fix broken PubSub functionality (matterbridge #1097)

xmpp.go

@@ -715,15 +715,46 @@ func (c *Client) Recv() (stanza interface{}, err error) {
 				}
 			case v.Type == "result":
 				switch v.ID {
+				case "sub1":
+					if v.Query.XMLName.Local == "pubsub" {
+						// Subscription or unsubscription was successful
+						var sub clientPubsubSubscription
+						err := xml.Unmarshal([]byte(v.Query.InnerXML), &sub)
+						if err != nil {
+							return PubsubSubscription{}, err
+						}
+
+						return PubsubSubscription{
+							SubID:  sub.SubID,
+							JID:    sub.JID,
+							Node:   sub.Node,
+							Errors: nil,
+						}, nil
+					}
 				case "unsub1":
-					// Unsubscribing MAY contain a pubsub element. But it does
-					// not have to
-					return PubsubUnsubscription{
-						SubID:  "",
-						JID:    v.From,
-						Node:   "",
-						Errors: nil,
-					}, nil
+					if v.Query.XMLName.Local == "pubsub" {
+						var sub clientPubsubSubscription
+						err := xml.Unmarshal([]byte(v.Query.InnerXML), &sub)
+						if err != nil {
+							return PubsubUnsubscription{}, err
+						}
+
+						return PubsubUnsubscription{
+							SubID:  sub.SubID,
+							JID:    v.From,
+							Node:   sub.Node,
+							Errors: nil,
+						}, nil
+					} else {
+						// Unsubscribing MAY contain a pubsub element. But it does
+						// not have to
+						return PubsubUnsubscription{
+							SubID:  "",
+							JID:    v.From,
+							Node:   "",
+							Errors: nil,
+						}, nil
+					}
 				case "info1":
 					if v.Query.XMLName.Space == XMPPNS_DISCO_ITEMS {
 						var itemsQuery clientDiscoItemsQuery
@@ -750,77 +781,51 @@ func (c *Client) Recv() (stanza interface{}, err error) {
 							Identities: clientIdentitiesToReturn(disco.Identities),
 						}, nil
 					}
-				}
-			case v.Query.XMLName.Local == "pubsub":
-				switch v.ID {
-				case "sub1":
-					// Subscription or unsubscription was successful
-					var sub clientPubsubSubscription
-					err := xml.Unmarshal([]byte(v.Query.InnerXML), &sub)
-					if err != nil {
-						return PubsubSubscription{}, err
-					}
-
-					return PubsubSubscription{
-						SubID:  sub.SubID,
-						JID:    sub.JID,
-						Node:   sub.Node,
-						Errors: nil,
-					}, nil
-				case "unsub1":
-					var sub clientPubsubSubscription
-					err := xml.Unmarshal([]byte(v.Query.InnerXML), &sub)
-					if err != nil {
-						return PubsubUnsubscription{}, err
-					}
-
-					return PubsubUnsubscription{
-						SubID:  sub.SubID,
-						JID:    v.From,
-						Node:   sub.Node,
-						Errors: nil,
-					}, nil
 				case "items1", "items3":
-					var p clientPubsubItems
-					err := xml.Unmarshal([]byte(v.Query.InnerXML), &p)
-					if err != nil {
-						return PubsubItems{}, err
-					}
+					if v.Query.XMLName.Local == "pubsub" {
+						var p clientPubsubItems
+						err := xml.Unmarshal([]byte(v.Query.InnerXML), &p)
+						if err != nil {
+							return PubsubItems{}, err
+						}
 
-					switch p.Node {
-					case XMPPNS_AVATAR_PEP_DATA:
-						return handleAvatarData(p.Items[0].Body,
-							v.From,
-							p.Items[0].ID)
-					case XMPPNS_AVATAR_PEP_METADATA:
-						return handleAvatarMetadata(p.Items[0].Body,
-							v.From)
-					default:
-						return PubsubItems{
-							p.Node,
-							pubsubItemsToReturn(p.Items),
-						}, nil
+						switch p.Node {
+						case XMPPNS_AVATAR_PEP_DATA:
+							return handleAvatarData(p.Items[0].Body,
+								v.From,
+								p.Items[0].ID)
+						case XMPPNS_AVATAR_PEP_METADATA:
+							return handleAvatarMetadata(p.Items[0].Body,
+								v.From)
+						default:
+							return PubsubItems{
+								p.Node,
+								pubsubItemsToReturn(p.Items),
+							}, nil
+						}
 					}
 					// Note: XEP-0084 states that metadata and data
 					// should be fetched with an id of retrieve1.
 					// Since we already have PubSub implemented, we
 					// can just use items1 and items3 to do the same
 					// as an Avatar node is just a PEP (PubSub) node.
 					/*case "retrieve1":
-					var p clientPubsubItems
-					err := xml.Unmarshal([]byte(v.Query.InnerXML), &p)
-					if err != nil {
-						return PubsubItems{}, err
-					}
+					if v.Query.XMLName.Local == "pubsub" {
+						var p clientPubsubItems
+						err := xml.Unmarshal([]byte(v.Query.InnerXML), &p)
+						if err != nil {
+							return PubsubItems{}, err
+						}
 
-					switch p.Node {
-					case XMPPNS_AVATAR_PEP_DATA:
-						return handleAvatarData(p.Items[0].Body,
-							v.From,
-							p.Items[0].ID)
-					case XMPPNS_AVATAR_PEP_METADATA:
-						return handleAvatarMetadata(p.Items[0].Body,
-							v
+						switch p.Node {
+						case XMPPNS_AVATAR_PEP_DATA:
+							return handleAvatarData(p.Items[0].Body,
+								v.From,
+								p.Items[0].ID)
+						case XMPPNS_AVATAR_PEP_METADATA:
+							return handleAvatarMetadata(p.Items[0].Body,
+								v.From)
+						}
 					}*/
 				}
 			case v.Query.XMLName.Local == "":