diff --git a/sat/core/xmpp.py b/sat/core/xmpp.py index 6cb4e465..2f60d56c 100644 --- a/sat/core/xmpp.py +++ b/sat/core/xmpp.py @@ -1081,7 +1081,7 @@ class SatMessageProtocol(xmppim.MessageProtocol): def _onMessageStartWorkflow(self, cont, client, message_elt, post_treat): """Parse message and do post treatments - It is the first callback called after MessageReceived trigger + It is the first callback called after messageReceived trigger @param cont(bool): workflow will continue only if this is True @param message_elt(domish.Element): message stanza may have be modified by triggers @@ -1108,7 +1108,7 @@ class SatMessageProtocol(xmppim.MessageProtocol): post_treat = defer.Deferred() d = self.host.trigger.asyncPoint( - "MessageReceived", client, message_elt, post_treat + "messageReceived", client, message_elt, post_treat ) d.addCallback(self._onMessageStartWorkflow, client, message_elt, post_treat) diff --git a/sat/plugins/plugin_exp_command_export.py b/sat/plugins/plugin_exp_command_export.py index 338e11d2..428fcbcc 100644 --- a/sat/plugins/plugin_exp_command_export.py +++ b/sat/plugins/plugin_exp_command_export.py @@ -92,7 +92,7 @@ class CommandExport(object): log.info(_("Plugin command export initialization")) self.host = host self.spawned = {} # key = entity - host.trigger.add("MessageReceived", self.MessageReceivedTrigger, priority=10000) + host.trigger.add("messageReceived", self.messageReceivedTrigger, priority=10000) host.bridge.addMethod( "exportCommand", ".plugin", @@ -113,7 +113,7 @@ class CommandExport(object): except ValueError: pass - def MessageReceivedTrigger(self, client, message_elt, post_treat): + def messageReceivedTrigger(self, client, message_elt, post_treat): """ Check if source is linked and repeat message, else do nothing """ from_jid = jid.JID(message_elt["from"]) spawned_key = (from_jid.userhostJID(), client.profile) @@ -148,7 +148,7 @@ class CommandExport(object): - exclusive: if set, skip all other triggers - loop: if set, restart the command once terminated #TODO - pty: if set, launch in a pseudo terminal - - continue: continue normal MessageReceived handling + - continue: continue normal messageReceived handling """ client = self.host.getClient(profile_key) for target in targets: diff --git a/sat/plugins/plugin_exp_lang_detect.py b/sat/plugins/plugin_exp_lang_detect.py index a2f82992..95f5524a 100644 --- a/sat/plugins/plugin_exp_lang_detect.py +++ b/sat/plugins/plugin_exp_lang_detect.py @@ -66,7 +66,7 @@ class LangDetect(object): log.info(_("Language detection plugin initialization")) self.host = host host.memory.updateParams(PARAMS) - host.trigger.add("MessageReceived", self.MessageReceivedTrigger) + host.trigger.add("messageReceived", self.messageReceivedTrigger) host.trigger.add("sendMessage", self.MessageSendTrigger) def addLanguage(self, mess_data): @@ -77,7 +77,7 @@ class LangDetect(object): mess_data["message"] = {lang: msg} return mess_data - def MessageReceivedTrigger(self, client, message_elt, post_treat): + def messageReceivedTrigger(self, client, message_elt, post_treat): """ Check if source is linked and repeat message, else do nothing """ lang_detect = self.host.memory.getParamA( diff --git a/sat/plugins/plugin_exp_parrot.py b/sat/plugins/plugin_exp_parrot.py index 37eff99e..b96145a4 100644 --- a/sat/plugins/plugin_exp_parrot.py +++ b/sat/plugins/plugin_exp_parrot.py @@ -55,7 +55,7 @@ class Exp_Parrot(object): def __init__(self, host): log.info(_("Plugin Parrot initialization")) self.host = host - host.trigger.add("MessageReceived", self.MessageReceivedTrigger, priority=100) + host.trigger.add("messageReceived", self.messageReceivedTrigger, priority=100) # host.trigger.add("sendMessage", self.sendMessageTrigger, priority=100) try: self.host.plugins[C.TEXT_CMDS].registerTextCommands(self) @@ -73,7 +73,7 @@ class Exp_Parrot(object): # log.debug("Parrot link detected, skipping other triggers") # raise trigger.SkipOtherTriggers - def MessageReceivedTrigger(self, client, message_elt, post_treat): + def messageReceivedTrigger(self, client, message_elt, post_treat): """ Check if source is linked and repeat message, else do nothing """ # TODO: many things are not repeated (subject, thread, etc) profile = client.profile diff --git a/sat/plugins/plugin_misc_android.py b/sat/plugins/plugin_misc_android.py index afc31fe2..70d0eb2f 100644 --- a/sat/plugins/plugin_misc_android.py +++ b/sat/plugins/plugin_misc_android.py @@ -251,7 +251,7 @@ class AndroidPlugin(object): raise e # we set a low priority because we want the notification to be sent after all # plugins have done their job - host.trigger.add("MessageReceived", self.messageReceivedTrigger, priority=-1000) + host.trigger.add("messageReceived", self.messageReceivedTrigger, priority=-1000) # profiles autoconnection host.bridge.addMethod( diff --git a/sat/plugins/plugin_sec_otr.py b/sat/plugins/plugin_sec_otr.py index 15393bf2..5dc9e36e 100644 --- a/sat/plugins/plugin_sec_otr.py +++ b/sat/plugins/plugin_sec_otr.py @@ -313,7 +313,7 @@ class OTR(object): ) #  FIXME: OTR should not be skipped per profile, this need to be refactored self._p_hints = host.plugins["XEP-0334"] self._p_carbons = host.plugins["XEP-0280"] - host.trigger.add("MessageReceived", self.MessageReceivedTrigger, priority=100000) + host.trigger.add("messageReceived", self.messageReceivedTrigger, priority=100000) host.trigger.add("sendMessage", self.sendMessageTrigger, priority=100000) host.trigger.add("sendMessageData", self._sendMessageDataTrigger) host.bridge.addMethod( @@ -730,7 +730,7 @@ class OTR(object): data["history"] = C.HISTORY_SKIP return data - def MessageReceivedTrigger(self, client, message_elt, post_treat): + def messageReceivedTrigger(self, client, message_elt, post_treat): if message_elt.getAttribute("type") == C.MESS_TYPE_GROUPCHAT: # OTR is not possible in group chats return True diff --git a/sat/plugins/plugin_xep_0033.py b/sat/plugins/plugin_xep_0033.py index 0e728072..0cb45deb 100644 --- a/sat/plugins/plugin_xep_0033.py +++ b/sat/plugins/plugin_xep_0033.py @@ -79,7 +79,7 @@ class XEP_0033(object): host.trigger.add( "sendMessage", self.sendMessageTrigger, trigger.TriggerManager.MIN_PRIORITY ) - host.trigger.add("MessageReceived", self.messageReceivedTrigger) + host.trigger.add("messageReceived", self.messageReceivedTrigger) def sendMessageTrigger( self, client, mess_data, pre_xml_treatments, post_xml_treatments diff --git a/sat/plugins/plugin_xep_0045.py b/sat/plugins/plugin_xep_0045.py index ec1ac88a..9ccd7f14 100644 --- a/sat/plugins/plugin_xep_0045.py +++ b/sat/plugins/plugin_xep_0045.py @@ -157,7 +157,7 @@ class XEP_0045(object): host.trigger.add("presence_available", self.presenceTrigger) host.trigger.add("presence_received", self.presenceReceivedTrigger) - host.trigger.add("MessageReceived", self.messageReceivedTrigger, priority=1000000) + host.trigger.add("messageReceived", self.messageReceivedTrigger, priority=1000000) host.trigger.add("message_parse", self._message_parseTrigger) def profileConnected(self, client): diff --git a/sat/plugins/plugin_xep_0071.py b/sat/plugins/plugin_xep_0071.py index 8cfabcf9..3ba7e76b 100644 --- a/sat/plugins/plugin_xep_0071.py +++ b/sat/plugins/plugin_xep_0071.py @@ -100,7 +100,7 @@ class XEP_0071(object): self.XHTML2XHTML_IM, [self._s.OPT_HIDDEN], ) - host.trigger.add("MessageReceived", self.messageReceivedTrigger) + host.trigger.add("messageReceived", self.messageReceivedTrigger) host.trigger.add("sendMessage", self.sendMessageTrigger) def getHandler(self, client): @@ -109,7 +109,7 @@ class XEP_0071(object): def _messagePostTreat(self, data, message_elt, body_elts, client): """Callback which manage the post treatment of the message in case of XHTML-IM found - @param data: data send by MessageReceived trigger through post_treat deferred + @param data: data send by messageReceived trigger through post_treat deferred @param message_elt: whole stanza @param body_elts: XHTML-IM body elements found @return: the data with the extra parameter updated diff --git a/sat/plugins/plugin_xep_0085.py b/sat/plugins/plugin_xep_0085.py index 29196cd1..c766c6c9 100644 --- a/sat/plugins/plugin_xep_0085.py +++ b/sat/plugins/plugin_xep_0085.py @@ -106,7 +106,7 @@ class XEP_0085(object): host.memory.updateParams(self.params) # triggers from core - host.trigger.add("MessageReceived", self.messageReceivedTrigger) + host.trigger.add("messageReceived", self.messageReceivedTrigger) host.trigger.add("sendMessage", self.sendMessageTrigger) host.trigger.add("paramUpdateTrigger", self.paramUpdateTrigger) diff --git a/sat/plugins/plugin_xep_0249.py b/sat/plugins/plugin_xep_0249.py index 8b48fe44..25ce6a38 100644 --- a/sat/plugins/plugin_xep_0249.py +++ b/sat/plugins/plugin_xep_0249.py @@ -94,7 +94,7 @@ class XEP_0249(object): except KeyError: log.info(_("Text commands not available")) host.registerNamespace('x-conference', NS_X_CONFERENCE) - host.trigger.add("MessageReceived", self._MessageReceivedTrigger) + host.trigger.add("messageReceived", self._messageReceivedTrigger) def getHandler(self, client): return XEP_0249_handler() @@ -143,7 +143,7 @@ class XEP_0249(object): d = self.host.plugins["XEP-0045"].join(client, room_jid, client.jid.user, {}) return d - def _MessageReceivedTrigger(self, client, message_elt, post_treat): + def _messageReceivedTrigger(self, client, message_elt, post_treat): """Check if a direct invitation is in the message, and handle it""" x_elt = next(message_elt.elements(NS_X_CONFERENCE, 'x'), None) if x_elt is None: diff --git a/sat/plugins/plugin_xep_0280.py b/sat/plugins/plugin_xep_0280.py index d3f1212b..2af786e6 100644 --- a/sat/plugins/plugin_xep_0280.py +++ b/sat/plugins/plugin_xep_0280.py @@ -75,7 +75,7 @@ class XEP_0280(object): log.info(_("Plugin XEP_0280 initialization")) self.host = host host.memory.updateParams(self.params) - host.trigger.add("MessageReceived", self.messageReceivedTrigger, priority=200000) + host.trigger.add("messageReceived", self.messageReceivedTrigger, priority=200000) def getHandler(self, client): return XEP_0280_handler() diff --git a/sat/plugins/plugin_xep_0334.py b/sat/plugins/plugin_xep_0334.py index eb37483f..c34c5433 100644 --- a/sat/plugins/plugin_xep_0334.py +++ b/sat/plugins/plugin_xep_0334.py @@ -65,7 +65,7 @@ class XEP_0334(object): log.info(_("Message Processing Hints plugin initialization")) self.host = host host.trigger.add("sendMessage", self.sendMessageTrigger) - host.trigger.add("MessageReceived", self.messageReceivedTrigger, priority=-1000) + host.trigger.add("messageReceived", self.messageReceivedTrigger, priority=-1000) def getHandler(self, client): return XEP_0334_handler() diff --git a/sat/plugins/plugin_xep_0380.py b/sat/plugins/plugin_xep_0380.py index 528429fe..1239a4f8 100644 --- a/sat/plugins/plugin_xep_0380.py +++ b/sat/plugins/plugin_xep_0380.py @@ -48,7 +48,7 @@ class XEP_0380(object): def __init__(self, host): self.host = host host.trigger.add("sendMessage", self._sendMessageTrigger) - host.trigger.add("MessageReceived", self._MessageReceivedTrigger, priority=100) + host.trigger.add("messageReceived", self._messageReceivedTrigger, priority=100) host.registerNamespace("eme", NS_EME) def _addEMEElement(self, mess_data, namespace, name): @@ -71,7 +71,7 @@ class XEP_0380(object): self._addEMEElement, namespace=namespace, name=name) return True - def _MessageReceivedTrigger(self, client, message_elt, post_treat): + def _messageReceivedTrigger(self, client, message_elt, post_treat): try: encryption_elt = next(message_elt.elements(NS_EME, 'encryption')) except StopIteration: diff --git a/sat/plugins/plugin_xep_0384.py b/sat/plugins/plugin_xep_0384.py index cbe1a6d6..f8f4a0d9 100644 --- a/sat/plugins/plugin_xep_0384.py +++ b/sat/plugins/plugin_xep_0384.py @@ -393,7 +393,7 @@ class OMEMO(object): self._p = host.plugins["XEP-0060"] self._m = host.plugins.get("XEP-0045") self._sid = host.plugins.get("XEP-0359") - host.trigger.add("MessageReceived", self._messageReceivedTrigger, priority=100050) + host.trigger.add("messageReceived", self._messageReceivedTrigger, priority=100050) host.trigger.add("sendMessageData", self._sendMessageDataTrigger) self.host.registerEncryptionPlugin(self, "OMEMO", NS_OMEMO, 100) pep = host.plugins['XEP-0163']