core: renamed presenceReceived to presence_reveiced + use "client" as first arguments instead of "profile"

This commit is contained in:
Goffi 2019-03-01 12:12:50 +01:00
commit 6033a0a0cb

View file

@ -62,20 +62,22 @@ class Watched(object):
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 @@ class Watched(object):
_(NOTIF).format(entity=entity.full())
).toXml()
},
profile=profile,
profile=client.profile,
)
return True