From e9fbe07bc0e9d95e5caf52fe5f3480fa4438e0ae Mon Sep 17 00:00:00 2001 From: MikalaiR Date: Mon, 6 Jun 2016 06:45:14 +0000 Subject: SkypeWeb: fix html cleaning for chats git-svn-id: http://svn.miranda-ng.org/main/trunk@16922 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeWeb/src/requests/avatars.h | 2 +- protocols/SkypeWeb/src/skype_history_sync.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'protocols/SkypeWeb/src') diff --git a/protocols/SkypeWeb/src/requests/avatars.h b/protocols/SkypeWeb/src/requests/avatars.h index 197ff15227..ab87e902fa 100644 --- a/protocols/SkypeWeb/src/requests/avatars.h +++ b/protocols/SkypeWeb/src/requests/avatars.h @@ -31,7 +31,7 @@ class SetAvatarRequest : public HttpRequest { public: SetAvatarRequest(const PBYTE data, size_t dataSize, const char *szMime, LoginInfo &li) : - HttpRequest(REQUEST_PUT, FORMAT, "api.skype.com/users/%s/profile/avatar", CMStringA(li.szSkypename).MakeLower()) + HttpRequest(REQUEST_PUT, FORMAT, "api.skype.com/users/%s/profile/avatar", CMStringA(li.szSkypename.get()).MakeLower()) { Headers << CHAR_VALUE("X-Skypetoken", li.api.szToken) diff --git a/protocols/SkypeWeb/src/skype_history_sync.cpp b/protocols/SkypeWeb/src/skype_history_sync.cpp index d8715e94fa..fde733ffda 100644 --- a/protocols/SkypeWeb/src/skype_history_sync.cpp +++ b/protocols/SkypeWeb/src/skype_history_sync.cpp @@ -105,9 +105,10 @@ void CSkypeProto::OnGetServerHistory(const NETLIBHTTPREQUEST *response) else if (conversationLink.find("/19:") != -1) { CMStringA chatname(UrlToSkypename(conversationLink.c_str())); + ptrA szMessage(messageType == "RichText" ? RemoveHtml(content.c_str()) : mir_strdup(content.c_str())); if (messageType == "Text" || messageType == "RichText") { - AddMessageToChat(_A2T(chatname), _A2T(skypename), content.c_str(), emoteOffset != NULL, emoteOffset, timestamp, true); + AddMessageToChat(_A2T(chatname), _A2T(skypename), szMessage, emoteOffset != NULL, emoteOffset, timestamp, true); } } } -- cgit v1.2.3