erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Goffi 2019-03-01 12:12:50 +01:00
commit 6033a0a0cb
3 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sat/core/xmpp.py
View file

@ -1247,7 +1247,7 @@ class SatPresenceProtocol(xmppim.PresenceClientProtocol):
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 @@ class SatPresenceProtocol(xmppim.PresenceClientProtocol):
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

12
sat/plugins/plugin_misc_watched.py
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

5
sat/plugins/plugin_sec_otr.py
View file

@ -354,7 +354,7 @@ class OTR(object):
# 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 @@ class OTR(object):
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(