Mercurial > libervia-backend

diff sat/core/xmpp.py @ 2994:94708a7d3ecf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Goffi <goffi@goffi.org>
date Tue, 09 Jul 2019 09:06:45 +0200
parents 1d92ad95185f
children ab2696e34d29
line wrap: on
line diff
--- a/sat/core/xmpp.py	Mon Jul 08 19:11:29 2019 +0200
+++ b/sat/core/xmpp.py	Tue Jul 09 09:06:45 2019 +0200
@@ -566,14 +566,14 @@
                                            # the type is not 'groupchat'
                 # we may have a groupchat message, we check if the we know this jid
                 try:
-                    entity_type = self.host_app.memory.getEntityData(
-                        data["to"], ["type"], self.profile
-                    )["type"]
+                    entity_type = self.host_app.memory.getEntityDatum(
+                        data["to"], C.ENTITY_TYPE, self.profile
+                    )
                     # FIXME: should entity_type manage resources ?
                 except (exceptions.UnknownEntityError, KeyError):
                     entity_type = "contact"
 
-                if entity_type == "chatroom":
+                if entity_type == C.ENTITY_TYPE_MUC:
                     data["type"] = C.MESS_TYPE_GROUPCHAT
                 else:
                     data["type"] = C.MESS_TYPE_CHAT