comparison sat/core/xmpp.py @ 3573:813595f88612

merge changes from main branch
author Goffi <goffi@goffi.org>
date Thu, 17 Jun 2021 13:05:58 +0200
parents 888109774673 01c23359b915
children 31628770a15a
comparison
equal deleted inserted replaced
3541:888109774673 3573:813595f88612
245 entity._createSubProtocols() 245 entity._createSubProtocols()
246 246
247 entity.fallBack = SatFallbackHandler(host) 247 entity.fallBack = SatFallbackHandler(host)
248 entity.fallBack.setHandlerParent(entity) 248 entity.fallBack.setHandlerParent(entity)
249 249
250 entity.versionHandler = SatVersionHandler(C.APP_NAME_FULL, host.full_version) 250 entity.versionHandler = SatVersionHandler(C.APP_NAME, host.full_version)
251 entity.versionHandler.setHandlerParent(entity) 251 entity.versionHandler.setHandlerParent(entity)
252 252
253 entity.identityHandler = SatIdentityHandler() 253 entity.identityHandler = SatIdentityHandler()
254 entity.identityHandler.setHandlerParent(entity) 254 entity.identityHandler.setHandlerParent(entity)
255 255
689 log.debug(_("Sending message (type {type}, to {to})") 689 log.debug(_("Sending message (type {type}, to {to})")
690 .format(type=data["type"], to=to_jid.full())) 690 .format(type=data["type"], to=to_jid.full()))
691 691
692 pre_xml_treatments.addCallback(lambda __: self.generateMessageXML(data, post_xml_treatments)) 692 pre_xml_treatments.addCallback(lambda __: self.generateMessageXML(data, post_xml_treatments))
693 pre_xml_treatments.addCallback(lambda __: post_xml_treatments) 693 pre_xml_treatments.addCallback(lambda __: post_xml_treatments)
694 pre_xml_treatments.addErrback(self._cancelErrorTrap)
694 post_xml_treatments.addCallback(lambda __: self.sendMessageData(data)) 695 post_xml_treatments.addCallback(lambda __: self.sendMessageData(data))
695 if send_only: 696 if send_only:
696 log.debug(_("Triggers, storage and echo have been inhibited by the " 697 log.debug(_("Triggers, storage and echo have been inhibited by the "
697 "'send_only' parameter")) 698 "'send_only' parameter"))
698 else: 699 else: