copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use new MAM Events and use chosen MAM namespace

This commit is contained in:
Philipp Hörist 2017-04-18 17:52:17 +02:00
parent 6b75f4ab35
commit b42c21d3e0
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/connection_handlers.py
View File

@ -2332,6 +2332,8 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream):
con.RegisterHandler('iq', self._PrivacySetCB, 'set', nbxmpp.NS_PRIVACY) con.RegisterHandler('iq', self._PrivacySetCB, 'set', nbxmpp.NS_PRIVACY)
con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_ARCHIVE) con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_ARCHIVE)
con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_MAM) con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_MAM)
con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_MAM_1)
con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_MAM_2)
con.RegisterHandler('iq', self._PubSubCB, 'result') con.RegisterHandler('iq', self._PubSubCB, 'result')
con.RegisterHandler('iq', self._PubSubErrorCB, 'error') con.RegisterHandler('iq', self._PubSubErrorCB, 'error')
con.RegisterHandler('iq', self._JingleCB, 'result') con.RegisterHandler('iq', self._JingleCB, 'result')

38
src/common/message_archiving.py
View File

@ -46,8 +46,10 @@ class ConnectionArchive313(ConnectionArchive):
self.archiving_313_supported = False self.archiving_313_supported = False
self.mam_awaiting_disco_result = {} self.mam_awaiting_disco_result = {}
self.iq_answer = [] self.iq_answer = []
gajim.ged.register_event_handler('raw-message-received', ged.CORE, gajim.ged.register_event_handler('archiving-finished-legacy', ged.CORE,
self._nec_raw_message_313_received) self._nec_result_finished)
gajim.ged.register_event_handler('archiving-finished', ged.CORE,
self._nec_result_finished)
gajim.ged.register_event_handler('agent-info-error-received', ged.CORE, gajim.ged.register_event_handler('agent-info-error-received', ged.CORE,
self._nec_agent_info_error) self._nec_agent_info_error)
gajim.ged.register_event_handler('agent-info-received', ged.CORE, gajim.ged.register_event_handler('agent-info-received', ged.CORE,
@ -59,8 +61,10 @@ class ConnectionArchive313(ConnectionArchive):
self._nec_archiving_313_preferences_changed_received) self._nec_archiving_313_preferences_changed_received)
def cleanup(self): def cleanup(self):
gajim.ged.remove_event_handler('raw-message-received', ged.CORE, gajim.ged.remove_event_handler('archiving-finished-legacy', ged.CORE,
self._nec_raw_message_313_received) self._nec_result_finished)
gajim.ged.remove_event_handler('archiving-finished', ged.CORE,
self._nec_result_finished)
gajim.ged.remove_event_handler('agent-info-error-received', ged.CORE, gajim.ged.remove_event_handler('agent-info-error-received', ged.CORE,
self._nec_agent_info_error) self._nec_agent_info_error)
gajim.ged.remove_event_handler('agent-info-received', ged.CORE, gajim.ged.remove_event_handler('agent-info-received', ged.CORE,
@ -100,29 +104,23 @@ class ConnectionArchive313(ConnectionArchive):
msg=msg_txt) msg=msg_txt)
del self.mam_awaiting_disco_result[obj.jid] del self.mam_awaiting_disco_result[obj.jid]
def _nec_raw_message_313_received(self, obj): def _nec_result_finished(self, obj):
if obj.conn.name != self.name: if obj.conn.name != self.name:
return return
fin_ = obj.stanza.getTag('fin', namespace=nbxmpp.NS_MAM) if obj.queryid not in self.awaiting_answers:
if fin_:
queryid_ = fin_.getAttr('queryid')
if queryid_ not in self.awaiting_answers:
return
else:
return return
if self.awaiting_answers[queryid_][0] == MAM_RESULTS_ARRIVED: if self.awaiting_answers[obj.queryid][0] == MAM_RESULTS_ARRIVED:
set_ = fin_.getTag('set', namespace=nbxmpp.NS_RSM) set_ = obj.fin.getTag('set', namespace=nbxmpp.NS_RSM)
if set_: if set_:
last = set_.getTagData('last') last = set_.getTagData('last')
if last: if last:
gajim.config.set_per('accounts', self.name, 'last_mam_id', last) gajim.config.set_per('accounts', self.name, 'last_mam_id', last)
complete = fin_.getAttr('complete') complete = obj.fin.getAttr('complete')
if complete != 'true': if complete != 'true':
self.request_archive(after=last) self.request_archive(after=last)
del self.awaiting_answers[obj.queryid]
del self.awaiting_answers[queryid_]
def _nec_mam_decrypted_message_received(self, obj): def _nec_mam_decrypted_message_received(self, obj):
if obj.conn.name != self.name: if obj.conn.name != self.name:
@ -133,9 +131,9 @@ class ConnectionArchive313(ConnectionArchive):
def request_archive(self, start=None, end=None, with_=None, after=None, def request_archive(self, start=None, end=None, with_=None, after=None,
max=30): max=30):
iq_ = nbxmpp.Iq('set') iq_ = nbxmpp.Iq('set')
query = iq_.addChild('query', namespace=nbxmpp.NS_MAM) query = iq_.addChild('query', namespace=self.archiving_namespace)
x = query.addChild(node=nbxmpp.DataForm(typ='submit')) x = query.addChild(node=nbxmpp.DataForm(typ='submit'))
x.addChild(node=nbxmpp.DataField(typ='hidden', name='FORM_TYPE', value=nbxmpp.NS_MAM)) x.addChild(node=nbxmpp.DataField(typ='hidden', name='FORM_TYPE', value=self.archiving_namespace))
if start: if start:
x.addChild(node=nbxmpp.DataField(typ='text-single', name='start', value=start)) x.addChild(node=nbxmpp.DataField(typ='text-single', name='start', value=start))
if end: if end:
@ -159,7 +157,7 @@ class ConnectionArchive313(ConnectionArchive):
iq = nbxmpp.Iq(typ='get') iq = nbxmpp.Iq(typ='get')
id_ = self.connection.getAnID() id_ = self.connection.getAnID()
iq.setID(id_) iq.setID(id_)
iq.addChild(name='prefs', namespace=nbxmpp.NS_MAM) iq.addChild(name='prefs', namespace=self.archiving_namespace)
self.connection.send(iq) self.connection.send(iq)
def set_archive_preferences(self, items, default): def set_archive_preferences(self, items, default):
@ -169,7 +167,7 @@ class ConnectionArchive313(ConnectionArchive):
id_ = self.connection.getAnID() id_ = self.connection.getAnID()
self.iq_answer.append(id_) self.iq_answer.append(id_)
iq.setID(id_) iq.setID(id_)
prefs = iq.addChild(name='prefs', namespace=nbxmpp.NS_MAM, attrs={'default': default}) prefs = iq.addChild(name='prefs', namespace=self.archiving_namespace, attrs={'default': default})
always = prefs.addChild(name='always') always = prefs.addChild(name='always')
never = prefs.addChild(name='never') never = prefs.addChild(name='never')
for item in items: for item in items: