Mercurial > libervia-backend

changeset 2820:7ab8684784c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core: renamed presenceReceived to presence_reveiced + use "client" as first arguments instead of "profile"
author Goffi <goffi@goffi.org>
date Fri, 01 Mar 2019 12:12:50 +0100
parents fd45089b3a92
children 3d735e0ab2fa
files sat/core/xmpp.py sat/plugins/plugin_misc_watched.py sat/plugins/plugin_sec_otr.py
diffstat 3 files changed, 11 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/sat/core/xmpp.py	Fri Mar 01 12:11:16 2019 +0100
+++ b/sat/core/xmpp.py	Fri Mar 01 12:12:50 2019 +0100
@@ -1247,7 +1247,7 @@
             statuses[C.PRESENCE_STATUSES_DEFAULT] = statuses.pop(None)
 
         if not self.host.trigger.point(
-            "presenceReceived", entity, show, priority, statuses, self.parent.profile
+            "presence_received", self.parent, entity, show, priority, statuses
         ):
             return
 
@@ -1273,7 +1273,7 @@
             statuses[C.PRESENCE_STATUSES_DEFAULT] = statuses.pop(None)
 
         if not self.host.trigger.point(
-            "presenceReceived", entity, "unavailable", 0, statuses, self.parent.profile
+            "presence_received", self.parent, entity, C.PRESENCE_UNAVAILABLE, 0, statuses,
         ):
             return
 
--- a/sat/plugins/plugin_misc_watched.py	Fri Mar 01 12:11:16 2019 +0100
+++ b/sat/plugins/plugin_misc_watched.py	Fri Mar 01 12:12:50 2019 +0100
@@ -62,20 +62,22 @@
         log.info(_("Watched initialisation"))
         self.host = host
         host.memory.updateParams(self.params)
-        host.trigger.add("presenceReceived", self._presenceReceivedTrigger)
+        host.trigger.add("presence_received", self._presenceReceivedTrigger)
 
-    def _presenceReceivedTrigger(self, entity, show, priority, statuses, profile):
+    def _presenceReceivedTrigger(self, client, entity, show, priority, statuses):
         if show == C.PRESENCE_UNAVAILABLE:
             return True
 
         # we check that the previous presence was unavailable (no notification else)
         try:
-            old_show = self.host.memory.getEntityDatum(entity, "presence", profile).show
+            old_show = self.host.memory.getEntityDatum(
+                entity, "presence", client.profile).show
         except (KeyError, exceptions.UnknownEntityError):
             old_show = C.PRESENCE_UNAVAILABLE
 
         if old_show == C.PRESENCE_UNAVAILABLE:
-            watched = self.host.memory.getParamA(NAME, CATEGORY, profile_key=profile)
+            watched = self.host.memory.getParamA(
+                NAME, CATEGORY, profile_key=client.profile)
             if entity in watched or entity.userhostJID() in watched:
                 self.host.actionNew(
                     {
@@ -83,7 +85,7 @@
                             _(NOTIF).format(entity=entity.full())
                         ).toXml()
                     },
-                    profile=profile,
+                    profile=client.profile,
                 )
 
         return True
--- a/sat/plugins/plugin_sec_otr.py	Fri Mar 01 12:11:16 2019 +0100
+++ b/sat/plugins/plugin_sec_otr.py	Fri Mar 01 12:12:50 2019 +0100
@@ -354,7 +354,7 @@
         #     security_limit=0,
         #     type_=C.MENU_SINGLE,
         # )
-        host.trigger.add("presenceReceived", self._presenceReceivedTrigger)
+        host.trigger.add("presence_received", self._presenceReceivedTrigger)
         self.host.registerEncryptionPlugin(self, u"OTR", NS_OTR, directed=True)
 
     def _skipOTR(self, profile):
@@ -810,10 +810,9 @@
                 mess_data["to"] = to_jid
         return True
 
-    def _presenceReceivedTrigger(self, entity, show, priority, statuses, profile):
+    def _presenceReceivedTrigger(self, client, entity, show, priority, statuses):
         if show != C.PRESENCE_UNAVAILABLE:
             return True
-        client = self.host.getClient(profile)
         if not entity.resource:
             try:
                 entity.resource = self.host.memory.getMainResource(