diff options
| -rw-r--r-- | protocols/Teams/src/teams_history.cpp | 2 | ||||
| -rw-r--r-- | protocols/Teams/src/teams_profile.cpp | 3 | ||||
| -rw-r--r-- | protocols/Teams/src/teams_proto.h | 2 | ||||
| -rw-r--r-- | protocols/Teams/src/teams_utils.cpp | 13 |
4 files changed, 4 insertions, 16 deletions
diff --git a/protocols/Teams/src/teams_history.cpp b/protocols/Teams/src/teams_history.cpp index ced9997b25..864e8a9290 100644 --- a/protocols/Teams/src/teams_history.cpp +++ b/protocols/Teams/src/teams_history.cpp @@ -23,7 +23,7 @@ void CTeamsProto::RefreshConversations() { auto *pReq = new AsyncHttpRequest(REQUEST_GET, HOST_DEFAULT, "/users/ME/conversations", &CTeamsProto::OnSyncConversations); pReq << INT_PARAM("startTime", getLastTime(0)) << INT_PARAM("pageSize", 100) - << CHAR_PARAM("view", "msnp24Equivalent") << CHAR_PARAM("targetType", "Passport|Skype|Lync|Thread"); + << CHAR_PARAM("view", "msnp24Equivalent") << CHAR_PARAM("targetType", "Passport|Skype|Lync|Thread|PSTN|Agent"); PushRequest(pReq); } diff --git a/protocols/Teams/src/teams_profile.cpp b/protocols/Teams/src/teams_profile.cpp index cf257aa839..2402467c51 100644 --- a/protocols/Teams/src/teams_profile.cpp +++ b/protocols/Teams/src/teams_profile.cpp @@ -134,9 +134,6 @@ void CTeamsProto::OnGetProfileInfo(MHttpResponse *response, AsyncHttpRequest *pR SetString(hContact, "FirstName", root["firstname"]); SetString(hContact, "CompanyPhone", root["phoneOffice"]); - if (auto &pMood = root["richMood"]) - RemoveHtml(pMood.as_mstring(), true); // this call extracts only emoji / mood id - UpdateProfileDisplayName(root, hContact); UpdateProfileGender(root, hContact); UpdateProfileBirthday(root, hContact); diff --git a/protocols/Teams/src/teams_proto.h b/protocols/Teams/src/teams_proto.h index f2d4162818..1ee1941f52 100644 --- a/protocols/Teams/src/teams_proto.h +++ b/protocols/Teams/src/teams_proto.h @@ -324,7 +324,7 @@ private: int64_t getLastTime(MCONTACT); void setLastTime(MCONTACT, int64_t); - CMStringW RemoveHtml(const CMStringW &src, bool bCheckSS = false); + CMStringW RemoveHtml(const CMStringW &src); void ShowNotification(const wchar_t *message, MCONTACT hContact = NULL); void ShowNotification(const wchar_t *caption, const wchar_t *message, MCONTACT hContact = NULL, int type = 0); diff --git a/protocols/Teams/src/teams_utils.cpp b/protocols/Teams/src/teams_utils.cpp index 615ba7a5de..72603c84d1 100644 --- a/protocols/Teams/src/teams_utils.cpp +++ b/protocols/Teams/src/teams_utils.cpp @@ -295,23 +295,14 @@ static CMStringW getAttrText(const wchar_t *pwszText, const wchar_t *pwszAttrNam return L""; } -CMStringW CTeamsProto::RemoveHtml(const CMStringW &data, bool bCheckSS) +CMStringW CTeamsProto::RemoveHtml(const CMStringW &data) { - bool inSS = false; CMStringW new_string; for (int i = 0; i < data.GetLength(); i++) { wchar_t c = data[i]; if (c == '<') { - if (bCheckSS && !wcsncmp(data.c_str() + i + 1, L"ss ", 3)) - inSS = true; - else if (!wcsncmp(data.c_str() + i + 1, L"/ss>", 4)) { - CMStringW wszStatusMsg = data.Mid(i + 5); - wszStatusMsg.Trim(); - m_wstrMoodMessage = wszStatusMsg; - inSS = false; - } - else if (m_bUseBBCodes) { + if (m_bUseBBCodes) { bool bEnable = true; auto *p = data.c_str() + i + 1; if (*p == '/') { |