core: renamed messageReceived trigger to message_received
This commit is contained in:
parent
216b3246e8
commit
1781694141
26 changed files with 31 additions and 32 deletions
|
|
@ -1319,7 +1319,7 @@ class SatMessageProtocol(xmppim.MessageProtocol):
|
|||
def _on_message_start_workflow(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 message_received 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
|
||||
|
|
@ -1354,7 +1354,7 @@ class SatMessageProtocol(xmppim.MessageProtocol):
|
|||
post_treat = defer.Deferred()
|
||||
|
||||
d = self.host.trigger.async_point(
|
||||
"messageReceived", client, message_elt, post_treat
|
||||
"message_received", client, message_elt, post_treat
|
||||
)
|
||||
|
||||
d.addCallback(self._on_message_start_workflow, client, message_elt, post_treat)
|
||||
|
|
|
|||
|
|
@ -462,7 +462,7 @@ class EncryptionHandler:
|
|||
def mark_as_encrypted(self, mess_data, namespace):
|
||||
"""Helper method to mark a message as having been e2e encrypted.
|
||||
|
||||
This should be used in the post_treat workflow of messageReceived trigger of
|
||||
This should be used in the post_treat workflow of message_received trigger of
|
||||
the plugin
|
||||
@param mess_data(dict): message data as used in post treat workflow
|
||||
@param namespace(str): namespace of the algorithm used for encrypting the message
|
||||
|
|
@ -516,7 +516,7 @@ class EncryptionHandler:
|
|||
def mark_as_trusted(self, mess_data):
|
||||
"""Helper methor to mark a message as sent from a trusted entity.
|
||||
|
||||
This should be used in the post_treat workflow of messageReceived trigger of
|
||||
This should be used in the post_treat workflow of message_received trigger of
|
||||
the plugin
|
||||
@param mess_data(dict): message data as used in post treat workflow
|
||||
"""
|
||||
|
|
@ -526,7 +526,7 @@ class EncryptionHandler:
|
|||
def mark_as_untrusted(self, mess_data):
|
||||
"""Helper methor to mark a message as sent from an untrusted entity.
|
||||
|
||||
This should be used in the post_treat workflow of messageReceived trigger of
|
||||
This should be used in the post_treat workflow of message_received trigger of
|
||||
the plugin
|
||||
@param mess_data(dict): message data as used in post treat workflow
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ class APGateway:
|
|||
self.pubsub_service = APPubsubService(self)
|
||||
self.ad_hoc = APAdHocService(self)
|
||||
self.ap_events = APEvents(self)
|
||||
host.trigger.add("messageReceived", self._message_received_trigger, priority=-1000)
|
||||
host.trigger.add("message_received", self._message_received_trigger, priority=-1000)
|
||||
host.trigger.add("XEP-0424_retractReceived", self._on_message_retract)
|
||||
host.trigger.add("XEP-0372_ref_received", self._on_reference_received)
|
||||
|
||||
|
|
|
|||
|
|
@ -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.message_received_trigger, priority=10000)
|
||||
host.trigger.add("message_received", self.message_received_trigger, priority=10000)
|
||||
host.bridge.add_method(
|
||||
"command_export",
|
||||
".plugin",
|
||||
|
|
@ -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 message_received handling
|
||||
"""
|
||||
client = self.host.get_client(profile_key)
|
||||
for target in targets:
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ class LangDetect(object):
|
|||
log.info(_("Language detection plugin initialization"))
|
||||
self.host = host
|
||||
host.memory.update_params(PARAMS)
|
||||
host.trigger.add("messageReceived", self.message_received_trigger)
|
||||
host.trigger.add("message_received", self.message_received_trigger)
|
||||
host.trigger.add("sendMessage", self.message_send_trigger)
|
||||
|
||||
def add_language(self, mess_data):
|
||||
|
|
|
|||
|
|
@ -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.message_received_trigger, priority=100)
|
||||
host.trigger.add("message_received", self.message_received_trigger, priority=100)
|
||||
# host.trigger.add("sendMessage", self.send_message_trigger, priority=100)
|
||||
try:
|
||||
self.host.plugins[C.TEXT_CMDS].register_text_commands(self)
|
||||
|
|
|
|||
|
|
@ -268,7 +268,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.message_received_trigger, priority=-1000)
|
||||
host.trigger.add("message_received", self.message_received_trigger, priority=-1000)
|
||||
|
||||
# profiles autoconnection
|
||||
host.bridge.add_method(
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ class AESGCM(object):
|
|||
self.can_handle_attachment, self.attach, encrypted=True)
|
||||
host.trigger.add("XEP-0363_upload_pre_slot", self._upload_pre_slot)
|
||||
host.trigger.add("XEP-0363_upload", self._upload_trigger)
|
||||
host.trigger.add("messageReceived", self._message_received_trigger)
|
||||
host.trigger.add("message_received", self._message_received_trigger)
|
||||
|
||||
async def download(self, client, uri_parsed, dest_path, options):
|
||||
fragment = bytes.fromhex(uri_parsed.fragment)
|
||||
|
|
|
|||
|
|
@ -314,7 +314,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.message_received_trigger, priority=100000)
|
||||
host.trigger.add("message_received", self.message_received_trigger, priority=100000)
|
||||
host.trigger.add("sendMessage", self.send_message_trigger, priority=100000)
|
||||
host.trigger.add("send_message_data", self._send_message_data_trigger)
|
||||
host.bridge.add_method(
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ class PubsubEncryption:
|
|||
host.trigger.add("XEP-0060_publish", self._publish_trigger)
|
||||
host.trigger.add("XEP-0060_items", self._items_trigger)
|
||||
host.trigger.add(
|
||||
"messageReceived",
|
||||
"message_received",
|
||||
self._message_received_trigger,
|
||||
)
|
||||
host.bridge.add_method(
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ class XEP_0033(object):
|
|||
host.trigger.add(
|
||||
"sendMessage", self.send_message_trigger, trigger.TriggerManager.MIN_PRIORITY
|
||||
)
|
||||
host.trigger.add("messageReceived", self.message_received_trigger)
|
||||
host.trigger.add("message_received", self.message_received_trigger)
|
||||
|
||||
def send_message_trigger(
|
||||
self, client, mess_data, pre_xml_treatments, post_xml_treatments
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ class XEP_0045(object):
|
|||
|
||||
host.trigger.add("presence_available", self.presence_trigger)
|
||||
host.trigger.add("presence_received", self.presence_received_trigger)
|
||||
host.trigger.add("messageReceived", self.message_received_trigger, priority=1000000)
|
||||
host.trigger.add("message_received", self.message_received_trigger, priority=1000000)
|
||||
host.trigger.add("message_parse", self._message_parse_trigger)
|
||||
|
||||
async def profile_connected(self, client):
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ class XEP_0071(object):
|
|||
self.XHTML2XHTML_IM,
|
||||
[self._s.OPT_HIDDEN],
|
||||
)
|
||||
host.trigger.add("messageReceived", self.message_received_trigger)
|
||||
host.trigger.add("message_received", self.message_received_trigger)
|
||||
host.trigger.add("sendMessage", self.send_message_trigger)
|
||||
|
||||
def get_handler(self, client):
|
||||
|
|
@ -109,7 +109,7 @@ class XEP_0071(object):
|
|||
def _message_post_treat(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 message_received trigger through post_treat deferred
|
||||
@param message_elt: whole <message> stanza
|
||||
@param body_elts: XHTML-IM body elements found
|
||||
@return: the data with the extra parameter updated
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ class XEP_0085(object):
|
|||
host.memory.update_params(self.params)
|
||||
|
||||
# triggers from core
|
||||
host.trigger.add("messageReceived", self.message_received_trigger)
|
||||
host.trigger.add("message_received", self.message_received_trigger)
|
||||
host.trigger.add("sendMessage", self.send_message_trigger)
|
||||
host.trigger.add("param_update_trigger", self.param_update_trigger)
|
||||
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ class XEP_0249(object):
|
|||
except KeyError:
|
||||
log.info(_("Text commands not available"))
|
||||
host.register_namespace('x-conference', NS_X_CONFERENCE)
|
||||
host.trigger.add("messageReceived", self._message_received_trigger)
|
||||
host.trigger.add("message_received", self._message_received_trigger)
|
||||
|
||||
def get_handler(self, client):
|
||||
return XEP_0249_handler()
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ class XEP_0280(object):
|
|||
log.info(_("Plugin XEP_0280 initialization"))
|
||||
self.host = host
|
||||
host.memory.update_params(self.params)
|
||||
host.trigger.add("messageReceived", self.message_received_trigger, priority=200000)
|
||||
host.trigger.add("message_received", self.message_received_trigger, priority=200000)
|
||||
|
||||
def get_handler(self, client):
|
||||
return XEP_0280_handler()
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
|
||||
# Libervia plugin
|
||||
# Copyright (C) 2009-2023 Jérôme Poisson (goffi@goffi.org)
|
||||
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ class XEP_0334(object):
|
|||
log.info(_("Message Processing Hints plugin initialization"))
|
||||
self.host = host
|
||||
host.trigger.add("sendMessage", self.send_message_trigger)
|
||||
host.trigger.add("messageReceived", self.message_received_trigger, priority=-1000)
|
||||
host.trigger.add("message_received", self.message_received_trigger, priority=-1000)
|
||||
|
||||
def get_handler(self, client):
|
||||
return XEP_0334_handler()
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ class XEP_0353:
|
|||
host.register_namespace("jingle-message", NS_JINGLE_MESSAGE)
|
||||
self._j = host.plugins["XEP-0166"]
|
||||
host.trigger.add("XEP-0166_initiate", self._on_initiate_trigger)
|
||||
host.trigger.add("messageReceived", self._on_message_received)
|
||||
host.trigger.add("message_received", self._on_message_received)
|
||||
|
||||
def get_handler(self, client):
|
||||
return Handler()
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ class XEP_0372:
|
|||
host.register_namespace("refs", NS_REFS)
|
||||
self.host = host
|
||||
self._h = host.plugins["XEP-0334"]
|
||||
host.trigger.add("messageReceived", self._message_received_trigger)
|
||||
host.trigger.add("message_received", self._message_received_trigger)
|
||||
host.bridge.add_method(
|
||||
"reference_send",
|
||||
".plugin",
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue