Mercurial > libervia-backend
diff sat/core/xmpp.py @ 2715:b35c84ea73cf
plugin XEP-0045: MAM implementation for MUC
author | Goffi <goffi@goffi.org> |
---|---|
date | Fri, 07 Dec 2018 19:13:28 +0100 |
parents | 57eac4fd0ec0 |
children | a58e380c1c37 |
line wrap: on
line diff
--- a/sat/core/xmpp.py Fri Dec 07 17:46:50 2018 +0100 +++ b/sat/core/xmpp.py Fri Dec 07 19:13:28 2018 +0100 @@ -925,8 +925,8 @@ return data = self.parseMessage(message_elt) post_treat.addCallback(self.skipEmptyMessage) - post_treat.addCallback(self.addToHistory, client) - post_treat.addCallback(self.bridgeSignal, client, data) + post_treat.addCallback(self.addToHistory) + post_treat.addCallback(self.bridgeSignal, data) post_treat.addErrback(self.cancelErrorTrap) post_treat.callback(data) @@ -951,14 +951,14 @@ raise failure.Failure(exceptions.CancelError("Cancelled empty message")) return data - def addToHistory(self, data, client): + def addToHistory(self, data): if data.pop(u"history", None) == C.HISTORY_SKIP: log.info(u"history is skipped as requested") data[u"extra"][u"history"] = C.HISTORY_SKIP else: - return self.host.memory.addToHistory(client, data) + return self.host.memory.addToHistory(self.parent, data) - def bridgeSignal(self, __, client, data): + def bridgeSignal(self, __, data): try: data["extra"]["received_timestamp"] = data["received_timestamp"] data["extra"]["delay_sender"] = data["delay_sender"] @@ -976,7 +976,7 @@ data["subject"], data["type"], data["extra"], - profile=client.profile, + profile=self.parent.profile, ) return data