diff options
| author | George Hazan <ghazan@miranda.im> | 2020-10-27 18:42:52 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-10-27 18:42:52 +0300 |
| commit | 005bde628864f2335445aab8c1b8f42d62da25d4 (patch) | |
| tree | 85118bf32db357b75fe53910df6029e70e82d05a /protocols/JabberG/src/jabber_iqid.cpp | |
| parent | 3f6d77ceaeda7a27deceab947f06de1cd1ab41e4 (diff) | |
Jabber: fix for MAM implementation in Prosody IM
Diffstat (limited to 'protocols/JabberG/src/jabber_iqid.cpp')
| -rwxr-xr-x | protocols/JabberG/src/jabber_iqid.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
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);
|