Always ignore resource in findDialog unless it's a MUC's private chat

psi-im · Jun 30, 2024 · 89b5898 · 89b5898
1 parent 3d64d67
commit 89b5898
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/chatdlg.cpp b/src/chatdlg.cpp
@@ -169,7 +169,7 @@ void ChatDlg::init()
     connect(account(), SIGNAL(pgpKeyChanged()), SLOT(updatePgp()));
     connect(account(), SIGNAL(encryptedMessageSent(int, bool, int, const QString &)),
             SLOT(encryptedMessageSent(int, bool, int, const QString &)));
-    account()->dialogRegister(this, jid());
+    account()->dialogRegister(this, isPrivate ? jid() : jid().withResource({}));
 
     chatView()->setFocusPolicy(Qt::NoFocus);
     chatEdit()->setFocus();
@@ -375,7 +375,8 @@ void ChatDlg::setJid(const Jid &j)
         account()->dialogUnregister(this);
         TabbableWidget::setJid(j);
         updateRealJid();
-        account()->dialogRegister(this, jid());
+        bool isPrivate = account()->groupchats().contains(jid().bare());
+        account()->dialogRegister(this, isPrivate ? jid() : jid().withResource({}));
         updateContact(jid(), false);
     }
 }

diff --git a/src/chatview_webkit.cpp b/src/chatview_webkit.cpp
@@ -151,7 +151,6 @@ class ChatViewPrivate {
     void sendReactionsToUI(const QString &nick, const QString &messageId, const QSet<QString> &reactions)
     {
         QVariantMap m;
-        // m["type"]      = "message";
         m["type"]      = QLatin1String("reactions");
         m["sender"]    = nick;
         m["messageid"] = messageId;

diff --git a/src/psiaccount.cpp b/src/psiaccount.cpp
@@ -3450,6 +3450,7 @@ ChatDlg *PsiAccount::findChatDialogEx(const Jid &jid, bool ignoreResource) const
     ChatDlg    *cm1     = nullptr;
     ChatDlg    *cm2     = nullptr;
     const auto &dialogs = findChatDialogs(jid, false);
+    ignoreResource      = ignoreResource || !d->groupchats.contains(jid.bare());
     for (ChatDlg *cl : dialogs) {
         if (cl->autoSelectContact() || ignoreResource)
             return cl;