diff options
| author | George Hazan <ghazan@miranda.im> | 2022-04-16 20:44:50 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2022-04-16 20:44:50 +0300 |
| commit | c13715051274a3dbe6e36279bdc27d06a0387cb0 (patch) | |
| tree | 0efb4049b84d1ac30eda880ad0d015d335d03b14 /protocols/ICQ-WIM/src | |
| parent | d12310676d262c0d635eb90d4a62a418ce6a506c (diff) | |
fixes #2964 (ICQ: если к аське привязана почта @mail.ru, то при логине прилетают контакты не только аськи, но и агента)
Diffstat (limited to 'protocols/ICQ-WIM/src')
| -rw-r--r-- | protocols/ICQ-WIM/src/server.cpp | 8 | ||||
| -rw-r--r-- | protocols/ICQ-WIM/src/version.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/protocols/ICQ-WIM/src/server.cpp b/protocols/ICQ-WIM/src/server.cpp index 9d50ee6d9f..8ba7cb4aa3 100644 --- a/protocols/ICQ-WIM/src/server.cpp +++ b/protocols/ICQ-WIM/src/server.cpp @@ -305,10 +305,18 @@ MCONTACT CIcqProto::ParseBuddyInfo(const JSONNode &buddy, MCONTACT hContact, boo return si->hContact; } + bool bIgnored = !m_isMra && buddy["userType"].as_string() != "icq"; if (hContact == INVALID_CONTACT_ID) { + if (bIgnored) + return INVALID_CONTACT_ID; + hContact = CreateContact(wszId, false); FindContactByUIN(wszId)->m_bInList = true; } + else if (bIgnored) { + db_delete_contact(hContact); + return INVALID_CONTACT_ID; + } CMStringA szVer; bool bVersionDetected = false, bSecureIM = false; diff --git a/protocols/ICQ-WIM/src/version.h b/protocols/ICQ-WIM/src/version.h index 379d7ff2a3..00ea8b47ed 100644 --- a/protocols/ICQ-WIM/src/version.h +++ b/protocols/ICQ-WIM/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 96 #define __RELEASE_NUM 1 -#define __BUILD_NUM 7 +#define __BUILD_NUM 8 #include <stdver.h> |