diff options
| author | George Hazan <george.hazan@gmail.com> | 2024-06-12 12:38:18 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2024-06-12 12:38:18 +0300 |
| commit | 67908297c933d9c06ddd41dec02d2ff7ed832837 (patch) | |
| tree | 5e9a5319c4eca91065bf3044a4dc84a91b8d4d4c /protocols/SkypeWeb/src/requests | |
| parent | 42eb8d4b7e3f4d99ccd2c9b60dccb03d1fd033f9 (diff) | |
Skype: code cleaning
Diffstat (limited to 'protocols/SkypeWeb/src/requests')
| -rw-r--r-- | protocols/SkypeWeb/src/requests/contacts.h | 18 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/requests/poll.h | 2 |
2 files changed, 7 insertions, 13 deletions
diff --git a/protocols/SkypeWeb/src/requests/contacts.h b/protocols/SkypeWeb/src/requests/contacts.h index ea572296f4..23fa74614a 100644 --- a/protocols/SkypeWeb/src/requests/contacts.h +++ b/protocols/SkypeWeb/src/requests/contacts.h @@ -20,14 +20,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. struct GetContactListRequest : public AsyncHttpRequest
{
- GetContactListRequest(CSkypeProto *ppro, const char *filter) :
- AsyncHttpRequest(REQUEST_GET, HOST_CONTACTS, 0, &CSkypeProto::LoadContactList)
+ GetContactListRequest() :
+ AsyncHttpRequest(REQUEST_GET, HOST_CONTACTS, "/users/SELF/contacts", &CSkypeProto::LoadContactList)
{
- m_szUrl.AppendFormat("/users/%s/contacts", ppro->m_szSkypename.MakeLower().GetBuffer());
-
- // ?filter=contacts[?(@.type="skype" or @.type="msn")]
- if (filter != NULL)
- this << CHAR_PARAM("filter", filter);
}
};
@@ -58,7 +53,7 @@ struct DeleteContactRequest : public AsyncHttpRequest DeleteContactRequest(CSkypeProto *ppro, const char *who) :
AsyncHttpRequest(REQUEST_DELETE, HOST_CONTACTS)
{
- m_szUrl.AppendFormat("/users/%s/contacts/%s", ppro->m_szMyname.c_str(), who);
+ m_szUrl.AppendFormat("/users/%s/contacts/%s", ppro->m_szSkypename.c_str(), who);
AddHeader("Accept", "application/json");
}
@@ -69,7 +64,7 @@ struct AuthAcceptRequest : public AsyncHttpRequest AuthAcceptRequest(CSkypeProto *ppro, const char *who) :
AsyncHttpRequest(REQUEST_PUT, HOST_CONTACTS)
{
- m_szUrl.AppendFormat("/users/%s/invites/%s/accept", ppro->m_szOwnSkypeId.get(), who);
+ m_szUrl.AppendFormat("/users/%s/invites/%s/accept", ppro->m_szSkypename.c_str(), who);
AddHeader("Accept", "application/json");
}
@@ -80,7 +75,7 @@ struct AuthDeclineRequest : public AsyncHttpRequest AuthDeclineRequest(CSkypeProto *ppro, const char *who) :
AsyncHttpRequest(REQUEST_PUT, HOST_CONTACTS)
{
- m_szUrl.AppendFormat("/users/%s/invites/%s/decline", ppro->m_szOwnSkypeId.get(), who);
+ m_szUrl.AppendFormat("/users/%s/invites/%s/decline", ppro->m_szSkypename.c_str(), who);
AddHeader("Accept", "application/json");
}
@@ -89,9 +84,8 @@ struct AuthDeclineRequest : public AsyncHttpRequest struct BlockContactRequest : public AsyncHttpRequest
{
BlockContactRequest(CSkypeProto *ppro, MCONTACT hContact) :
- AsyncHttpRequest(REQUEST_PUT, HOST_CONTACTS, 0, &CSkypeProto::OnBlockContact)
+ AsyncHttpRequest(REQUEST_PUT, HOST_CONTACTS, "/users/SELF/contacts/blocklist/" + ppro->getId(hContact), &CSkypeProto::OnBlockContact)
{
- m_szUrl.AppendFormat("/users/SELF/contacts/blocklist/%s", ppro->getId(hContact).c_str());
m_szParam = "{\"report_abuse\":\"false\",\"ui_version\":\"skype.com\"}";
pUserInfo = (void *)hContact;
diff --git a/protocols/SkypeWeb/src/requests/poll.h b/protocols/SkypeWeb/src/requests/poll.h index 86f6304095..20f260fb64 100644 --- a/protocols/SkypeWeb/src/requests/poll.h +++ b/protocols/SkypeWeb/src/requests/poll.h @@ -30,7 +30,7 @@ struct PollRequest : public AsyncHttpRequest AddHeader("Referer", "https://web.skype.com/main");
AddHeader("ClientInfo", "os=Windows; osVer=8.1; proc=Win32; lcid=en-us; deviceType=1; country=n/a; clientName=swx-skype.com; clientVer=908/1.85.0.29");
- AddHeader("Accept", "application/json; ver=1.0");
+ AddHeader("Accept", "application/json");
AddHeader("Accept-Language", "en, C");
}
};
|