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

plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass):

Browse source 
- bridge methods/signals now all start with "muc" to follow new convention
    - internal method use client instead of profile to follow new convention
    - removed excetpions from plugin XEP-0045 in favor of core.exceptions, NotReady added
    - cleaned/simplified several part of the code. checkClient removed as it is not needed anymore
    - self.clients map removed, muc data are now stored directly in client
    - getRoomEntityNick and getRoomNicksOfUsers are removed as they don't look sane.
        /!\ This break all room game plugins for the moment
    - use of uuid4 instead of uuid1 for getUniqueName, as host ID and current time are used for uuid1
This commit is contained in:
Goffi 2016-06-27 21:45:11 +02:00
commit 04515e5013
1 changed files with 296 additions and 309 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/plugins/plugin_xep_0085.py
View file

@ -309,18 +309,16 @@ class XEP_0085(object):
@param profile_key (str): %(doc_profile_key)s
"""
# TODO: try to optimize this method which is called often
profile = self.host.memory.getProfileName(profile_key)
if profile is None:
raise exceptions.ProfileUnknownError
client = self.host.getClient(profile_key)
to_jid = JID(to_jid_s)
if self._isMUC(to_jid, profile):
if self._isMUC(to_jid, client.profile):
to_jid = to_jid.userhostJID()
elif not to_jid.resource:
to_jid.resource = self.host.memory.getMainResource(to_jid, profile)
if not self._checkActivation(to_jid, forceEntityData=False, profile=profile):
to_jid.resource = self.host.memory.getMainResource(client, to_jid)
if not self._checkActivation(to_jid, forceEntityData=False, profile=client.profile):
return
try:
self.map[profile][to_jid]._onEvent("composing")
self.map[client.profile][to_jid]._onEvent("composing")
except (KeyError, AttributeError):
# no message has been sent/received since the notifications
# have been enabled, it's better to wait for a first one