Mercurial > libervia-backend
comparison sat/plugins/plugin_xep_0045.py @ 3715:b9718216a1c0 0.9
merge bookmark 0.9
author | Goffi <goffi@goffi.org> |
---|---|
date | Wed, 01 Dec 2021 16:13:31 +0100 |
parents | 813595f88612 |
children | 8289ac1b34f4 |
comparison
equal
deleted
inserted
replaced
3714:af09b5aaa5d7 | 3715:b9718216a1c0 |
---|---|
1319 # it attached to the element | 1319 # it attached to the element |
1320 mess_data = message.element._mess_data | 1320 mess_data = message.element._mess_data |
1321 except AttributeError: | 1321 except AttributeError: |
1322 mess_data = self.client.messageProt.parseMessage(message.element) | 1322 mess_data = self.client.messageProt.parseMessage(message.element) |
1323 if mess_data['message'] or mess_data['subject']: | 1323 if mess_data['message'] or mess_data['subject']: |
1324 return self.host.memory.addToHistory(self.client, mess_data) | 1324 return defer.ensureDeferred( |
1325 self.host.memory.addToHistory(self.client, mess_data) | |
1326 ) | |
1325 else: | 1327 else: |
1326 return defer.succeed(None) | 1328 return defer.succeed(None) |
1327 | 1329 |
1328 def _addToHistoryEb(self, failure): | 1330 def _addToHistoryEb(self, failure): |
1329 failure.trap(exceptions.CancelError) | 1331 failure.trap(exceptions.CancelError) |