From c13715051274a3dbe6e36279bdc27d06a0387cb0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 16 Apr 2022 20:44:50 +0300 Subject: =?UTF-8?q?fixes=20#2964=20(ICQ:=20=D0=B5=D1=81=D0=BB=D0=B8=20?= =?UTF-8?q?=D0=BA=20=D0=B0=D1=81=D1=8C=D0=BA=D0=B5=20=D0=BF=D1=80=D0=B8?= =?UTF-8?q?=D0=B2=D1=8F=D0=B7=D0=B0=D0=BD=D0=B0=20=D0=BF=D0=BE=D1=87=D1=82?= =?UTF-8?q?=D0=B0=20@mail.ru,=20=D1=82=D0=BE=20=D0=BF=D1=80=D0=B8=20=D0=BB?= =?UTF-8?q?=D0=BE=D0=B3=D0=B8=D0=BD=D0=B5=20=D0=BF=D1=80=D0=B8=D0=BB=D0=B5?= =?UTF-8?q?=D1=82=D0=B0=D1=8E=D1=82=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B0=D0=BA?= =?UTF-8?q?=D1=82=D1=8B=20=D0=BD=D0=B5=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA?= =?UTF-8?q?=D0=BE=20=D0=B0=D1=81=D1=8C=D0=BA=D0=B8,=20=D0=BD=D0=BE=20?= =?UTF-8?q?=D0=B8=20=D0=B0=D0=B3=D0=B5=D0=BD=D1=82=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protocols/ICQ-WIM/src/server.cpp | 8 ++++++++ protocols/ICQ-WIM/src/version.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'protocols/ICQ-WIM/src') 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 -- cgit v1.2.3