core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant:
an old hardcoded value was used in several places to detect if an entity is a MUC, but this value was not valid anymore. This has been fixed, and ENTITY_TYPE_MUC constant is now used instead. This fixes message type autodetection for "groupchat" messages. fixes 300
This commit is contained in:
parent
90fcacd4bd
commit
5e43c6c98c
1 changed files with 39 additions and 29 deletions
|
|
@ -94,12 +94,11 @@ class Exp_Parrot(object):
|
|||
lang = e.getAttribute("lang") or ""
|
||||
|
||||
try:
|
||||
entity_type = self.host.memory.getEntityData(from_jid, ["type"], profile)[
|
||||
"type"
|
||||
]
|
||||
entity_type = self.host.memory.getEntityData(
|
||||
from_jid, [C.ENTITY_TYPE], profile)[C.ENTITY_TYPE]
|
||||
except (UnknownEntityError, KeyError):
|
||||
entity_type = "contact"
|
||||
if entity_type == "chatroom":
|
||||
if entity_type == C.ENTITY_TYPE_MUC:
|
||||
src_txt = from_jid.resource
|
||||
if src_txt == self.host.plugins["XEP-0045"].getRoomNick(
|
||||
client, from_jid.userhostJID()
|
||||
|
|
|
|||
Loading…
Reference in a new issue