diff options
author | George Hazan <ghazan@miranda.im> | 2019-05-27 18:45:43 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2019-05-27 18:45:43 +0300 |
commit | ef1a349d88912a89a8dd20ca1dcb342b6dc9c2ff (patch) | |
tree | 78e6344d923966b7a8f1866763d6bacaf054a9e2 /protocols/FacebookRM/src | |
parent | 189f6be24f11066a3c711b783cf98f79f703e3a5 (diff) |
fixes #1963 (Remove Free for Chat, On the Phone and Out to Lunch statuses completely)
Diffstat (limited to 'protocols/FacebookRM/src')
-rw-r--r-- | protocols/FacebookRM/src/json.cpp | 2 | ||||
-rw-r--r-- | protocols/FacebookRM/src/proto.cpp | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/protocols/FacebookRM/src/json.cpp b/protocols/FacebookRM/src/json.cpp index 9a5436e204..b774fde6ee 100644 --- a/protocols/FacebookRM/src/json.cpp +++ b/protocols/FacebookRM/src/json.cpp @@ -1064,7 +1064,7 @@ int FacebookProto::ParseMessages(std::string &pData, std::vector<facebook_messag // const JSONNode &ol_ = itNodes["ol"]; // possible values: -1 (when goes to offline), 0 (when goes back online) (something more?) // const JSONNode &p_ = itNodes["p"]; // class with fbAppStatus, messengerStatus, otherStatus, status, webStatus - int status = ID_STATUS_FREECHAT; // FREECHAT to easily spot some problem, as we expect it will always be p==0 or p==2 below + int status = ID_STATUS_INVISIBLE; // FREECHAT to easily spot some problem, as we expect it will always be p==0 or p==2 below if (a_) { int a = a_.as_int(); diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index d2221ae899..e99dc8b895 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -133,17 +133,19 @@ INT_PTR FacebookProto::GetCaps(int type, MCONTACT) else return flags |= PF1_MODEMSGRECV; } + case PFLAGNUM_2: - return PF2_ONLINE | PF2_SHORTAWAY | PF2_INVISIBLE | PF2_ONTHEPHONE | PF2_IDLE; + return PF2_ONLINE | PF2_SHORTAWAY | PF2_INVISIBLE | PF2_IDLE; + case PFLAGNUM_3: if (getByte(FACEBOOK_KEY_SET_MIRANDA_STATUS)) return PF2_ONLINE; // | PF2_SHORTAWAY; else return 0; + case PFLAGNUM_4: return PF4_NOCUSTOMAUTH | PF4_AVATARS | PF4_SUPPORTTYPING | PF4_NOAUTHDENYREASON | PF4_IMSENDOFFLINE | PF4_READNOTIFY; - case PFLAGNUM_5: - return PF2_ONTHEPHONE; + case PFLAG_MAXLENOFMESSAGE: return FACEBOOK_MESSAGE_LIMIT; case PFLAG_UNIQUEIDTEXT: @@ -174,9 +176,6 @@ int FacebookProto::SetStatus(int new_status) case ID_STATUS_NA: m_iDesiredStatus = ID_STATUS_AWAY; break; - case ID_STATUS_FREECHAT: - m_iDesiredStatus = ID_STATUS_ONLINE; - break; default: m_iDesiredStatus = getByte(FACEBOOK_KEY_MAP_STATUSES, DEFAULT_MAP_STATUSES) ? ID_STATUS_INVISIBLE : ID_STATUS_AWAY; break; |