verdnatura-chat/ios/Pods/Flipper-Folly/folly/json.cpp

1028 lines
27 KiB
C++
Raw Normal View History

Merge beta into master (#2143) * [FIX] Messages being sent but showing as temp status (#1469) * [FIX] Missing messages after reconnect (#1470) * [FIX] Few fixes on themes (#1477) * [I18N] Missing German translations (#1465) * Missing German translation * adding a missing space behind colon * added a missing space after colon * and another attempt to finally fix this – got confused by all the branches * some smaller fixes for the translation * better wording * fixed another typo * [FIX] Crash while displaying the attached image with http on file name (#1401) * [IMPROVEMENT] Tap app and server version to copy to clipboard (#1425) * [NEW] Reply notification (#1448) * [FIX] Incorrect background color login on iPad (#1480) * [FIX] Prevent multiple tap on send (Share Extension) (#1481) * [NEW] Image Viewer (#1479) * [DOCS] Update Readme (#1485) * [FIX] Jitsi with Hermes Enabled (#1523) * [FIX] Draft messages not working with themed Messagebox (#1525) * [FIX] Go to direct message from members list (#1519) * [FIX] Make SAML wait for idp token instead of creating it on client (#1527) * [FIX] Server Test Push Notification (#1508) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [CHORE] Update to new server response (#1509) * [FIX] Insert messages with blank users (#1529) * Bump version to 4.2.1 (#1530) * [FIX] Error when normalizing empty messages (#1532) * [REGRESSION] CAS (#1570) * Bump version to 4.2.2 (#1571) * [FIX] Add username block condition to prevent error (#1585) * Bump version to 4.2.3 * Bump version to 4.2.4 * Bump version to 4.3.0 (#1630) * [FIX] Channels doesn't load (#1586) * [FIX] Channels doesn't load * [FIX] Update roomsUpdatedAt when subscriptions.length is 0 * [FIX] Remove unnecessary changes * [FIX] Improve the code Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Make SAML to work on Rocket.Chat < 2.3.0 (#1629) * [NEW] Invite links (#1534) * [FIX] Set the http-agent to the form that Rocket.Chat requires for logging (#1482) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] "Following thread" and "Unfollowed Thread" is hardcoded and not translated (#1625) * [FIX] Disable reset button if form didn't changed (#1569) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Header title of RoomInfoView (#1553) * [I18N] Gallery Permissions DE (#1542) * [FIX] Not allow to send messages to archived room (#1623) * [FIX] Profile fields automatically reset (#1502) * [FIX] Show attachment on ThreadMessagesView (#1493) * [NEW] Wordpress auth (#1633) * [CHORE] Add Start Packager script (#1639) * [CHORE] Update RN to 0.61.5 (#1638) * [CHORE] Update RN to 0.61.5 * [CHORE] Update react-native patch Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> * Bump version to 4.3.1 (#1641) * [FIX] Change force logout rule (#1640) * Bump version to 4.4.0 (#1643) * [IMPROVEMENT] Use MessagingStyle on Android Notification (#1575) * [NEW] Request review (#1627) * [NEW] Pull to refresh RoomView (#1657) * [FIX] Unsubscribe from room (#1655) * [FIX] Server with subdirs (#1646) * [NEW] Clear cache (#1660) * [IMPROVEMENT] Memoize and batch subscriptions updates (#1642) * [FIX] Disallow empty sharing (#1664) * [REGRESSION] Use HTTPS links for sharing and markets protocol for review (#1663) * [FIX] In some cases, share extension doesn't load images (#1649) * [i18n] DE translations for new invite function and some minor fixes (#1631) * [FIX] Remove duplicate jetify step (#1628) minor: also remove 'cd' calls Co-authored-by: Diego Mello <diegolmello@gmail.com> * [REGRESSION] Read messages (#1666) * [i18n] German translations missing (#1670) * [FIX] Notifications crash on older Android Versions (#1672) * [i18n] Added Dutch translation (#1676) * [NEW] Omnichannel Beta (#1674) * [NEW] Confirm logout/clear cache (#1688) * [I18N] Add es-ES language (#1495) * [NEW] UiKit Beta (#1497) * [IMPROVEMENT] Use reselect (#1696) * [FIX] Notification in Android API level less than 24 (#1692) * [IMPROVEMENT] Send tmid on slash commands and media (#1698) * [FIX] Unhandled action on UIKit (#1703) * [NEW] Pull to refresh RoomsList (#1701) * [IMPROVEMENT] Reset app when language is changed (#1702) * [FIX] Small fixes on UIKit (#1709) * [FIX] Spotlight (#1719) * [CHORE] Update react-native-image-crop-picker (#1712) * [FIX] Messages Overlapping (Android) and MessageBox Scroll (iOS) (#1720) * [REGRESSION] Remove @ and # from mention (#1721) * [NEW] Direct message from user info (#1516) * [FIX] Delete slash commands (#1723) * [IMPROVEMENT] Hold URL to copy (#1684) * [FIX] Different sourcemaps generation for Hermes (#1724) * [FIX] Different sourcemaps generation for Hermes * Upload sourcemaps after build * [REVERT] Show emoji keyboard on Android (#1738) * [FIX] Stop logging react-native-image-crop-picker (#1745) * [FIX] Prevent toast ref error (#1744) * [FIX] Prevent reaction map error (#1743) * [FIX] Add missing calls to user info (#1741) * [FIX] Catch room unsubscribe error (#1739) * [i18n] Missing German keys (#1735) * [FIX] Missing i18n on MessagesView title (#1733) * [FIX] UIKit Modal: Weird behavior on Android Tablet (#1742) * [i18n] Missing key on German (#1747) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [i18n] Add Italian (#1736) * [CHORE] Memory leaks investigation (#1675) * [IMPROVEMENT] Alert verify email when enabled (#1725) * [NEW] Jitsi JWT added to URL (#1746) * [FIX] UIKit submit when connection lost (#1748) * Bump version to 4.5.0 (#1761) * [NEW] Default browser (#1752) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] HTTP Basic Auth (#1753) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [IMPROVEMENT] Honor profile fields edit settings (#1687) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [IMPROVEMENT] Room announcements (#1726) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [IMPROVEMENT] Honor Register/Login settings (#1727) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [IMPROVEMENT] Make links clickable on Room Info (#1730) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [NEW] Hide system messages (#1755) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [IMPROVEMENT] Honor "Message_AudioRecorderEnabled" (#1764) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [i18n] Missing de keys (#1765) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Redirect user to SetUsernameView (#1728) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Join Room (#1769) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Accept all media types using * (#1770) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Use RealName when necessary (#1758) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Markdown Line Break (#1783) * [IMPROVEMENT] Remove useMarkdown (#1774) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [IMPROVEMENT] Open browser rather than webview on Create Workspace (#1788) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [IMPROVEMENT] Markdown perf (#1796) * [FIX] Stop video when modal is closed (#1787) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Hide reply notification action when there are missing data (#1771) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [i18n] Added Japanese translation (#1781) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Reset password error message (#1772) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Close tablet modal (#1773) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Setting not present (#1775) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Thread header (#1776) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Keyboard tracking loses input ref (#1784) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [NEW] Mark message as unread (#1785) Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> * [IMPROVEMENT] Log server version (#1786) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [IMPROVEMENT] Add loading message on long running tasks (#1798) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [CHORE] Switch Apple account on Fastlane (#1810) * [FIX] Watermelon throwing "Cannot update a record with pending updates" (#1754) * [FIX] Detox tests (#1790) * [CHORE] Use markdown preview on RoomView Header (#1807) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] LoginSignup blink services (#1809) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [IMPROVEMENT] Request user presence on demand (#1813) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Remove all invited users when create a channel (#1814) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Pop from room which you have been removed (#1819) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Room Info styles (#1820) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [i18n] Add missing German keys (#1800) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Empty mentions for @all and @here when real name is enabled (#1822) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [TESTS] Markdown added to Storybook (#1812) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [REGRESSION] Room View header title (#1827) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Storybook snapshots (#1831) Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> * [FIX] Mentions (#1829) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Thread message not found (#1830) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Separate delete and remove channel (#1832) * Rename to delete room * Separate delete and remove channel * handleRemoved -> handleRoomRemoved * [FIX] Navigate to RoomsList & Handle tablet case Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> * [NEW] Filter system messages per room (#1815) Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] e2e tests (#1838) * [FIX] Consecutive clear cache calls freezing app (#1851) * Bump version to 4.5.1 (#1853) * [FIX][iOS] Ignore silent mode on audio player (#1862) * [IMPROVEMENT] Create App Group property on Info.plist (#1858) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [IMPROVEMENT] Make username clickable on message (#1618) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Show proper error message on profile (#1768) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [IMPROVEMENT] Show toast when a message is starred/unstarred (#1616) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Incorrect size params to avatar endpoint (#1875) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Remove unrecognized emoji flags on android (#1887) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Remove react-native global installs (#1886) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Emojis transparent on android (#1881) Co-authored-by: Diego Mello <diegolmello@gmail.com> * Bump acorn from 5.7.3 to 5.7.4 (#1876) Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Diego Mello <diegolmello@gmail.com> * Bump version to 4.6.0 (#1911) * [FIX] Encode Image URI (#1909) * [FIX] Encode Image URI * [FIX] Check if Image is Valid Co-authored-by: Diego Mello <diegolmello@gmail.com> * [NEW] Adaptive Icons (#1904) * Remove unnecessary stuff from debug build * Adaptive icon for experimental app * [FIX] Stop showing message on leave channel (#1896) * [FIX] Leave room don't show 'was removed' message * [FIX] Remove duplicated code Co-authored-by: Diego Mello <diegolmello@gmail.com> * [i18n] Added missing German translations(#1900) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Linkedin OAuth login (#1913) * [CHORE] Fix typo in CreateChannel View (#1930) * [FIX] Respect protocol in HTTP Auth IPs (#1933) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Use new LinkedIn OAuth url (#1935) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [CHORE] Use storyboard on splash screen (#1939) * Update react-native-bootsplash * iOS * Fix android * [FIX] Check if avatar exists before create Icon (#1927) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Ignore self typing event (#1950) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Change default directory listing to Users (#1948) * fix: change default directory listing to Users * follow server settings * Fix state to props Co-authored-by: Diego Mello <diegolmello@gmail.com> * [NEW] Onboarding layout (#1954) * Onboarding texts * OnboardingView * FormContainer * Minor fixes * NewServerView * Remove code * Refactor * WorkspaceView * Stash * Login with email working * Login with * Join open * Revert "Login with" This reverts commit d05dc507d2e9a2db76d433b9b1f62192eba35dbd. * Fix create account styles * Register * Refactor * LoginServices component * Refactor * Multiple servers * Remove native images * Refactor styles * Fix testid * Fix add server on tablet * i18n * Fix close modal * Fix TOTP * [FIX] Registration disabled * [FIX] Login Services separator * Fix logos * Fix AppVersion name * I18n * Minor fixes * [FIX] Custom Fields Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> * [NEW] Create discussions (#1942) * [WIP][NEW] Create Discussion * [FIX] Clear multiselect & Translations * [NEW] Create Discussion at MessageActions * [NEW] Disabled Multiselect * [FIX] Initial channel * [NEW] Create discussion on MessageBox Actions * [FIX] Crashing on edit name * [IMPROVEMENT] New message layout * [CHORE] Update README * [NEW] Avatars on MultiSelect * [FIX] Select Users * [FIX] Add redirect and Handle tablet * [IMPROVEMENT] Split CreateDiscussionView * [FIX] Create a discussion inner discussion * [FIX] Create a discussion * [I18N] Add pt-br * Change icons * [FIX] Nav to discussion & header title * Fix header Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Load messages (#1910) * Create updateLastOpen param on readMessages * Remove InteractionManager from load messages * [NEW] Custom Status (#1811) * [NEW] Custom Status * [FIX] Subscribe to changes * [FIX] Improve code using Banner component * [IMPROVEMENT] Toggle modal * [NEW] Edit custom status from Sidebar * [FIX] Modal when tablet * [FIX] Styles * [FIX] Switch to react-native-promp-android * [FIX] Custom Status UI * [TESTS] E2E Custom Status * Fix banner * Fix banner * Fix subtitle * status text * Fix topic header * Fix RoomActionsView topic * Fix header alignment on Android * [FIX] RoomInfo crashes when without statusText * [FIX] Use users.setStatus * [FIX] Remove customStatus of ProfileView * [FIX] Room View Thread Header Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] UI issues of Create Discussion View (#1965) * [NEW] Direct Message between multiple users (#1958) * [WIP] DM between multiple users * [WIP][NEW] Create new DM between multiple users * [IMPROVEMENT] Improve createChannel Sagas * [IMPROVEMENT] Selected Users view * [IMPROVEMENT] Room Actions of Group DM * [NEW] Create new DM between multiple users * [NEW] Group DM avatar * [FIX] Directory border * [IMPROVEMENT] Use isGroupChat * [CHORE] Remove legacy getRoomMemberId * [NEW] RoomTypeIcon * [FIX] No use legacy method on RoomInfoView * [FIX] Blink header when create new DM * [FIX] Only show create direct message option when allowed * [FIX] RoomInfoView * pt-BR * Few fixes * Create button name * Show create button only after a user is selected * Fix max users issues Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Add server and hide login (#1968) * Navigate to new server workspace from ServerDropdown if there's no token * Hide login button based on login services and Accounts_ShowFormLogin setting * [FIX] Lint Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> * [FIX] MultiSelect Keyboard behavior (Android) (#1969) * fixed-modal-position * made-changes Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> * [FIX] Bottom border style on DirectoryView (#1963) * [FIX] Border style * [FIX] Refactoring * [FIX] fix color of border * Undo Co-authored-by: Aroo <azhaubassar@gmail.com> Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Clear settings on server change (#1967) * [FIX] Deeplinking without RoomId (#1925) * [FIX] Deeplinking without rid * [FIX] Join channel * [FIX] Deep linking without rid * Update app/lib/methods/canOpenRoom.js Co-authored-by: Diego Mello <diegolmello@gmail.com> * [NEW] Two Factor authentication via email (#1961) * First api call working * [NEW] REST API Post wrapper 2FA * [NEW] Send 2FA on Email * [I18n] Add translations * [NEW] Translations & Cancel totp * [CHORE] Totp -> TwoFactor * [NEW] Two Factor by email * [NEW] Tablet Support * [FIX] Text colors * [NEW] Password 2fa * [FIX] Encrypt password on 2FA * [NEW] MethodCall2FA * [FIX] Password fallback * [FIX] Wrap all post/methodCall with 2fa * [FIX] Wrap missed function * few fixes * [FIX] Use new TOTP on Login * [improvement] 2fa methodCall Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> * [FIX] Correct message for manual approval user Registration (#1906) * [FIX] Correct message for manual approval from admin shown on Registeration * lint fix - added semicolon * Updated the translations * [FIX] Translations * i18n to match server Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Direct Message between multiple users REST (#1974) * [FIX] Investigate app losing connection issues (#1890) * [WIP] Reopen without timeOut & ping with 5 sec & Fix Unsubscribe * [FIX] Remove duplicated close * [FIX] Use no-dist lib * [FIX] Try minor fix * [FIX] Try reopen connection when app was put on foreground * [FIX] Remove timeout * [FIX] Build * [FIX] Patch * [FIX] Snapshot * [IMPROVEMENT] Decrease time to reopen * [FIX] Some fixes * [FIX] Update sdk version * [FIX] Subscribe Room Once * [CHORE] Update sdk * [FIX] Subscribe Room * [FIX] Try to resend missed subs * [FIX] Users never show status when start app without network * [FIX] Subscribe to room * [FIX] Multiple servers * [CHORE] Update SDK * [FIX] Don't duplicate streams on subscribeAll * [FIX] Server version when start the app offline * [FIX] Server version cached * [CHORE] Remove unnecessary code * [FIX] Offline server version * [FIX] Subscribe before connect * [FIX] Remove unncessary props * [FIX] Update sdk * [FIX] User status & Unsubscribe Typing * [FIX] Typing at incorrect room * [FIX] Multiple Servers * [CHORE] Update SDK * [REVERT] Undo some changes on SDK * [CHORE] Update sdk to prevent incorrect subscribes * [FIX] Prevent no reconnect * [FIX] Remove close on open * [FIX] Clear typing when disconnect/connect to SDK * [CHORE] Update SDK * [CHORE] Update SDK * Update SDK * fix merge develop Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Single message thread inserting thread without rid (#1999) * [FIX] ThreadMessagesView crashing on load (#1997) * [FIX] Saml (#1996) * [FIX] SAML incorrect close * [FIX] Pathname Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Change user own status (#1995) * [FIX] Change user own status * [IMPROVEMENT] Set activeUsers Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Loading all updated rooms after app resume (#1998) * [FIX] Loading all updated rooms after app resume * Fix room date on RoomItem Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Change notifications preferences (#2000) * [FIX] Change notifications preferences * [IMPROVEMENT] Picker View * [I18N] Translations * [FIX] Picker Selection * [FIX] List border * [FIX] Prevent crash * [FIX] Not-Pref tablet * [FIX] Use same style of LanguageView * [IMPROVEMENT] Send listItem title Co-authored-by: Diego Mello <diegolmello@gmail.com> * Bump version to 4.6.1 (#2001) * [FIX] DM header blink (#2011) * [FIX] Split get settings into two requests (#2017) * [FIX] Split get settings into two requests * [FIX] Clear settings only when change server * [IMPROVEMENT] Move the way to clear settings * [REVERT] Revert some changes * [FIX] Server Icon Co-authored-by: Diego Mello <diegolmello@gmail.com> * [REGRESSION] Invite Links (#2007) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Read only channel/broadcast (#1951) * [FIX] Read only channel/broadcast * [FIX] Roles missing * [FIX] Check roles to readOnly * [FIX] Can post * [FIX] Respect post-readonly permission * [FIX] Search a room readOnly Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Cas auth (#2024) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Login TOTP Compatibility to older servers (#2018) * [FIX] Login TOTP Compatibility to older servers * [FIX] Android crashes if use double negation Co-authored-by: Diego Mello <diegolmello@gmail.com> * Bump version to 4.6.4 (#2029) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Lint (#2030) * [FIX] UIKit with only one block (#2022) * [FIX] Message with only one block * [FIX] Update headers Co-authored-by: Diego Mello <diegolmello@gmail.com> * Bump version to 4.7.0 (#2035) * [FIX] Action Tint Color on Black theme (#2081) * [FIX] Prevent crash when thread is not found (#2080) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Prevent double click (#2079) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Show slash commands when disconnected (#2078) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Backhandler onboarding (#2077) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Respect UI_Allow_room_names_with_special_chars setting (#2076) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] RoomsList update sometimes isn't fired (#2071) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [IMPROVEMENT] Stop inserting last message as message object from rooms stream if room is focused (#2069) * [IMPROVEMENT] No insert last message if the room is focused * fix discussion/threads Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Hide system messages (#2067) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Pending update (#2066) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Prevent crash when room.uids was not inserted yet (#2055) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FEATURE] Save video (#2063) * added-feature-save-video * fix sha256 Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Send totp-code to meteor call (#2050) * fixed-issue * removed-variable-name-errors * reverted-last-commit Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] MessageBox mention shouldn't show group DMs (#2049) * fixed-issue * [FIX] Filter users only if it's not a group chat Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] AttachmentView (Android)(Tablet) (#2047) * [fix]Tablet attachment View and Room Navigation * fix weird navigation and margin bottom Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Allow special chars in Filename (#2020) * fixed-filename-issue * improve Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Recorded audio on Android doesn't play on iOS (#2073) * react-native-video -> expo-av * remove react-native-video * Add audio mode * update mocks * [FIX] Loading bigger than play/pause Co-authored-by: Diego Mello <diegolmello@gmail.com> * [IMPROVEMENT] Message Touchable (#2082) * [FIX] Avatar touchable * [IMPROVEMENT] onLongPress on all Message Touchables * [IMPROVEMENT] User & baseUrl on MessageContext * [FIX] Context Access * [FIX] BaseURL * Fix User Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] ReactionsModal (#2085) * [NEW] Delete Server (#1975) * [NEW] Delete server Co-authored-by: Bruno Dantas <oliveiradantas96@gmail.com> Co-authored-by: Calebe Rios <calebersmendes@gmail.com> * [FIX] Revert removed function Co-authored-by: Bruno Dantas <oliveiradantas96@gmail.com> Co-authored-by: Calebe Rios <calebersmendes@gmail.com> * pods * i18n * Revert "pods" This reverts commit 2854a1650538159aeeafe90fdb2118d12b76a82f. Co-authored-by: Bruno Dantas <oliveiradantas96@gmail.com> Co-authored-by: Calebe Rios <calebersmendes@gmail.com> Co-authored-by: Diego Mello <diegolmello@gmail.com> * [IMPROVEMENT] Change server while connecting/updating (#1981) * [IMPROVEMENT] Change server while connecting * [FIX] Not login/reconnect to previous server * [FIX] Abort all fetch while connecting * [FIX] Abort sdk fetch * [FIX] Patch-package * Add comments Co-authored-by: Diego Mello <diegolmello@gmail.com> * [IMPROVEMENT] Keep screen awake while recording/playing some audio (#2089) * [IMPROVEMENT] Keep screen awake while recording/playing some audio * [FIX] Add expo-keep-awake mock * [FIX] UIKit crashing when UIKitModal receive update event (#2088) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [IMPROVEMENT] Close announcement banner (#2064) * [NEW] Created new field in subscription table Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * [NEW] New field added to obeserver in room view Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * [NEW] Added icon and new design to banner Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * [NEW] Close banner function works Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * [IMPROVEMENT] closed banner status now update correctly Signed-off-by: Ezequiel De Oliveira <ezequiel1de1oliveira@gmail.com> * improve banner style Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> Co-authored-by: Diego Mello <diegolmello@gmail.com> * Update all dependencies (#2008) * Android RN 62 * First steps iOS * Second step iOS * iOS compiling * "New" build system * Finish iOS * Flipper * Update to RN 0.62.1 * expo libs * Hermes working * Fix lint * Fix android build * Patches * Dev patches * Patch WatermelonDB: https://github.com/Nozbe/WatermelonDB/pull/660 * Fix jitsi * Update several minors * Update dev minors and lint * react-native-keyboard-input * Few updates * device info * react-native-fast-image * Navigation bar color * react-native-picker-select * webview * reactotron-react-native * Watermelondb * RN 0.62.2 * Few updates * Fix selection * update gems * remove lib * finishing * tests * Use node 10 * Re-enable app bundle * iOS build * Update jitsi ios * [NEW] Passcode and biometric unlock (#2059) * Update expo libs * Configure expo-local-authentication * ScreenLockedView * Authenticate server change * Auth on app resume * localAuthentication util * Add servers.lastLocalAuthenticatedSession column * Save last session date on background * Use our own version of app state redux * Fix libs * Remove inactive * ScreenLockConfigView * Apply on saved data * Auto lock option label * Starting passcode * Basic passcode flow working * Change passcode * Check if biometry is enrolled * Use fork * Migration * Patch expo-local-authentication * Use async storage * Styling * Timer * Refactor * Lock orientation portrait when not on tablet * share extension * Deep linking * Share extension * Refactoring passcode * use state * Stash * Refactor * Change passcode * Animate dots on error * Matching passcodes * Shake * Remove lib * Delete button * Fade animation on modal * Refactoring * ItemInfo * I18n * I18n * Remove unnecessary prop * Save biometry column * Raise time to lock to 30 seconds * Vibrate on wrong confirmation passcode * Reset attempts and save last authentication on local passcode confirmation * Remove inline style * Save last auth * Fix header blink * Change function name * Fix android modal * Fix vibration permission * PasscodeEnter calls biometry * Passcode on the state * Biometry button on PasscodeEnter * Show whole passcode * Secure passcode * Save passcode with promise to prevent empty passcodes and immediately lock * Patch expo-local-authentication * I18n * Fix biometry being called every time * Blur screen on app inactive * Revert "Blur screen on app inactive" This reverts commit a4ce812934adcf6cf87eb1a92aec9283e2f26753. * Remove immediately because of how Activities work on Android * Pods * New layout * stash * Layout refactored * Fix icons * Force set passcode from server * Lint * Improve permission message * Forced passcode subtitle * Disable based on admin's choice * Require local authentication on login success * Refactor * Update tests * Update react-native-device-info to fix notch * Lint * Fix modal * Fix icons * Fix min auto lock time * Review * keep enabled on mobile * fix forced by admin when enable unlock with passcode * use DEFAULT_AUTO_LOCK when manual enable screenLock * fix check has passcode * request biometry on first password * reset auto time lock when disabled on server Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> * [FIX] Messages View (#2090) * [FIX] Messages View * [FIX] Opening PDF from Files View * [FIX] Audio * [FIX] SearchMessagesView Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Big names overflow (#2072) * [FIX] Big names overflow * [FIX] Message time Co-authored-by: devyaniChoubey <devyanichoubey16@gmail.com> * [FIX] Some alignments * fix user item overflow * some adjustments Co-authored-by: devyaniChoubey <devyanichoubey16@gmail.com> Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Avatar of message as an emoji (#2038) * fixed-issue * removed-hardcoded-emoji * Merge develop * replaced markdown with emoji componenent * made-changes * use avatar onPress Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> Co-authored-by: Diego Mello <diegolmello@gmail.com> * [NEW] Livechat (#2004) * [WIP][NEW] Livechat info/actions * [IMPROVEMENT] RoomActionsView * [NEW] Visitor Navigation * [NEW] Get Department REST * [FIX] Borders * [IMPROVEMENT] Refactor RoomInfo View * [FIX] Error while navigate from mention -> roomInfo * [NEW] Livechat Fields * [NEW] Close Livechat * [WIP] Forward livechat * [NEW] Return inquiry * [WIP] Comment when close livechat * [WIP] Improve roomInfo * [IMPROVEMENT] Forward room * [FIX] Department picker * [FIX] Picker without results * [FIX] Superfluous argument * [FIX] Check permissions on RoomActionsView * [FIX] Livechat permissions * [WIP] Show edit to livechat * [I18N] Add pt-br translations * [WIP] Livechat Info * [IMPROVEMENT] Livechat info * [WIP] Livechat Edit * [WIP] Livechat edit * [WIP] Livechat Edit * [WIP] Livechat edit scroll * [FIX] Edit customFields * [FIX] Clean livechat customField * [FIX] Visitor Navigation * [NEW] Next input logic LivechatEdit * [FIX] Add livechat data to subscription * [FIX] Revert change * [NEW] Livechat user Status * [WIP] Livechat tags * [NEW] Edit livechat tags * [FIX] Prevent some crashes * [FIX] Forward * [FIX] Return Livechat error * [FIX] Prevent livechat info crash * [IMPROVEMENT] Use input style on forward chat * OnboardingSeparator -> OrSeparator * [FIX] Go to next input * [NEW] Added some icons * [NEW] Livechat close * [NEW] Forward Room Action * [FIX] Livechat edit style * [FIX] Change status logic * [CHORE] Remove unnecessary logic * [CHORE] Remove unnecessary code * [CHORE] Remove unecessary case * [FIX] Superfluous argument * [IMPROVEMENT] Submit livechat edit * [CHORE] Remove textInput type * [FIX] Livechat edit * [FIX] Livechat Edit * [FIX] Use same effect * [IMPROVEMENT] Tags input * [FIX] Add empty tag * Fix minor issues * Fix typo * insert livechat room data to our room object * review * add method calls server version Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Delete Subs (#2091) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Android build (#2094) * [FIX] Blink header DM (#2093) * [FIX] Blink header DM * Remove query * [FIX] Push RoomInfoView * remove unnecessary try/catch * [FIX] RoomInfo > Message (Tablet) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Default biometry enabled (#2095) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [IMPROVEMENT] Enable navigating to a room from auth deep linking (#2115) * Wait for login success to navigate * Enable auth and room deep linking at the same time * [FIX] NewMessageView Press Item should open DM (#2116) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Roles throwing error (#2110) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Wait attach activity before changeNavigationBarColor (#2111) * [FIX] Wait attach activity before changeNavigationBarColor * Remove timeout and add try/catch Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] UIKit crash when some app send a list (#2117) * [FIX] StoryBook * [FIX] UIKit crash when some app send a list * [CHORE] Update snapshot * [CHORE] Remove token & id * [FIX] Change bar color while no activity attached (#2130) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Screen Lock options i18n (#2120) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [i18n] Added missing German translation strings (#2105) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Sometimes SDK is null when try to connect (#2131) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [FIX] Autocomplete position on Android (#2106) * [FIX] Autocomplete position on Android * [FIX] Set selection to 0 when needed Co-authored-by: Diego Mello <diegolmello@gmail.com> * Revert "[FIX] Autocomplete position on Android (#2106)" (#2136) This reverts commit e8c38d6f6f69ae396a4aae6e37336617da739a6d. * [FIX] Here and all mentions shouldn't refer to users (#2137) * [FIX] No send data to bugsnag if it's an aborted request (#2133) Co-authored-by: Diego Mello <diegolmello@gmail.com> * [TESTS] Update and separate E2E tests (#2126) * Tests passing until roomslist * create room * roominfo * change server * broadcast * profile * custom status * forgot password * working * room and onboarding * Tests separated * config.yml refactor * Revert "config.yml refactor" This reverts commit 0e984d3029e47612726bf199553f7abdf24843e5. * CI * lint * CI refactor * Onboarding tests * npx detox * Add all tests * Save brew cache * mac-env executor * detox-test command * Update readme * Remove folder * [FIX] Screen Lock Time respect local value (#2141) * [FIX] Screen Lock Time respect local value * [FIX] Enable biometry at the first passcode change Co-authored-by: phriedrich <info@phriedrich.de> Co-authored-by: Guilherme Siqueira <guilhersiqueira@gmail.com> Co-authored-by: Prateek Jain <44807945+Prateek93a@users.noreply.github.com> Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com> Co-authored-by: Prateek Jain <prateek93a@gmail.com> Co-authored-by: devyaniChoubey <52153085+devyaniChoubey@users.noreply.github.com> Co-authored-by: Bernard Seow <ssbing99@gmail.com> Co-authored-by: Hiroki Ishiura <ishiura@ja2.so-net.ne.jp> Co-authored-by: Exordian <jakob.englisch@gmail.com> Co-authored-by: Daanchaam <daanhendriks97@gmail.com> Co-authored-by: Youssef Muhamad <emaildeyoussefmuhamad@gmail.com> Co-authored-by: Iván Álvarez <ialvarezpereira@gmail.com> Co-authored-by: Sarthak Pranesh <41206172+sarthakpranesh@users.noreply.github.com> Co-authored-by: Michele Pellegrini <pellettiero@users.noreply.github.com> Co-authored-by: Tanmoy Bhowmik <tanmoy.openroot@gmail.com> Co-authored-by: Hibikine Kage <14365761+hibikine@users.noreply.github.com> Co-authored-by: Ezequiel de Oliveira <ezequiel1de1oliveira@gmail.com> Co-authored-by: Neil Agarwal <neil@neilagarwal.me> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Govind Dixit <GOVINDDIXIT93@GMAIL.COM> Co-authored-by: Zhaubassarova Aruzhan <49000079+azhaubassar@users.noreply.github.com> Co-authored-by: Aroo <azhaubassar@gmail.com> Co-authored-by: Sarthak Pranesh <sarthak.pranesh2018@vitstudent.ac.in> Co-authored-by: Siddharth Padhi <padhisiddharth31@gmail.com> Co-authored-by: Bruno Dantas <oliveiradantas96@gmail.com> Co-authored-by: Calebe Rios <calebersmendes@gmail.com> Co-authored-by: devyaniChoubey <devyanichoubey16@gmail.com>
2020-05-25 20:54:27 +00:00
/*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <folly/json.h>
#include <algorithm>
#include <functional>
#include <iterator>
#include <type_traits>
#include <boost/algorithm/string.hpp>
#include <glog/logging.h>
#include <folly/Conv.h>
#include <folly/Portability.h>
#include <folly/Range.h>
#include <folly/String.h>
#include <folly/Unicode.h>
#include <folly/Utility.h>
#include <folly/lang/Bits.h>
#include <folly/portability/Constexpr.h>
namespace folly {
//////////////////////////////////////////////////////////////////////
namespace json {
namespace {
parse_error make_parse_error(
unsigned int line,
std::string const& context,
std::string const& expected) {
return parse_error(to<std::string>(
"json parse error on line ",
line,
!context.empty() ? to<std::string>(" near `", context, '\'') : "",
": ",
expected));
}
struct Printer {
explicit Printer(
std::string& out,
unsigned* indentLevel,
serialization_opts const* opts)
: out_(out), indentLevel_(indentLevel), opts_(*opts) {}
void operator()(dynamic const& v) const {
switch (v.type()) {
case dynamic::DOUBLE:
if (!opts_.allow_nan_inf &&
(std::isnan(v.asDouble()) || std::isinf(v.asDouble()))) {
throw json::parse_error(
"folly::toJson: JSON object value was a "
"NaN or INF");
}
toAppend(
v.asDouble(), &out_, opts_.double_mode, opts_.double_num_digits);
break;
case dynamic::INT64: {
auto intval = v.asInt();
if (opts_.javascript_safe) {
// Use folly::to to check that this integer can be represented
// as a double without loss of precision.
intval = int64_t(to<double>(intval));
}
toAppend(intval, &out_);
break;
}
case dynamic::BOOL:
out_ += v.asBool() ? "true" : "false";
break;
case dynamic::NULLT:
out_ += "null";
break;
case dynamic::STRING:
escapeString(v.asString(), out_, opts_);
break;
case dynamic::OBJECT:
printObject(v);
break;
case dynamic::ARRAY:
printArray(v);
break;
default:
CHECK(0) << "Bad type " << v.type();
}
}
private:
void printKV(const std::pair<const dynamic, dynamic>& p) const {
if (!opts_.allow_non_string_keys && !p.first.isString()) {
throw json::parse_error(
"folly::toJson: JSON object key was not a "
"string");
}
(*this)(p.first);
mapColon();
(*this)(p.second);
}
template <typename Iterator>
void printKVPairs(Iterator begin, Iterator end) const {
printKV(*begin);
for (++begin; begin != end; ++begin) {
out_ += ',';
newline();
printKV(*begin);
}
}
void printObject(dynamic const& o) const {
if (o.empty()) {
out_ += "{}";
return;
}
out_ += '{';
indent();
newline();
if (opts_.sort_keys || opts_.sort_keys_by) {
using ref = std::reference_wrapper<decltype(o.items())::value_type const>;
auto sort_keys_by = [&](auto begin, auto end, const auto& comp) {
std::sort(begin, end, [&](ref a, ref b) {
// Only compare keys. No ordering among identical keys.
return comp(a.get().first, b.get().first);
});
};
std::vector<ref> refs(o.items().begin(), o.items().end());
if (opts_.sort_keys_by) {
sort_keys_by(refs.begin(), refs.end(), opts_.sort_keys_by);
} else {
sort_keys_by(refs.begin(), refs.end(), std::less<>());
}
printKVPairs(refs.cbegin(), refs.cend());
} else {
printKVPairs(o.items().begin(), o.items().end());
}
outdent();
newline();
out_ += '}';
}
void printArray(dynamic const& a) const {
if (a.empty()) {
out_ += "[]";
return;
}
out_ += '[';
indent();
newline();
(*this)(a[0]);
for (auto& val : range(std::next(a.begin()), a.end())) {
out_ += ',';
newline();
(*this)(val);
}
outdent();
newline();
out_ += ']';
}
private:
void outdent() const {
if (indentLevel_) {
--*indentLevel_;
}
}
void indent() const {
if (indentLevel_) {
++*indentLevel_;
}
}
void newline() const {
if (indentLevel_) {
out_ += to<std::string>('\n', std::string(*indentLevel_ * 2, ' '));
}
}
void mapColon() const {
out_ += indentLevel_ ? ": " : ":";
}
private:
std::string& out_;
unsigned* const indentLevel_;
serialization_opts const& opts_;
};
//////////////////////////////////////////////////////////////////////
// Wraps our input buffer with some helper functions.
struct Input {
explicit Input(StringPiece range, json::serialization_opts const* opts)
: range_(range), opts_(*opts), lineNum_(0) {
storeCurrent();
}
Input(Input const&) = delete;
Input& operator=(Input const&) = delete;
char const* begin() const {
return range_.begin();
}
unsigned getLineNum() const {
return lineNum_;
}
// Parse ahead for as long as the supplied predicate is satisfied,
// returning a range of what was skipped.
template <class Predicate>
StringPiece skipWhile(const Predicate& p) {
std::size_t skipped = 0;
for (; skipped < range_.size(); ++skipped) {
if (!p(range_[skipped])) {
break;
}
if (range_[skipped] == '\n') {
++lineNum_;
}
}
auto ret = range_.subpiece(0, skipped);
range_.advance(skipped);
storeCurrent();
return ret;
}
StringPiece skipDigits() {
return skipWhile([](char c) { return c >= '0' && c <= '9'; });
}
StringPiece skipMinusAndDigits() {
bool firstChar = true;
return skipWhile([&firstChar](char c) {
bool result = (c >= '0' && c <= '9') || (firstChar && c == '-');
firstChar = false;
return result;
});
}
void skipWhitespace() {
unsigned index = 0;
while (true) {
while (index < range_.size() && range_[index] == ' ') {
index++;
}
if (index < range_.size()) {
if (range_[index] == '\n') {
index++;
++lineNum_;
continue;
}
if (range_[index] == '\t' || range_[index] == '\r') {
index++;
continue;
}
}
break;
}
range_.advance(index);
storeCurrent();
}
void expect(char c) {
if (**this != c) {
throw json::make_parse_error(
lineNum_, context(), to<std::string>("expected '", c, '\''));
}
++*this;
}
std::size_t size() const {
return range_.size();
}
int operator*() const {
return current_;
}
void operator++() {
range_.pop_front();
storeCurrent();
}
template <class T>
T extract() {
try {
return to<T>(&range_);
} catch (std::exception const& e) {
error(e.what());
}
}
bool consume(StringPiece str) {
if (boost::starts_with(range_, str)) {
range_.advance(str.size());
storeCurrent();
return true;
}
return false;
}
std::string context() const {
return range_.subpiece(0, 16 /* arbitrary */).toString();
}
dynamic error(char const* what) const {
throw json::make_parse_error(lineNum_, context(), what);
}
json::serialization_opts const& getOpts() {
return opts_;
}
void incrementRecursionLevel() {
if (currentRecursionLevel_ > opts_.recursion_limit) {
error("recursion limit exceeded");
}
currentRecursionLevel_++;
}
void decrementRecursionLevel() {
currentRecursionLevel_--;
}
private:
void storeCurrent() {
current_ = range_.empty() ? EOF : range_.front();
}
private:
StringPiece range_;
json::serialization_opts const& opts_;
unsigned lineNum_;
int current_;
unsigned int currentRecursionLevel_{0};
};
class RecursionGuard {
public:
explicit RecursionGuard(Input& in) : in_(in) {
in_.incrementRecursionLevel();
}
~RecursionGuard() {
in_.decrementRecursionLevel();
}
private:
Input& in_;
};
dynamic parseValue(Input& in, json::metadata_map* map);
std::string parseString(Input& in);
dynamic parseNumber(Input& in);
template <class K>
void parseObjectKeyValue(
Input& in,
dynamic& ret,
K&& key,
json::metadata_map* map) {
auto keyLineNumber = in.getLineNum();
in.skipWhitespace();
in.expect(':');
in.skipWhitespace();
K tmp;
if (map) {
tmp = K(key);
}
auto valueLineNumber = in.getLineNum();
ret.insert(std::forward<K>(key), parseValue(in, map));
if (map) {
auto val = ret.get_ptr(tmp);
// We just inserted it, so it should be there!
DCHECK(val != nullptr);
map->emplace(
val, json::parse_metadata{{{keyLineNumber}}, {{valueLineNumber}}});
}
}
dynamic parseObject(Input& in, json::metadata_map* map) {
DCHECK_EQ(*in, '{');
++in;
dynamic ret = dynamic::object;
in.skipWhitespace();
if (*in == '}') {
++in;
return ret;
}
for (;;) {
if (in.getOpts().allow_trailing_comma && *in == '}') {
break;
}
if (*in == '\"') { // string
auto key = parseString(in);
parseObjectKeyValue(in, ret, std::move(key), map);
} else if (!in.getOpts().allow_non_string_keys) {
in.error("expected string for object key name");
} else {
auto key = parseValue(in, map);
parseObjectKeyValue(in, ret, std::move(key), map);
}
in.skipWhitespace();
if (*in != ',') {
break;
}
++in;
in.skipWhitespace();
}
in.expect('}');
return ret;
}
dynamic parseArray(Input& in, json::metadata_map* map) {
DCHECK_EQ(*in, '[');
++in;
dynamic ret = dynamic::array;
in.skipWhitespace();
if (*in == ']') {
++in;
return ret;
}
std::vector<uint32_t> lineNumbers;
for (;;) {
if (in.getOpts().allow_trailing_comma && *in == ']') {
break;
}
ret.push_back(parseValue(in, map));
if (map) {
lineNumbers.push_back(in.getLineNum());
}
in.skipWhitespace();
if (*in != ',') {
break;
}
++in;
in.skipWhitespace();
}
if (map) {
for (size_t i = 0; i < ret.size(); i++) {
map->emplace(&ret[i], json::parse_metadata{{{0}}, {{lineNumbers[i]}}});
}
}
in.expect(']');
return ret;
}
dynamic parseNumber(Input& in) {
bool const negative = (*in == '-');
if (negative && in.consume("-Infinity")) {
if (in.getOpts().parse_numbers_as_strings) {
return "-Infinity";
} else {
return -std::numeric_limits<double>::infinity();
}
}
auto integral = in.skipMinusAndDigits();
if (negative && integral.size() < 2) {
in.error("expected digits after `-'");
}
auto const wasE = *in == 'e' || *in == 'E';
constexpr const char* maxInt = "9223372036854775807";
constexpr const char* minInt = "-9223372036854775808";
constexpr auto maxIntLen = constexpr_strlen(maxInt);
constexpr auto minIntLen = constexpr_strlen(minInt);
if (*in != '.' && !wasE && in.getOpts().parse_numbers_as_strings) {
return integral;
}
if (*in != '.' && !wasE) {
if (LIKELY(!in.getOpts().double_fallback || integral.size() < maxIntLen) ||
(!negative && integral.size() == maxIntLen && integral <= maxInt) ||
(negative && integral.size() == minIntLen && integral <= minInt)) {
auto val = to<int64_t>(integral);
in.skipWhitespace();
return val;
} else {
auto val = to<double>(integral);
in.skipWhitespace();
return val;
}
}
auto end = !wasE ? (++in, in.skipDigits().end()) : in.begin();
if (*in == 'e' || *in == 'E') {
++in;
if (*in == '+' || *in == '-') {
++in;
}
auto expPart = in.skipDigits();
end = expPart.end();
}
auto fullNum = range(integral.begin(), end);
if (in.getOpts().parse_numbers_as_strings) {
return fullNum;
}
auto val = to<double>(fullNum);
return val;
}
std::string decodeUnicodeEscape(Input& in) {
auto hexVal = [&](int c) -> uint16_t {
// clang-format off
return uint16_t(
c >= '0' && c <= '9' ? c - '0' :
c >= 'a' && c <= 'f' ? c - 'a' + 10 :
c >= 'A' && c <= 'F' ? c - 'A' + 10 :
(in.error("invalid hex digit"), 0));
// clang-format on
};
auto readHex = [&]() -> uint16_t {
if (in.size() < 4) {
in.error("expected 4 hex digits");
}
auto ret = uint16_t(hexVal(*in) * 4096);
++in;
ret += hexVal(*in) * 256;
++in;
ret += hexVal(*in) * 16;
++in;
ret += hexVal(*in);
++in;
return ret;
};
/*
* If the value encoded is in the surrogate pair range, we need to
* make sure there is another escape that we can use also.
*/
uint32_t codePoint = readHex();
if (codePoint >= 0xd800 && codePoint <= 0xdbff) {
if (!in.consume("\\u")) {
in.error(
"expected another unicode escape for second half of "
"surrogate pair");
}
uint16_t second = readHex();
if (second >= 0xdc00 && second <= 0xdfff) {
codePoint = 0x10000 + ((codePoint & 0x3ff) << 10) + (second & 0x3ff);
} else {
in.error("second character in surrogate pair is invalid");
}
} else if (codePoint >= 0xdc00 && codePoint <= 0xdfff) {
in.error("invalid unicode code point (in range [0xdc00,0xdfff])");
}
return codePointToUtf8(codePoint);
}
std::string parseString(Input& in) {
DCHECK_EQ(*in, '\"');
++in;
std::string ret;
for (;;) {
auto range = in.skipWhile([](char c) { return c != '\"' && c != '\\'; });
ret.append(range.begin(), range.end());
if (*in == '\"') {
++in;
break;
}
if (*in == '\\') {
++in;
switch (*in) {
// clang-format off
case '\"': ret.push_back('\"'); ++in; break;
case '\\': ret.push_back('\\'); ++in; break;
case '/': ret.push_back('/'); ++in; break;
case 'b': ret.push_back('\b'); ++in; break;
case 'f': ret.push_back('\f'); ++in; break;
case 'n': ret.push_back('\n'); ++in; break;
case 'r': ret.push_back('\r'); ++in; break;
case 't': ret.push_back('\t'); ++in; break;
case 'u': ++in; ret += decodeUnicodeEscape(in); break;
// clang-format on
default:
in.error(
to<std::string>("unknown escape ", *in, " in string").c_str());
}
continue;
}
if (*in == EOF) {
in.error("unterminated string");
}
if (!*in) {
/*
* Apparently we're actually supposed to ban all control
* characters from strings. This seems unnecessarily
* restrictive, so we're only banning zero bytes. (Since the
* string is presumed to be UTF-8 encoded it's fine to just
* check this way.)
*/
in.error("null byte in string");
}
ret.push_back(char(*in));
++in;
}
return ret;
}
dynamic parseValue(Input& in, json::metadata_map* map) {
RecursionGuard guard(in);
in.skipWhitespace();
// clang-format off
return
*in == '[' ? parseArray(in, map) :
*in == '{' ? parseObject(in, map) :
*in == '\"' ? parseString(in) :
(*in == '-' || (*in >= '0' && *in <= '9')) ? parseNumber(in) :
in.consume("true") ? true :
in.consume("false") ? false :
in.consume("null") ? nullptr :
in.consume("Infinity") ?
(in.getOpts().parse_numbers_as_strings ? (dynamic)"Infinity" :
(dynamic)std::numeric_limits<double>::infinity()) :
in.consume("NaN") ?
(in.getOpts().parse_numbers_as_strings ? (dynamic)"NaN" :
(dynamic)std::numeric_limits<double>::quiet_NaN()) :
in.error("expected json value");
// clang-format on
}
} // namespace
//////////////////////////////////////////////////////////////////////
std::array<uint64_t, 2> buildExtraAsciiToEscapeBitmap(StringPiece chars) {
std::array<uint64_t, 2> escapes{{0, 0}};
for (auto b : ByteRange(chars)) {
if (b >= 0x20 && b < 0x80) {
escapes[b / 64] |= uint64_t(1) << (b % 64);
}
}
return escapes;
}
std::string serialize(dynamic const& dyn, serialization_opts const& opts) {
std::string ret;
unsigned indentLevel = 0;
Printer p(ret, opts.pretty_formatting ? &indentLevel : nullptr, &opts);
p(dyn);
return ret;
}
// Fast path to determine the longest prefix that can be left
// unescaped in a string of sizeof(T) bytes packed in an integer of
// type T.
template <bool EnableExtraAsciiEscapes, class T>
size_t firstEscapableInWord(T s, const serialization_opts& opts) {
static_assert(std::is_unsigned<T>::value, "Unsigned integer required");
static constexpr T kOnes = ~T() / 255; // 0x...0101
static constexpr T kMsbs = kOnes * 0x80; // 0x...8080
// Sets the MSB of bytes < b. Precondition: b < 128.
auto isLess = [](T w, uint8_t b) {
// A byte is < b iff subtracting b underflows, so we check that
// the MSB wasn't set before and it's set after the subtraction.
return (w - kOnes * b) & ~w & kMsbs;
};
auto isChar = [&](uint8_t c) {
// A byte is == c iff it is 0 if xored with c.
return isLess(s ^ (kOnes * c), 1);
};
// The following masks have the MSB set for each byte of the word
// that satisfies the corresponding condition.
auto isHigh = s & kMsbs; // >= 128
auto isLow = isLess(s, 0x20); // <= 0x1f
auto needsEscape = isHigh | isLow | isChar('\\') | isChar('"');
if /* constexpr */ (EnableExtraAsciiEscapes) {
// Deal with optional bitmap for unicode escapes. Escapes can optionally be
// set for ascii characters 32 - 127, so the inner loop may run up to 96
// times. However, for the case where 0 or a handful of bits are set,
// looping will be minimal through use of findFirstSet.
for (size_t i = 0; i < opts.extra_ascii_to_escape_bitmap.size(); ++i) {
const auto offset = i * 64;
// Clear first 32 characters if this is the first index, since those are
// always escaped.
auto bitmap = opts.extra_ascii_to_escape_bitmap[i] &
(i == 0 ? uint64_t(-1) << 32 : ~0UL);
while (bitmap) {
auto bit = folly::findFirstSet(bitmap);
needsEscape |= isChar(static_cast<uint8_t>(offset + bit - 1));
bitmap &= bitmap - 1;
}
}
}
if (!needsEscape) {
return sizeof(T);
}
if (folly::kIsLittleEndian) {
return folly::findFirstSet(needsEscape) / 8 - 1;
} else {
return sizeof(T) - folly::findLastSet(needsEscape) / 8;
}
}
// Escape a string so that it is legal to print it in JSON text.
template <bool EnableExtraAsciiEscapes>
void escapeStringImpl(
StringPiece input,
std::string& out,
const serialization_opts& opts) {
auto hexDigit = [](uint8_t c) -> char {
return c < 10 ? c + '0' : c - 10 + 'a';
};
out.push_back('\"');
auto* p = reinterpret_cast<const unsigned char*>(input.begin());
auto* q = reinterpret_cast<const unsigned char*>(input.begin());
auto* e = reinterpret_cast<const unsigned char*>(input.end());
while (p < e) {
// Find the longest prefix that does not need escaping, and copy
// it literally into the output string.
auto firstEsc = p;
while (firstEsc < e) {
auto avail = to_unsigned(e - firstEsc);
uint64_t word = 0;
if (avail >= 8) {
word = folly::loadUnaligned<uint64_t>(firstEsc);
} else {
word = folly::partialLoadUnaligned<uint64_t>(firstEsc, avail);
}
auto prefix = firstEscapableInWord<EnableExtraAsciiEscapes>(word, opts);
DCHECK_LE(prefix, avail);
firstEsc += prefix;
if (prefix < 8) {
break;
}
}
if (firstEsc > p) {
out.append(reinterpret_cast<const char*>(p), firstEsc - p);
p = firstEsc;
// We can't be in the middle of a multibyte sequence, so we can reset q.
q = p;
if (p == e) {
break;
}
}
// Handle the next byte that may need escaping.
// Since non-ascii encoding inherently does utf8 validation
// we explicitly validate utf8 only if non-ascii encoding is disabled.
if ((opts.validate_utf8 || opts.skip_invalid_utf8) &&
!opts.encode_non_ascii) {
// To achieve better spatial and temporal coherence
// we do utf8 validation progressively along with the
// string-escaping instead of two separate passes.
// As the encoding progresses, q will stay at or ahead of p.
CHECK_GE(q, p);
// As p catches up with q, move q forward.
if (q == p) {
// calling utf8_decode has the side effect of
// checking that utf8 encodings are valid
char32_t v = utf8ToCodePoint(q, e, opts.skip_invalid_utf8);
if (opts.skip_invalid_utf8 && v == U'\ufffd') {
out.append(reinterpret_cast<const char*>(u8"\ufffd"));
p = q;
continue;
}
}
}
auto encodeUnicode = opts.encode_non_ascii && (*p & 0x80);
if /* constexpr */ (EnableExtraAsciiEscapes) {
encodeUnicode = encodeUnicode ||
(*p >= 0x20 && *p < 0x80 &&
(opts.extra_ascii_to_escape_bitmap[*p / 64] &
(uint64_t(1) << (*p % 64))));
}
if (encodeUnicode) {
// note that this if condition captures utf8 chars
// with value > 127, so size > 1 byte (or they are whitelisted for
// Unicode encoding).
// NOTE: char32_t / char16_t are both unsigned.
char32_t cp = utf8ToCodePoint(p, e, opts.skip_invalid_utf8);
auto writeHex = [&](char16_t v) {
char buf[] = "\\u\0\0\0\0";
buf[2] = hexDigit((v >> 12) & 0x0f);
buf[3] = hexDigit((v >> 8) & 0x0f);
buf[4] = hexDigit((v >> 4) & 0x0f);
buf[5] = hexDigit(v & 0x0f);
out.append(buf, 6);
};
// From the ECMA-404 The JSON Data Interchange Syntax 2nd Edition Dec 2017
if (cp < 0x10000u) {
// If the code point is in the Basic Multilingual Plane (U+0000 through
// U+FFFF), then it may be represented as a six-character sequence:
// a reverse solidus, followed by the lowercase letter u, followed by
// four hexadecimal digits that encode the code point.
writeHex(static_cast<char16_t>(cp));
} else {
// To escape a code point that is not in the Basic Multilingual Plane,
// the character may be represented as a twelve-character sequence,
// encoding the UTF-16 surrogate pair corresponding to the code point.
writeHex(static_cast<char16_t>(
0xd800u + (((cp - 0x10000u) >> 10) & 0x3ffu)));
writeHex(static_cast<char16_t>(0xdc00u + ((cp - 0x10000u) & 0x3ffu)));
}
} else if (*p == '\\' || *p == '\"') {
char buf[] = "\\\0";
buf[1] = char(*p++);
out.append(buf, 2);
} else if (*p <= 0x1f) {
switch (*p) {
// clang-format off
case '\b': out.append("\\b"); p++; break;
case '\f': out.append("\\f"); p++; break;
case '\n': out.append("\\n"); p++; break;
case '\r': out.append("\\r"); p++; break;
case '\t': out.append("\\t"); p++; break;
// clang-format on
default:
// Note that this if condition captures non readable chars
// with value < 32, so size = 1 byte (e.g control chars).
char buf[] = "\\u00\0\0";
buf[4] = hexDigit(uint8_t((*p & 0xf0) >> 4));
buf[5] = hexDigit(uint8_t(*p & 0xf));
out.append(buf, 6);
p++;
}
} else {
out.push_back(char(*p++));
}
}
out.push_back('\"');
}
void escapeString(
StringPiece input,
std::string& out,
const serialization_opts& opts) {
if (FOLLY_UNLIKELY(
opts.extra_ascii_to_escape_bitmap[0] ||
opts.extra_ascii_to_escape_bitmap[1])) {
escapeStringImpl<true>(input, out, opts);
} else {
escapeStringImpl<false>(input, out, opts);
}
}
std::string stripComments(StringPiece jsonC) {
std::string result;
enum class State {
None,
InString,
InlineComment,
LineComment
} state = State::None;
for (size_t i = 0; i < jsonC.size(); ++i) {
auto s = jsonC.subpiece(i);
switch (state) {
case State::None:
if (s.startsWith("/*")) {
state = State::InlineComment;
++i;
continue;
} else if (s.startsWith("//")) {
state = State::LineComment;
++i;
continue;
} else if (s[0] == '\"') {
state = State::InString;
}
result.push_back(s[0]);
break;
case State::InString:
if (s[0] == '\\') {
if (UNLIKELY(s.size() == 1)) {
throw std::logic_error("Invalid JSONC: string is not terminated");
}
result.push_back(s[0]);
result.push_back(s[1]);
++i;
continue;
} else if (s[0] == '\"') {
state = State::None;
}
result.push_back(s[0]);
break;
case State::InlineComment:
if (s.startsWith("*/")) {
state = State::None;
++i;
}
break;
case State::LineComment:
if (s[0] == '\n') {
// skip the line break. It doesn't matter.
state = State::None;
}
break;
default:
throw std::logic_error("Unknown comment state");
}
}
return result;
}
} // namespace json
//////////////////////////////////////////////////////////////////////
dynamic parseJsonWithMetadata(StringPiece range, json::metadata_map* map) {
return parseJsonWithMetadata(range, json::serialization_opts(), map);
}
dynamic parseJsonWithMetadata(
StringPiece range,
json::serialization_opts const& opts,
json::metadata_map* map) {
json::Input in(range, &opts);
uint32_t n = in.getLineNum();
auto ret = parseValue(in, map);
if (map) {
map->emplace(&ret, json::parse_metadata{{{0}}, {{n}}});
}
in.skipWhitespace();
if (in.size() && *in != '\0') {
in.error("parsing didn't consume all input");
}
return ret;
}
dynamic parseJson(StringPiece range) {
return parseJson(range, json::serialization_opts());
}
dynamic parseJson(StringPiece range, json::serialization_opts const& opts) {
json::Input in(range, &opts);
auto ret = parseValue(in, nullptr);
in.skipWhitespace();
if (in.size() && *in != '\0') {
in.error("parsing didn't consume all input");
}
return ret;
}
std::string toJson(dynamic const& dyn) {
return json::serialize(dyn, json::serialization_opts());
}
std::string toPrettyJson(dynamic const& dyn) {
json::serialization_opts opts;
opts.pretty_formatting = true;
opts.sort_keys = true;
return json::serialize(dyn, opts);
}
//////////////////////////////////////////////////////////////////////
// dynamic::print_as_pseudo_json() is implemented here for header
// ordering reasons (most of the dynamic implementation is in
// dynamic-inl.h, which we don't want to include json.h).
void dynamic::print_as_pseudo_json(std::ostream& out) const {
json::serialization_opts opts;
opts.allow_non_string_keys = true;
opts.allow_nan_inf = true;
out << json::serialize(*this, opts);
}
void PrintTo(const dynamic& dyn, std::ostream* os) {
json::serialization_opts opts;
opts.allow_nan_inf = true;
opts.allow_non_string_keys = true;
opts.pretty_formatting = true;
opts.sort_keys = true;
*os << json::serialize(dyn, opts);
}
//////////////////////////////////////////////////////////////////////
} // namespace folly