Mercurial > libervia-backend

changeset 2792:441b536e28ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
quick frontend (chat): use right type in getOrCreateWidget on new message
author Goffi <goffi@goffi.org>
date Tue, 22 Jan 2019 18:52:16 +0100
parents 034c88e9cd93
children 181735d1b062
files sat_frontends/quick_frontend/quick_app.py sat_frontends/quick_frontend/quick_widgets.py
diffstat 2 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/sat_frontends/quick_frontend/quick_app.py	Sun Jan 20 18:20:55 2019 +0100
+++ b/sat_frontends/quick_frontend/quick_app.py	Tue Jan 22 18:52:16 2019 +0100
@@ -674,7 +674,13 @@
         from_me = from_jid.bare == self.profiles[profile].whoami.bare
         target = to_jid if from_me else from_jid
         contact_list = self.contact_lists[profile]
-        if target.resource and not contact_list.isRoom(target.bare):
+
+        try:
+            is_room = contact_list.isRoom(target.bare)
+        except exceptions.NotFound:
+            is_room = False
+
+        if target.resource and not is_room:
             # we avoid resource locking, but we must keep resource for private MUC
             # messages
             target = target.bare
@@ -682,9 +688,9 @@
         self.widgets.getOrCreateWidget(
             quick_chat.QuickChat,
             target,
-            type_=C.CHAT_ONE2ONE,
-            on_new_widget=None,
-            profile=profile,
+            type_ = C.CHAT_GROUP if is_room else C.CHAT_ONE2ONE,
+            on_new_widget = None,
+            profile = profile,
         )
 
         if (
--- a/sat_frontends/quick_frontend/quick_widgets.py	Sun Jan 20 18:20:55 2019 +0100
+++ b/sat_frontends/quick_frontend/quick_widgets.py	Tue Jan 22 18:52:16 2019 +0100
@@ -184,13 +184,13 @@
             if not "profiles" in _kwargs:
                 _kwargs["profiles"] = None
 
-        # on_new_widget tell what to do for the new widget creation
+        # on_new_widget tells what to do for the new widget creation
         try:
             on_new_widget = _kwargs.pop("on_new_widget")
         except KeyError:
             on_new_widget = C.WIDGET_NEW
 
-        # on_existing_widget tell what to do when the widget already exists
+        # on_existing_widget tells what to do when the widget already exists
         try:
             on_existing_widget = _kwargs.pop("on_existing_widget")
         except KeyError: