Refactor parsing oob data

Adapt to nbxmpp changes

gajim/common/modules/mam.py

@@ -195,6 +195,8 @@ def _mam_message_received(self, _con, stanza, properties):
             additional_data.set_value(
                 'gajim', 'user_timestamp', properties.user_timestamp)
 
+        parse_oob(properties, additional_data)
+
         event_attrs.update(
             {'conn': self._con,
              'account': self._account,
@@ -260,7 +262,6 @@ def _decryption_finished(self, event):
             return
 
         event.correct_id = parse_correction(event.message)
-        parse_oob(event)
 
         with_ = event.with_.getStripped()
         if event.muc_pm:

gajim/common/modules/message.py

@@ -148,6 +148,8 @@ def _message_received(self, _con, stanza, properties):
             additional_data.set_value(
                 'gajim', 'user_timestamp', properties.user_timestamp)
 
+        parse_oob(properties, additional_data)
+
         event_attr = {
             'conn': self._con,
             'stanza': stanza,
@@ -213,7 +215,6 @@ def _on_message_decrypted(self, event):
             'form_node': parse_form(event.stanza),
             'xhtml': parse_xhtml(event.stanza),
         }
-        parse_oob(event)
 
         for name, value in event_attr.items():
             setattr(event, name, value)

gajim/common/modules/misc.py

@@ -25,18 +25,14 @@
 
 # XEP-0066: Out of Band Data
 
-def parse_oob(event):
-    oob_node = event.stanza.getTag('x', namespace=nbxmpp.NS_X_OOB)
-    if oob_node is None:
+def parse_oob(properties, additional_data):
+    if not properties.is_oob:
         return
 
-    url = oob_node.getTagData('url')
-    if url is not None:
-        event.additional_data.set_value('gajim', 'oob_url', url)
-
-    desc = oob_node.getTagData('desc')
-    if desc is not None:
-        event.additional_data.set_value('gajim', 'oob_desc', desc)
+    additional_data.set_value('gajim', 'oob_url', properties.oob.url)
+    if properties.oob.desc is not None:
+        additional_data.set_value('gajim', 'oob_desc',
+                                  properties.oob.desc)
 
 
 # XEP-0308: Last Message Correction

gajim/common/zeroconf/connection_handlers_zeroconf.py

@@ -94,13 +94,16 @@ def _messageCB(self, con, stanza, properties):
 
         session.last_receive = time.time()
 
+        additional_data = AdditionalDataDict()
+        parse_oob(properties, additional_data)
+
         event_attr = {
             'conn': self,
             'stanza': stanza,
             'account': self.name,
             'id_': id_,
             'encrypted': False,
-            'additional_data': AdditionalDataDict(),
+            'additional_data': additional_data,
             'forwarded': False,
             'sent': False,
             'timestamp': time.time(),
@@ -146,8 +149,6 @@ def _on_message_decrypted(self, event):
             'stanza_id': event.unique_id
         }
 
-        parse_oob(event)
-
         for name, value in event_attr.items():
             setattr(event, name, value)