From 005bde628864f2335445aab8c1b8f42d62da25d4 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 27 Oct 2020 18:42:52 +0300 Subject: Jabber: fix for MAM implementation in Prosody IM --- protocols/JabberG/src/jabber_iqid.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'protocols/JabberG/src') diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index a9ddcda9ff..d2c77698eb 100755 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -181,14 +181,10 @@ void CJabberProto::OnLoggedIn() // XEP-0083 support if (!(m_StrmMgmt.IsSessionResumed())) { - { - CJabberIqInfo *pIqInfo = AddIQ(&CJabberProto::OnIqResultNestedRosterGroups, JABBER_IQ_TYPE_GET); - // ugly hack to prevent hangup during login process - pIqInfo->SetTimeout(30000); - m_ThreadInfo->send( - XmlNodeIq(pIqInfo) << XQUERY(JABBER_FEAT_PRIVATE_STORAGE) - << XCHILDNS("roster", JABBER_FEAT_NESTED_ROSTER_GROUPS)); - } + // ugly hack to prevent hangup during login process + CJabberIqInfo *pIqInfo = AddIQ(&CJabberProto::OnIqResultNestedRosterGroups, JABBER_IQ_TYPE_GET); + pIqInfo->SetTimeout(30000); + m_ThreadInfo->send(XmlNodeIq(pIqInfo) << XQUERY(JABBER_FEAT_PRIVATE_STORAGE) << XCHILDNS("roster", JABBER_FEAT_NESTED_ROSTER_GROUPS)); // Server-side notes m_ThreadInfo->send( @@ -204,8 +200,10 @@ void CJabberProto::OnLoggedIn() m_bPepSupported = false; m_ThreadInfo->jabberServerCaps = JABBER_RESOURCE_CAPS_NONE; + char szBareJid[JABBER_MAX_JID_LEN]; + JabberStripJid(m_ThreadInfo->fullJID, szBareJid, _countof(szBareJid)); m_ThreadInfo->send( - XmlNodeIq(AddIQ(&CJabberProto::OnIqResultServerDiscoInfo, JABBER_IQ_TYPE_GET, m_ThreadInfo->conn.server)) + XmlNodeIq(AddIQ(&CJabberProto::OnIqResultServerDiscoInfo, JABBER_IQ_TYPE_GET, szBareJid)) << XQUERY(JABBER_FEAT_DISCO_INFO)); QueryPrivacyLists(m_ThreadInfo); -- cgit v1.2.3