diff options
| -rw-r--r-- | protocols/Facebook/src/db.h | 79 | ||||
| -rw-r--r-- | protocols/Facebook/src/server.cpp | 4 |
2 files changed, 16 insertions, 67 deletions
diff --git a/protocols/Facebook/src/db.h b/protocols/Facebook/src/db.h index 494f752246..3d96302cb9 100644 --- a/protocols/Facebook/src/db.h +++ b/protocols/Facebook/src/db.h @@ -25,72 +25,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MODULENAME "Facebook" // Contact DB keys -#define DBKEY_LOGIN "Email" -#define DBKEY_ID "ID" -#define DBKEY_SID "SID" -#define DBKEY_TID "ThreadID" -#define DBKEY_FIRST_NAME "FirstName" -#define DBKEY_SECOND_NAME "SecondName" -#define DBKEY_LAST_NAME "LastName" -#define DBKEY_NICK "Nick" -#define DBKEY_PASS "Password" -#define DBKEY_CLIENT_ID "ClientID" -#define DBKEY_DEVICE_ID "DeviceID" -#define DBKEY_AVATAR "Avatar" -#define DBKEY_CONTACT_TYPE "ContactType" -#define DBKEY_TOKEN "Token" -#define DBKEY_SYNC_TOKEN "SyncToken" - -// Thread specific DB keys -#define DBKEY_CHAT_CAN_REPLY "CanReply" -#define DBKEY_CHAT_READ_ONLY "ReadOnly" -#define DBKEY_CHAT_IS_ARCHIVED "IsArchived" -#define DBKEY_CHAT_IS_SUBSCRIBED "IsSubscribed" - -// Contact and account DB keys -#define DBKEY_KEEP_UNREAD "KeepUnread" // (byte) 1 = don't mark messages as read on server (works globally or per contact) +#define DBKEY_LOGIN "Email" +#define DBKEY_ID "ID" +#define DBKEY_SID "SID" +#define DBKEY_NICK "Nick" +#define DBKEY_PASS "Password" +#define DBKEY_CLIENT_ID "ClientID" +#define DBKEY_DEVICE_ID "DeviceID" +#define DBKEY_AVATAR "Avatar" +#define DBKEY_CONTACT_TYPE "ContactType" +#define DBKEY_TOKEN "Token" +#define DBKEY_SYNC_TOKEN "SyncToken" // Account DB keys -#define DBKEY_DEF_GROUP "DefaultGroup" -#define DBKEY_SET_MIRANDA_STATUS "SetMirandaStatus" -#define DBKEY_SYSTRAY_NOTIFY "UseSystrayNotify" -#define DBKEY_DISABLE_STATUS_NOTIFY "DisableStatusNotify" -#define DBKEY_BIG_AVATARS "UseBigAvatars" -#define DBKEY_DISCONNECT_CHAT "DisconnectChatEnable" -#define DBKEY_MAP_STATUSES "MapStatuses" -#define DBKEY_CUSTOM_SMILEYS "CustomSmileys" -#define DBKEY_SERVER_TYPE "ServerType" -#define DBKEY_PRIVACY_TYPE "PrivacyType" -#define DBKEY_PLACE "Place" -#define DBKEY_LAST_WALL "LastWall" -#define DBKEY_LOAD_PAGES "LoadPages" -#define DBKEY_FILTER_ADS "FilterAds" -#define DBKEY_LOGON_TS "LogonTS" -#define DBKEY_LAST_ACTION_TS "LastActionTS" -#define DBKEY_MESSAGES_ON_OPEN "MessagesOnOpen" -#define DBKEY_MESSAGES_ON_OPEN_COUNT "MessagesOnOpenCount" -#define DBKEY_HIDE_CHATS "HideChats" -#define DBKEY_ENABLE_CHATS "EnableChat" -#define DBKEY_JOIN_EXISTING_CHATS "JoinExistingChats" -#define DBKEY_NOTIFICATIONS_CHATROOM "NotificationsChatroom" -#define DBKEY_NAME_AS_NICK "NameAsNick" -#define DBKEY_LOAD_ALL_CONTACTS "LoadAllContacts" -#define DBKEY_PAGES_ALWAYS_ONLINE "PagesAlwaysOnline" -#define DBKEY_TYPING_WHEN_INVISIBLE "TypingWhenInvisible" - -// Account DB keys - notifications -#define DBKEY_EVENT_NOTIFICATIONS_ENABLE "EventNotificationsEnable" -#define DBKEY_EVENT_FEEDS_ENABLE "EventFeedsEnable" -#define DBKEY_EVENT_FRIENDSHIP_ENABLE "EventFriendshipEnable" -#define DBKEY_EVENT_TICKER_ENABLE "EventTickerEnable" -#define DBKEY_EVENT_ON_THIS_DAY_ENABLE "EventMemoriesEnable" -#define DBKEY_FEED_TYPE "EventFeedsType" +#define DBKEY_MAP_STATUSES "MapStatuses" +#define DBKEY_SET_MIRANDA_STATUS "SetMirandaStatus" // Hidden account DB keys (can't be changed through GUI) -#define DBKEY_POLL_RATE "PollRate" // [HIDDEN] - (byte) -#define DBKEY_TIMEOUTS_LIMIT "TimeoutsLimit" // [HIDDEN] - (byte) -#define DBKEY_LOCALE "Locale" // [HIDDEN] - (string) en_US, cs_CZ, etc. (requires restart to apply) -#define DBKEY_NASEEMS_SPAM_MODE "NaseemsSpamMode" // [HIDDEN] - (byte) 1 = don't load messages sent from other instances (e.g., browser) - known as "Naseem's spam mode" -#define DBKEY_OPEN_URL_BROWSER "OpenUrlBrowser" // [HIDDEN] - (unicode) = absolute path to browser to open url links with -#define DBKEY_SEND_MESSAGE_TRIES "SendMessageTries" // [HIDDEN] - (byte) = number of tries to send message, default=1, min=1, max=5 -#define DBKEY_PAGE_PREFIX "PagePrefix" // [HIDDEN] - (unicode) = prefix for name of "page" contacts (requires restart to apply), default is emoji :page_facing_up: (written as unicode char) +#define DBKEY_LOCALE "Locale" // [HIDDEN] - (string) en_US, cs_CZ, etc. (requires restart to apply) diff --git a/protocols/Facebook/src/server.cpp b/protocols/Facebook/src/server.cpp index b4adb46d35..17f0ace5c9 100644 --- a/protocols/Facebook/src/server.cpp +++ b/protocols/Facebook/src/server.cpp @@ -156,9 +156,9 @@ int FacebookProto::RefreshContacts() CMStringW wszPart(nn["part"].as_mstring()); int offset = nn["offset"].as_int(), length = nn["length"].as_int(); if (wszPart == L"first") - setWString(hContact, DBKEY_FIRST_NAME, wszName.Mid(offset, length)); + setWString(hContact, "FirstName", wszName.Mid(offset, length)); else if (wszPart == L"last") - setWString(hContact, DBKEY_LAST_NAME, wszName.Mid(offset, length)); + setWString(hContact, "LastName", wszName.Mid(offset, length)); } } |