author int64 658 755k | date stringlengths 19 19 | timezone int64 -46,800 43.2k | hash stringlengths 40 40 | message stringlengths 5 490 | mods list | language stringclasses 20 values | license stringclasses 3 values | repo stringlengths 5 68 | original_message stringlengths 12 491 |
|---|---|---|---|---|---|---|---|---|---|
129,187 | 07.08.2018 20:35:20 | 14,400 | 7f7ce057da52006500c0bd3d6d1530d77eeb3f3f | [native] Optimize reactotron usage | [
{
"change_type": "MODIFY",
"old_path": "native/reactotron.js",
"new_path": "native/reactotron.js",
"diff": "// @flow\n-import Reactotron, {\n- networking,\n- asyncStorage,\n- trackGlobalErrors,\n-} from 'reactotron-react-native';\n-import { reactotronRedux } from 'reactotron-redux';\n-\nlet reactotron = null;\nif (__DEV__) {\n+ const { default: Reactotron } = require('reactotron-react-native');\n+ const { reactotronRedux } = require('reactotron-redux');\nreactotron = Reactotron\n.configure()\n.useReactNative()\n.use(reactotronRedux())\n- .use(networking())\n- .use(asyncStorage())\n- .use(trackGlobalErrors())\n.connect();\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Optimize reactotron usage |
129,187 | 08.08.2018 12:59:32 | 14,400 | 0f2e2ed78cb26110aaaec4dcac1242eec80536f2 | [native] Never show in-app notification about activeThread
No need to pop up an in-app notification when we're already on the relevant thread. | [
{
"change_type": "MODIFY",
"old_path": "native/app.react.js",
"new_path": "native/app.react.js",
"diff": "@@ -718,11 +718,7 @@ class AppWithNavigationState extends React.PureComponent<Props> {\nthis.saveMessageInfos(messageInfos);\n}\nthis.pingNow();\n- invariant(this.inAppNotification, \"should be set\");\n- this.inAppNotification.show({\n- message: notification.getMessage(),\n- onPress: () => this.onPressNotificationForThread(threadID, false),\n- });\n+ this.showInAppNotification(threadID, notification.getMessage());\nnotification.finish(NotificationsIOS.FetchResult.NewData);\n}\n@@ -742,6 +738,17 @@ class AppWithNavigationState extends React.PureComponent<Props> {\nnotification.finish(NotificationsIOS.FetchResult.NewData);\n}\n+ showInAppNotification(threadID: string, message: string) {\n+ if (threadID === this.props.activeThread) {\n+ return;\n+ }\n+ invariant(this.inAppNotification, \"should be set\");\n+ this.inAppNotification.show({\n+ message,\n+ onPress: () => this.onPressNotificationForThread(threadID, false),\n+ });\n+ }\n+\n// This function gets called when:\n// - The app is open (either foreground or background) and a notif is\n// received. In this case, notification has a custom_notification property.\n@@ -797,11 +804,7 @@ class AppWithNavigationState extends React.PureComponent<Props> {\nif (this.currentState === \"active\") {\n// In the case where the app is in the foreground, we will show an\n// in-app notif\n- invariant(this.inAppNotification, \"should be set\");\n- this.inAppNotification.show({\n- message: customNotification.body,\n- onPress: () => this.onPressNotificationForThread(threadID, false),\n- });\n+ this.showInAppNotification(threadID, customNotification.body);\n} else {\n// We keep track of what notifs have been rendered for a given thread so\n// that we can clear them immediately (without waiting for the rescind)\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Never show in-app notification about activeThread
No need to pop up an in-app notification when we're already on the relevant thread. |
129,187 | 08.08.2018 13:06:11 | 14,400 | d31a358add8ea3cfa045595997fe880bc34e5355 | [native] Add no-op FOREGROUND and BACKGROUND actions
These are just for logging, so we can understand a chronological list of action types better. | [
{
"change_type": "MODIFY",
"old_path": "native/app.react.js",
"new_path": "native/app.react.js",
"diff": "@@ -84,6 +84,8 @@ import {\nhandleURLActionType,\nRootNavigator,\nAppRouteName,\n+ backgroundActionType,\n+ foregroundActionType,\n} from './navigation-setup';\nimport { store } from './redux-setup';\nimport { resolveInvalidatedCookie } from './account/native-credentials';\n@@ -428,6 +430,7 @@ class AppWithNavigationState extends React.PureComponent<Props> {\nlastState.match(/inactive|background/) &&\nthis.currentState === \"active\"\n) {\n+ this.props.dispatchActionPayload(foregroundActionType, null);\nthis.startTimeouts();\nif (this.props.appLoggedIn) {\nthis.ensurePushNotifsEnabled();\n@@ -441,6 +444,7 @@ class AppWithNavigationState extends React.PureComponent<Props> {\nthis.currentState &&\nthis.currentState.match(/inactive|background/)\n) {\n+ this.props.dispatchActionPayload(backgroundActionType, null);\nthis.closingApp();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation-setup.js",
"new_path": "native/navigation-setup.js",
"diff": "@@ -90,6 +90,8 @@ export type NavInfo = {|\nconst handleURLActionType = \"HANDLE_URL\";\nconst navigateToAppActionType = \"NAVIGATE_TO_APP\";\n+const backgroundActionType = \"BACKGROUND\";\n+const foregroundActionType = \"FOREGROUND\";\nconst uniqueBaseId = `id-${Date.now()}`;\nlet uuidCount = 0;\n@@ -107,7 +109,9 @@ export type Action =\npayload: NotificationPressPayload,\n|}\n| AndroidNotificationActions\n- | {| type: \"RECORD_NOTIF_PERMISSION_ALERT\", time: number |};\n+ | {| type: \"RECORD_NOTIF_PERMISSION_ALERT\", time: number |}\n+ | {| type: \"BACKGROUND\" |}\n+ | {| type: \"FOREGROUND\" |};\nlet tabBarOptions;\nif (Platform.OS === \"android\") {\n@@ -739,4 +743,6 @@ export {\nreduceNavInfo,\nAppRouteName,\nremoveScreensFromStack,\n+ backgroundActionType,\n+ foregroundActionType,\n};\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Add no-op FOREGROUND and BACKGROUND actions
These are just for logging, so we can understand a chronological list of action types better. |
129,187 | 08.08.2018 13:34:19 | 14,400 | 70e09ae0101d7de0e9c533cace9a93eb14bb5080 | Avoid creating duplicate thread inconsistency reports | [
{
"change_type": "MODIFY",
"old_path": "lib/reducers/thread-reducer.js",
"new_path": "lib/reducers/thread-reducer.js",
"diff": "@@ -208,6 +208,7 @@ function findInconsistencies(\npollResult,\npushResult,\nlastActionTypes: reduxLogger.actions.map(action => action.type),\n+ time: Date.now(),\n}];\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/report-types.js",
"new_path": "lib/types/report-types.js",
"diff": "@@ -44,6 +44,7 @@ export type ThreadPollPushInconsistencyReportCreationRequest = {|\npollResult: {[id: string]: RawThreadInfo},\npushResult: {[id: string]: RawThreadInfo},\nlastActionTypes?: $ReadOnlyArray<$PropertyType<BaseAction, 'type'>>,\n+ time?: number,\n|};\nexport type ReportCreationRequest =\n| ErrorReportCreationRequest\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/request-types.js",
"new_path": "lib/types/request-types.js",
"diff": "@@ -55,6 +55,7 @@ export type ThreadPollPushInconsistencyClientResponse = {|\npollResult: {[id: string]: RawThreadInfo},\npushResult: {[id: string]: RawThreadInfo},\nlastActionTypes?: $ReadOnlyArray<$PropertyType<BaseAction, 'type'>>,\n+ time?: number,\n|};\ntype PlatformDetailsServerRequest = {|\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/report-creator.js",
"new_path": "server/src/creators/report-creator.js",
"diff": "@@ -28,18 +28,26 @@ async function createReport(\nviewer: Viewer,\nrequest: ReportCreationRequest,\n): Promise<?ReportCreationResponse> {\n- if (ignoreReport(request)) {\n+ const shouldIgnore = await ignoreReport(viewer, request);\n+ if (shouldIgnore) {\nreturn null;\n}\nconst [ id ] = await createIDs(\"reports\", 1);\n- const { type, platformDetails, ...report } = request;\n+ let type, platformDetails, report, time;\n+ if (request.type === reportTypes.THREAD_POLL_PUSH_INCONSISTENCY) {\n+ ({ type, platformDetails, time, ...report } = request);\n+ time = time ? time : Date.now();\n+ } else {\n+ ({ type, platformDetails, ...report } = request);\n+ time = Date.now();\n+ }\nconst row = [\nid,\nviewer.id,\ntype,\nplatformDetails.platform,\nJSON.stringify(report),\n- Date.now(),\n+ time,\n];\nconst query = SQL`\nINSERT INTO reports (id, user, type, platform, report, creation_time)\n@@ -74,7 +82,35 @@ async function sendSquadbotMessage(\n}]);\n}\n-function ignoreReport(request: ReportCreationRequest): bool {\n+async function ignoreReport(\n+ viewer: Viewer,\n+ request: ReportCreationRequest,\n+): Promise<bool> {\n+ if (ignoreKnownInconsistencyReport(request)) {\n+ return true;\n+ }\n+ // The below logic is to avoid duplicate inconsistency reports\n+ if (request.type !== reportTypes.THREAD_POLL_PUSH_INCONSISTENCY) {\n+ return false;\n+ }\n+ const { type, platformDetails, time } = request;\n+ if (!time) {\n+ return false;\n+ }\n+ const { platform } = platformDetails;\n+ const query = SQL`\n+ SELECT id\n+ FROM reports\n+ WHERE user = ${viewer.id} AND type = ${type}\n+ AND platform = ${platform} AND creation_time = ${time}\n+ `;\n+ const [ result ] = await dbQuery(query);\n+ return result.length !== 0;\n+}\n+\n+// Currently this only ignores cases that are the result of the thread-reducer\n+// conditional with the comment above that starts with \"If the thread at the\"\n+function ignoreKnownInconsistencyReport(request: ReportCreationRequest): bool {\nif (request.type !== reportTypes.THREAD_POLL_PUSH_INCONSISTENCY) {\nreturn false;\n}\n@@ -101,8 +137,6 @@ function ignoreReport(request: ReportCreationRequest): bool {\nreturn false;\n}\n}\n- // Currently we only ignore cases that are the result of the thread-reducer\n- // conditional with the comment above that starts with \"If the thread at the\"\nreturn true;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -84,6 +84,7 @@ const pingRequestInputValidator = tShape({\npollResult: t.Object,\npushResult: t.Object,\nlastActionTypes: t.maybe(t.list(t.String)),\n+ time: t.maybe(t.Number),\n}),\ntShape({\ntype: t.irreducible(\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/report-responders.js",
"new_path": "server/src/responders/report-responders.js",
"diff": "@@ -54,6 +54,8 @@ const reportCreationRequestInputValidator = t.union([\naction: t.Object,\npollResult: t.Object,\npushResult: t.Object,\n+ lastActionTypes: t.maybe(t.list(t.String)),\n+ time: t.maybe(t.Number),\n}),\n]);\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Avoid creating duplicate thread inconsistency reports |
129,187 | 09.08.2018 11:31:16 | 14,400 | fbc9fa1d70aea2d392537537204670e1aa90a5c3 | [native] Avoid notificationReceivedForeground on press-notif-while-closed
`notificationOpened` should cover this. this makes the behavior consistent with press-notif-while-backgrounded.
Also this commit updates `react-native-notications`. | [
{
"change_type": "MODIFY",
"old_path": "native/app.react.js",
"new_path": "native/app.react.js",
"diff": "@@ -203,8 +203,10 @@ class AppWithNavigationState extends React.PureComponent<Props> {\nopenThreadOnceReceived: Set<string> = new Set();\nupdateBadgeCountAfterNextPing = true;\nqueuedDeviceToken: ?string = null;\n+ appStarted = 0;\ncomponentDidMount() {\n+ this.appStarted = Date.now();\nif (Platform.OS === \"android\") {\nsetTimeout(SplashScreen.hide, 350);\n} else {\n@@ -711,6 +713,15 @@ class AppWithNavigationState extends React.PureComponent<Props> {\nnotification.finish(NotificationsIOS.FetchResult.NoData);\nreturn;\n}\n+ if (Date.now() < this.appStarted + 1500) {\n+ // On iOS, when the app is opened from a notif press, for some reason this\n+ // callback gets triggered before iosNotificationOpened. In fact this\n+ // callback shouldn't be triggered at all. To avoid weirdness we are\n+ // ignoring any foreground notification received within the first second\n+ // of the app being started, since they are most likely to be erroneous.\n+ notification.finish(NotificationsIOS.FetchResult.NoData);\n+ return;\n+ }\nconst threadID = notification.getData().threadID;\nif (!threadID) {\nconsole.log(\"Notification with missing threadID received!\");\n"
},
{
"change_type": "MODIFY",
"old_path": "yarn.lock",
"new_path": "yarn.lock",
"diff": "\"@babel/highlight\" \"7.0.0-beta.47\"\n\"@babel/code-frame@^7.0.0-beta.35\":\n- version \"7.0.0-beta.55\"\n- resolved \"https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.55.tgz#71f530e7b010af5eb7a7df7752f78921dd57e9ee\"\n+ version \"7.0.0-beta.56\"\n+ resolved \"https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.56.tgz#09f76300673ac085d3b90e02aafa0ffc2c96846a\"\ndependencies:\n- \"@babel/highlight\" \"7.0.0-beta.55\"\n+ \"@babel/highlight\" \"7.0.0-beta.56\"\n\"@babel/core@7.0.0-beta.47\":\nversion \"7.0.0-beta.47\"\nesutils \"^2.0.2\"\njs-tokens \"^3.0.0\"\n-\"@babel/highlight@7.0.0-beta.55\":\n- version \"7.0.0-beta.55\"\n- resolved \"https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.55.tgz#988653647d629c261dae156e74d5f0252ba520c0\"\n+\"@babel/highlight@7.0.0-beta.56\":\n+ version \"7.0.0-beta.56\"\n+ resolved \"https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.56.tgz#f8b0fc8c5c2de53bb2c12f9001ad3d99e573696d\"\ndependencies:\nchalk \"^2.0.0\"\nesutils \"^2.0.2\"\nresolved \"https://registry.yarnpkg.com/@types/long/-/long-4.0.0.tgz#719551d2352d301ac8b81db732acb6bdc28dbdef\"\n\"@types/node@*\", \"@types/node@^10.1.0\":\n- version \"10.5.5\"\n- resolved \"https://registry.yarnpkg.com/@types/node/-/node-10.5.5.tgz#8e84d24e896cd77b0d4f73df274027e3149ec2ba\"\n+ version \"10.5.7\"\n+ resolved \"https://registry.yarnpkg.com/@types/node/-/node-10.5.7.tgz#960d9feb3ade2233bcc9843c918d740b4f78a7cf\"\n\"@types/node@^8.0.24\", \"@types/node@^8.0.53\":\n- version \"8.10.23\"\n- resolved \"https://registry.yarnpkg.com/@types/node/-/node-8.10.23.tgz#e5ccfdafff42af5397c29669b6d7d65f7d629a00\"\n+ version \"8.10.24\"\n+ resolved \"https://registry.yarnpkg.com/@types/node/-/node-8.10.24.tgz#302a8f0c00bd1bf364471b6687258617c5d410fc\"\n\"@types/request@*\", \"@types/request@^2.47.0\":\nversion \"2.47.1\"\n@@ -1078,8 +1078,10 @@ asn1.js@^4.0.0:\nminimalistic-assert \"^1.0.0\"\nasn1@~0.2.3:\n- version \"0.2.3\"\n- resolved \"https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86\"\n+ version \"0.2.4\"\n+ resolved \"https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136\"\n+ dependencies:\n+ safer-buffer \"~2.1.0\"\nassert-plus@1.0.0, assert-plus@^1.0.0:\nversion \"1.0.0\"\n@@ -1092,8 +1094,8 @@ assert@^1.1.1:\nutil \"0.10.3\"\nassets-webpack-plugin@^3.8.3:\n- version \"3.8.4\"\n- resolved \"https://registry.yarnpkg.com/assets-webpack-plugin/-/assets-webpack-plugin-3.8.4.tgz#4b96a69850563ab36b54206741ef372901569597\"\n+ version \"3.9.4\"\n+ resolved \"https://registry.yarnpkg.com/assets-webpack-plugin/-/assets-webpack-plugin-3.9.4.tgz#fcb10dd03f2c1b0bf6f9548228e5e38609bde0a9\"\ndependencies:\ncamelcase \"^5.0.0\"\nescape-string-regexp \"^1.0.3\"\n@@ -1151,8 +1153,8 @@ aws-sign2@~0.7.0:\nresolved \"https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8\"\naws4@^1.6.0:\n- version \"1.7.0\"\n- resolved \"https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289\"\n+ version \"1.8.0\"\n+ resolved \"https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f\"\naxios@^0.18.0:\nversion \"0.18.0\"\n@@ -1961,8 +1963,8 @@ before-after-hook@^1.1.0:\nresolved \"https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-1.1.0.tgz#83165e15a59460d13702cb8febd6a1807896db5a\"\nbig-integer@^1.6.17, big-integer@^1.6.7:\n- version \"1.6.33\"\n- resolved \"https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.33.tgz#6295b55e6010d2b2b4d234d32be93bfebddbba67\"\n+ version \"1.6.34\"\n+ resolved \"https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.34.tgz#701affc8f0d73c490930a6b482dc23ed6ffc7484\"\nbig.js@^3.1.3:\nversion \"3.2.0\"\n@@ -2274,8 +2276,8 @@ caniuse-api@^1.5.2:\nlodash.uniq \"^4.5.0\"\ncaniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:\n- version \"1.0.30000872\"\n- resolved \"https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000872.tgz#3f6e53b63d373768bf99e896133d66ef89c49999\"\n+ version \"1.0.30000875\"\n+ resolved \"https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000875.tgz#6f904fc89120de4029a9ca0f21d7ac3db89a0dce\"\ncapture-exit@^1.2.0:\nversion \"1.2.0\"\n@@ -2493,8 +2495,8 @@ color-string@^0.3.0:\ncolor-name \"^1.0.0\"\ncolor-string@^1.4.0, color-string@^1.5.2:\n- version \"1.5.2\"\n- resolved \"https://registry.yarnpkg.com/color-string/-/color-string-1.5.2.tgz#26e45814bc3c9a7cbd6751648a41434514a773a9\"\n+ version \"1.5.3\"\n+ resolved \"https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc\"\ndependencies:\ncolor-name \"^1.0.0\"\nsimple-swizzle \"^0.2.2\"\n@@ -2560,8 +2562,8 @@ commander@2.6.0:\nresolved \"https://registry.yarnpkg.com/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d\"\ncommander@^2.11.0, commander@^2.9.0:\n- version \"2.16.0\"\n- resolved \"https://registry.yarnpkg.com/commander/-/commander-2.16.0.tgz#f16390593996ceb4f3eeb020b31d78528f7f8a50\"\n+ version \"2.17.1\"\n+ resolved \"https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf\"\ncommander@~2.13.0:\nversion \"2.13.0\"\n@@ -2710,8 +2712,8 @@ core-util-is@1.0.2, core-util-is@~1.0.0:\nresolved \"https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7\"\ncosmiconfig@^5.0.5:\n- version \"5.0.5\"\n- resolved \"https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.5.tgz#a809e3c2306891ce17ab70359dc8bdf661fe2cd0\"\n+ version \"5.0.6\"\n+ resolved \"https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39\"\ndependencies:\nis-directory \"^0.3.1\"\njs-yaml \"^3.9.0\"\n@@ -3207,8 +3209,8 @@ electron-download@^3.0.1:\nsumchecker \"^1.2.0\"\nelectron-to-chromium@^1.2.7:\n- version \"1.3.54\"\n- resolved \"https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.54.tgz#2121a34b5cd2ba994ad89f8778ea9ae5ebc40cab\"\n+ version \"1.3.56\"\n+ resolved \"https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.56.tgz#aad1420d23e9dd8cd2fc2bc53f4928adcf85f02f\"\nelectron@^1.8.7:\nversion \"1.8.7\"\n@@ -3219,8 +3221,8 @@ electron@^1.8.7:\nextract-zip \"^1.0.3\"\nelliptic@^6.0.0:\n- version \"6.4.0\"\n- resolved \"https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df\"\n+ version \"6.4.1\"\n+ resolved \"https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a\"\ndependencies:\nbn.js \"^4.4.0\"\nbrorand \"^1.0.1\"\n@@ -3919,8 +3921,8 @@ flow-typed@^2.2.3:\nyargs \"^4.2.0\"\nfollow-redirects@^1.0.0, follow-redirects@^1.3.0:\n- version \"1.5.1\"\n- resolved \"https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.1.tgz#67a8f14f5a1f67f962c2c46469c79eaec0a90291\"\n+ version \"1.5.2\"\n+ resolved \"https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.2.tgz#5a9d80e0165957e5ef0c1210678fc5c4acb9fb03\"\ndependencies:\ndebug \"^3.1.0\"\n@@ -6365,8 +6367,8 @@ mute-stream@0.0.7:\nresolved \"https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab\"\nmysql2@^1.5.1:\n- version \"1.6.0\"\n- resolved \"https://registry.yarnpkg.com/mysql2/-/mysql2-1.6.0.tgz#40a28ca304628b5c3bf7e1073ac5c481de5782fe\"\n+ version \"1.6.1\"\n+ resolved \"https://registry.yarnpkg.com/mysql2/-/mysql2-1.6.1.tgz#9027fd93a05c5d86e79bfada35c9b677b3a0d7c5\"\ndependencies:\ncardinal \"2.1.1\"\ndenque \"1.3.0\"\n@@ -6410,8 +6412,8 @@ natural-compare@^1.4.0:\nresolved \"https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7\"\nneedle@^2.2.1:\n- version \"2.2.1\"\n- resolved \"https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d\"\n+ version \"2.2.2\"\n+ resolved \"https://registry.yarnpkg.com/needle/-/needle-2.2.2.tgz#1120ca4c41f2fcc6976fd28a8968afe239929418\"\ndependencies:\ndebug \"^2.1.2\"\niconv-lite \"^0.4.4\"\n@@ -6753,10 +6755,10 @@ optjs@~3.2.2:\nresolved \"https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee\"\noriginal@>=0.0.5:\n- version \"1.0.1\"\n- resolved \"https://registry.yarnpkg.com/original/-/original-1.0.1.tgz#b0a53ff42ba997a8c9cd1fb5daaeb42b9d693190\"\n+ version \"1.0.2\"\n+ resolved \"https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f\"\ndependencies:\n- url-parse \"~1.4.0\"\n+ url-parse \"^1.4.3\"\nos-browserify@^0.3.0:\nversion \"0.3.0\"\n@@ -6921,8 +6923,8 @@ path-key@^2.0.0, path-key@^2.0.1:\nresolved \"https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40\"\npath-parse@^1.0.5:\n- version \"1.0.5\"\n- resolved \"https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1\"\n+ version \"1.0.6\"\n+ resolved \"https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c\"\npath-to-regexp@0.1.7:\nversion \"0.1.7\"\n@@ -7049,8 +7051,8 @@ pn@^1.1.0:\nresolved \"https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb\"\nportfinder@^1.0.9:\n- version \"1.0.13\"\n- resolved \"https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9\"\n+ version \"1.0.16\"\n+ resolved \"https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.16.tgz#a6a68be9c352bc66c1a4c17a261f661f3facaf52\"\ndependencies:\nasync \"^1.5.2\"\ndebug \"^2.2.0\"\n@@ -7463,8 +7465,8 @@ promise@^8.0.1:\nasap \"~2.0.3\"\nprompts@^0.1.9:\n- version \"0.1.13\"\n- resolved \"https://registry.yarnpkg.com/prompts/-/prompts-0.1.13.tgz#7fad7ee1c6cafe49834ca0b2a6a471262de57620\"\n+ version \"0.1.14\"\n+ resolved \"https://registry.yarnpkg.com/prompts/-/prompts-0.1.14.tgz#a8e15c612c5c9ec8f8111847df3337c9cbd443b2\"\ndependencies:\nkleur \"^2.0.1\"\nsisteransi \"^0.1.1\"\n@@ -7525,8 +7527,8 @@ pseudomap@^1.0.2:\nresolved \"https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3\"\npsl@^1.1.24:\n- version \"1.1.28\"\n- resolved \"https://registry.yarnpkg.com/psl/-/psl-1.1.28.tgz#4fb6ceb08a1e2214d4fd4de0ca22dae13740bc7b\"\n+ version \"1.1.29\"\n+ resolved \"https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67\"\npstree.remy@^1.1.0:\nversion \"1.1.0\"\n@@ -7620,8 +7622,8 @@ ramdasauce@^2.0.0:\nramda \"^0.24.1\"\nrandomatic@^3.0.0:\n- version \"3.0.0\"\n- resolved \"https://registry.yarnpkg.com/randomatic/-/randomatic-3.0.0.tgz#d35490030eb4f7578de292ce6dfb04a91a128923\"\n+ version \"3.1.0\"\n+ resolved \"https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.0.tgz#36f2ca708e9e567f5ed2ec01949026d50aa10116\"\ndependencies:\nis-number \"^4.0.0\"\nkind-of \"^6.0.0\"\n@@ -7703,8 +7705,8 @@ react-devtools@^3.0.0:\nupdate-notifier \"^2.1.0\"\nreact-dom@^16.2.0:\n- version \"16.4.1\"\n- resolved \"https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.1.tgz#7f8b0223b3a5fbe205116c56deb85de32685dad6\"\n+ version \"16.4.2\"\n+ resolved \"https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.2.tgz#4afed569689f2c561d2b8da0b819669c38a0bda4\"\ndependencies:\nfbjs \"^0.8.16\"\nloose-envify \"^1.1.0\"\n@@ -7781,8 +7783,8 @@ react-native-exit-app@^1.0.0:\nresolved \"git+https://git@github.com/ashoat/react-native-fcm.git#5b3c8a971c3030c42b8cb795ad2f0e29ae319b78\"\nreact-native-floating-action@^1.9.0:\n- version \"1.12.1\"\n- resolved \"https://registry.yarnpkg.com/react-native-floating-action/-/react-native-floating-action-1.12.1.tgz#269f41bd0217c54b62add3ee844ee088ed52c586\"\n+ version \"1.13.0\"\n+ resolved \"https://registry.yarnpkg.com/react-native-floating-action/-/react-native-floating-action-1.13.0.tgz#876ab9227c4eda8630020a6a3adc20041870edf3\"\n\"react-native-hyperlink@git+https://git@github.com/ashoat/react-native-hyperlink.git#both\":\nversion \"0.0.12\"\n@@ -7809,8 +7811,8 @@ react-native-modal@^6.2.0:\nreact-native-animatable \"^1.2.4\"\n\"react-native-notifications@git+https://git@github.com/ashoat/react-native-notifications.git\":\n- version \"1.1.17\"\n- resolved \"git+https://git@github.com/ashoat/react-native-notifications.git#37d462e56a0b8691c0ee2e2fb4c76c973e8dcca4\"\n+ version \"1.1.19\"\n+ resolved \"git+https://git@github.com/ashoat/react-native-notifications.git#6f741c582bcf19fd4151f2b18d48d55d3da157e9\"\ndependencies:\ncore-js \"^1.0.0\"\nuuid \"^2.0.3\"\n@@ -7834,8 +7836,8 @@ react-native-safe-area-view@^0.8.0:\nhoist-non-react-statics \"^2.3.1\"\nreact-native-segmented-control-tab@^3.2.1:\n- version \"3.2.2\"\n- resolved \"https://registry.yarnpkg.com/react-native-segmented-control-tab/-/react-native-segmented-control-tab-3.2.2.tgz#251ce94acdc655e04063b9813bb1ef595bf11f2d\"\n+ version \"3.3.1\"\n+ resolved \"https://registry.yarnpkg.com/react-native-segmented-control-tab/-/react-native-segmented-control-tab-3.3.1.tgz#6fba6b2a48d4a0a3105f1b2225b5fd176e0dc88b\"\ndependencies:\nprop-types \"^15.5.10\"\n@@ -7929,9 +7931,9 @@ react-navigation-deprecated-tab-navigator@1.3.0:\ndependencies:\nreact-native-tab-view \"^0.0.77\"\n-react-navigation-drawer@0.4.3:\n- version \"0.4.3\"\n- resolved \"https://registry.yarnpkg.com/react-navigation-drawer/-/react-navigation-drawer-0.4.3.tgz#c04c94e2429b7e724801af05bd0a93a79cb27f71\"\n+react-navigation-drawer@0.5.0:\n+ version \"0.5.0\"\n+ resolved \"https://registry.yarnpkg.com/react-navigation-drawer/-/react-navigation-drawer-0.5.0.tgz#d91b6a6ec65c34ba78c00f814b1e6508922cc9ec\"\ndependencies:\nreact-native-drawer-layout-polyfill \"^1.3.2\"\n@@ -7941,9 +7943,9 @@ react-navigation-redux-helpers@^2.0.1:\ndependencies:\ninvariant \"^2.2.2\"\n-react-navigation-tabs@0.5.1:\n- version \"0.5.1\"\n- resolved \"https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-0.5.1.tgz#ed33bce3a3e21b92646700de25bd94b8fc570371\"\n+react-navigation-tabs@0.6.0:\n+ version \"0.6.0\"\n+ resolved \"https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-0.6.0.tgz#2f526194f4360e56c2702e736887449acc2080dc\"\ndependencies:\nhoist-non-react-statics \"^2.5.0\"\nprop-types \"^15.6.1\"\n@@ -7952,8 +7954,8 @@ react-navigation-tabs@0.5.1:\nreact-native-tab-view \"^1.0.0\"\nreact-navigation@^2.8.0:\n- version \"2.9.3\"\n- resolved \"https://registry.yarnpkg.com/react-navigation/-/react-navigation-2.9.3.tgz#de97f7102df6b836af780bfa5bfa80747148da19\"\n+ version \"2.11.2\"\n+ resolved \"https://registry.yarnpkg.com/react-navigation/-/react-navigation-2.11.2.tgz#cd099f6d7d09efe48ef8463614a3abb113d45c01\"\ndependencies:\nclamp \"^1.0.1\"\ncreate-react-context \"^0.2.1\"\n@@ -7963,8 +7965,8 @@ react-navigation@^2.8.0:\nreact-lifecycles-compat \"^3\"\nreact-native-safe-area-view \"^0.8.0\"\nreact-navigation-deprecated-tab-navigator \"1.3.0\"\n- react-navigation-drawer \"0.4.3\"\n- react-navigation-tabs \"0.5.1\"\n+ react-navigation-drawer \"0.5.0\"\n+ react-navigation-tabs \"0.6.0\"\nreact-proxy@^1.1.7:\nversion \"1.1.8\"\n@@ -8047,7 +8049,7 @@ react-transform-hmr@^1.0.4:\nglobal \"^4.3.0\"\nreact-proxy \"^1.1.7\"\n-react@16.4.1, react@^16.2.0:\n+react@16.4.1:\nversion \"16.4.1\"\nresolved \"https://registry.yarnpkg.com/react/-/react-16.4.1.tgz#de51ba5764b5dbcd1f9079037b862bd26b82fe32\"\ndependencies:\n@@ -8056,6 +8058,15 @@ react@16.4.1, react@^16.2.0:\nobject-assign \"^4.1.1\"\nprop-types \"^15.6.0\"\n+react@^16.2.0:\n+ version \"16.4.2\"\n+ resolved \"https://registry.yarnpkg.com/react/-/react-16.4.2.tgz#2cd90154e3a9d9dd8da2991149fdca3c260e129f\"\n+ dependencies:\n+ fbjs \"^0.8.16\"\n+ loose-envify \"^1.1.0\"\n+ object-assign \"^4.1.1\"\n+ prop-types \"^15.6.0\"\n+\nreactcss@^1.2.0:\nversion \"1.2.3\"\nresolved \"https://registry.yarnpkg.com/reactcss/-/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd\"\n@@ -8536,7 +8547,7 @@ safe-regex@^1.1.0:\ndependencies:\nret \"~0.1.10\"\n-\"safer-buffer@>= 2.1.2 < 3\", safer-buffer@^2.0.2, safer-buffer@^2.1.0:\n+\"safer-buffer@>= 2.1.2 < 3\", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:\nversion \"2.1.2\"\nresolved \"https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a\"\n@@ -8570,8 +8581,8 @@ schema-utils@^0.3.0:\najv \"^5.0.0\"\nschema-utils@^0.4.3, schema-utils@^0.4.5:\n- version \"0.4.5\"\n- resolved \"https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e\"\n+ version \"0.4.7\"\n+ resolved \"https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187\"\ndependencies:\najv \"^6.1.0\"\najv-keywords \"^3.1.0\"\n@@ -8837,8 +8848,8 @@ source-map-support@^0.4.15, source-map-support@^0.4.2:\nsource-map \"^0.5.6\"\nsource-map-support@^0.5.6:\n- version \"0.5.6\"\n- resolved \"https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13\"\n+ version \"0.5.7\"\n+ resolved \"https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.7.tgz#71503b94aefbc89789841100c18c0cc63a7e6137\"\ndependencies:\nbuffer-from \"^1.0.0\"\nsource-map \"^0.6.0\"\n@@ -9220,8 +9231,8 @@ tapable@^0.2.7:\nresolved \"https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22\"\ntar@^4:\n- version \"4.4.4\"\n- resolved \"https://registry.yarnpkg.com/tar/-/tar-4.4.4.tgz#ec8409fae9f665a4355cc3b4087d0820232bb8cd\"\n+ version \"4.4.6\"\n+ resolved \"https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b\"\ndependencies:\nchownr \"^1.0.1\"\nfs-minipass \"^1.2.5\"\n@@ -9628,7 +9639,7 @@ url-parse-lax@^1.0.0:\ndependencies:\nprepend-http \"^1.0.1\"\n-url-parse@^1.1.8, url-parse@^1.1.9, url-parse@~1.4.0:\n+url-parse@^1.1.8, url-parse@^1.1.9, url-parse@^1.4.3:\nversion \"1.4.3\"\nresolved \"https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.3.tgz#bfaee455c889023219d757e045fa6a684ec36c15\"\ndependencies:\n@@ -9704,8 +9715,8 @@ v8flags@^2.1.1:\nuser-home \"^1.1.1\"\nvalidate-npm-package-license@^3.0.1:\n- version \"3.0.3\"\n- resolved \"https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338\"\n+ version \"3.0.4\"\n+ resolved \"https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a\"\ndependencies:\nspdx-correct \"^3.0.0\"\nspdx-expression-parse \"^3.0.0\"\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Avoid notificationReceivedForeground on press-notif-while-closed
`notificationOpened` should cover this. this makes the behavior consistent with press-notif-while-backgrounded.
Also this commit updates `react-native-notications`. |
129,187 | 09.08.2018 15:21:33 | 14,400 | 577fa47dbbd5764d988c847be7cb9bc32582e3b4 | [native] Avoid activityUpdate on activeThread change with inactive NativeAppState
Inline comment explains the reasoning.
Also fixes error message when log in attempted with empty password. | [
{
"change_type": "MODIFY",
"old_path": "native/account/log-in-panel.react.js",
"new_path": "native/account/log-in-panel.react.js",
"diff": "@@ -197,6 +197,16 @@ class LogInPanel extends React.PureComponent<Props> {\n{ cancelable: false },\n);\nreturn;\n+ } else if (this.props.state.state.passwordInputText === \"\") {\n+ Alert.alert(\n+ \"Empty password\",\n+ \"Password cannot be empty\",\n+ [\n+ { text: 'OK', onPress: this.onPasswordAlertAcknowledged },\n+ ],\n+ { cancelable: false },\n+ );\n+ return;\n}\nKeyboard.dismiss();\n"
},
{
"change_type": "MODIFY",
"old_path": "native/app.react.js",
"new_path": "native/app.react.js",
"diff": "@@ -840,7 +840,12 @@ class AppWithNavigationState extends React.PureComponent<Props> {\noldActiveThread: ?string,\noldActiveThreadLatestMessage: ?string,\n) {\n- if (!props.appLoggedIn) {\n+ if (!props.appLoggedIn || this.currentState !== \"active\") {\n+ // If the app isn't logged in, the server isn't tracking our activity\n+ // anyways. If the currentState isn't active, we can expect that when it\n+ // becomes active, the corresponding startTimeouts call will include any\n+ // activity update that it needs to update the server. We want to avoid\n+ // any races between update_activity and ping, so we return here.\nreturn;\n}\nconst updates = [];\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Avoid activityUpdate on activeThread change with inactive NativeAppState
Inline comment explains the reasoning.
Also fixes error message when log in attempted with empty password. |
129,187 | 10.08.2018 10:09:18 | 14,400 | afaf90593606eef0fe80c5f3c3c16bf033c80466 | [server] Add code to delete rows from new filters table
Also adds some code to delete rows from `focused` that I forgot to add at the time.
Also a couple other things. | [
{
"change_type": "MODIFY",
"old_path": "server/src/cron.js",
"new_path": "server/src/cron.js",
"diff": "@@ -15,6 +15,7 @@ import { deleteOrphanedMessages } from './deleters/message-deleters';\nimport { deleteOrphanedFocused } from './deleters/activity-deleters';\nimport { deleteOrphanedNotifs } from './deleters/notif-deleters';\nimport { deleteExpiredUpdates } from './deleters/update-deleters';\n+import { deleteOrphanedFilters } from './deleters/filter-deleters';\nimport { backupDB } from './backups';\nif (cluster.isMaster) {\n@@ -36,6 +37,7 @@ if (cluster.isMaster) {\nawait deleteOrphanedFocused();\nawait deleteOrphanedNotifs();\nawait deleteExpiredUpdates();\n+ await deleteOrphanedFilters();\n} catch (e) {\nconsole.warn(\n\"encountered error while trying to clean database\",\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/account-deleters.js",
"new_path": "server/src/deleters/account-deleters.js",
"diff": "@@ -38,7 +38,7 @@ async function deleteAccount(\n// TODO: if this results in any orphaned orgs, convert them to chats\nconst deletedUserID = viewer.userID;\nconst deletionQuery = SQL`\n- DELETE u, iu, v, iv, c, ic, m, f, n, ino\n+ DELETE u, iu, v, iv, c, ic, m, f, n, ino, up, iup, fi\nFROM users u\nLEFT JOIN ids iu ON iu.id = u.id\nLEFT JOIN verifications v ON v.user = u.id\n@@ -49,6 +49,9 @@ async function deleteAccount(\nLEFT JOIN focused f ON f.user = u.id\nLEFT JOIN notifications n ON n.user = u.id\nLEFT JOIN ids ino ON ino.id = n.id\n+ LEFT JOIN updates up ON up.user = u.id\n+ LEFT JOIN ids iup ON iup.id = up.id\n+ LEFT JOIN filters fi ON fi.user = u.id\nWHERE u.id = ${deletedUserID}\n`;\nconst [ anonymousViewerData ] = await Promise.all([\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/activity-deleters.js",
"new_path": "server/src/deleters/activity-deleters.js",
"diff": "@@ -7,7 +7,9 @@ async function deleteOrphanedFocused(): Promise<void> {\nDELETE f\nFROM focused f\nLEFT JOIN threads t ON t.id = f.thread\n- WHERE t.id IS NULL\n+ LEFT JOIN users u ON u.id = f.user\n+ LEFT JOIN cookies c ON c.id = f.cookie\n+ WHERE t.id IS NULL OR u.id IS NULL OR c.id IS NULL\n`);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/cookie-deleters.js",
"new_path": "server/src/deleters/cookie-deleters.js",
"diff": "@@ -6,9 +6,13 @@ import { cookieLifetime } from '../session/cookies';\nasync function deleteCookie(cookieID: string): Promise<void> {\nawait dbQuery(SQL`\n- DELETE c, i\n+ DELETE c, i, fo, fi, u, iu\nFROM cookies c\nLEFT JOIN ids i ON i.id = c.id\n+ LEFT JOIN focused fo ON fo.cookie = c.id\n+ LEFT JOIN filters fi ON fi.cookie = c.id\n+ LEFT JOIN updates u ON u.target_cookie = c.id\n+ LEFT JOIN ids iu ON iu.id = u.id\nWHERE c.id = ${cookieID}\n`);\n}\n@@ -25,9 +29,13 @@ async function deleteCookiesOnLogOut(\n}\nconst query = SQL`\n- DELETE c, i\n+ DELETE c, i, fo, fi, u, iu\nFROM cookies c\nLEFT JOIN ids i ON i.id = c.id\n+ LEFT JOIN focused fo ON fo.cookie = c.id\n+ LEFT JOIN filters fi ON fi.cookie = c.id\n+ LEFT JOIN updates u ON u.target_cookie = c.id\n+ LEFT JOIN ids iu ON iu.id = u.id\nWHERE c.user = ${userID} AND\n`;\nquery.append(mergeOrConditions(conditions));\n@@ -38,9 +46,13 @@ async function deleteCookiesOnLogOut(\nasync function deleteExpiredCookies(): Promise<void> {\nconst earliestInvalidLastUpdate = Date.now() - cookieLifetime;\nconst query = SQL`\n- DELETE c, i\n+ DELETE c, i, fo, fi, u, iu\nFROM cookies c\nLEFT JOIN ids i ON i.id = c.id\n+ LEFT JOIN focused fo ON fo.cookie = c.id\n+ LEFT JOIN filters fi ON fi.cookie = c.id\n+ LEFT JOIN updates u ON u.target_cookie = c.id\n+ LEFT JOIN ids iu ON iu.id = u.id\nWHERE c.last_update <= ${earliestInvalidLastUpdate}\n`;\nawait dbQuery(query);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "server/src/deleters/filter-deleters.js",
"diff": "+// @flow\n+\n+import { dbQuery, SQL } from '../database';\n+\n+async function deleteOrphanedFilters(): Promise<void> {\n+ await dbQuery(SQL`\n+ DELETE f\n+ FROM filters f\n+ LEFT JOIN users u ON u.id = f.user\n+ LEFT JOIN cookies c ON c.id = f.cookie\n+ WHERE c.id IS NULL OR u.id IS NULL\n+ `);\n+}\n+\n+export {\n+ deleteOrphanedFilters,\n+};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/activity-updaters.js",
"new_path": "server/src/updaters/activity-updaters.js",
"diff": "@@ -24,8 +24,7 @@ async function activityUpdater(\nviewer: Viewer,\nrequest: UpdateActivityRequest,\n): Promise<UpdateActivityResult> {\n- const localViewer = viewer;\n- if (!localViewer.loggedIn) {\n+ if (!viewer.loggedIn) {\nthrow new ServerError('invalid_credentials');\n}\n@@ -65,7 +64,7 @@ async function activityUpdater(\nFROM memberships\nWHERE role != 0\nAND thread IN (${[...focusedThreadIDs, ...unfocusedThreadIDs]})\n- AND user = ${localViewer.userID}\n+ AND user = ${viewer.userID}\n`;\nconst [ membershipResult ] = await dbQuery(membershipQuery);\n@@ -79,34 +78,34 @@ async function activityUpdater(\nconst memberUnfocusedThreadIDs = unfocusedThreadIDs.filter(filterFunc);\nconst promises = [];\n- promises.push(updateFocusedRows(localViewer, focusedThreadIDs));\n+ promises.push(updateFocusedRows(viewer, focusedThreadIDs));\nif (focusedThreadIDs.length > 0) {\npromises.push(dbQuery(SQL`\nUPDATE memberships\nSET unread = 0\nWHERE thread IN (${memberFocusedThreadIDs})\n- AND user = ${localViewer.userID}\n+ AND user = ${viewer.userID}\n`));\nconst time = Date.now();\npromises.push(createUpdates(\nmemberFocusedThreadIDs.map(threadID => ({\ntype: updateTypes.UPDATE_THREAD_READ_STATUS,\n- userID: localViewer.userID,\n+ userID: viewer.userID,\ntime,\nthreadID,\nunread: false,\n})),\n- { viewer: localViewer },\n+ { viewer },\n));\nconst rescindCondition = SQL`\n- n.user = ${localViewer.userID} AND n.thread IN (${focusedThreadIDs})\n+ n.user = ${viewer.userID} AND n.thread IN (${focusedThreadIDs})\n`;\npromises.push(rescindPushNotifs(rescindCondition));\n}\nawait Promise.all(promises);\nconst unfocusedToUnread = await possiblyResetThreadsToUnread(\n- localViewer,\n+ viewer,\nmemberUnfocusedThreadIDs,\nunfocusedThreadLatestMessages,\n);\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/thread-updaters.js",
"new_path": "server/src/updaters/thread-updaters.js",
"diff": "@@ -571,7 +571,7 @@ async function joinThread(\n}\nif (\nrowToSave.operation === \"join\" &&\n- (rowToSave.userID !== viewer.userID ||\n+ (rowToSave.userID !== viewer.id ||\nrowToSave.threadID !== request.threadID)\n) {\nrowToSave.unread = true;\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Add code to delete rows from new filters table
Also adds some code to delete rows from `focused` that I forgot to add at the time.
Also a couple other things. |
129,187 | 10.08.2018 10:25:27 | 14,400 | 9b4da8b5ac8d1d77f8684343dbd0e71c888c1a51 | Prevent empty message sends | [
{
"change_type": "MODIFY",
"old_path": "native/app.react.js",
"new_path": "native/app.react.js",
"diff": "@@ -456,7 +456,7 @@ class AppWithNavigationState extends React.PureComponent<Props> {\nif (justLoggedIn) {\nthis.startTimeouts(nextProps, \"active\");\n} else if (nextProps.activeThread !== this.props.activeThread) {\n- AppWithNavigationState.updateFocusedThreads(\n+ this.updateFocusedThreads(\nnextProps,\nthis.props.activeThread,\nthis.props.activeThreadLatestMessage,\n@@ -835,7 +835,7 @@ class AppWithNavigationState extends React.PureComponent<Props> {\n}\n}\n- static updateFocusedThreads(\n+ updateFocusedThreads(\nprops: Props,\noldActiveThread: ?string,\noldActiveThreadLatestMessage: ?string,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/chat-input-bar.react.js",
"new_path": "native/chat/chat-input-bar.react.js",
"diff": "@@ -101,9 +101,11 @@ class ChatInputBar extends React.PureComponent<Props, State> {\n}\ncomponentWillUpdate(nextProps: Props, nextState: State) {\n+ const currentText = this.state.text.trim();\n+ const nextText = nextState.text.trim();\nif (\n- this.state.text === \"\" && nextState.text !== \"\" ||\n- this.state.text !== \"\" && nextState.text === \"\"\n+ currentText === \"\" && nextText !== \"\" ||\n+ currentText !== \"\" && nextText === \"\"\n) {\nLayoutAnimation.easeInEaseOut();\n}\n@@ -162,7 +164,7 @@ class ChatInputBar extends React.PureComponent<Props, State> {\n/>\n);\nlet button = null;\n- if (this.state.text) {\n+ if (this.state.text.trim()) {\nbutton = (\n<TouchableOpacity\nonPress={this.onSend}\n@@ -246,6 +248,9 @@ class ChatInputBar extends React.PureComponent<Props, State> {\nonSend = () => {\nconst text = this.state.text.trim();\n+ if (!text) {\n+ return;\n+ }\nthis.updateText(\"\");\nconst localID = `local${getNewLocalID()}`;\nconst creatorID = this.props.viewerID;\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/message-responders.js",
"new_path": "server/src/responders/message-responders.js",
"diff": "@@ -33,9 +33,15 @@ async function textMessageCreationResponder(\nconst request: SendTextMessageRequest = input;\nvalidateInput(sendTextMessageRequestInputValidator, request);\n+ const { threadID, text: rawText } = request;\n+ const text = rawText.trim();\n+ if (!text) {\n+ throw new ServerError('invalid_parameters');\n+ }\n+\nconst hasPermission = await checkThreadPermission(\nviewer,\n- request.threadID,\n+ threadID,\nthreadPermissions.VOICED,\n);\nif (!hasPermission) {\n@@ -44,10 +50,10 @@ async function textMessageCreationResponder(\nconst messageData = {\ntype: messageTypes.TEXT,\n- threadID: request.threadID,\n+ threadID,\ncreatorID: viewer.id,\ntime: Date.now(),\n- text: request.text,\n+ text,\n};\nconst rawMessageInfos = await createMessages([messageData]);\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/chat-input-bar.react.js",
"new_path": "web/chat/chat-input-bar.react.js",
"diff": "@@ -205,6 +205,11 @@ class ChatInputBar extends React.PureComponent<Props, State> {\nsend() {\nconst text = this.state.messageText.trim();\n+ if (!text) {\n+ // TODO we should make the send button appear dynamically\n+ // iff trimmed text is nonempty, just like native\n+ return;\n+ }\nthis.updateText(\"\");\nconst localID = `local${getNewLocalID()}`;\nconst creatorID = this.props.viewerID;\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Prevent empty message sends |
129,187 | 10.08.2018 11:30:15 | 14,400 | f78802da253b80c574644cf4df7c299670157b9b | Update types since CalendarQuery is always included now
Also a fix where we weren't putting the `CalendarQuery` in `LOG_IN_STARTED` actions corresponding to recovery attempts. | [
{
"change_type": "MODIFY",
"old_path": "lib/actions/user-actions.js",
"new_path": "lib/actions/user-actions.js",
"diff": "@@ -123,24 +123,18 @@ async function logIn(\nplatformDetails: getConfig().platformDetails,\n},\n);\n-\nconst userInfos = mergeUserInfos(\nresponse.userInfos,\nresponse.cookieChange.userInfos,\n);\n- let calendarResult = null;\n- if (logInInfo.calendarQuery) {\n- calendarResult = {\n- calendarQuery: logInInfo.calendarQuery,\n- rawEntryInfos: response.rawEntryInfos,\n- userInfos,\n- };\n- }\n-\nreturn {\nthreadInfos: response.cookieChange.threadInfos,\ncurrentUserInfo: response.currentUserInfo,\n- calendarResult,\n+ calendarResult: {\n+ calendarQuery: logInInfo.calendarQuery,\n+ rawEntryInfos: response.rawEntryInfos,\n+ userInfos,\n+ },\nmessagesResult: {\nmessageInfos: response.rawMessageInfos,\ntruncationStatus: response.truncationStatuses,\n@@ -170,24 +164,18 @@ async function resetPassword(\nplatformDetails: getConfig().platformDetails,\n},\n);\n-\nconst userInfos = mergeUserInfos(\nresponse.userInfos,\nresponse.cookieChange.userInfos,\n);\n- let calendarResult = null;\n- if (updatePasswordInfo.calendarQuery) {\n- calendarResult = {\n- calendarQuery: updatePasswordInfo.calendarQuery,\n- rawEntryInfos: response.rawEntryInfos,\n- userInfos,\n- };\n- }\n-\nreturn {\nthreadInfos: response.cookieChange.threadInfos,\ncurrentUserInfo: response.currentUserInfo,\n- calendarResult,\n+ calendarResult: {\n+ calendarQuery: updatePasswordInfo.calendarQuery,\n+ rawEntryInfos: response.rawEntryInfos,\n+ userInfos,\n+ },\nmessagesResult: {\nmessageInfos: response.rawMessageInfos,\ntruncationStatus: response.truncationStatuses,\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/nav-reducer.js",
"new_path": "lib/reducers/nav-reducer.js",
"diff": "@@ -48,14 +48,8 @@ export default function reduceBaseNavInfo<T: BaseNavInfo>(\naction.type === registerActionTypes.started ||\naction.type === pingActionTypes.started\n) {\n- const calendarQuery = action.payload && action.payload.calendarQuery;\n- if (calendarQuery) {\n- return {\n- ...state,\n- startDate: calendarQuery.startDate,\n- endDate: calendarQuery.endDate,\n- };\n- }\n+ const { startDate, endDate } = action.payload.calendarQuery;\n+ return { ...state, startDate, endDate };\n}\nreturn state;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/account-types.js",
"new_path": "lib/types/account-types.js",
"diff": "@@ -77,8 +77,8 @@ export type LogInActionSource =\n| \"APP_START_NATIVE_CREDENTIALS_AUTO_LOG_IN\"\n| \"APP_START_REDUX_LOGGED_IN_BUT_INVALID_COOKIE\";\nexport type LogInStartingPayload = {|\n+ calendarQuery: CalendarQuery,\nsource?: LogInActionSource,\n- calendarQuery?: CalendarQuery,\n|};\nexport type LogInExtraInfo = {|\n@@ -115,7 +115,7 @@ export type LogInResult = {|\ncurrentUserInfo: LoggedInUserInfo,\nmessagesResult: GenericMessagesResult,\nuserInfos: UserInfo[],\n- calendarResult?: ?CalendarResult,\n+ calendarResult: CalendarResult,\nupdatesCurrentAsOf: number,\n|};\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/redux-types.js",
"new_path": "lib/types/redux-types.js",
"diff": "@@ -182,7 +182,7 @@ export type BaseAction =\n|} | {|\ntype: \"LOG_IN_STARTED\",\nloadingInfo: LoadingInfo,\n- payload?: LogInStartingPayload,\n+ payload: LogInStartingPayload,\n|} | {|\ntype: \"LOG_IN_FAILED\",\nerror: true,\n@@ -195,7 +195,7 @@ export type BaseAction =\n|} | {|\ntype: \"REGISTER_STARTED\",\nloadingInfo: LoadingInfo,\n- payload?: LogInStartingPayload,\n+ payload: LogInStartingPayload,\n|} | {|\ntype: \"REGISTER_FAILED\",\nerror: true,\n@@ -207,9 +207,7 @@ export type BaseAction =\nloadingInfo: LoadingInfo,\n|} | {|\ntype: \"RESET_PASSWORD_STARTED\",\n- payload?: {|\n- calendarQuery?: CalendarQuery,\n- |},\n+ payload: {| calendarQuery: CalendarQuery |},\nloadingInfo: LoadingInfo,\n|} | {|\ntype: \"RESET_PASSWORD_FAILED\",\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/utils/action-utils.js",
"new_path": "lib/utils/action-utils.js",
"diff": "@@ -25,10 +25,7 @@ import _memoize from 'lodash/memoize';\nimport fetchJSON from './fetch-json';\nimport { getConfig } from './config';\n-import {\n- cookieInvalidationResolutionAttempt,\n- logInActionTypes,\n-} from '../actions/user-actions';\n+import { cookieInvalidationResolutionAttempt } from '../actions/user-actions';\nlet nextPromiseIndex = 0;\n@@ -165,6 +162,7 @@ export type DispatchRecoveryAttempt = (\n\"LOG_IN_FAILED\",\n>,\npromise: Promise<LogInResult>,\n+ startingPayload: LogInStartingPayload,\n) => Promise<?string>;\nexport type SetCookiePayload = {|\n@@ -264,7 +262,6 @@ async function fetchNewCookieFromNativeCredentials(\nthrow e;\n}\n};\n- const startingPayload: ?LogInStartingPayload = source ? { source } : null;\nconst dispatchRecoveryAttempt = (\nactionTypes: ActionTypes<\n\"LOG_IN_STARTED\",\n@@ -272,7 +269,9 @@ async function fetchNewCookieFromNativeCredentials(\n\"LOG_IN_FAILED\",\n>,\npromise: Promise<LogInResult>,\n+ inputStartingPayload: LogInStartingPayload,\n) => {\n+ const startingPayload = { ...inputStartingPayload, source };\ndispatch(wrapActionPromise(actionTypes, promise, null, startingPayload));\nreturn new Promise(r => fetchJSONCallback = r);\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "native/account/native-credentials.js",
"new_path": "native/account/native-credentials.js",
"diff": "@@ -223,6 +223,7 @@ async function resolveInvalidatedCookie(\nconst keychainCredentials = await fetchNativeKeychainCredentials();\nif (keychainCredentials) {\nconst extraInfo = logInExtraInfo();\n+ const { calendarQuery } = extraInfo;\nconst newCookie = await dispatchRecoveryAttempt(\nlogInActionTypes,\nlogIn(\n@@ -233,6 +234,7 @@ async function resolveInvalidatedCookie(\n...extraInfo,\n},\n),\n+ { calendarQuery },\n);\nif (newCookie) {\nreturn;\n@@ -241,6 +243,7 @@ async function resolveInvalidatedCookie(\nconst sharedWebCredentials = getNativeSharedWebCredentials();\nif (sharedWebCredentials) {\nconst extraInfo = logInExtraInfo();\n+ const { calendarQuery } = extraInfo;\nawait dispatchRecoveryAttempt(\nlogInActionTypes,\nlogIn(\n@@ -251,6 +254,7 @@ async function resolveInvalidatedCookie(\n...extraInfo,\n},\n),\n+ { calendarQuery },\n);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "web/app.react.js",
"new_path": "web/app.react.js",
"diff": "@@ -7,7 +7,10 @@ import type {\nDispatchActionPromise,\n} from 'lib/utils/action-utils';\nimport { type VerifyField, verifyField } from 'lib/types/verify-types';\n-import type { CalendarQuery, CalendarResult } from 'lib/types/entry-types';\n+import type {\n+ CalendarQuery,\n+ FetchEntryInfosResult,\n+} from 'lib/types/entry-types';\nimport {\ntype PingStartingPayload,\ntype PingActionInput,\n@@ -128,7 +131,7 @@ type Props = {\n// async functions that hit server APIs\nfetchEntries: (\ncalendarQuery: CalendarQuery,\n- ) => Promise<CalendarResult>,\n+ ) => Promise<FetchEntryInfosResult>,\nping: (actionInput: PingActionInput) => Promise<PingResult>,\nupdateActivity: (\nactivityUpdates: $ReadOnlyArray<ActivityUpdate>,\n"
},
{
"change_type": "MODIFY",
"old_path": "web/modals/history/history-modal.react.js",
"new_path": "web/modals/history/history-modal.react.js",
"diff": "// @flow\nimport type { HistoryMode, HistoryRevisionInfo } from 'lib/types/history-types';\n-import type { EntryInfo, CalendarQuery } from 'lib/types/entry-types';\n+import type {\n+ EntryInfo,\n+ CalendarQuery,\n+ FetchEntryInfosResult,\n+} from 'lib/types/entry-types';\nimport { entryInfoPropType } from 'lib/types/entry-types';\nimport type { LoadingStatus } from 'lib/types/loading-types';\nimport type { DispatchActionPromise } from 'lib/utils/action-utils';\n@@ -55,7 +59,9 @@ type Props = {\n// Redux dispatch functions\ndispatchActionPromise: DispatchActionPromise,\n// async functions that hit server APIs\n- fetchEntries: (calendarQuery: CalendarQuery) => Promise<EntryInfo[]>,\n+ fetchEntries: (\n+ calendarQuery: CalendarQuery,\n+ ) => Promise<FetchEntryInfosResult>,\nfetchRevisionsForEntry: (entryID: string) => Promise<HistoryRevisionInfo[]>,\n};\ntype State = {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Update types since CalendarQuery is always included now
Also a fix where we weren't putting the `CalendarQuery` in `LOG_IN_STARTED` actions corresponding to recovery attempts. |
129,187 | 10.08.2018 13:31:57 | 14,400 | 3054122ec0a6652edb9caba79936b4dbf9e3325f | [lib] PingResult always has updatesResult | [
{
"change_type": "MODIFY",
"old_path": "lib/reducers/device-token-reducer.js",
"new_path": "lib/reducers/device-token-reducer.js",
"diff": "@@ -13,7 +13,6 @@ export default function reduceDeviceToken(\nif (action.type === setDeviceTokenActionTypes.started) {\nreturn action.payload;\n} else if (action.type === pingActionTypes.success) {\n- if (action.payload.updatesResult) {\nfor (let update of action.payload.updatesResult.newUpdates) {\nif (\nupdate.type === updateTypes.BAD_DEVICE_TOKEN &&\n@@ -23,6 +22,5 @@ export default function reduceDeviceToken(\n}\n}\n}\n- }\nreturn state;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/entry-reducer.js",
"new_path": "lib/reducers/entry-reducer.js",
"diff": "@@ -209,11 +209,16 @@ function reduceEntryInfos(\nconst newEntryInfos = _pickBy(\n(entry: RawEntryInfo) => authorizedThreadInfos[entry.threadID],\n)(entryInfos);\n+ const newLastUserInteractionCalendar =\n+ action.type === logOutActionTypes.success ||\n+ action.type === deleteAccountActionTypes.success\n+ ? 0\n+ : lastUserInteractionCalendar;\nif (Object.keys(newEntryInfos).length === Object.keys(entryInfos).length) {\nreturn {\nentryInfos,\ndaysToEntries,\n- lastUserInteractionCalendar: 0,\n+ lastUserInteractionCalendar: newLastUserInteractionCalendar,\n};\n}\nconst newDaysToEntries = filterExistingDaysToEntriesWithNewEntryInfos(\n@@ -223,7 +228,7 @@ function reduceEntryInfos(\nreturn {\nentryInfos: newEntryInfos,\ndaysToEntries: newDaysToEntries,\n- lastUserInteractionCalendar: 0,\n+ lastUserInteractionCalendar: newLastUserInteractionCalendar,\n};\n} else if (action.type === setCookieActionType) {\nconst authorizedThreadInfos = _pickBy(threadInFilterList)(newThreadInfos);\n@@ -456,13 +461,10 @@ function reduceEntryInfos(\n}\n} else if (action.type === pingActionTypes.success) {\nconst calendarResult = action.payload.calendarResult;\n- let rawEntryInfos = calendarResult.rawEntryInfos;\n- if (action.payload.updatesResult) {\n- rawEntryInfos = mergeUpdateEntryInfos(\n- rawEntryInfos,\n+ const rawEntryInfos = mergeUpdateEntryInfos(\n+ calendarResult.rawEntryInfos,\naction.payload.updatesResult.newUpdates,\n);\n- }\nconst [updatedEntryInfos, updatedDaysToEntries] = mergeNewEntryInfos(\nentryInfos,\ndaysToEntries,\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/message-reducer.js",
"new_path": "lib/reducers/message-reducer.js",
"diff": "@@ -354,20 +354,16 @@ function reduceMessageStore(\nnewThreadInfos,\n);\n} else if (action.type === pingActionTypes.success) {\n- let messagesResult = action.payload.messagesResult;\nif (\n- messagesResult.messageInfos.length === 0 &&\n- (!action.payload.updatesResult ||\n- action.payload.updatesResult.newUpdates.length === 0)\n+ action.payload.messagesResult.messageInfos.length === 0 &&\n+ action.payload.updatesResult.newUpdates.length === 0\n) {\nreturn messageStore;\n}\n- if (action.payload.updatesResult) {\n- messagesResult = mergeUpdatesIntoMessagesResult(\n- messagesResult,\n+ const messagesResult = mergeUpdatesIntoMessagesResult(\n+ action.payload.messagesResult,\naction.payload.updatesResult.newUpdates,\n);\n- }\nconst newMessageStore = mergeNewMessages(\nmessageStore,\nmessagesResult.messageInfos,\n@@ -375,7 +371,7 @@ function reduceMessageStore(\nnewThreadInfos,\naction.type,\n);\n- const oldWatchedIDs = action.payload.messagesResult.watchedIDsAtRequestTime;\n+ const oldWatchedIDs = messagesResult.watchedIDsAtRequestTime;\nconst currentWatchedIDs = threadWatcher.getWatchedIDs();\nif (_difference(currentWatchedIDs)(oldWatchedIDs).length !== 0) {\n// This indicates that we have had a new watched ID since this query was\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/thread-reducer.js",
"new_path": "lib/reducers/thread-reducer.js",
"diff": "@@ -119,11 +119,8 @@ function pingPoll(\n// ... PUSH.\nfunction pingPush(\nthreadInfos: {[id: string]: RawThreadInfo},\n- payload: { +updatesResult: ?{ newUpdates: $ReadOnlyArray<UpdateInfo> } },\n+ payload: { +updatesResult: { newUpdates: $ReadOnlyArray<UpdateInfo> } },\n): {[id: string]: RawThreadInfo} {\n- if (!payload.updatesResult) {\n- return threadInfos;\n- }\nconst newState = { ...threadInfos };\nlet someThreadUpdated = false;\nfor (let update of payload.updatesResult.newUpdates) {\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/updates-reducer.js",
"new_path": "lib/reducers/updates-reducer.js",
"diff": "@@ -20,10 +20,7 @@ function reduceUpdatesCurrentAsOf(\naction.type === resetPasswordActionTypes.success\n) {\nreturn action.payload.updatesCurrentAsOf;\n- } else if (\n- action.type === pingActionTypes.success &&\n- action.payload.updatesResult\n- ) {\n+ } else if (action.type === pingActionTypes.success) {\nreturn action.payload.updatesResult.currentAsOf;\n}\nreturn currentAsOf;\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/user-reducer.js",
"new_path": "lib/reducers/user-reducer.js",
"diff": "@@ -125,13 +125,11 @@ function reduceUserInfos(\n}\nconst newUserInfos = _keyBy('id')(action.payload.userInfos);\nconst updated = { ...state, ...newUserInfos };\n- if (action.payload.updatesResult) {\nfor (let update of action.payload.updatesResult.newUpdates) {\nif (update.type === updateTypes.DELETE_ACCOUNT) {\ndelete updated[update.deletedUserID];\n}\n}\n- }\nif (!_isEqual(state)(updated)) {\nreturn updated;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/ping-types.js",
"new_path": "lib/types/ping-types.js",
"diff": "@@ -54,7 +54,7 @@ export type PingResult = {|\nuserInfos: $ReadOnlyArray<UserInfo>,\nloggedIn: bool,\nprevState: PingPrevState,\n- updatesResult: ?UpdatesResult,\n+ updatesResult: UpdatesResult,\nrequests: {\nserverRequests: $ReadOnlyArray<ServerRequest>,\ndeliveredClientResponses: $ReadOnlyArray<ClientResponse>,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [lib] PingResult always has updatesResult |
129,187 | 10.08.2018 13:32:32 | 14,400 | 576e371c8cb11a795234019b6f13663836632c01 | [lib] Use JOIN_THREAD and DELETE_THREAD to determine calendar filters changes
Instead of comparing and contrasing the list of threads before and after `threadReducer`. | [
{
"change_type": "MODIFY",
"old_path": "lib/reducers/calendar-filters-reducer.js",
"new_path": "lib/reducers/calendar-filters-reducer.js",
"diff": "@@ -10,6 +10,7 @@ import {\n} from '../types/filter-types';\nimport type { BaseAction } from '../types/redux-types';\nimport type { RawThreadInfo } from '../types/thread-types';\n+import { updateTypes } from '../types/update-types';\nimport {\nlogOutActionTypes,\n@@ -25,12 +26,17 @@ import {\nnonExcludeDeletedCalendarFilters,\n} from '../selectors/calendar-filter-selectors';\nimport { threadInFilterList } from '../shared/thread-utils';\n+import {\n+ newThreadActionTypes,\n+ joinThreadActionTypes,\n+ leaveThreadActionTypes,\n+ deleteThreadActionTypes,\n+} from '../actions/thread-actions';\n+import { pingActionTypes } from '../actions/ping-actions';\nexport default function reduceCalendarFilters(\nstate: $ReadOnlyArray<CalendarFilter>,\naction: BaseAction,\n- newThreadInfos: {[id: string]: RawThreadInfo},\n- oldThreadInfos: {[id: string]: RawThreadInfo},\n): $ReadOnlyArray<CalendarFilter> {\nif (\naction.type === logOutActionTypes.success ||\n@@ -48,9 +54,7 @@ export default function reduceCalendarFilters(\n...nonThreadFilters,\n{\ntype: calendarThreadFilterTypes.THREAD_LIST,\n- threadIDs: action.payload.threadIDs.filter(\n- threadID => threadInFilterList(newThreadInfos[threadID]),\n- ),\n+ threadIDs: action.payload.threadIDs,\n},\n];\n} else if (action.type === clearCalendarThreadFilter) {\n@@ -70,38 +74,49 @@ export default function reduceCalendarFilters(\n// Adding NOT_DELETED filter\nreturn [...state, { type: calendarThreadFilterTypes.NOT_DELETED }];\n}\n- }\n-\n- // The following should handle:\n- // - joinThreadActionTypes.success\n- // - newThreadActionTypes.success\n- // - pingActionTypes.success\n- // - deleteThreadActionTypes.success\n- // - leaveThreadActionTypes.success\n- // - changeThreadMemberRolesActionTypes.success\n- // - changeThreadSettingsActionTypes.success\n- // - removeUsersFromThreadActionTypes.success\n+ } else if (\n+ action.type === newThreadActionTypes.success ||\n+ action.type === joinThreadActionTypes.success ||\n+ action.type === leaveThreadActionTypes.success ||\n+ action.type === deleteThreadActionTypes.success ||\n+ action.type === pingActionTypes.success\n+ ) {\nconst currentlyFilteredIDs = filteredThreadIDs(state);\n+ let changeOccurred = false;\nif (!currentlyFilteredIDs) {\nreturn state;\n}\n- const validCurrentFilteredIDs = [...currentlyFilteredIDs].filter(\n- threadID => threadInFilterList(newThreadInfos[threadID]),\n- );\n- const joinedThreadIDs = [];\n- for (let threadID in newThreadInfos) {\n- const newThreadInfo = newThreadInfos[threadID];\n- if (!oldThreadInfos[threadID] && threadInFilterList(newThreadInfo)) {\n- joinedThreadIDs.push(threadID);\n+ for (let update of action.payload.updatesResult.newUpdates) {\n+ if (update.type === updateTypes.DELETE_THREAD) {\n+ const result = currentlyFilteredIDs.delete(update.threadID);\n+ if (result) {\n+ changeOccurred = true;\n}\n+ } else if (update.type === updateTypes.JOIN_THREAD) {\n+ if (\n+ !threadInFilterList(update.threadInfo) ||\n+ currentlyFilteredIDs.has(update.threadInfo.id)\n+ ) {\n+ continue;\n}\n- const newFilteredIDs = [\n- ...validCurrentFilteredIDs,\n- ...joinedThreadIDs,\n- ];\n- const nonThreadFilters = nonThreadCalendarFilters(state);\n+ currentlyFilteredIDs.add(update.threadInfo.id);\n+ changeOccurred = true;\n+ } else if (update.type === updateTypes.UPDATE_THREAD) {\n+ if (threadInFilterList(update.threadInfo)) {\n+ continue;\n+ }\n+ const result = currentlyFilteredIDs.delete(update.threadInfo.id);\n+ if (result) {\n+ changeOccurred = true;\n+ }\n+ }\n+ }\n+ if (changeOccurred) {\nreturn [\n- ...nonThreadFilters,\n- { type: \"threads\", threadIDs: newFilteredIDs },\n+ ...nonThreadCalendarFilters(state),\n+ { type: \"threads\", threadIDs: [...currentlyFilteredIDs] },\n];\n}\n+ }\n+ return state;\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/master-reducer.js",
"new_path": "lib/reducers/master-reducer.js",
"diff": "@@ -95,8 +95,6 @@ export default function baseReducer<N: BaseNavInfo, T: BaseAppState<N>>(\ncalendarFilters: reduceCalendarFilters(\nstate.calendarFilters,\naction,\n- threadInfos,\n- state.threadStore.threadInfos,\n),\n};\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [lib] Use JOIN_THREAD and DELETE_THREAD to determine calendar filters changes
Instead of comparing and contrasing the list of threads before and after `threadReducer`. |
129,187 | 10.08.2018 13:36:10 | 14,400 | 93001bf6f15597632520b78b125df7f7cb5702b5 | [server] Fix use of updateFilterIfChanged versus createFilter | [
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -46,8 +46,7 @@ import {\n} from '../session/cookies';\nimport { deviceTokenUpdater } from '../updaters/device-token-updaters';\nimport createReport from '../creators/report-creator';\n-import { createFilter } from '../creators/filter-creator';\n-import { fetchCurrentFilter } from '../fetchers/filter-fetchers';\n+import { updateFilterIfChanged } from '../updaters/filter-updaters';\nimport {\ndeleteUpdatesBeforeTimeTargettingCookie,\n} from '../deleters/update-deleters';\n@@ -221,18 +220,11 @@ async function pingResponder(\nfetchThreadInfos(viewer),\nfetchEntryInfos(viewer, calendarQuery),\nfetchCurrentUserInfo(viewer),\n- calendarQuery ? fetchCurrentFilter(viewer) : undefined,\n+ calendarQuery ? updateFilterIfChanged(viewer, calendarQuery) : undefined,\n]);\nconst promises = {};\npromises.activityUpdate = updateActivityTime(viewer);\n- if (\n- calendarQuery &&\n- (!currentCalendarQuery ||\n- !_isEqual(currentCalendarQuery)(calendarQuery))\n- ) {\n- promises.filterCreation = createFilter(viewer, calendarQuery);\n- }\nif (oldUpdatesCurrentAsOf !== null && oldUpdatesCurrentAsOf !== undefined) {\npromises.deleteExpiredUpdates = deleteUpdatesBeforeTimeTargettingCookie(\nviewer,\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/user-responders.js",
"new_path": "server/src/responders/user-responders.js",
"diff": "@@ -64,7 +64,7 @@ import { fetchEntryInfos } from '../fetchers/entry-fetchers';\nimport { deviceTokenUpdater } from '../updaters/device-token-updaters';\nimport { deviceTokenUpdateRequestInputValidator } from './device-responders';\nimport { sendAccessRequestEmailToAshoat } from '../emails/access-request';\n-import { updateFilterIfChanged } from '../updaters/filter-updaters';\n+import { createFilter } from '../creators/filter-creator';\nconst subscriptionUpdateRequestInputValidator = tShape({\nthreadID: t.String,\n@@ -247,7 +247,7 @@ async function logInResponder(\nrequest.deviceTokenUpdateRequest\n? deviceTokenUpdater(viewer, request.deviceTokenUpdateRequest)\n: undefined,\n- calendarQuery ? updateFilterIfChanged(viewer, calendarQuery) : undefined,\n+ calendarQuery ? createFilter(viewer, calendarQuery) : undefined,\n]);\nconst rawEntryInfos = entriesResult ? entriesResult.rawEntryInfos : null;\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/account-updaters.js",
"new_path": "server/src/updaters/account-updaters.js",
"diff": "@@ -24,7 +24,7 @@ import { createNewUserCookie } from '../session/cookies';\nimport { fetchMessageInfos } from '../fetchers/message-fetchers';\nimport { fetchEntryInfos } from '../fetchers/entry-fetchers';\nimport { verifyCalendarQueryThreadIDs } from '../responders/entry-responders';\n-import { updateFilterIfChanged } from '../updaters/filter-updaters';\n+import { createFilter } from '../creators/filter-creator';\nasync function accountUpdater(\nviewer: Viewer,\n@@ -194,7 +194,7 @@ async function updatePassword(\ndefaultNumberPerThread,\n),\ncalendarQuery ? fetchEntryInfos(viewer, calendarQuery) : undefined,\n- calendarQuery ? updateFilterIfChanged(viewer, calendarQuery) : undefined,\n+ calendarQuery ? createFilter(viewer, calendarQuery) : undefined,\n]);\nconst rawEntryInfos = entriesResult ? entriesResult.rawEntryInfos : null;\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Fix use of updateFilterIfChanged versus createFilter |
129,187 | 10.08.2018 14:04:00 | 14,400 | ee6d1bc36e81b823d871cdb71a997dbc15e81034 | [lib] Get rid of unused fetchEntriesAndSetRangeActionTypes | [
{
"change_type": "MODIFY",
"old_path": "lib/actions/entry-actions.js",
"new_path": "lib/actions/entry-actions.js",
"diff": "@@ -39,11 +39,6 @@ async function fetchEntries(\n};\n}\n-const fetchEntriesAndSetRangeActionTypes = Object.freeze({\n- started: \"FETCH_ENTRIES_AND_SET_RANGE_STARTED\",\n- success: \"FETCH_ENTRIES_AND_SET_RANGE_SUCCESS\",\n- failed: \"FETCH_ENTRIES_AND_SET_RANGE_FAILED\",\n-});\nconst fetchEntriesAndAppendRangeActionTypes = Object.freeze({\nstarted: \"FETCH_ENTRIES_AND_APPEND_RANGE_STARTED\",\nsuccess: \"FETCH_ENTRIES_AND_APPEND_RANGE_SUCCESS\",\n@@ -176,7 +171,6 @@ async function restoreEntry(\nexport {\nfetchEntriesActionTypes,\nfetchEntries,\n- fetchEntriesAndSetRangeActionTypes,\nfetchEntriesAndAppendRangeActionTypes,\nfetchEntriesWithRange,\ncreateLocalEntryActionType,\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/entry-reducer.js",
"new_path": "lib/reducers/entry-reducer.js",
"diff": "@@ -30,7 +30,6 @@ import { setHighestLocalID } from '../utils/local-ids';\nimport { setCookieActionType } from '../utils/action-utils';\nimport {\nfetchEntriesActionTypes,\n- fetchEntriesAndSetRangeActionTypes,\ncreateLocalEntryActionType,\ncreateEntryActionTypes,\nsaveEntryActionTypes,\n@@ -254,10 +253,7 @@ function reduceEntryInfos(\ndaysToEntries: newDaysToEntries,\nlastUserInteractionCalendar: newLastUserInteractionCalendar,\n};\n- } else if (\n- action.type === fetchEntriesAndSetRangeActionTypes.success ||\n- action.type === fetchEntriesAndAppendRangeActionTypes.success\n- ) {\n+ } else if (action.type === fetchEntriesAndAppendRangeActionTypes.success) {\nconst [updatedEntryInfos, updatedDaysToEntries] = mergeNewEntryInfos(\nentryInfos,\ndaysToEntries,\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/nav-reducer.js",
"new_path": "lib/reducers/nav-reducer.js",
"diff": "@@ -5,7 +5,6 @@ import type { BaseNavInfo } from '../types/nav-types';\nimport { dateFromString } from '../utils/date-utils';\nimport {\n- fetchEntriesAndSetRangeActionTypes,\nfetchEntriesAndAppendRangeActionTypes,\n} from '../actions/entry-actions';\nimport {\n@@ -19,13 +18,7 @@ export default function reduceBaseNavInfo<T: BaseNavInfo>(\nstate: T,\naction: BaseAction,\n): T {\n- if (action.type === fetchEntriesAndSetRangeActionTypes.success) {\n- return {\n- ...state,\n- startDate: action.payload.calendarQuery.startDate,\n- endDate: action.payload.calendarQuery.endDate,\n- };\n- } else if (action.type === fetchEntriesAndAppendRangeActionTypes.success) {\n+ if (action.type === fetchEntriesAndAppendRangeActionTypes.success) {\nconst queryStartDate =\ndateFromString(action.payload.calendarQuery.startDate);\nconst reduxStartDate = dateFromString(state.startDate);\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/user-reducer.js",
"new_path": "lib/reducers/user-reducer.js",
"diff": "@@ -11,7 +11,6 @@ import _isEqual from 'lodash/fp/isEqual';\nimport { setCookieActionType } from '../utils/action-utils';\nimport {\nfetchEntriesActionTypes,\n- fetchEntriesAndSetRangeActionTypes,\nfetchEntriesAndAppendRangeActionTypes,\n} from '../actions/entry-actions';\nimport {\n@@ -90,7 +89,6 @@ function reduceUserInfos(\naction.type === joinThreadActionTypes.success ||\naction.type === fetchMessagesBeforeCursorActionTypes.success ||\naction.type === fetchMostRecentMessagesActionTypes.success ||\n- action.type === fetchEntriesAndSetRangeActionTypes.success ||\naction.type === fetchEntriesAndAppendRangeActionTypes.success ||\naction.type === fetchEntriesActionTypes.success ||\naction.type === searchUsersActionTypes.success ||\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/redux-types.js",
"new_path": "lib/types/redux-types.js",
"diff": "@@ -77,21 +77,6 @@ export type BaseAppState<NavInfo: BaseNavInfo> = {\nexport type BaseAction =\n{| type: \"@@redux/INIT\" |} | {|\n- type: \"FETCH_ENTRIES_AND_SET_RANGE_STARTED\",\n- payload?: {|\n- calendarQuery?: CalendarQuery,\n- |},\n- loadingInfo: LoadingInfo,\n- |} | {|\n- type: \"FETCH_ENTRIES_AND_SET_RANGE_FAILED\",\n- error: true,\n- payload: Error,\n- loadingInfo: LoadingInfo,\n- |} | {|\n- type: \"FETCH_ENTRIES_AND_SET_RANGE_SUCCESS\",\n- payload: CalendarResult,\n- loadingInfo: LoadingInfo,\n- |} | {|\ntype: \"FETCH_ENTRIES_STARTED\",\nloadingInfo: LoadingInfo,\n|} | {|\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [lib] Get rid of unused fetchEntriesAndSetRangeActionTypes |
129,187 | 13.08.2018 21:36:08 | 14,400 | 7518a57f375e3e200e44b04cedd16ad6d98f90b4 | web and lib updates for new UPDATE_CALENDAR_QUERY paradigm
Also unrelated reducer updates since I figured it'd be easier to do it in one go. | [
{
"change_type": "MODIFY",
"old_path": "lib/actions/entry-actions.js",
"new_path": "lib/actions/entry-actions.js",
"diff": "@@ -13,6 +13,7 @@ import type {\nRestoreEntryResponse,\nFetchEntryInfosResult,\nCalendarResult,\n+ CalendarQueryUpdateResult,\n} from '../types/entry-types';\nimport type { FetchJSON } from '../utils/fetch-json';\nimport type { HistoryRevisionInfo } from '../types/history-types';\n@@ -39,6 +40,25 @@ async function fetchEntries(\n};\n}\n+const updateCalendarQueryActionTypes = Object.freeze({\n+ started: \"UPDATE_CALENDAR_QUERY_STARTED\",\n+ success: \"UPDATE_CALENDAR_QUERY_SUCCESS\",\n+ failed: \"UPDATE_CALENDAR_QUERY_FAILED\",\n+});\n+async function updateCalendarQuery(\n+ fetchJSON: FetchJSON,\n+ calendarQuery: CalendarQuery,\n+ reduxAlreadyUpdated: bool = false,\n+): Promise<CalendarQueryUpdateResult> {\n+ const response = await fetchJSON('update_calendar_query', calendarQuery);\n+ const { rawEntryInfos, userInfos } = response;\n+ if (reduxAlreadyUpdated) {\n+ return { rawEntryInfos, userInfos };\n+ } else {\n+ return { rawEntryInfos, userInfos, calendarQuery };\n+ }\n+}\n+\nconst fetchEntriesAndAppendRangeActionTypes = Object.freeze({\nstarted: \"FETCH_ENTRIES_AND_APPEND_RANGE_STARTED\",\nsuccess: \"FETCH_ENTRIES_AND_APPEND_RANGE_SUCCESS\",\n@@ -171,6 +191,8 @@ async function restoreEntry(\nexport {\nfetchEntriesActionTypes,\nfetchEntries,\n+ updateCalendarQueryActionTypes,\n+ updateCalendarQuery,\nfetchEntriesAndAppendRangeActionTypes,\nfetchEntriesWithRange,\ncreateLocalEntryActionType,\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/entry-reducer.js",
"new_path": "lib/reducers/entry-reducer.js",
"diff": "@@ -30,6 +30,7 @@ import { setHighestLocalID } from '../utils/local-ids';\nimport { setCookieActionType } from '../utils/action-utils';\nimport {\nfetchEntriesActionTypes,\n+ updateCalendarQueryActionTypes,\ncreateLocalEntryActionType,\ncreateEntryActionTypes,\nsaveEntryActionTypes,\n@@ -197,7 +198,13 @@ function reduceEntryInfos(\naction: BaseAction,\nnewThreadInfos: {[id: string]: RawThreadInfo},\n): EntryStore {\n- const { entryInfos, daysToEntries, lastUserInteractionCalendar } = entryStore;\n+ const {\n+ entryInfos,\n+ daysToEntries,\n+ actualizedCalendarQuery,\n+ lastUserInteractionCalendar,\n+ inconsistencyResponses,\n+ } = entryStore;\nif (\naction.type === logOutActionTypes.success ||\naction.type === deleteAccountActionTypes.success ||\n@@ -217,7 +224,9 @@ function reduceEntryInfos(\nreturn {\nentryInfos,\ndaysToEntries,\n+ actualizedCalendarQuery,\nlastUserInteractionCalendar: newLastUserInteractionCalendar,\n+ inconsistencyResponses,\n};\n}\nconst newDaysToEntries = filterExistingDaysToEntriesWithNewEntryInfos(\n@@ -227,7 +236,9 @@ function reduceEntryInfos(\nreturn {\nentryInfos: newEntryInfos,\ndaysToEntries: newDaysToEntries,\n+ actualizedCalendarQuery,\nlastUserInteractionCalendar: newLastUserInteractionCalendar,\n+ inconsistencyResponses,\n};\n} else if (action.type === setCookieActionType) {\nconst authorizedThreadInfos = _pickBy(threadInFilterList)(newThreadInfos);\n@@ -245,13 +256,17 @@ function reduceEntryInfos(\nreturn {\nentryInfos,\ndaysToEntries,\n+ actualizedCalendarQuery,\nlastUserInteractionCalendar: newLastUserInteractionCalendar,\n+ inconsistencyResponses,\n};\n}\nreturn {\nentryInfos: newEntryInfos,\ndaysToEntries: newDaysToEntries,\n+ actualizedCalendarQuery,\nlastUserInteractionCalendar: newLastUserInteractionCalendar,\n+ inconsistencyResponses,\n};\n} else if (action.type === fetchEntriesAndAppendRangeActionTypes.success) {\nconst [updatedEntryInfos, updatedDaysToEntries] = mergeNewEntryInfos(\n@@ -263,7 +278,9 @@ function reduceEntryInfos(\nreturn {\nentryInfos: updatedEntryInfos,\ndaysToEntries: updatedDaysToEntries,\n+ actualizedCalendarQuery,\nlastUserInteractionCalendar: Date.now(),\n+ inconsistencyResponses,\n};\n} else if (action.type === fetchEntriesActionTypes.success) {\nconst [updatedEntryInfos, updatedDaysToEntries] = mergeNewEntryInfos(\n@@ -275,7 +292,38 @@ function reduceEntryInfos(\nreturn {\nentryInfos: updatedEntryInfos,\ndaysToEntries: updatedDaysToEntries,\n+ actualizedCalendarQuery,\nlastUserInteractionCalendar,\n+ inconsistencyResponses,\n+ };\n+ } else if (\n+ action.type === updateCalendarQueryActionTypes.started &&\n+ action.payload &&\n+ action.payload.calendarQuery\n+ ) {\n+ return {\n+ entryInfos,\n+ daysToEntries,\n+ actualizedCalendarQuery: action.payload.calendarQuery,\n+ lastUserInteractionCalendar,\n+ inconsistencyResponses,\n+ };\n+ } else if (action.type === updateCalendarQueryActionTypes.success) {\n+ const newActualizedCalendarQuery = action.payload.calendarQuery\n+ ? action.payload.calendarQuery\n+ : actualizedCalendarQuery;\n+ const [updatedEntryInfos, updatedDaysToEntries] = mergeNewEntryInfos(\n+ entryInfos,\n+ daysToEntries,\n+ action.payload.rawEntryInfos,\n+ newThreadInfos,\n+ );\n+ return {\n+ entryInfos: updatedEntryInfos,\n+ daysToEntries: updatedDaysToEntries,\n+ actualizedCalendarQuery: newActualizedCalendarQuery,\n+ lastUserInteractionCalendar,\n+ inconsistencyResponses,\n};\n} else if (action.type === createLocalEntryActionType) {\nconst entryInfo = action.payload;\n@@ -294,7 +342,9 @@ function reduceEntryInfos(\nreturn {\nentryInfos: newEntryInfos,\ndaysToEntries: newDaysToEntries,\n+ actualizedCalendarQuery,\nlastUserInteractionCalendar: Date.now(),\n+ inconsistencyResponses,\n};\n} else if (action.type === createEntryActionTypes.success) {\nconst localID = action.payload.localID;\n@@ -339,7 +389,9 @@ function reduceEntryInfos(\nreturn {\nentryInfos: newEntryInfos,\ndaysToEntries: newDaysToEntries,\n+ actualizedCalendarQuery,\nlastUserInteractionCalendar: Date.now(),\n+ inconsistencyResponses,\n};\n} else if (action.type === saveEntryActionTypes.success) {\nconst serverID = action.payload.entryID;\n@@ -360,7 +412,9 @@ function reduceEntryInfos(\nreturn {\nentryInfos: newEntryInfos,\ndaysToEntries,\n+ actualizedCalendarQuery,\nlastUserInteractionCalendar: Date.now(),\n+ inconsistencyResponses,\n};\n} else if (action.type === concurrentModificationResetActionType) {\nconst payload = action.payload;\n@@ -381,7 +435,9 @@ function reduceEntryInfos(\nreturn {\nentryInfos: newEntryInfos,\ndaysToEntries,\n+ actualizedCalendarQuery,\nlastUserInteractionCalendar,\n+ inconsistencyResponses,\n};\n} else if (action.type === deleteEntryActionTypes.started) {\nconst payload = action.payload;\n@@ -399,7 +455,9 @@ function reduceEntryInfos(\nreturn {\nentryInfos: newEntryInfos,\ndaysToEntries,\n+ actualizedCalendarQuery,\nlastUserInteractionCalendar: Date.now(),\n+ inconsistencyResponses,\n};\n} else if (action.type === fetchRevisionsForEntryActionTypes.success) {\nconst id = action.payload.entryID;\n@@ -422,7 +480,9 @@ function reduceEntryInfos(\nreturn {\nentryInfos: newEntryInfos,\ndaysToEntries,\n+ actualizedCalendarQuery,\nlastUserInteractionCalendar,\n+ inconsistencyResponses,\n};\n} else if (action.type === restoreEntryActionTypes.success) {\nconst entryInfo = action.payload.entryInfo;\n@@ -434,7 +494,9 @@ function reduceEntryInfos(\nreturn {\nentryInfos: newEntryInfos,\ndaysToEntries,\n+ actualizedCalendarQuery,\nlastUserInteractionCalendar: Date.now(),\n+ inconsistencyResponses,\n};\n} else if (\naction.type === logInActionTypes.success ||\n@@ -452,14 +514,17 @@ function reduceEntryInfos(\nreturn {\nentryInfos: updatedEntryInfos,\ndaysToEntries: updatedDaysToEntries,\n+ actualizedCalendarQuery,\nlastUserInteractionCalendar,\n+ inconsistencyResponses,\n};\n}\n} else if (action.type === pingActionTypes.success) {\n- const calendarResult = action.payload.calendarResult;\n+ const { payload } = action;\n+ const calendarResult = payload.calendarResult;\nconst rawEntryInfos = mergeUpdateEntryInfos(\ncalendarResult.rawEntryInfos,\n- action.payload.updatesResult.newUpdates,\n+ payload.updatesResult.newUpdates,\n);\nconst [updatedEntryInfos, updatedDaysToEntries] = mergeNewEntryInfos(\nentryInfos,\n@@ -467,14 +532,19 @@ function reduceEntryInfos(\nrawEntryInfos,\nnewThreadInfos,\n{\n- prevEntryInfos: action.payload.prevState.entryInfos,\n- calendarQuery: action.payload.calendarResult.calendarQuery,\n+ prevEntryInfos: payload.prevState.entryInfos,\n+ calendarQuery: payload.calendarResult.calendarQuery,\n},\n);\nreturn {\nentryInfos: updatedEntryInfos,\ndaysToEntries: updatedDaysToEntries,\n+ actualizedCalendarQuery,\nlastUserInteractionCalendar,\n+ inconsistencyResponses: inconsistencyResponses.filter(\n+ response =>\n+ !payload.requests.deliveredClientResponses.includes(response),\n+ ),\n};\n} else if (\naction.type === changeThreadSettingsActionTypes.success ||\n@@ -495,7 +565,9 @@ function reduceEntryInfos(\nreturn {\nentryInfos: newEntryInfos,\ndaysToEntries: newDaysToEntries,\n+ actualizedCalendarQuery,\nlastUserInteractionCalendar,\n+ inconsistencyResponses,\n};\n} else if (action.type === rehydrateActionType) {\nif (!action.payload || !action.payload.entryStore) {\n@@ -528,10 +600,16 @@ function mergeUpdateEntryInfos(\nconst entryIDs = new Set(entryInfos.map(entryInfo => entryInfo.id));\nconst mergedEntryInfos = [...entryInfos];\nfor (let updateInfo of newUpdates) {\n- if (updateInfo.type !== updateTypes.JOIN_THREAD) {\n+ if (updateInfo.type === updateTypes.JOIN_THREAD) {\n+ for (let entryInfo of updateInfo.rawEntryInfos) {\n+ if (entryIDs.has(entryInfo.id)) {\ncontinue;\n}\n- for (let entryInfo of updateInfo.rawEntryInfos) {\n+ mergedEntryInfos.push(entryInfo);\n+ entryIDs.add(entryInfo.id);\n+ }\n+ } else if (updateInfo.type === updateTypes.UPDATE_ENTRY) {\n+ const { entryInfo } = updateInfo;\nif (entryIDs.has(entryInfo.id)) {\ncontinue;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/nav-reducer.js",
"new_path": "lib/reducers/nav-reducer.js",
"diff": "@@ -5,6 +5,7 @@ import type { BaseNavInfo } from '../types/nav-types';\nimport { dateFromString } from '../utils/date-utils';\nimport {\n+ updateCalendarQueryActionTypes,\nfetchEntriesAndAppendRangeActionTypes,\n} from '../actions/entry-actions';\nimport {\n@@ -43,6 +44,14 @@ export default function reduceBaseNavInfo<T: BaseNavInfo>(\n) {\nconst { startDate, endDate } = action.payload.calendarQuery;\nreturn { ...state, startDate, endDate };\n+ } else if (\n+ (action.type === updateCalendarQueryActionTypes.started ||\n+ action.type === updateCalendarQueryActionTypes.success) &&\n+ action.payload &&\n+ action.payload.calendarQuery\n+ ) {\n+ const { startDate, endDate } = action.payload.calendarQuery;\n+ return { ...state, startDate, endDate };\n}\nreturn state;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/user-reducer.js",
"new_path": "lib/reducers/user-reducer.js",
"diff": "@@ -11,6 +11,7 @@ import _isEqual from 'lodash/fp/isEqual';\nimport { setCookieActionType } from '../utils/action-utils';\nimport {\nfetchEntriesActionTypes,\n+ updateCalendarQueryActionTypes,\nfetchEntriesAndAppendRangeActionTypes,\n} from '../actions/entry-actions';\nimport {\n@@ -91,6 +92,7 @@ function reduceUserInfos(\naction.type === fetchMostRecentMessagesActionTypes.success ||\naction.type === fetchEntriesAndAppendRangeActionTypes.success ||\naction.type === fetchEntriesActionTypes.success ||\n+ action.type === updateCalendarQueryActionTypes.success ||\naction.type === searchUsersActionTypes.success ||\n(action.type === setCookieActionType &&\n!action.payload.cookieInvalidated)\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/selectors/nav-selectors.js",
"new_path": "lib/selectors/nav-selectors.js",
"diff": "@@ -5,7 +5,10 @@ import type { BaseNavInfo } from '../types/nav-types';\nimport type { RawThreadInfo } from '../types/thread-types';\nimport type { CalendarQuery } from '../types/entry-types';\nimport type { UserInfo } from '../types/user-types';\n-import type { CalendarFilter } from '../types/filter-types';\n+import {\n+ type CalendarFilter,\n+ defaultCalendarFilters,\n+} from '../types/filter-types';\nimport { createSelector } from 'reselect';\nimport _some from 'lodash/fp/some';\n@@ -46,6 +49,12 @@ function currentEndDate(\nreturn fifteenDaysLater();\n}\n+const defaultCalendarQuery = () => ({\n+ startDate: fifteenDaysEarlier().valueOf(),\n+ endDate: fifteenDaysLater().valueOf(),\n+ filters: defaultCalendarFilters,\n+});\n+\nconst currentCalendarQuery = createSelector(\n(state: BaseAppState<*>) => state.entryStore.lastUserInteractionCalendar,\n(state: BaseAppState<*>) => state.navInfo,\n@@ -125,6 +134,7 @@ const nonThreadCalendarQuery = createSelector(\n);\nexport {\n+ defaultCalendarQuery,\ncurrentCalendarQuery,\nthreadSearchIndex,\nnonThreadCalendarQuery,\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/selectors/ping-selectors.js",
"new_path": "lib/selectors/ping-selectors.js",
"diff": "@@ -9,6 +9,7 @@ import {\nserverRequestTypes,\ntype ServerRequest,\ntype ThreadPollPushInconsistencyClientResponse,\n+ type EntryPollPushInconsistencyClientResponse,\n} from '../types/request-types';\nimport { createSelector } from 'reselect';\n@@ -52,6 +53,7 @@ const pingActionInput = createSelector(\n(state: BaseAppState<*>) => state.activeServerRequests,\n(state: BaseAppState<*>) => state.deviceToken,\n(state: BaseAppState<*>) => state.threadStore.inconsistencyResponses,\n+ (state: BaseAppState<*>) => state.entryStore.inconsistencyResponses,\n(state: BaseAppState<*>) => state.pingTimestamps.lastSuccess,\n(\nthreadInfos: {[id: string]: RawThreadInfo},\n@@ -61,11 +63,16 @@ const pingActionInput = createSelector(\nupdatesCurrentAsOf: number,\nactiveServerRequests: $ReadOnlyArray<ServerRequest>,\ndeviceToken: ?string,\n- inconsistencyResponses:\n+ threadInconsistencyResponses:\n$ReadOnlyArray<ThreadPollPushInconsistencyClientResponse>,\n+ entryInconsistencyResponses:\n+ $ReadOnlyArray<EntryPollPushInconsistencyClientResponse>,\nlastSuccess: number,\n): (startingPayload: PingStartingPayload) => PingActionInput => {\n- const clientResponses = [...inconsistencyResponses];\n+ const clientResponses = [\n+ ...threadInconsistencyResponses,\n+ ...entryInconsistencyResponses,\n+ ];\nconst serverRequestedPlatformDetails = activeServerRequests.some(\nrequest => request.type === serverRequestTypes.PLATFORM_DETAILS,\n);\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/endpoints.js",
"new_path": "lib/types/endpoints.js",
"diff": "@@ -34,5 +34,6 @@ export const endpoint = Object.freeze({\nFETCH_ERROR_REPORT_INFOS: 'fetch_error_report_infos',\nREQUEST_ACCESS: 'request_access',\nCREATE_REPORT: 'create_report',\n+ UPDATE_CALENDAR_QUERY: 'update_calendar_query',\n});\nexport type Endpoint = $Values<typeof endpoint>;\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/entry-types.js",
"new_path": "lib/types/entry-types.js",
"diff": "import type { RawMessageInfo } from './message-types';\nimport type { UserInfo, AccountUserInfo } from './user-types';\n-import type { CalendarFilter } from './filter-types';\n+import { type CalendarFilter, calendarFilterPropType } from './filter-types';\nimport type { CreateUpdatesResult } from './update-types';\n+import type { EntryPollPushInconsistencyClientResponse } from './request-types';\nimport PropTypes from 'prop-types';\n@@ -62,7 +63,10 @@ export const entryInfoPropType = PropTypes.shape({\nexport type EntryStore = {|\nentryInfos: {[id: string]: RawEntryInfo},\ndaysToEntries: {[day: string]: string[]},\n+ actualizedCalendarQuery: CalendarQuery,\nlastUserInteractionCalendar: number,\n+ inconsistencyResponses:\n+ $ReadOnlyArray<EntryPollPushInconsistencyClientResponse>,\n|};\nexport type CalendarQuery = {|\n@@ -71,6 +75,12 @@ export type CalendarQuery = {|\nfilters: $ReadOnlyArray<CalendarFilter>,\n|};\n+export const calendarQueryPropType = PropTypes.shape({\n+ startDate: PropTypes.string.isRequired,\n+ endDate: PropTypes.string.isRequired,\n+ filters: PropTypes.arrayOf(calendarFilterPropType).isRequired,\n+});\n+\nexport type SaveEntryInfo = {|\nentryID: string,\ntext: string,\n@@ -183,3 +193,9 @@ export type CalendarResult = {|\ncalendarQuery: CalendarQuery,\nuserInfos: $ReadOnlyArray<UserInfo>,\n|};\n+\n+export type CalendarQueryUpdateResult = {|\n+ rawEntryInfos: $ReadOnlyArray<RawEntryInfo>,\n+ userInfos: $ReadOnlyArray<AccountUserInfo>,\n+ calendarQuery?: CalendarQuery,\n+|};\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/redux-types.js",
"new_path": "lib/types/redux-types.js",
"diff": "@@ -17,6 +17,7 @@ import type {\nRestoreEntryResponse,\nFetchEntryInfosResult,\nCalendarResult,\n+ CalendarQueryUpdateResult,\n} from './entry-types';\nimport type { LoadingStatus, LoadingInfo } from './loading-types';\nimport type { BaseNavInfo } from './nav-types';\n@@ -520,6 +521,19 @@ export type BaseAction =\ntype: \"UPDATE_SUBSCRIPTION_SUCCESS\",\npayload: SubscriptionUpdateResult,\nloadingInfo: LoadingInfo,\n+ |} | {|\n+ type: \"UPDATE_CALENDAR_QUERY_STARTED\",\n+ loadingInfo: LoadingInfo,\n+ payload?: {| calendarQuery?: CalendarQuery |},\n+ |} | {|\n+ type: \"UPDATE_CALENDAR_QUERY_FAILED\",\n+ error: true,\n+ payload: Error,\n+ loadingInfo: LoadingInfo,\n+ |} | {|\n+ type: \"UPDATE_CALENDAR_QUERY_SUCCESS\",\n+ payload: CalendarQueryUpdateResult,\n+ loadingInfo: LoadingInfo,\n|};\nexport type ActionPayload\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/request-types.js",
"new_path": "lib/types/request-types.js",
"diff": "import type { Platform, PlatformDetails } from './device-types';\nimport type { RawThreadInfo } from './thread-types';\n+import type { RawEntryInfo } from './entry-types';\nimport type { BaseAction } from './redux-types';\nimport invariant from 'invariant';\n@@ -15,6 +16,7 @@ export const serverRequestTypes = Object.freeze({\nTHREAD_POLL_PUSH_INCONSISTENCY: 2,\nPLATFORM_DETAILS: 3,\nINITIAL_ACTIVITY_UPDATE: 4,\n+ ENTRY_POLL_PUSH_INCONSISTENCY: 5,\n});\ntype ServerRequestType = $Values<typeof serverRequestTypes>;\nfunction assertServerRequestType(\n@@ -71,6 +73,17 @@ type InitialActivityUpdateClientResponse = {|\nthreadID: string,\n|};\n+export type EntryPollPushInconsistencyClientResponse = {|\n+ type: 5,\n+ platformDetails: PlatformDetails,\n+ beforeAction: {[id: string]: RawEntryInfo},\n+ action: BaseAction,\n+ pollResult: {[id: string]: RawEntryInfo},\n+ pushResult: {[id: string]: RawEntryInfo},\n+ lastActionTypes?: $ReadOnlyArray<$PropertyType<BaseAction, 'type'>>,\n+ time?: number,\n+|};\n+\nexport const serverRequestPropType = PropTypes.oneOfType([\nPropTypes.shape({\ntype: PropTypes.oneOf([ serverRequestTypes.PLATFORM ]).isRequired,\n@@ -92,4 +105,5 @@ export type ClientResponse =\n| DeviceTokenClientResponse\n| ThreadPollPushInconsistencyClientResponse\n| PlatformDetailsClientResponse\n- | InitialActivityUpdateClientResponse;\n+ | InitialActivityUpdateClientResponse\n+ | EntryPollPushInconsistencyClientResponse;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/persist.js",
"new_path": "native/persist.js",
"diff": "@@ -8,6 +8,8 @@ import storage from 'redux-persist/lib/storage';\nimport { createMigrate } from 'redux-persist';\nimport invariant from 'invariant';\n+import { currentCalendarQuery } from 'lib/selectors/nav-selectors';\n+\nimport { defaultNotifPermissionAlertInfo } from './push/alerts';\nconst blacklist = __DEV__\n@@ -69,6 +71,14 @@ const migrations = {\ninconsistencyResponses: [],\n},\n}),\n+ [7]: (state) => ({\n+ ...state,\n+ entryStore: {\n+ ...state.entryStore,\n+ inconsistencyResponses: [],\n+ actualizedCalendarQuery: currentCalendarQuery(state)(),\n+ },\n+ }),\n};\nconst persistConfig = {\n@@ -76,7 +86,7 @@ const persistConfig = {\nstorage,\nblacklist,\ndebug: __DEV__,\n- version: 6,\n+ version: 7,\nmigrate: createMigrate(migrations, { debug: __DEV__ }),\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "native/redux-setup.js",
"new_path": "native/redux-setup.js",
"diff": "@@ -42,6 +42,7 @@ import { notificationPressActionType } from 'lib/shared/notif-utils';\nimport { sendMessageActionTypes } from 'lib/actions/message-actions';\nimport { pingActionTypes } from 'lib/actions/ping-actions';\nimport { reduxLoggerMiddleware } from 'lib/utils/redux-logger';\n+import { defaultCalendarQuery } from 'lib/selectors/nav-selectors';\nimport { MessageListRouteName } from './chat/message-list.react';\nimport { activeThreadSelector } from './selectors/nav-selectors';\n@@ -107,7 +108,9 @@ const defaultState = ({\nentryStore: {\nentryInfos: {},\ndaysToEntries: {},\n+ actualizedCalendarQuery: defaultCalendarQuery(),\nlastUserInteractionCalendar: 0,\n+ inconsistencyResponses: [],\n},\nlastUserInteraction: { sessionReset: Date.now() },\nthreadStore: {\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/website-responders.js",
"new_path": "server/src/responders/website-responders.js",
"diff": "@@ -123,7 +123,9 @@ async function websiteResponder(viewer: Viewer, url: string): Promise<string> {\nentryStore: {\nentryInfos: _keyBy('id')(rawEntryInfos),\ndaysToEntries: daysToEntriesFromEntryInfos(rawEntryInfos),\n+ actualizedCalendarQuery: calendarQuery,\nlastUserInteractionCalendar: time,\n+ inconsistencyResponses: [],\n},\nlastUserInteraction: { sessionReset: time },\nthreadStore: {\n"
},
{
"change_type": "MODIFY",
"old_path": "web/app.react.js",
"new_path": "web/app.react.js",
"diff": "@@ -7,9 +7,10 @@ import type {\nDispatchActionPromise,\n} from 'lib/utils/action-utils';\nimport { type VerifyField, verifyField } from 'lib/types/verify-types';\n-import type {\n- CalendarQuery,\n- FetchEntryInfosResult,\n+import {\n+ type CalendarQuery,\n+ type CalendarQueryUpdateResult,\n+ calendarQueryPropType,\n} from 'lib/types/entry-types';\nimport {\ntype PingStartingPayload,\n@@ -38,9 +39,13 @@ import { getDate } from 'lib/utils/date-utils';\nimport { currentCalendarQuery } from 'lib/selectors/nav-selectors';\nimport {\nfetchEntriesActionTypes,\n- fetchEntries,\n+ updateCalendarQueryActionTypes,\n+ updateCalendarQuery,\n} from 'lib/actions/entry-actions';\n-import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors';\n+import {\n+ createLoadingStatusSelector,\n+ combineLoadingStatuses,\n+} from 'lib/selectors/loading-selectors';\nimport { connect } from 'lib/utils/redux-utils';\nimport {\npingStartingPayload,\n@@ -125,13 +130,15 @@ type Props = {\nactiveThreadLatestMessage: ?string,\nviewerID: ?string,\nunreadCount: number,\n+ actualizedCalendarQuery: CalendarQuery,\n// Redux dispatch functions\ndispatchActionPayload: DispatchActionPayload,\ndispatchActionPromise: DispatchActionPromise,\n// async functions that hit server APIs\n- fetchEntries: (\n+ updateCalendarQuery: (\ncalendarQuery: CalendarQuery,\n- ) => Promise<FetchEntryInfosResult>,\n+ reduxAlreadyUpdated?: bool,\n+ ) => Promise<CalendarQueryUpdateResult>,\nping: (actionInput: PingActionInput) => Promise<PingResult>,\nupdateActivity: (\nactivityUpdates: $ReadOnlyArray<ActivityUpdate>,\n@@ -164,17 +171,24 @@ class App extends React.PureComponent<Props, State> {\nactiveThreadLatestMessage: PropTypes.string,\nviewerID: PropTypes.string,\nunreadCount: PropTypes.number.isRequired,\n+ actualizedCalendarQuery: calendarQueryPropType.isRequired,\ndispatchActionPayload: PropTypes.func.isRequired,\ndispatchActionPromise: PropTypes.func.isRequired,\n- fetchEntries: PropTypes.func.isRequired,\n+ updateCalendarQuery: PropTypes.func.isRequired,\nping: PropTypes.func.isRequired,\nupdateActivity: PropTypes.func.isRequired,\n};\npingCounter = 0;\n+ actualizedCalendarQuery: CalendarQuery;\nstate = {\ncurrentModal: null,\n};\n+ constructor(props: Props) {\n+ super(props);\n+ this.actualizedCalendarQuery = props.actualizedCalendarQuery;\n+ }\n+\ncomponentDidMount() {\nif (this.props.navInfo.verify) {\nif (this.props.verifyField === verifyField.RESET_PASSWORD) {\n@@ -359,6 +373,12 @@ class App extends React.PureComponent<Props, State> {\n}\ncomponentWillReceiveProps(nextProps: Props) {\n+ if (\n+ nextProps.actualizedCalendarQuery !== this.props.actualizedCalendarQuery\n+ ) {\n+ this.actualizedCalendarQuery = nextProps.actualizedCalendarQuery;\n+ }\n+\nif (nextProps.loggedIn) {\nif (nextProps.location.pathname !== this.props.location.pathname) {\nconst newNavInfo = navInfoFromURL(\n@@ -378,14 +398,17 @@ class App extends React.PureComponent<Props, State> {\n}\n}\n+ const calendarQuery = nextProps.currentCalendarQuery();\nif (\n- nextProps.navInfo.startDate !== this.props.navInfo.startDate ||\n- nextProps.navInfo.endDate !== this.props.navInfo.endDate ||\n- (nextProps.includeDeleted && !this.props.includeDeleted)\n+ !_isEqual(calendarQuery)(this.actualizedCalendarQuery) &&\n+ !_isEqual(calendarQuery)(nextProps.actualizedCalendarQuery)\n) {\n+ this.actualizedCalendarQuery = calendarQuery;\nnextProps.dispatchActionPromise(\n- fetchEntriesActionTypes,\n- nextProps.fetchEntries(nextProps.currentCalendarQuery()),\n+ updateCalendarQueryActionTypes,\n+ nextProps.updateCalendarQuery(calendarQuery, true),\n+ undefined,\n+ { calendarQuery },\n);\n}\n}\n@@ -564,8 +587,10 @@ class App extends React.PureComponent<Props, State> {\n}\n-const loadingStatusSelector\n+const fetchEntriesLoadingStatusSelector\n= createLoadingStatusSelector(fetchEntriesActionTypes);\n+const updateCalendarQueryLoadingStatusSelector\n+ = createLoadingStatusSelector(updateCalendarQueryActionTypes);\nexport default connect(\n(state: AppState) => {\n@@ -573,7 +598,10 @@ export default connect(\nreturn {\nnavInfo: state.navInfo,\nverifyField: state.verifyField,\n- entriesLoadingStatus: loadingStatusSelector(state),\n+ entriesLoadingStatus: combineLoadingStatuses(\n+ fetchEntriesLoadingStatusSelector(state),\n+ updateCalendarQueryLoadingStatusSelector(state),\n+ ),\ncurrentCalendarQuery: currentCalendarQuery(state),\npingStartingPayload: pingStartingPayload(state),\npingActionInput: pingWebActionInput(state),\n@@ -593,7 +621,8 @@ export default connect(\n: null,\nviewerID: state.currentUserInfo && state.currentUserInfo.id,\nunreadCount: unreadCount(state),\n+ actualizedCalendarQuery: state.entryStore.actualizedCalendarQuery,\n};\n},\n- { fetchEntries, ping, updateActivity },\n+ { updateCalendarQuery, ping, updateActivity },\n)(App);\n"
},
{
"change_type": "MODIFY",
"old_path": "web/calendar/calendar.react.js",
"new_path": "web/calendar/calendar.react.js",
"diff": "// @flow\n-import type { EntryInfo } from 'lib/types/entry-types';\n-import { entryInfoPropType } from 'lib/types/entry-types';\n+import {\n+ entryInfoPropType,\n+ type EntryInfo,\n+ type CalendarQuery,\n+ type CalendarQueryUpdateResult,\n+} from 'lib/types/entry-types';\nimport { type AppState, type NavInfo, navInfoPropType } from '../redux-setup';\n+import type { DispatchActionPromise } from 'lib/utils/action-utils';\nimport * as React from 'react';\nimport _filter from 'lodash/fp/filter';\nimport PropTypes from 'prop-types';\nimport invariant from 'invariant';\nimport dateFormat from 'dateformat';\n-import { Link } from 'react-router-dom';\nimport FontAwesomeIcon from '@fortawesome/react-fontawesome';\nimport faFilter from '@fortawesome/fontawesome-free-solid/faFilter';\n@@ -21,6 +25,11 @@ import {\n} from 'lib/utils/date-utils';\nimport { currentDaysToEntries } from 'lib/selectors/thread-selectors';\nimport { connect } from 'lib/utils/redux-utils';\n+import {\n+ updateCalendarQueryActionTypes,\n+ updateCalendarQuery,\n+} from 'lib/actions/entry-actions';\n+import { currentCalendarQuery } from 'lib/selectors/nav-selectors';\nimport Day from './day.react';\nimport {\n@@ -39,6 +48,14 @@ type Props = {\nmonth: number, // 1-indexed\ndaysToEntries: {[dayString: string]: EntryInfo[]},\nnavInfo: NavInfo,\n+ currentCalendarQuery: () => CalendarQuery,\n+ // Redux dispatch functions\n+ dispatchActionPromise: DispatchActionPromise,\n+ // async functions that hit server APIs\n+ updateCalendarQuery: (\n+ calendarQuery: CalendarQuery,\n+ reduxAlreadyUpdated?: bool,\n+ ) => Promise<CalendarQueryUpdateResult>,\n};\ntype State = {|\nfilterPanelOpen: bool,\n@@ -54,6 +71,9 @@ class Calendar extends React.PureComponent<Props, State> {\nPropTypes.arrayOf(entryInfoPropType),\n).isRequired,\nnavInfo: navInfoPropType.isRequired,\n+ currentCalendarQuery: PropTypes.func.isRequired,\n+ dispatchActionPromise: PropTypes.func.isRequired,\n+ updateCalendarQuery: PropTypes.func.isRequired,\n};\nstate = {\nfilterPanelOpen: false,\n@@ -71,32 +91,37 @@ class Calendar extends React.PureComponent<Props, State> {\n);\n}\n- render() {\n- const year = this.props.year;\n- const month = this.props.month;\n- const monthName = dateFormat(getDate(year, month, 1), \"mmmm\");\n-\n+ prevMonthDates() {\n+ const { year, month } = this.props;\nconst lastMonthDate = getDate(year, month - 1, 1);\nconst prevYear = lastMonthDate.getFullYear();\nconst prevMonth = lastMonthDate.getMonth() + 1;\n- const prevURL = canonicalURLFromReduxState(\n- {\n- ...this.props.navInfo,\n+ return {\nstartDate: startDateForYearAndMonth(prevYear, prevMonth),\nendDate: endDateForYearAndMonth(prevYear, prevMonth),\n- },\n- this.props.url,\n- );\n+ };\n+ }\n+ nextMonthDates() {\n+ const { year, month } = this.props;\nconst nextMonthDate = getDate(year, month + 1, 1);\nconst nextYear = nextMonthDate.getFullYear();\nconst nextMonth = nextMonthDate.getMonth() + 1;\n- const nextURL = canonicalURLFromReduxState(\n- {\n- ...this.props.navInfo,\n+ return {\nstartDate: startDateForYearAndMonth(nextYear, nextMonth),\nendDate: endDateForYearAndMonth(nextYear, nextMonth),\n- },\n+ };\n+ }\n+\n+ render() {\n+ const { year, month } = this.props;\n+ const monthName = dateFormat(getDate(year, month, 1), \"mmmm\");\n+ const prevURL = canonicalURLFromReduxState(\n+ { ...this.props.navInfo, ...this.prevMonthDates() },\n+ this.props.url,\n+ );\n+ const nextURL = canonicalURLFromReduxState(\n+ { ...this.props.navInfo, ...this.nextMonthDates() },\nthis.props.url,\n);\n@@ -165,9 +190,13 @@ class Calendar extends React.PureComponent<Props, State> {\nFilters\n</a>\n<h2 className={css['calendar-nav']}>\n- <Link to={prevURL} className={css['previous-month-link']}>\n+ <a\n+ className={css['previous-month-link']}\n+ href={prevURL}\n+ onClick={this.onClickPrevURL}\n+ >\n<\n- </Link>\n+ </a>\n<div className={css['calendar-month-name']}>\n{\" \"}\n{monthName}\n@@ -175,9 +204,13 @@ class Calendar extends React.PureComponent<Props, State> {\n{year}\n{\" \"}\n</div>\n- <Link to={nextURL} className={css['next-month-link']}>\n+ <a\n+ className={css['next-month-link']}\n+ href={nextURL}\n+ onClick={this.onClickNextURL}\n+ >\n>\n- </Link>\n+ </a>\n</h2>\n</div>\n<table className={css['calendar']}>\n@@ -204,11 +237,45 @@ class Calendar extends React.PureComponent<Props, State> {\nthis.setState({ filterPanelOpen: !this.state.filterPanelOpen });\n}\n+ onClickPrevURL = (event: SyntheticEvent<HTMLAnchorElement>) => {\n+ event.preventDefault();\n+ const currentCalendarQuery = this.props.currentCalendarQuery();\n+ const newCalendarQuery = {\n+ ...currentCalendarQuery,\n+ ...this.prevMonthDates(),\n+ };\n+ this.props.dispatchActionPromise(\n+ updateCalendarQueryActionTypes,\n+ this.props.updateCalendarQuery(newCalendarQuery, true),\n+ undefined,\n+ { calendarQuery: newCalendarQuery },\n+ );\n+ }\n+\n+ onClickNextURL = (event: SyntheticEvent<HTMLAnchorElement>) => {\n+ event.preventDefault();\n+ const currentCalendarQuery = this.props.currentCalendarQuery();\n+ const newCalendarQuery = {\n+ ...currentCalendarQuery,\n+ ...this.nextMonthDates(),\n+ };\n+ this.props.dispatchActionPromise(\n+ updateCalendarQueryActionTypes,\n+ this.props.updateCalendarQuery(newCalendarQuery, true),\n+ undefined,\n+ { calendarQuery: newCalendarQuery },\n+ );\n+ }\n+\n}\n-export default connect((state: AppState) => ({\n+export default connect(\n+ (state: AppState) => ({\nyear: yearAssertingSelector(state),\nmonth: monthAssertingSelector(state),\ndaysToEntries: currentDaysToEntries(state),\nnavInfo: state.navInfo,\n-}))(Calendar);\n+ currentCalendarQuery: currentCalendarQuery(state),\n+ }),\n+ { updateCalendarQuery },\n+)(Calendar);\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | web and lib updates for new UPDATE_CALENDAR_QUERY paradigm
Also unrelated reducer updates since I figured it'd be easier to do it in one go. |
129,187 | 13.08.2018 21:50:13 | 14,400 | 1511c7a830316e5de7671f5df5870290818979a5 | [server] Introduce update_calendar_query endpoint | [
{
"change_type": "MODIFY",
"old_path": "server/src/responders/entry-responders.js",
"new_path": "server/src/responders/entry-responders.js",
"diff": "@@ -10,6 +10,7 @@ import type {\nRestoreEntryRequest,\nRestoreEntryResponse,\nFetchEntryInfosResponse,\n+ FetchEntryInfosResult,\nSaveEntryResult,\n} from 'lib/types/entry-types';\nimport type {\n@@ -38,6 +39,7 @@ import {\nimport createEntry from '../creators/entry-creator';\nimport { updateEntry } from '../updaters/entry-updaters';\nimport { deleteEntry, restoreEntry } from '../deleters/entry-deleters';\n+import { updateFilterIfChanged } from '../updaters/filter-updaters';\nconst entryQueryInputValidator = tShape({\nnavID: t.maybe(t.String),\n@@ -202,6 +204,25 @@ async function entryRestorationResponder(\nreturn await restoreEntry(viewer, request);\n}\n+async function calendarQueryUpdateResponder(\n+ viewer: Viewer,\n+ input: any,\n+): Promise<FetchEntryInfosResult> {\n+ const request: CalendarQuery = input;\n+ validateInput(newEntryQueryInputValidator, input);\n+\n+ await verifyCalendarQueryThreadIDs(request);\n+\n+ const [ response ] = await Promise.all([\n+ fetchEntryInfos(viewer, request),\n+ updateFilterIfChanged(viewer, request),\n+ ]);\n+ return {\n+ rawEntryInfos: response.rawEntryInfos,\n+ userInfos: (Object.values(response.userInfos): any),\n+ };\n+}\n+\nexport {\nentryQueryInputValidator,\nnewEntryQueryInputValidator,\n@@ -213,4 +234,5 @@ export {\nentryUpdateResponder,\nentryDeletionResponder,\nentryRestorationResponder,\n+ calendarQueryUpdateResponder,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/server.js",
"new_path": "server/src/server.js",
"diff": "@@ -39,6 +39,7 @@ import {\nentryUpdateResponder,\nentryDeletionResponder,\nentryRestorationResponder,\n+ calendarQueryUpdateResponder,\n} from './responders/entry-responders';\nimport {\ncodeVerificationResponder,\n@@ -98,6 +99,7 @@ const jsonEndpoints: {[id: Endpoint]: JSONResponder} = {\n'create_report': reportCreationResponder,\n'fetch_error_report_infos': errorReportFetchInfosResponder,\n'request_access': requestAccessResponder,\n+ 'update_calendar_query': calendarQueryUpdateResponder,\n};\nif (cluster.isMaster) {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Introduce update_calendar_query endpoint |
129,187 | 13.08.2018 23:45:10 | 14,400 | 005768511daeb30f4750ccd4f8a2dd52bd1bdafc | native and lib updates for new UPDATE_CALENDAR_QUERY paradigm | [
{
"change_type": "MODIFY",
"old_path": "lib/actions/entry-actions.js",
"new_path": "lib/actions/entry-actions.js",
"diff": "@@ -59,23 +59,6 @@ async function updateCalendarQuery(\n}\n}\n-const fetchEntriesAndAppendRangeActionTypes = Object.freeze({\n- started: \"FETCH_ENTRIES_AND_APPEND_RANGE_STARTED\",\n- success: \"FETCH_ENTRIES_AND_APPEND_RANGE_SUCCESS\",\n- failed: \"FETCH_ENTRIES_AND_APPEND_RANGE_FAILED\",\n-});\n-async function fetchEntriesWithRange(\n- fetchJSON: FetchJSON,\n- calendarQuery: CalendarQuery,\n-): Promise<CalendarResult> {\n- const fetchEntriesResult = await fetchEntries(fetchJSON, calendarQuery);\n- return {\n- rawEntryInfos: fetchEntriesResult.rawEntryInfos,\n- calendarQuery,\n- userInfos: fetchEntriesResult.userInfos,\n- };\n-}\n-\nconst createLocalEntryActionType = \"CREATE_LOCAL_ENTRY\";\nfunction createLocalEntry(\nthreadID: string,\n@@ -193,8 +176,6 @@ export {\nfetchEntries,\nupdateCalendarQueryActionTypes,\nupdateCalendarQuery,\n- fetchEntriesAndAppendRangeActionTypes,\n- fetchEntriesWithRange,\ncreateLocalEntryActionType,\ncreateLocalEntry,\ncreateEntryActionTypes,\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/entry-reducer.js",
"new_path": "lib/reducers/entry-reducer.js",
"diff": "@@ -38,13 +38,13 @@ import {\ndeleteEntryActionTypes,\nfetchRevisionsForEntryActionTypes,\nrestoreEntryActionTypes,\n- fetchEntriesAndAppendRangeActionTypes,\n} from '../actions/entry-actions';\nimport {\nlogOutActionTypes,\ndeleteAccountActionTypes,\nlogInActionTypes,\nresetPasswordActionTypes,\n+ registerActionTypes,\n} from '../actions/user-actions';\nimport {\ndeleteThreadActionTypes,\n@@ -268,20 +268,6 @@ function reduceEntryInfos(\nlastUserInteractionCalendar: newLastUserInteractionCalendar,\ninconsistencyResponses,\n};\n- } else if (action.type === fetchEntriesAndAppendRangeActionTypes.success) {\n- const [updatedEntryInfos, updatedDaysToEntries] = mergeNewEntryInfos(\n- entryInfos,\n- daysToEntries,\n- action.payload.rawEntryInfos,\n- newThreadInfos,\n- );\n- return {\n- entryInfos: updatedEntryInfos,\n- daysToEntries: updatedDaysToEntries,\n- actualizedCalendarQuery,\n- lastUserInteractionCalendar: Date.now(),\n- inconsistencyResponses,\n- };\n} else if (action.type === fetchEntriesActionTypes.success) {\nconst [updatedEntryInfos, updatedDaysToEntries] = mergeNewEntryInfos(\nentryInfos,\n@@ -308,10 +294,26 @@ function reduceEntryInfos(\nlastUserInteractionCalendar,\ninconsistencyResponses,\n};\n+ } else if (\n+ action.type === logInActionTypes.started ||\n+ action.type === resetPasswordActionTypes.started ||\n+ action.type === registerActionTypes.started ||\n+ action.type === pingActionTypes.started\n+ ) {\n+ return {\n+ entryInfos,\n+ daysToEntries,\n+ actualizedCalendarQuery: action.payload.calendarQuery,\n+ lastUserInteractionCalendar,\n+ inconsistencyResponses,\n+ };\n} else if (action.type === updateCalendarQueryActionTypes.success) {\nconst newActualizedCalendarQuery = action.payload.calendarQuery\n? action.payload.calendarQuery\n: actualizedCalendarQuery;\n+ const newLastUserInteractionCalendar = action.payload.calendarQuery\n+ ? Date.now()\n+ : lastUserInteractionCalendar;\nconst [updatedEntryInfos, updatedDaysToEntries] = mergeNewEntryInfos(\nentryInfos,\ndaysToEntries,\n@@ -322,7 +324,7 @@ function reduceEntryInfos(\nentryInfos: updatedEntryInfos,\ndaysToEntries: updatedDaysToEntries,\nactualizedCalendarQuery: newActualizedCalendarQuery,\n- lastUserInteractionCalendar,\n+ lastUserInteractionCalendar: newLastUserInteractionCalendar,\ninconsistencyResponses,\n};\n} else if (action.type === createLocalEntryActionType) {\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/nav-reducer.js",
"new_path": "lib/reducers/nav-reducer.js",
"diff": "@@ -4,10 +4,7 @@ import type { BaseAction } from '../types/redux-types';\nimport type { BaseNavInfo } from '../types/nav-types';\nimport { dateFromString } from '../utils/date-utils';\n-import {\n- updateCalendarQueryActionTypes,\n- fetchEntriesAndAppendRangeActionTypes,\n-} from '../actions/entry-actions';\n+import { updateCalendarQueryActionTypes } from '../actions/entry-actions';\nimport {\nlogInActionTypes,\nresetPasswordActionTypes,\n@@ -19,24 +16,7 @@ export default function reduceBaseNavInfo<T: BaseNavInfo>(\nstate: T,\naction: BaseAction,\n): T {\n- if (action.type === fetchEntriesAndAppendRangeActionTypes.success) {\n- const queryStartDate =\n- dateFromString(action.payload.calendarQuery.startDate);\n- const reduxStartDate = dateFromString(state.startDate);\n- const queryEndDate = dateFromString(action.payload.calendarQuery.endDate);\n- const reduxEndDate = dateFromString(state.endDate);\n- const startDate = queryStartDate > reduxStartDate\n- ? state.startDate\n- : action.payload.calendarQuery.startDate;\n- const endDate = queryEndDate > reduxEndDate\n- ? action.payload.calendarQuery.endDate\n- : state.endDate;\n- return {\n- ...state,\n- startDate,\n- endDate,\n- };\n- } else if (\n+ if (\naction.type === logInActionTypes.started ||\naction.type === resetPasswordActionTypes.started ||\naction.type === registerActionTypes.started ||\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/user-reducer.js",
"new_path": "lib/reducers/user-reducer.js",
"diff": "@@ -12,7 +12,6 @@ import { setCookieActionType } from '../utils/action-utils';\nimport {\nfetchEntriesActionTypes,\nupdateCalendarQueryActionTypes,\n- fetchEntriesAndAppendRangeActionTypes,\n} from '../actions/entry-actions';\nimport {\nlogOutActionTypes,\n@@ -90,7 +89,6 @@ function reduceUserInfos(\naction.type === joinThreadActionTypes.success ||\naction.type === fetchMessagesBeforeCursorActionTypes.success ||\naction.type === fetchMostRecentMessagesActionTypes.success ||\n- action.type === fetchEntriesAndAppendRangeActionTypes.success ||\naction.type === fetchEntriesActionTypes.success ||\naction.type === updateCalendarQueryActionTypes.success ||\naction.type === searchUsersActionTypes.success ||\n"
},
{
"change_type": "MODIFY",
"old_path": "native/calendar/calendar.react.js",
"new_path": "native/calendar/calendar.react.js",
"diff": "@@ -4,7 +4,7 @@ import {\ntype EntryInfo,\nentryInfoPropType,\ntype CalendarQuery,\n- type CalendarResult,\n+ type CalendarQueryUpdateResult,\n} from 'lib/types/entry-types';\nimport type { AppState } from '../redux-setup';\nimport type {\n@@ -54,8 +54,8 @@ import { entryKey } from 'lib/shared/entry-utils';\nimport { dateString, prettyDate, dateFromString } from 'lib/utils/date-utils';\nimport { sessionExpired } from 'lib/selectors/session-selectors';\nimport {\n- fetchEntriesAndAppendRangeActionTypes,\n- fetchEntriesWithRange,\n+ updateCalendarQueryActionTypes,\n+ updateCalendarQuery,\n} from 'lib/actions/entry-actions';\nimport { connect } from 'lib/utils/redux-utils';\nimport { registerFetchKey } from 'lib/reducers/loading-reducer';\n@@ -118,9 +118,10 @@ type Props = {\n// Redux dispatch functions\ndispatchActionPromise: DispatchActionPromise,\n// async functions that hit server APIs\n- fetchEntriesWithRange: (\n+ updateCalendarQuery: (\ncalendarQuery: CalendarQuery,\n- ) => Promise<CalendarResult>,\n+ reduxAlreadyUpdated?: bool,\n+ ) => Promise<CalendarQueryUpdateResult>,\n};\ntype State = {\ntextToMeasure: TextToMeasure[],\n@@ -162,7 +163,7 @@ class InnerCalendar extends React.PureComponent<Props, State> {\nendDate: PropTypes.string.isRequired,\ncalendarFilters: PropTypes.arrayOf(calendarFilterPropType).isRequired,\ndispatchActionPromise: PropTypes.func.isRequired,\n- fetchEntriesWithRange: PropTypes.func.isRequired,\n+ updateCalendarQuery: PropTypes.func.isRequired,\n};\nstatic navigationOptions = {\ntabBarLabel: 'Calendar',\n@@ -1044,8 +1045,8 @@ class InnerCalendar extends React.PureComponent<Props, State> {\n}\nthis.loadingFromScroll = true;\nthis.props.dispatchActionPromise(\n- fetchEntriesAndAppendRangeActionTypes,\n- this.props.fetchEntriesWithRange({\n+ updateCalendarQueryActionTypes,\n+ this.props.updateCalendarQuery({\nstartDate: dateString(start),\nendDate: dateString(end),\nfilters: this.props.calendarFilters,\n@@ -1138,7 +1139,7 @@ const styles = StyleSheet.create({\n},\n});\n-registerFetchKey(fetchEntriesAndAppendRangeActionTypes);\n+registerFetchKey(updateCalendarQueryActionTypes);\nconst CalendarRouteName = 'Calendar';\nconst activeTabSelector = createActiveTabSelector(CalendarRouteName);\n@@ -1152,7 +1153,7 @@ const Calendar = connect(\nendDate: state.navInfo.endDate,\ncalendarFilters: state.calendarFilters,\n}),\n- { fetchEntriesWithRange },\n+ { updateCalendarQuery },\n)(InnerCalendar);\nexport {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | native and lib updates for new UPDATE_CALENDAR_QUERY paradigm |
129,187 | 13.08.2018 23:50:23 | 14,400 | 99c1376cc0c6d654165e070de6858637dfffa1ee | [server] Include userInfos from FetchUpdatesResult in ping response | [
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -243,12 +243,13 @@ async function pingResponder(\nconst { fetchUpdateResult } = await promiseAll(promises);\n- let updatesResult = null;\n+ let updateUserInfos = {}, updatesResult = null;\nif (fetchUpdateResult) {\ninvariant(\noldUpdatesCurrentAsOf !== null && oldUpdatesCurrentAsOf !== undefined,\n\"should be set\",\n);\n+ updateUserInfos = fetchUpdateResult.userInfos;\nconst { updateInfos } = fetchUpdateResult;\nconst newUpdatesCurrentAsOf = mostRecentUpdateTimestamp(\n[...updateInfos],\n@@ -264,6 +265,7 @@ async function pingResponder(\n...messagesResult.userInfos,\n...entriesResult.userInfos,\n...threadsResult.userInfos,\n+ ...updateUserInfos,\n});\nconst serverRequests = [];\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Include userInfos from FetchUpdatesResult in ping response |
129,187 | 14.08.2018 00:17:20 | 14,400 | 119f30a13bd6c55e6c13fd3bbbe53cb708585f92 | Get user-reducer looking at UserInfos in CreateUpdatesResponse on entry actions
Also made it `CreateUpdatesResponse` instead of `CreateUpdatesResult` (`UserInfos` in array instead of object). | [
{
"change_type": "MODIFY",
"old_path": "lib/reducers/user-reducer.js",
"new_path": "lib/reducers/user-reducer.js",
"diff": "@@ -12,6 +12,10 @@ import { setCookieActionType } from '../utils/action-utils';\nimport {\nfetchEntriesActionTypes,\nupdateCalendarQueryActionTypes,\n+ createEntryActionTypes,\n+ saveEntryActionTypes,\n+ deleteEntryActionTypes,\n+ restoreEntryActionTypes,\n} from '../actions/entry-actions';\nimport {\nlogOutActionTypes,\n@@ -131,6 +135,22 @@ function reduceUserInfos(\nif (!_isEqual(state)(updated)) {\nreturn updated;\n}\n+ } else if (\n+ action.type === createEntryActionTypes.success ||\n+ action.type === saveEntryActionTypes.success ||\n+ action.type === restoreEntryActionTypes.success\n+ ) {\n+ const newUserInfos = _keyBy('id')(action.payload.updatesResult.userInfos);\n+ const updated = { ...state, ...newUserInfos };\n+ if (!_isEqual(state)(updated)) {\n+ return updated;\n+ }\n+ } else if (action.type === deleteEntryActionTypes.success && action.payload) {\n+ const newUserInfos = _keyBy('id')(action.payload.updatesResult.userInfos);\n+ const updated = { ...state, ...newUserInfos };\n+ if (!_isEqual(state)(updated)) {\n+ return updated;\n+ }\n}\nreturn state;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/entry-types.js",
"new_path": "lib/types/entry-types.js",
"diff": "import type { RawMessageInfo } from './message-types';\nimport type { UserInfo, AccountUserInfo } from './user-types';\nimport { type CalendarFilter, calendarFilterPropType } from './filter-types';\n-import type { CreateUpdatesResult } from './update-types';\n+import type { CreateUpdatesResponse } from './update-types';\nimport type { EntryPollPushInconsistencyClientResponse } from './request-types';\nimport PropTypes from 'prop-types';\n@@ -102,7 +102,7 @@ export type SaveEntryRequest = {|\nexport type SaveEntryResult = {|\nentryID: string,\nnewMessageInfos: $ReadOnlyArray<RawMessageInfo>,\n- updatesResult: CreateUpdatesResult,\n+ updatesResult: CreateUpdatesResponse,\n|};\nexport type SaveEntryResponse = {|\n@@ -169,13 +169,13 @@ export type RestoreEntryRequest = {|\nexport type DeleteEntryResponse = {|\nnewMessageInfos: $ReadOnlyArray<RawMessageInfo>,\nthreadID: string,\n- updatesResult: CreateUpdatesResult,\n+ updatesResult: CreateUpdatesResponse,\n|};\nexport type RestoreEntryResponse = {|\nnewMessageInfos: $ReadOnlyArray<RawMessageInfo>,\nentryInfo: RawEntryInfo,\n- updatesResult: CreateUpdatesResult,\n+ updatesResult: CreateUpdatesResponse,\n|};\nexport type FetchEntryInfosResponse = {|\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/update-types.js",
"new_path": "lib/types/update-types.js",
"diff": "@@ -154,3 +154,8 @@ export type CreateUpdatesResult = {|\nviewerUpdates: $ReadOnlyArray<UpdateInfo>,\nuserInfos: {[id: string]: AccountUserInfo},\n|};\n+\n+export type CreateUpdatesResponse = {|\n+ viewerUpdates: $ReadOnlyArray<UpdateInfo>,\n+ userInfos: $ReadOnlyArray<AccountUserInfo>,\n+|};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/update-creator.js",
"new_path": "server/src/creators/update-creator.js",
"diff": "@@ -584,6 +584,5 @@ async function updateInfosFromUpdateDatas(\nexport {\ncreateUpdates,\n- defaultUpdateCreationResult,\nfetchUpdateInfosWithUpdateDatas,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/entry-updaters.js",
"new_path": "server/src/updaters/entry-updaters.js",
"diff": "@@ -7,7 +7,7 @@ import type {\nCalendarQuery,\n} from 'lib/types/entry-types';\nimport type { Viewer } from '../session/viewer';\n-import { updateTypes, type CreateUpdatesResult } from 'lib/types/update-types';\n+import { updateTypes, type CreateUpdatesResponse } from 'lib/types/update-types';\nimport invariant from 'invariant';\n@@ -31,11 +31,9 @@ import {\nfetchCurrentFilter,\nfetchFiltersForThread,\n} from '../fetchers/filter-fetchers';\n-import {\n- defaultUpdateCreationResult,\n- createUpdates,\n-} from '../creators/update-creator';\n+import { createUpdates } from '../creators/update-creator';\n+const defaultUpdateCreationResponse = { viewerUpdates: [], userInfos: [] };\nasync function updateEntry(\nviewer: Viewer,\nrequest: SaveEntryRequest,\n@@ -97,7 +95,7 @@ async function updateEntry(\nreturn {\nentryID: request.entryID,\nnewMessageInfos: [],\n- updatesResult: defaultUpdateCreationResult,\n+ updatesResult: defaultUpdateCreationResponse,\n};\n}\nupdateEntry = true;\n@@ -183,7 +181,7 @@ async function createUpdateDatasForChangedEntryInfo(\nviewer: Viewer,\nentryInfo: RawEntryInfo,\ninputCalendarQuery: ?CalendarQuery,\n-): Promise<CreateUpdatesResult> {\n+): Promise<CreateUpdatesResponse> {\nconst entryID = entryInfo.id;\ninvariant(entryID, \"should be set\");\nconst [ fetchedFilters, fetchedCalendarQuery ] = await Promise.all([\n@@ -224,10 +222,14 @@ async function createUpdateDatasForChangedEntryInfo(\nentryID,\ntargetCookie: filter.cookieID,\n}));\n- return await createUpdates(\n+ const { userInfos, ...updatesResult } = await createUpdates(\nupdateDatas,\n{ viewer, calendarQuery },\n);\n+ return {\n+ ...updatesResult,\n+ userInfos: (Object.values(userInfos): any),\n+ };\n}\nexport {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Get user-reducer looking at UserInfos in CreateUpdatesResponse on entry actions
Also made it `CreateUpdatesResponse` instead of `CreateUpdatesResult` (`UserInfos` in array instead of object). |
129,187 | 14.08.2018 13:21:18 | 14,400 | 9bb0a6bbaf584444ed26e85766e589615d9d4835 | Simplify session ID management
Session ID now represents a state initialization so we can use it for tracking updates. | [
{
"change_type": "MODIFY",
"old_path": "lib/reducers/master-reducer.js",
"new_path": "lib/reducers/master-reducer.js",
"diff": "@@ -5,7 +5,6 @@ import type { BaseNavInfo } from '../types/nav-types';\nimport invariant from 'invariant';\n-import { sessionInactivityLimit } from '../selectors/session-selectors';\nimport { reduceLoadingStatuses } from './loading-reducer';\nimport { reduceEntryInfos } from './entry-reducer';\nimport { reduceCurrentUserInfo, reduceUserInfos } from './user-reducer';\n@@ -36,43 +35,14 @@ export default function baseReducer<N: BaseNavInfo, T: BaseAppState<N>>(\n? state.navInfo\n: { ...state.navInfo, ...baseNavInfo };\n- const entryStore = reduceEntryInfos(\n- state.entryStore,\n- action,\n- threadInfos,\n- );\n-\n- const currentLastUserInteractionSessionReset =\n- state.lastUserInteraction.sessionReset;\n- invariant(\n- currentLastUserInteractionSessionReset !== undefined &&\n- currentLastUserInteractionSessionReset !== null,\n- \"sessionReset should have an entry in lastUserInteraction\",\n- );\n- let [sessionID, lastUserInteractionSessionReset] = reduceSessionID(\n- state.sessionID,\n- currentLastUserInteractionSessionReset,\n- action,\n- );\n-\n- // Allow calendar interaction to extend the lifetime of a session, but if the\n- // session is too old force it to be dropped the next time it's used\n- const lastUserInteractionCalendar = entryStore.lastUserInteractionCalendar;\n- if (\n- lastUserInteractionSessionReset < lastUserInteractionCalendar &&\n- (lastUserInteractionSessionReset + sessionInactivityLimit\n- > lastUserInteractionCalendar)\n- ) {\n- lastUserInteractionSessionReset = lastUserInteractionCalendar;\n- }\nreturn {\n...state,\nnavInfo,\n- entryStore,\n- lastUserInteraction: {\n- ...state.lastUserInteraction,\n- sessionReset: lastUserInteractionSessionReset,\n- },\n+ entryStore: reduceEntryInfos(\n+ state.entryStore,\n+ action,\n+ threadInfos,\n+ ),\nloadingStatuses: reduceLoadingStatuses(state.loadingStatuses, action),\ncurrentUserInfo: reduceCurrentUserInfo(state.currentUserInfo, action),\nthreadStore,\n@@ -84,7 +54,7 @@ export default function baseReducer<N: BaseNavInfo, T: BaseAppState<N>>(\naction,\n),\ncookie: reduceCookie(state.cookie, action),\n- sessionID,\n+ sessionID: reduceSessionID(state.sessionID, action),\ndeviceToken: reduceDeviceToken(state.deviceToken, action),\nurlPrefix: reduceURLPrefix(state.urlPrefix, action),\npingTimestamps: reducePingTimestamps(state.pingTimestamps, action),\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/session-reducer.js",
"new_path": "lib/reducers/session-reducer.js",
"diff": "import type { BaseAction } from '../types/redux-types';\n-import { newSessionID } from '../selectors/session-selectors';\nimport { setCookieActionType } from '../utils/action-utils';\n-import {\n- createEntryActionTypes,\n- saveEntryActionTypes,\n- deleteEntryActionTypes,\n- restoreEntryActionTypes,\n-} from '../actions/entry-actions';\n-import { pingActionTypes } from '../actions/ping-actions';\nimport {\nlogOutActionTypes,\ndeleteAccountActionTypes,\n} from '../actions/user-actions';\n-const newSessionIDActionType = \"NEW_SESSION_ID\";\n+function newSessionID(): string {\n+ return Math.floor(0x80000000 * Math.random()).toString(36);\n+}\n-function reduceSessionID(\n- state: string,\n- lastUserInteractionSessionReset: number,\n- action: BaseAction,\n-) {\n+function reduceSessionID(state: string, action: BaseAction) {\nif (\n- (\n- action.type === pingActionTypes.started ||\n- action.type === createEntryActionTypes.started ||\n- action.type === saveEntryActionTypes.started ||\n- action.type === deleteEntryActionTypes.started ||\n- action.type === restoreEntryActionTypes.started\n- ) &&\n- action.payload.newSessionID\n- ) {\n- return [action.payload.newSessionID, Date.now()];\n- } else if (\naction.type === setCookieActionType ||\naction.type === logOutActionTypes.success ||\naction.type === deleteAccountActionTypes.success\n) {\n- return [newSessionID(), Date.now()];\n- } else if (action.type === newSessionIDActionType) {\n- return [action.payload, Date.now()];\n+ return newSessionID();\n}\n- return [state, lastUserInteractionSessionReset];\n+ return state;\n}\nexport {\n- newSessionIDActionType,\n+ newSessionID,\nreduceSessionID,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/selectors/ping-selectors.js",
"new_path": "lib/selectors/ping-selectors.js",
"diff": "@@ -14,29 +14,21 @@ import {\nimport { createSelector } from 'reselect';\n-import { nextSessionID } from './session-selectors';\nimport { currentCalendarQuery } from './nav-selectors';\nimport { getConfig } from '../utils/config';\nconst pingStartingPayload = createSelector(\n(state: BaseAppState<*>) => !!(state.currentUserInfo &&\n!state.currentUserInfo.anonymous && true),\n- nextSessionID,\ncurrentCalendarQuery,\n(\nloggedIn: bool,\n- nextSessionID: () => ?string,\ncurrentCalendarQuery: () => CalendarQuery,\n): () => PingStartingPayload => {\nreturn () => {\nconst calendarQuery = currentCalendarQuery();\n- const sessionID = nextSessionID();\nconst time = Date.now();\n- if (sessionID) {\n- return { loggedIn, calendarQuery, time, newSessionID: sessionID };\n- } else {\nreturn { loggedIn, calendarQuery, time };\n- }\n};\n},\n);\n"
},
{
"change_type": "DELETE",
"old_path": "lib/selectors/session-selectors.js",
"new_path": null,
"diff": "-// @flow\n-\n-import type { BaseAppState } from '../types/redux-types';\n-\n-import { createSelector } from 'reselect';\n-import invariant from 'invariant';\n-\n-function newSessionID(): string {\n- return Math.floor(0x80000000 * Math.random()).toString(36);\n-}\n-\n-const sessionInactivityLimit = 15 * 60 * 1000;\n-const sessionTimeLeft = createSelector(\n- (state: BaseAppState<*>) => state.lastUserInteraction.sessionReset,\n- (lastUserInteractionSessionReset: ?number) => {\n- const lastUserInteractionSessionReset2 = lastUserInteractionSessionReset;\n- invariant(\n- lastUserInteractionSessionReset2 !== undefined &&\n- lastUserInteractionSessionReset2 !== null,\n- \"sessionReset should have a lastUserInteraction entry\",\n- );\n- // Return a function since we depend on the time of evaluation\n- return () =>\n- sessionInactivityLimit - Date.now() + lastUserInteractionSessionReset2;\n- },\n-);\n-\n-const sessionExpired = createSelector(\n- sessionTimeLeft,\n- (timeLeft: () => number) => {\n- return () => timeLeft() < 0;\n- },\n-);\n-\n-let cachedNextSessionID: ?string = null;\n-const currentSessionID = createSelector(\n- (state: BaseAppState<*>) => state.sessionID,\n- sessionExpired,\n- (sessionID: string, sessionExpired: () => bool) => {\n- // Return a function since we depend on the time of evaluation\n- return (): string => {\n- if (!sessionExpired()) {\n- return sessionID;\n- }\n- if (!cachedNextSessionID || cachedNextSessionID === sessionID) {\n- cachedNextSessionID = newSessionID();\n- }\n- return cachedNextSessionID;\n- };\n- },\n-);\n-\n-// Returns null if the session isn't expired\n-const nextSessionID = createSelector(\n- (state: BaseAppState<*>) => state.sessionID,\n- sessionExpired,\n- (sessionID: string, sessionExpired: () => bool) => {\n- // Return a function since we depend on the time of evaluation\n- return (): ?string => {\n- if (!sessionExpired()) {\n- return null;\n- }\n- if (!cachedNextSessionID || cachedNextSessionID === sessionID) {\n- cachedNextSessionID = newSessionID();\n- }\n- return cachedNextSessionID;\n- };\n- },\n-);\n-\n-const sessionStartingPayload = createSelector(\n- nextSessionID,\n- (nextSessionID: () => ?string) => {\n- return () => {\n- const sessionID = nextSessionID();\n- if (sessionID) {\n- return { newSessionID: sessionID };\n- } else {\n- return {};\n- }\n- };\n- },\n-);\n-\n-export {\n- sessionTimeLeft,\n- sessionExpired,\n- newSessionID,\n- sessionInactivityLimit,\n- currentSessionID,\n- nextSessionID,\n- sessionStartingPayload,\n-};\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/ping-types.js",
"new_path": "lib/types/ping-types.js",
"diff": "@@ -65,7 +65,6 @@ export type PingStartingPayload = {|\nloggedIn: bool,\ncalendarQuery: CalendarQuery,\ntime: number,\n- newSessionID?: string,\nmessageStorePruneRequest?: {\nthreadIDs: $ReadOnlyArray<string>,\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/redux-types.js",
"new_path": "lib/types/redux-types.js",
"diff": "@@ -61,7 +61,6 @@ export type BaseAppState<NavInfo: BaseNavInfo> = {\ncurrentUserInfo: ?CurrentUserInfo,\nsessionID: string,\nentryStore: EntryStore,\n- lastUserInteraction: {[section: string]: number},\nthreadStore: ThreadStore,\nuserInfos: {[id: string]: UserInfo},\nmessageStore: MessageStore,\n@@ -119,7 +118,6 @@ export type BaseAction =\n|} | {|\ntype: \"CREATE_ENTRY_STARTED\",\nloadingInfo: LoadingInfo,\n- payload: {| newSessionID?: string |},\n|} | {|\ntype: \"CREATE_ENTRY_FAILED\",\nerror: true,\n@@ -132,7 +130,6 @@ export type BaseAction =\n|} | {|\ntype: \"SAVE_ENTRY_STARTED\",\nloadingInfo: LoadingInfo,\n- payload: {| newSessionID?: string |},\n|} | {|\ntype: \"SAVE_ENTRY_FAILED\",\nerror: true,\n@@ -154,7 +151,6 @@ export type BaseAction =\npayload: {|\nlocalID: ?string,\nserverID: ?string,\n- newSessionID?: string,\n|},\n|} | {|\ntype: \"DELETE_ENTRY_FAILED\",\n@@ -319,9 +315,6 @@ export type BaseAction =\n|} | {|\ntype: \"RESTORE_ENTRY_STARTED\",\nloadingInfo: LoadingInfo,\n- payload: {|\n- newSessionID?: string,\n- |},\n|} | {|\ntype: \"RESTORE_ENTRY_FAILED\",\nerror: true,\n@@ -371,9 +364,6 @@ export type BaseAction =\ntype: \"PING_SUCCESS\",\npayload: PingResult,\nloadingInfo: LoadingInfo,\n- |} | {|\n- type: \"NEW_SESSION_ID\",\n- payload: string,\n|} | {|\ntype: \"FETCH_ENTRIES_AND_APPEND_RANGE_STARTED\",\nloadingInfo: LoadingInfo,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/app.react.js",
"new_path": "native/app.react.js",
"diff": "@@ -61,12 +61,6 @@ import SplashScreen from 'react-native-splash-screen';\nimport { registerConfig } from 'lib/utils/config';\nimport { connect } from 'lib/utils/redux-utils';\nimport { ping } from 'lib/actions/ping-actions';\n-import {\n- sessionInactivityLimit,\n- sessionTimeLeft,\n- nextSessionID,\n-} from 'lib/selectors/session-selectors';\n-import { newSessionIDActionType } from 'lib/reducers/session-reducer';\nimport {\nupdateActivityActionTypes,\nupdateActivity,\n@@ -120,7 +114,7 @@ registerConfig({\nreturn null;\n},\nsetCookieOnRequest: true,\n- calendarRangeInactivityLimit: sessionInactivityLimit,\n+ calendarRangeInactivityLimit: 15 * 60 * 1000,\nplatformDetails: {\nplatform: Platform.OS,\ncodeVersion,\n@@ -150,8 +144,6 @@ type Props = {\nrawThreadInfos: {[id: string]: RawThreadInfo},\nnotifPermissionAlertInfo: NotifPermissionAlertInfo,\npingTimestamps: PingTimestamps,\n- sessionTimeLeft: () => number,\n- nextSessionID: () => ?string,\nactiveServerRequests: $ReadOnlyArray<ServerRequest>,\nupdatesCurrentAsOf: number,\n// Redux dispatch functions\n@@ -183,8 +175,6 @@ class AppWithNavigationState extends React.PureComponent<Props> {\nrawThreadInfos: PropTypes.objectOf(rawThreadInfoPropType).isRequired,\nnotifPermissionAlertInfo: notifPermissionAlertInfoPropType.isRequired,\npingTimestamps: pingTimestampsPropType.isRequired,\n- sessionTimeLeft: PropTypes.func.isRequired,\n- nextSessionID: PropTypes.func.isRequired,\nactiveServerRequests: PropTypes.arrayOf(serverRequestPropType).isRequired,\nupdatesCurrentAsOf: PropTypes.number.isRequired,\ndispatch: PropTypes.func.isRequired,\n@@ -392,36 +382,13 @@ class AppWithNavigationState extends React.PureComponent<Props> {\ndispatchPing(props, !!justForegrounded);\n}\n- possiblyNewSessionID = (inputProps?: Props, inputAppState?: ?string) => {\n+ startTimeouts(inputProps?: Props, inputAppState?: ?string) {\nconst props = inputProps ? inputProps : this.props;\n- const appState = inputAppState ? inputAppState : this.currentState;\n- if (appState !== \"active\" || props.loggedIn) {\n+ if (!props.loggedIn) {\nreturn;\n}\n- const sessionID = props.nextSessionID();\n- if (sessionID) {\n- props.dispatchActionPayload(newSessionIDActionType, sessionID);\n- setTimeout(\n- this.possiblyNewSessionID,\n- sessionInactivityLimit,\n- );\n- } else {\n- const timeLeft = props.sessionTimeLeft();\n- setTimeout(\n- this.possiblyNewSessionID,\n- timeLeft + 10,\n- );\n- }\n- }\n-\n- startTimeouts(inputProps?: Props, inputAppState?: ?string) {\n- const props = inputProps ? inputProps : this.props;\nconst appState = inputAppState ? inputAppState : this.currentState;\n- if (props.loggedIn) {\nthis.possiblePing(props, appState, true);\n- } else {\n- this.possiblyNewSessionID(props, appState);\n- }\n}\nhandleAppStateChange = (nextAppState: ?string) => {\n@@ -939,8 +906,6 @@ const ConnectedAppWithNavigationState = connect(\nrawThreadInfos: state.threadStore.threadInfos,\nnotifPermissionAlertInfo: state.notifPermissionAlertInfo,\npingTimestamps: state.pingTimestamps,\n- sessionTimeLeft: sessionTimeLeft(state),\n- nextSessionID: nextSessionID(state),\nactiveServerRequests: state.activeServerRequests,\nupdatesCurrentAsOf: state.updatesCurrentAsOf,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "native/calendar/calendar.react.js",
"new_path": "native/calendar/calendar.react.js",
"diff": "@@ -52,7 +52,6 @@ import _size from 'lodash/fp/size';\nimport { entryKey } from 'lib/shared/entry-utils';\nimport { dateString, prettyDate, dateFromString } from 'lib/utils/date-utils';\n-import { sessionExpired } from 'lib/selectors/session-selectors';\nimport {\nupdateCalendarQueryActionTypes,\nupdateCalendarQuery,\n@@ -111,7 +110,6 @@ type Props = {\nlistData: ?$ReadOnlyArray<CalendarItem>,\ntabActive: bool,\nsessionID: string,\n- sessionExpired: () => bool,\nstartDate: string,\nendDate: string,\ncalendarFilters: $ReadOnlyArray<CalendarFilter>,\n@@ -158,7 +156,6 @@ class InnerCalendar extends React.PureComponent<Props, State> {\n])),\ntabActive: PropTypes.bool.isRequired,\nsessionID: PropTypes.string.isRequired,\n- sessionExpired: PropTypes.func.isRequired,\nstartDate: PropTypes.string.isRequired,\nendDate: PropTypes.string.isRequired,\ncalendarFilters: PropTypes.arrayOf(calendarFilterPropType).isRequired,\n@@ -1148,7 +1145,6 @@ const Calendar = connect(\nlistData: calendarListData(state),\ntabActive: activeTabSelector(state),\nsessionID: state.sessionID,\n- sessionExpired: sessionExpired(state),\nstartDate: state.navInfo.startDate,\nendDate: state.navInfo.endDate,\ncalendarFilters: state.calendarFilters,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/calendar/entry.react.js",
"new_path": "native/calendar/entry.react.js",
"diff": "@@ -46,11 +46,6 @@ import { NavigationActions } from 'react-navigation';\nimport Hyperlink from 'react-native-hyperlink';\nimport { colorIsDark } from 'lib/shared/thread-utils';\n-import {\n- currentSessionID,\n- nextSessionID,\n- sessionStartingPayload,\n-} from 'lib/selectors/session-selectors';\nimport {\ncreateEntryActionTypes,\ncreateEntry,\n@@ -88,9 +83,7 @@ type Props = {\nentryRef: (entryKey: string, entry: ?InternalEntry) => void,\n// Redux state\nthreadInfo: ThreadInfo,\n- sessionStartingPayload: () => { newSessionID?: string },\n- sessionID: () => string,\n- nextSessionID: () => ?string,\n+ sessionID: string,\ncalendarQuery: () => CalendarQuery,\n// Redux dispatch functions\ndispatchActionPayload: DispatchActionPayload,\n@@ -119,9 +112,7 @@ class InternalEntry extends React.Component<Props, State> {\nonPressWhitespace: PropTypes.func.isRequired,\nentryRef: PropTypes.func.isRequired,\nthreadInfo: threadInfoPropType.isRequired,\n- sessionStartingPayload: PropTypes.func.isRequired,\n- sessionID: PropTypes.func.isRequired,\n- nextSessionID: PropTypes.func.isRequired,\n+ sessionID: PropTypes.string.isRequired,\ncalendarQuery: PropTypes.func.isRequired,\ndispatchActionPayload: PropTypes.func.isRequired,\ndispatchActionPromise: PropTypes.func.isRequired,\n@@ -455,20 +446,15 @@ class InternalEntry extends React.Component<Props, State> {\n}\n}\n- const startingPayload = this.props.sessionStartingPayload();\nif (!serverID) {\nthis.props.dispatchActionPromise(\ncreateEntryActionTypes,\nthis.createAction(newText),\n- undefined,\n- startingPayload,\n);\n} else {\nthis.props.dispatchActionPromise(\nsaveEntryActionTypes,\nthis.saveAction(serverID, newText),\n- undefined,\n- startingPayload,\n);\n}\n}\n@@ -481,7 +467,7 @@ class InternalEntry extends React.Component<Props, State> {\ntry {\nconst response = await this.props.createEntry({\ntext,\n- sessionID: this.props.sessionID(),\n+ sessionID: this.props.sessionID,\ntimestamp: this.props.entryInfo.creationTime,\ndate: dateString(\nthis.props.entryInfo.year,\n@@ -520,7 +506,7 @@ class InternalEntry extends React.Component<Props, State> {\nentryID,\ntext: newText,\nprevText: this.props.entryInfo.text,\n- sessionID: this.props.sessionID(),\n+ sessionID: this.props.sessionID,\ntimestamp: Date.now(),\ncalendarQuery: this.props.calendarQuery(),\n});\n@@ -572,19 +558,12 @@ class InternalEntry extends React.Component<Props, State> {\n}\nthis.deleted = true;\nLayoutAnimation.easeInEaseOut();\n- const startingPayload: {[key: string]: ?string} = {\n- localID: this.props.entryInfo.localID,\n- serverID: serverID,\n- };\n- const nextSessionID = this.props.nextSessionID();\n- if (nextSessionID) {\n- startingPayload.newSessionID = nextSessionID;\n- }\n+ const { localID } = this.props.entryInfo;\nthis.props.dispatchActionPromise(\ndeleteEntryActionTypes,\nthis.deleteAction(serverID),\nundefined,\n- startingPayload,\n+ { localID, serverID },\n);\n}\n@@ -593,7 +572,7 @@ class InternalEntry extends React.Component<Props, State> {\nreturn await this.props.deleteEntry({\nentryID: serverID,\nprevText: this.props.entryInfo.text,\n- sessionID: this.props.sessionID(),\n+ sessionID: this.props.sessionID,\ncalendarQuery: this.props.calendarQuery(),\n});\n} else if (this.creating) {\n@@ -705,9 +684,7 @@ registerFetchKey(deleteEntryActionTypes);\nconst Entry = connect(\n(state: AppState, ownProps: { entryInfo: EntryInfoWithHeight }) => ({\nthreadInfo: threadInfoSelector(state)[ownProps.entryInfo.threadID],\n- sessionStartingPayload: sessionStartingPayload(state),\n- sessionID: currentSessionID(state),\n- nextSessionID: nextSessionID(state),\n+ sessionID: state.sessionID,\ncalendarQuery: nonThreadCalendarQuery(state),\n}),\n{ createEntry, saveEntry, deleteEntry },\n"
},
{
"change_type": "MODIFY",
"old_path": "native/persist.js",
"new_path": "native/persist.js",
"diff": "@@ -13,17 +13,8 @@ import { currentCalendarQuery } from 'lib/selectors/nav-selectors';\nimport { defaultNotifPermissionAlertInfo } from './push/alerts';\nconst blacklist = __DEV__\n- ? [\n- 'sessionID',\n- 'lastUserInteraction',\n- 'loadingStatuses',\n- ]\n- : [\n- 'sessionID',\n- 'lastUserInteraction',\n- 'loadingStatuses',\n- 'navInfo',\n- ];\n+ ? [ 'loadingStatuses' ]\n+ : [ 'loadingStatuses', 'navInfo' ];\nconst migrations = {\n[1]: (state: AppState) => ({\n@@ -73,6 +64,7 @@ const migrations = {\n}),\n[7]: (state) => ({\n...state,\n+ lastUserInteraction: undefined,\nentryStore: {\n...state.entryStore,\ninconsistencyResponses: [],\n"
},
{
"change_type": "MODIFY",
"old_path": "native/redux-setup.js",
"new_path": "native/redux-setup.js",
"diff": "@@ -37,7 +37,7 @@ import {\nimport { AppState as NativeAppState } from 'react-native';\nimport baseReducer from 'lib/reducers/master-reducer';\n-import { newSessionID } from 'lib/selectors/session-selectors';\n+import { newSessionID } from 'lib/reducers/session-reducer';\nimport { notificationPressActionType } from 'lib/shared/notif-utils';\nimport { sendMessageActionTypes } from 'lib/actions/message-actions';\nimport { pingActionTypes } from 'lib/actions/ping-actions';\n@@ -81,7 +81,6 @@ export type AppState = {|\ncurrentUserInfo: ?CurrentUserInfo,\nsessionID: string,\nentryStore: EntryStore,\n- lastUserInteraction: {[section: string]: number},\nthreadStore: ThreadStore,\nuserInfos: {[id: string]: UserInfo},\nmessageStore: MessageStore,\n@@ -112,7 +111,6 @@ const defaultState = ({\nlastUserInteractionCalendar: 0,\ninconsistencyResponses: [],\n},\n- lastUserInteraction: { sessionReset: Date.now() },\nthreadStore: {\nthreadInfos: {},\ninconsistencyResponses: [],\n@@ -193,114 +191,31 @@ function reducer(state: AppState = defaultState, action: *) {\n}\n}\n- state = {\n- navInfo,\n- currentUserInfo: state.currentUserInfo,\n- sessionID: state.sessionID,\n- entryStore: state.entryStore,\n- lastUserInteraction: state.lastUserInteraction,\n- threadStore: state.threadStore,\n- userInfos: state.userInfos,\n- messageStore: state.messageStore,\n- drafts: state.drafts,\n- updatesCurrentAsOf: state.updatesCurrentAsOf,\n- loadingStatuses: state.loadingStatuses,\n- pingTimestamps: state.pingTimestamps,\n- activeServerRequests: state.activeServerRequests,\n- calendarFilters: state.calendarFilters,\n- cookie: state.cookie,\n- deviceToken: state.deviceToken,\n- urlPrefix: state.urlPrefix,\n- customServer: state.customServer,\n- threadIDsToNotifIDs: state.threadIDsToNotifIDs,\n- notifPermissionAlertInfo: state.notifPermissionAlertInfo,\n- messageSentFromRoute: state.messageSentFromRoute,\n- _persist: state._persist,\n- };\n+ state = { ...state, navInfo };\n}\nif (\naction.type === recordAndroidNotificationActionType ||\naction.type === clearAndroidNotificationActionType\n) {\nreturn {\n- navInfo: state.navInfo,\n- currentUserInfo: state.currentUserInfo,\n- sessionID: state.sessionID,\n- entryStore: state.entryStore,\n- lastUserInteraction: state.lastUserInteraction,\n- threadStore: state.threadStore,\n- userInfos: state.userInfos,\n- messageStore: state.messageStore,\n- drafts: state.drafts,\n- updatesCurrentAsOf: state.updatesCurrentAsOf,\n- loadingStatuses: state.loadingStatuses,\n- pingTimestamps: state.pingTimestamps,\n- activeServerRequests: state.activeServerRequests,\n- calendarFilters: state.calendarFilters,\n- cookie: state.cookie,\n- deviceToken: state.deviceToken,\n- urlPrefix: state.urlPrefix,\n- customServer: state.customServer,\n+ ...state,\nthreadIDsToNotifIDs: reduceThreadIDsToNotifIDs(\nstate.threadIDsToNotifIDs,\naction,\n),\n- notifPermissionAlertInfo: state.notifPermissionAlertInfo,\n- messageSentFromRoute: state.messageSentFromRoute,\n- _persist: state._persist,\n};\n} else if (action.type === setCustomServer) {\nreturn {\n- navInfo: state.navInfo,\n- currentUserInfo: state.currentUserInfo,\n- sessionID: state.sessionID,\n- entryStore: state.entryStore,\n- lastUserInteraction: state.lastUserInteraction,\n- threadStore: state.threadStore,\n- userInfos: state.userInfos,\n- messageStore: state.messageStore,\n- drafts: state.drafts,\n- updatesCurrentAsOf: state.updatesCurrentAsOf,\n- loadingStatuses: state.loadingStatuses,\n- pingTimestamps: state.pingTimestamps,\n- activeServerRequests: state.activeServerRequests,\n- calendarFilters: state.calendarFilters,\n- cookie: state.cookie,\n- deviceToken: state.deviceToken,\n- urlPrefix: state.urlPrefix,\n+ ...state,\ncustomServer: action.payload,\n- threadIDsToNotifIDs: state.threadIDsToNotifIDs,\n- notifPermissionAlertInfo: state.notifPermissionAlertInfo,\n- messageSentFromRoute: state.messageSentFromRoute,\n- _persist: state._persist,\n};\n} else if (action.type === recordNotifPermissionAlertActionType) {\nreturn {\n- navInfo: state.navInfo,\n- currentUserInfo: state.currentUserInfo,\n- sessionID: state.sessionID,\n- entryStore: state.entryStore,\n- lastUserInteraction: state.lastUserInteraction,\n- threadStore: state.threadStore,\n- userInfos: state.userInfos,\n- messageStore: state.messageStore,\n- drafts: state.drafts,\n- updatesCurrentAsOf: state.updatesCurrentAsOf,\n- loadingStatuses: state.loadingStatuses,\n- pingTimestamps: state.pingTimestamps,\n- activeServerRequests: state.activeServerRequests,\n- calendarFilters: state.calendarFilters,\n- cookie: state.cookie,\n- deviceToken: state.deviceToken,\n- urlPrefix: state.urlPrefix,\n- customServer: state.customServer,\n- threadIDsToNotifIDs: state.threadIDsToNotifIDs,\n+ ...state,\nnotifPermissionAlertInfo: {\ntotalAlerts: state.notifPermissionAlertInfo.totalAlerts + 1,\nlastAlertTime: action.payload.time,\n},\n- messageSentFromRoute: state.messageSentFromRoute,\n- _persist: state._persist,\n};\n}\n// These action type are handled by reduceNavInfo above\n@@ -329,28 +244,8 @@ function reducer(state: AppState = defaultState, action: *) {\n? state.messageSentFromRoute\n: [ ...state.messageSentFromRoute, currentChatSubroute.key];\nstate = {\n- navInfo: state.navInfo,\n- currentUserInfo: state.currentUserInfo,\n- sessionID: state.sessionID,\n- entryStore: state.entryStore,\n- lastUserInteraction: state.lastUserInteraction,\n- threadStore: state.threadStore,\n- userInfos: state.userInfos,\n- messageStore: state.messageStore,\n- drafts: state.drafts,\n- updatesCurrentAsOf: state.updatesCurrentAsOf,\n- loadingStatuses: state.loadingStatuses,\n- pingTimestamps: state.pingTimestamps,\n- activeServerRequests: state.activeServerRequests,\n- calendarFilters: state.calendarFilters,\n- cookie: state.cookie,\n- deviceToken: state.deviceToken,\n- urlPrefix: state.urlPrefix,\n- customServer: state.customServer,\n- threadIDsToNotifIDs: state.threadIDsToNotifIDs,\n- notifPermissionAlertInfo: state.notifPermissionAlertInfo,\n+ ...state,\nmessageSentFromRoute,\n- _persist: state._persist,\n};\n}\nreturn validateState(oldState, baseReducer(state, action));\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/website-responders.js",
"new_path": "server/src/responders/website-responders.js",
"diff": "@@ -22,7 +22,7 @@ import {\nendDateForYearAndMonth,\n} from 'lib/utils/date-utils';\nimport { defaultNumberPerThread } from 'lib/types/message-types';\n-import { newSessionID } from 'lib/selectors/session-selectors';\n+import { newSessionID } from 'lib/reducers/session-reducer';\nimport { daysToEntriesFromEntryInfos } from 'lib/reducers/entry-reducer';\nimport { freshMessageStore } from 'lib/reducers/message-reducer';\nimport { verifyField } from 'lib/types/verify-types';\n@@ -127,7 +127,6 @@ async function websiteResponder(viewer: Viewer, url: string): Promise<string> {\nlastUserInteractionCalendar: time,\ninconsistencyResponses: [],\n},\n- lastUserInteraction: { sessionReset: time },\nthreadStore: {\nthreadInfos,\ninconsistencyResponses: [],\n"
},
{
"change_type": "MODIFY",
"old_path": "web/app.react.js",
"new_path": "web/app.react.js",
"diff": "@@ -52,12 +52,6 @@ import {\n} from 'lib/selectors/ping-selectors';\nimport { pingActionTypes, ping } from 'lib/actions/ping-actions';\nimport { pingFrequency, dispatchPing } from 'lib/shared/ping-utils';\n-import {\n- sessionInactivityLimit,\n- sessionTimeLeft,\n- nextSessionID,\n-} from 'lib/selectors/session-selectors';\n-import { newSessionIDActionType } from 'lib/reducers/session-reducer';\nimport { registerConfig } from 'lib/utils/config';\nimport {\nincludeDeletedSelector,\n@@ -120,8 +114,6 @@ type Props = {\njustForegrounded: bool,\n) => PingActionInput,\npingTimestamps: PingTimestamps,\n- sessionTimeLeft: () => number,\n- nextSessionID: () => ?string,\nloggedIn: bool,\nincludeDeleted: bool,\nmostRecentReadThread: ?string,\n@@ -161,8 +153,6 @@ class App extends React.PureComponent<Props, State> {\npingStartingPayload: PropTypes.func.isRequired,\npingActionInput: PropTypes.func.isRequired,\npingTimestamps: pingTimestampsPropType.isRequired,\n- sessionTimeLeft: PropTypes.func.isRequired,\n- nextSessionID: PropTypes.func.isRequired,\nloggedIn: PropTypes.bool.isRequired,\nincludeDeleted: PropTypes.bool.isRequired,\nmostRecentReadThread: PropTypes.string,\n@@ -317,33 +307,10 @@ class App extends React.PureComponent<Props, State> {\ndispatchPing(props, !!justForegrounded);\n}\n- possiblyNewSessionID = (inputProps?: Props) => {\n- const props = inputProps ? inputProps : this.props;\n- if (!Visibility.hidden() || props.loggedIn) {\n- return;\n- }\n- const sessionID = props.nextSessionID();\n- if (sessionID) {\n- props.dispatchActionPayload(newSessionIDActionType, sessionID);\n- setTimeout(\n- this.possiblyNewSessionID,\n- sessionInactivityLimit,\n- );\n- } else {\n- const timeLeft = props.sessionTimeLeft();\n- setTimeout(\n- this.possiblyNewSessionID,\n- timeLeft + 10,\n- );\n- }\n- }\n-\nstartTimeouts(inputProps?: Props) {\nconst props = inputProps ? inputProps : this.props;\nif (props.loggedIn) {\nthis.possiblePing(props, true);\n- } else {\n- this.possiblyNewSessionID(props);\n}\n}\n@@ -606,8 +573,6 @@ export default connect(\npingStartingPayload: pingStartingPayload(state),\npingActionInput: pingWebActionInput(state),\npingTimestamps: state.pingTimestamps,\n- sessionTimeLeft: sessionTimeLeft(state),\n- nextSessionID: nextSessionID(state),\nloggedIn: !!(state.currentUserInfo &&\n!state.currentUserInfo.anonymous && true),\nincludeDeleted: includeDeletedSelector(state),\n"
},
{
"change_type": "MODIFY",
"old_path": "web/calendar/entry.react.js",
"new_path": "web/calendar/entry.react.js",
"diff": "@@ -37,11 +37,6 @@ import {\nconcurrentModificationResetActionType,\n} from 'lib/actions/entry-actions';\nimport { ServerError } from 'lib/utils/errors';\n-import {\n- currentSessionID,\n- nextSessionID,\n- sessionStartingPayload,\n-} from 'lib/selectors/session-selectors';\nimport { dateString } from 'lib/utils/date-utils';\nimport { threadInfoSelector } from 'lib/selectors/thread-selectors';\nimport { nonThreadCalendarQuery } from 'lib/selectors/nav-selectors';\n@@ -62,9 +57,7 @@ type Props = {\ntabIndex: number,\n// Redux state\nthreadInfo: ThreadInfo,\n- sessionID: () => string,\n- nextSessionID: () => ?string,\n- sessionStartingPayload: () => { newSessionID?: string },\n+ sessionID: string,\nloggedIn: bool,\ncalendarQuery: () => CalendarQuery,\n// Redux dispatch functions\n@@ -289,20 +282,15 @@ class Entry extends React.PureComponent<Props, State> {\n}\n}\n- const startingPayload = this.props.sessionStartingPayload();\nif (!serverID) {\nthis.props.dispatchActionPromise(\ncreateEntryActionTypes,\nthis.createAction(newText),\n- undefined,\n- startingPayload,\n);\n} else {\nthis.props.dispatchActionPromise(\nsaveEntryActionTypes,\nthis.saveAction(serverID, newText),\n- undefined,\n- startingPayload,\n);\n}\n}\n@@ -315,7 +303,7 @@ class Entry extends React.PureComponent<Props, State> {\ntry {\nconst response = await this.props.createEntry({\ntext,\n- sessionID: this.props.sessionID(),\n+ sessionID: this.props.sessionID,\ntimestamp: this.props.entryInfo.creationTime,\ndate: dateString(\nthis.props.entryInfo.year,\n@@ -354,7 +342,7 @@ class Entry extends React.PureComponent<Props, State> {\nentryID,\ntext: newText,\nprevText: this.props.entryInfo.text,\n- sessionID: this.props.sessionID(),\n+ sessionID: this.props.sessionID,\ntimestamp: Date.now(),\ncalendarQuery: this.props.calendarQuery(),\n});\n@@ -404,19 +392,12 @@ class Entry extends React.PureComponent<Props, State> {\n}\ndelete(serverID: ?string, focusOnNextEntry: bool) {\n- const startingPayload: {[key: string]: ?string} = {\n- localID: this.props.entryInfo.localID,\n- serverID: serverID,\n- };\n- const nextSessionID = this.props.nextSessionID();\n- if (nextSessionID) {\n- startingPayload.newSessionID = nextSessionID;\n- }\n+ const { localID } = this.props.entryInfo;\nthis.props.dispatchActionPromise(\ndeleteEntryActionTypes,\nthis.deleteAction(serverID, focusOnNextEntry),\nundefined,\n- startingPayload,\n+ { localID, serverID },\n);\n}\n@@ -432,7 +413,7 @@ class Entry extends React.PureComponent<Props, State> {\nreturn await this.props.deleteEntry({\nentryID: serverID,\nprevText: this.props.entryInfo.text,\n- sessionID: this.props.sessionID(),\n+ sessionID: this.props.sessionID,\ncalendarQuery: this.props.calendarQuery(),\n});\n} else if (this.creating) {\n@@ -472,9 +453,7 @@ Entry.propTypes = {\nsetModal: PropTypes.func.isRequired,\ntabIndex: PropTypes.number.isRequired,\nthreadInfo: threadInfoPropType.isRequired,\n- sessionID: PropTypes.func.isRequired,\n- nextSessionID: PropTypes.func.isRequired,\n- sessionStartingPayload: PropTypes.func.isRequired,\n+ sessionID: PropTypes.string.isRequired,\nloggedIn: PropTypes.bool.isRequired,\ncalendarQuery: PropTypes.func.isRequired,\ndispatchActionPayload: PropTypes.func.isRequired,\n@@ -490,9 +469,7 @@ type OwnProps = {\nexport default connect(\n(state: AppState, ownProps: OwnProps) => ({\nthreadInfo: threadInfoSelector(state)[ownProps.entryInfo.threadID],\n- sessionID: currentSessionID(state),\n- nextSessionID: nextSessionID(state),\n- sessionStartingPayload: sessionStartingPayload(state),\n+ sessionID: state.sessionID,\nloggedIn: !!(state.currentUserInfo &&\n!state.currentUserInfo.anonymous && true),\ncalendarQuery: nonThreadCalendarQuery(state),\n"
},
{
"change_type": "MODIFY",
"old_path": "web/modals/history/history-entry.react.js",
"new_path": "web/modals/history/history-entry.react.js",
"diff": "@@ -26,10 +26,6 @@ import {\n} from 'lib/actions/entry-actions';\nimport { createLoadingStatusSelector } from 'lib/selectors/loading-selectors';\nimport { connect } from 'lib/utils/redux-utils';\n-import {\n- currentSessionID,\n- sessionStartingPayload,\n-} from 'lib/selectors/session-selectors';\nimport { threadInfoSelector } from 'lib/selectors/thread-selectors';\nimport { nonThreadCalendarQuery } from 'lib/selectors/nav-selectors';\n@@ -42,10 +38,9 @@ type Props = {\nanimateAndLoadEntry: (entryID: string) => void,\n// Redux state\nthreadInfo: ThreadInfo,\n- sessionID: () => string,\n+ sessionID: string,\nloggedIn: bool,\nrestoreLoadingStatus: LoadingStatus,\n- sessionStartingPayload: () => { newSessionID?: string },\ncalendarQuery: () => CalendarQuery,\n// Redux dispatch functions\ndispatchActionPromise: DispatchActionPromise,\n@@ -125,12 +120,10 @@ class HistoryEntry extends React.PureComponent<Props> {\nevent.preventDefault();\nconst entryID = this.props.entryInfo.id;\ninvariant(entryID, \"entryInfo.id (serverID) should be set\");\n- const startingPayload = this.props.sessionStartingPayload();\nthis.props.dispatchActionPromise(\nrestoreEntryActionTypes,\nthis.restoreEntryAction(),\n{ customKeyName: `${restoreEntryActionTypes.started}:${entryID}` },\n- startingPayload,\n);\n}\n@@ -146,7 +139,7 @@ class HistoryEntry extends React.PureComponent<Props> {\ninvariant(entryID, \"entry should have ID\");\nconst result = await this.props.restoreEntry({\nentryID,\n- sessionID: this.props.sessionID(),\n+ sessionID: this.props.sessionID,\ncalendarQuery: this.props.calendarQuery(),\n});\nthis.props.animateAndLoadEntry(entryID);\n@@ -160,10 +153,9 @@ HistoryEntry.propTypes = {\nonClick: PropTypes.func.isRequired,\nanimateAndLoadEntry: PropTypes.func.isRequired,\nthreadInfo: threadInfoPropType,\n- sessionID: PropTypes.func.isRequired,\n+ sessionID: PropTypes.string.isRequired,\nloggedIn: PropTypes.bool.isRequired,\nrestoreLoadingStatus: PropTypes.string.isRequired,\n- sessionStartingPayload: PropTypes.func.isRequired,\ncalendarQuery: PropTypes.func.isRequired,\ndispatchActionPromise: PropTypes.func.isRequired,\nrestoreEntry: PropTypes.func.isRequired,\n@@ -175,14 +167,13 @@ export default connect(\ninvariant(entryID, \"entryInfo.id (serverID) should be set\");\nreturn {\nthreadInfo: threadInfoSelector(state)[ownProps.entryInfo.threadID],\n- sessionID: currentSessionID(state),\n+ sessionID: state.sessionID,\nloggedIn: !!(state.currentUserInfo &&\n!state.currentUserInfo.anonymous && true),\nrestoreLoadingStatus: createLoadingStatusSelector(\nrestoreEntryActionTypes,\n`${restoreEntryActionTypes.started}:${entryID}`,\n)(state),\n- sessionStartingPayload: sessionStartingPayload(state),\ncalendarQuery: nonThreadCalendarQuery(state),\n};\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "web/redux-setup.js",
"new_path": "web/redux-setup.js",
"diff": "@@ -48,7 +48,6 @@ export type AppState = {|\nverifyField: ?VerifyField,\nresetPasswordUsername: string,\nentryStore: EntryStore,\n- lastUserInteraction: {[section: string]: number},\nthreadStore: ThreadStore,\nuserInfos: {[id: string]: UserInfo},\nmessageStore: MessageStore,\n@@ -81,48 +80,12 @@ export function reducer(inputState: AppState | void, action: Action) {\nlet state = oldState;\nif (action.type === updateNavInfoActionType) {\nstate = {\n+ ...state,\nnavInfo: action.payload,\n- currentUserInfo: state.currentUserInfo,\n- sessionID: state.sessionID,\n- verifyField: state.verifyField,\n- resetPasswordUsername: state.resetPasswordUsername,\n- entryStore: state.entryStore,\n- lastUserInteraction: state.lastUserInteraction,\n- threadStore: state.threadStore,\n- userInfos: state.userInfos,\n- messageStore: state.messageStore,\n- drafts: state.drafts,\n- updatesCurrentAsOf: state.updatesCurrentAsOf,\n- loadingStatuses: state.loadingStatuses,\n- pingTimestamps: state.pingTimestamps,\n- activeServerRequests: state.activeServerRequests,\n- calendarFilters: state.calendarFilters,\n- cookie: state.cookie,\n- deviceToken: state.deviceToken,\n- urlPrefix: state.urlPrefix,\n- windowDimensions: state.windowDimensions,\n};\n} else if (action.type === updateWindowDimensions) {\nstate = {\n- navInfo: state.navInfo,\n- currentUserInfo: state.currentUserInfo,\n- sessionID: state.sessionID,\n- verifyField: state.verifyField,\n- resetPasswordUsername: state.resetPasswordUsername,\n- entryStore: state.entryStore,\n- lastUserInteraction: state.lastUserInteraction,\n- threadStore: state.threadStore,\n- userInfos: state.userInfos,\n- messageStore: state.messageStore,\n- drafts: state.drafts,\n- updatesCurrentAsOf: state.updatesCurrentAsOf,\n- loadingStatuses: state.loadingStatuses,\n- pingTimestamps: state.pingTimestamps,\n- activeServerRequests: state.activeServerRequests,\n- calendarFilters: state.calendarFilters,\n- cookie: state.cookie,\n- deviceToken: state.deviceToken,\n- urlPrefix: state.urlPrefix,\n+ ...state,\nwindowDimensions: action.payload,\n};\n} else {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Simplify session ID management
Session ID now represents a state initialization so we can use it for tracking updates. |
129,187 | 15.08.2018 19:35:41 | 25,200 | 69acd6b9cd09fa8a8ff452456a917bd1c9dfa35c | Pass sessionID to the server on web
Server will have `sessionID` property on `Viewer` now to access the `sessionID` of web clients. This is necessary to uniquely identify different web sessions that are using the same cookie. | [
{
"change_type": "MODIFY",
"old_path": "lib/utils/action-utils.js",
"new_path": "lib/utils/action-utils.js",
"diff": "@@ -224,6 +224,7 @@ async function fetchNewCookieFromNativeCredentials(\ndispatch: Dispatch,\ncookie: ?string,\nurlPrefix: string,\n+ sessionID: string,\nsource: LogInActionSource,\nlogInExtraInfo: () => LogInExtraInfo,\n): Promise<?string> {\n@@ -247,6 +248,7 @@ async function fetchNewCookieFromNativeCredentials(\n() => new Promise(r => r(null)),\n(someCookie: ?string) => new Promise(r => r(null)),\nurlPrefix,\n+ sessionID,\nendpoint,\ndata,\noptions,\n@@ -294,6 +296,7 @@ function bindCookieAndUtilsIntoFetchJSON(\ndispatch: Dispatch,\ncookie: ?string,\nurlPrefix: string,\n+ sessionID: string,\nlogInExtraInfo: () => LogInExtraInfo,\nloggedIn: bool,\n): FetchJSON {\n@@ -321,6 +324,7 @@ function bindCookieAndUtilsIntoFetchJSON(\ndispatch,\nnewAnonymousCookie,\nurlPrefix,\n+ sessionID,\ncookieInvalidationResolutionAttempt,\nlogInExtraInfo,\n);\n@@ -334,6 +338,7 @@ function bindCookieAndUtilsIntoFetchJSON(\ndispatch,\nnewValidCookie,\nurlPrefix,\n+ sessionID,\nlogInExtraInfo,\nloggedIn,\n)\n@@ -374,6 +379,7 @@ function bindCookieAndUtilsIntoFetchJSON(\nwaitIfCookieInvalidated,\ncookieInvalidationRecovery,\nurlPrefix,\n+ sessionID,\nendpoint,\ndata,\noptions,\n@@ -385,6 +391,7 @@ type BindServerCallsParams = {\ndispatch: Dispatch,\ncookie: ?string,\nurlPrefix: string,\n+ sessionID: string,\nlogInExtraInfo: () => LogInExtraInfo,\nloggedIn: bool,\n};\n@@ -402,12 +409,14 @@ const baseCreateBoundServerCallsSelector = (actionFunc: ActionFunc) => {\n(state: BindServerCallsParams) => state.dispatch,\n(state: BindServerCallsParams) => state.cookie,\n(state: BindServerCallsParams) => state.urlPrefix,\n+ (state: BindServerCallsParams) => state.sessionID,\n(state: BindServerCallsParams) => state.logInExtraInfo,\n(state: BindServerCallsParams) => state.loggedIn,\n(\ndispatch: Dispatch,\ncookie: ?string,\nurlPrefix: string,\n+ sessionID: string,\nlogInExtraInfo: () => LogInExtraInfo,\nloggedIn: bool,\n) => {\n@@ -415,6 +424,7 @@ const baseCreateBoundServerCallsSelector = (actionFunc: ActionFunc) => {\ndispatch,\ncookie,\nurlPrefix,\n+ sessionID,\nlogInExtraInfo,\nloggedIn,\n);\n@@ -432,6 +442,7 @@ function bindServerCalls(serverCalls: ServerCalls) {\nstateProps: {\ncookie: ?string,\nurlPrefix: string,\n+ sessionID: string,\nlogInExtraInfo: () => LogInExtraInfo,\ncurrentUserInfoLoggedIn: bool,\n},\n@@ -443,6 +454,7 @@ function bindServerCalls(serverCalls: ServerCalls) {\nconst {\ncookie,\nurlPrefix,\n+ sessionID,\nlogInExtraInfo,\ncurrentUserInfoLoggedIn: loggedIn,\n} = stateProps;\n@@ -452,6 +464,7 @@ function bindServerCalls(serverCalls: ServerCalls) {\ndispatch,\ncookie,\nurlPrefix,\n+ sessionID,\nlogInExtraInfo,\nloggedIn,\n}),\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/utils/config.js",
"new_path": "lib/utils/config.js",
"diff": "@@ -15,6 +15,7 @@ export type Config = {\n) => Promise<void>),\ngetNewCookie: ?((response: Object) => Promise<?string>),\nsetCookieOnRequest: bool,\n+ setSessionIDOnRequest: bool,\ncalendarRangeInactivityLimit: ?number,\nplatformDetails: PlatformDetails,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/utils/fetch-json.js",
"new_path": "lib/utils/fetch-json.js",
"diff": "@@ -26,6 +26,12 @@ export type FetchJSON = (\n) => Promise<Object>;\nconst defaultTimeout = 10000;\n+type RequestData = {|\n+ input: {[key: string]: mixed},\n+ cookie?: ?string,\n+ sessionID?: string,\n+|};\n+\n// If cookie is undefined, then we will defer to the underlying environment to\n// handle cookies, and we won't worry about them. We do this on the web since\n// our cookies are httponly to protect against XSS attacks. On the other hand,\n@@ -40,6 +46,7 @@ async function fetchJSON(\ncookieInvalidationRecovery:\n(newAnonymousCookie: ?string) => Promise<?FetchJSON>,\nurlPrefix: string,\n+ sessionID: string,\nendpoint: Endpoint,\ninput: {[key: string]: mixed},\noptions?: ?FetchJSONOptions,\n@@ -50,9 +57,14 @@ async function fetchJSON(\n}\nconst definedCookie = cookie ? cookie : null;\n- const mergedData = getConfig().setCookieOnRequest\n- ? { input, cookie: definedCookie }\n- : { input };\n+ const mergedData: RequestData = { input };\n+ if (getConfig().setCookieOnRequest) {\n+ mergedData.cookie = definedCookie;\n+ }\n+ if (getConfig().setSessionIDOnRequest) {\n+ mergedData.sessionID = sessionID;\n+ }\n+\nconst url = urlPrefix ? `${urlPrefix}/${endpoint}` : endpoint;\nconst fetchPromise = fetch(url, {\n'method': 'POST',\n@@ -72,6 +84,7 @@ async function fetchJSON(\nthrow new FetchTimeout(`fetchJSON timed out call to ${endpoint}`, endpoint);\n})();\nconst response = await Promise.race([ fetchPromise, rejectPromise ]);\n+\nconst text = await response.text();\nlet json;\ntry {\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/utils/redux-utils.js",
"new_path": "lib/utils/redux-utils.js",
"diff": "@@ -26,6 +26,7 @@ function connect<S: BaseAppState<*>, OP: Object, SP: Object>(\n...SP,\ncookie: ?string,\nurlPrefix: string,\n+ sessionID: string,\nlogInExtraInfo: () => LogInExtraInfo,\ncurrentUserInfoLoggedIn: bool,\n} => {\n@@ -33,6 +34,7 @@ function connect<S: BaseAppState<*>, OP: Object, SP: Object>(\n...mapStateToProps(state, ownProps),\ncookie: state.cookie,\nurlPrefix: state.urlPrefix,\n+ sessionID: state.sessionID,\nlogInExtraInfo: logInExtraInfoSelector(state),\ncurrentUserInfoLoggedIn:\n!!(state.currentUserInfo && !state.currentUserInfo.anonymous && true),\n@@ -43,6 +45,7 @@ function connect<S: BaseAppState<*>, OP: Object, SP: Object>(\n...SP,\ncookie: ?string,\nurlPrefix: string,\n+ sessionID: string,\nlogInExtraInfo: () => LogInExtraInfo,\ncurrentUserInfoLoggedIn: bool,\n} => {\n@@ -51,6 +54,7 @@ function connect<S: BaseAppState<*>, OP: Object, SP: Object>(\n...mapStateToProps(state),\ncookie: state.cookie,\nurlPrefix: state.urlPrefix,\n+ sessionID: state.sessionID,\nlogInExtraInfo: logInExtraInfoSelector(state),\ncurrentUserInfoLoggedIn:\n!!(state.currentUserInfo && !state.currentUserInfo.anonymous && true),\n@@ -70,12 +74,14 @@ function connect<S: BaseAppState<*>, OP: Object, SP: Object>(\nmapState = (state: S): {\ncookie: ?string,\nurlPrefix: string,\n+ sessionID: string,\nlogInExtraInfo: () => LogInExtraInfo,\ncurrentUserInfoLoggedIn: bool,\n} => {\nreturn {\ncookie: state.cookie,\nurlPrefix: state.urlPrefix,\n+ sessionID: state.sessionID,\nlogInExtraInfo: logInExtraInfoSelector(state),\ncurrentUserInfoLoggedIn:\n!!(state.currentUserInfo && !state.currentUserInfo.anonymous && true),\n"
},
{
"change_type": "MODIFY",
"old_path": "native/account/logged-out-modal.react.js",
"new_path": "native/account/logged-out-modal.react.js",
"diff": "@@ -91,6 +91,7 @@ type Props = {\nrehydrateConcluded: bool,\ncookie: ?string,\nurlPrefix: string,\n+ sessionID: string,\nloggedIn: bool,\nisForeground: bool,\npingStartingPayload: () => PingStartingPayload,\n@@ -123,6 +124,7 @@ class InnerLoggedOutModal extends React.PureComponent<Props, State> {\nrehydrateConcluded: PropTypes.bool.isRequired,\ncookie: PropTypes.string,\nurlPrefix: PropTypes.string.isRequired,\n+ sessionID: PropTypes.string.isRequired,\nloggedIn: PropTypes.bool.isRequired,\nisForeground: PropTypes.bool.isRequired,\npingStartingPayload: PropTypes.func.isRequired,\n@@ -287,7 +289,7 @@ class InnerLoggedOutModal extends React.PureComponent<Props, State> {\ninitialAppLoad = false;\nlet { cookie } = nextProps;\n- const { urlPrefix } = nextProps;\n+ const { urlPrefix, sessionID } = nextProps;\nconst showPrompt = () => {\nthis.nextMode = \"prompt\";\nthis.guardedSetState({ mode: \"prompt\" });\n@@ -308,6 +310,7 @@ class InnerLoggedOutModal extends React.PureComponent<Props, State> {\nnextProps.dispatch,\ncookie,\nurlPrefix,\n+ sessionID,\nappStartNativeCredentialsAutoLogIn,\nnextProps.logInExtraInfo,\n);\n@@ -328,6 +331,7 @@ class InnerLoggedOutModal extends React.PureComponent<Props, State> {\nnextProps.dispatch,\ncookie,\nurlPrefix,\n+ sessionID,\nappStartReduxLoggedInButInvalidCookie,\nnextProps.logInExtraInfo,\n);\n@@ -353,6 +357,7 @@ class InnerLoggedOutModal extends React.PureComponent<Props, State> {\ndispatch: props.dispatch,\ncookie,\nurlPrefix: props.urlPrefix,\n+ sessionID: props.sessionID,\nlogInExtraInfo: props.logInExtraInfo,\nloggedIn: props.loggedIn,\n});\n@@ -840,6 +845,7 @@ const LoggedOutModal = connect(\nrehydrateConcluded: state._persist && state._persist.rehydrated,\ncookie: state.cookie,\nurlPrefix: state.urlPrefix,\n+ sessionID: state.sessionID,\nloggedIn: !!(state.currentUserInfo &&\n!state.currentUserInfo.anonymous && true),\nisForeground: isForegroundSelector(state),\n"
},
{
"change_type": "MODIFY",
"old_path": "native/app.react.js",
"new_path": "native/app.react.js",
"diff": "@@ -114,6 +114,7 @@ registerConfig({\nreturn null;\n},\nsetCookieOnRequest: true,\n+ setSessionIDOnRequest: false,\ncalendarRangeInactivityLimit: 15 * 60 * 1000,\nplatformDetails: {\nplatform: Platform.OS,\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/session/cookies.js",
"new_path": "server/src/session/cookies.js",
"diff": "@@ -42,22 +42,35 @@ function cookieIsExpired(lastUpdate: number) {\ntype FetchViewerResult =\n| {| type: \"valid\", viewer: Viewer |}\n- | {| type: \"nonexistant\", cookieName: ?string, source: CookieSource |}\n+ | {|\n+ type: \"nonexistant\",\n+ cookieName: ?string,\n+ source: CookieSource,\n+ sessionID: ?string,\n+ |}\n| {|\ntype: \"invalidated\",\ncookieName: string,\ncookieID: string,\nsource: CookieSource,\nplatformDetails: ?PlatformDetails,\n+ sessionID: ?string,\n|};\nasync function fetchUserViewer(\ncookie: string,\nsource: CookieSource,\n+ req: $Request,\n): Promise<FetchViewerResult> {\nconst [ cookieID, cookiePassword ] = cookie.split(':');\n+ const sessionID = getSessionIDFromRequestBody(req);\nif (!cookieID || !cookiePassword) {\n- return { type: \"nonexistant\", cookieName: cookieType.USER, source };\n+ return {\n+ type: \"nonexistant\",\n+ cookieName: cookieType.USER,\n+ source,\n+ sessionID,\n+ };\n}\nconst query = SQL`\nSELECT hash, user, last_used, platform, device_token, versions\n@@ -66,7 +79,12 @@ async function fetchUserViewer(\n`;\nconst [ result ] = await dbQuery(query);\nif (result.length === 0) {\n- return { type: \"nonexistant\", cookieName: cookieType.USER, source };\n+ return {\n+ type: \"nonexistant\",\n+ cookieName: cookieType.USER,\n+ source,\n+ sessionID,\n+ };\n}\nconst cookieRow = result[0];\n@@ -91,6 +109,7 @@ async function fetchUserViewer(\ncookieID,\nsource,\nplatformDetails,\n+ sessionID,\n};\n}\nconst userID = cookieRow.user.toString();\n@@ -103,6 +122,7 @@ async function fetchUserViewer(\nuserID,\ncookieID,\ncookiePassword,\n+ sessionID,\n},\nsource,\n);\n@@ -112,10 +132,17 @@ async function fetchUserViewer(\nasync function fetchAnonymousViewer(\ncookie: string,\nsource: CookieSource,\n+ req: $Request,\n): Promise<FetchViewerResult> {\nconst [ cookieID, cookiePassword ] = cookie.split(':');\n+ const sessionID = getSessionIDFromRequestBody(req);\nif (!cookieID || !cookiePassword) {\n- return { type: \"nonexistant\", cookieName: cookieType.ANONYMOUS, source };\n+ return {\n+ type: \"nonexistant\",\n+ cookieName: cookieType.ANONYMOUS,\n+ source,\n+ sessionID,\n+ };\n}\nconst query = SQL`\nSELECT last_used, hash, platform, device_token, versions\n@@ -124,7 +151,12 @@ async function fetchAnonymousViewer(\n`;\nconst [ result ] = await dbQuery(query);\nif (result.length === 0) {\n- return { type: \"nonexistant\", cookieName: cookieType.ANONYMOUS, source };\n+ return {\n+ type: \"nonexistant\",\n+ cookieName: cookieType.ANONYMOUS,\n+ source,\n+ sessionID,\n+ };\n}\nconst cookieRow = result[0];\n@@ -149,6 +181,7 @@ async function fetchAnonymousViewer(\ncookieID,\nsource,\nplatformDetails,\n+ sessionID,\n};\n}\nconst viewer = new Viewer(\n@@ -159,22 +192,29 @@ async function fetchAnonymousViewer(\ndeviceToken: cookieRow.device_token,\ncookieID,\ncookiePassword,\n+ sessionID,\n},\nsource,\n);\nreturn { type: \"valid\", viewer };\n}\n+function getSessionIDFromRequestBody(req: $Request): ?string {\n+ const body = (req.body: any);\n+ return body.sessionID;\n+}\n+\n// This function is meant to consume a cookie that has already been processed.\n// That means it doesn't have any logic to handle an invalid cookie, and it\n// doesn't update the cookie's last_used timestamp.\nasync function fetchViewerFromCookieData(\n- cookieData: {[cookieName: string]: string},\n+ req: $Request,\n): Promise<?FetchViewerResult> {\n- if (cookieData.user) {\n- return await fetchUserViewer(cookieData.user, cookieSource.HEADER);\n- } else if (cookieData.anonymous) {\n- return await fetchAnonymousViewer(cookieData.anonymous, cookieSource.HEADER);\n+ const { user, anonymous } = req.cookies;\n+ if (user) {\n+ return await fetchUserViewer(user, cookieSource.HEADER, req);\n+ } else if (anonymous) {\n+ return await fetchAnonymousViewer(anonymous, cookieSource.HEADER, req);\n}\nreturn null;\n}\n@@ -185,16 +225,22 @@ async function fetchViewerFromRequestBody(\nconst body = (req.body: any);\nconst cookiePair = body.cookie;\nif (cookiePair === null) {\n- return { type: \"nonexistant\", cookieName: null, source: cookieSource.BODY };\n+ const sessionID = getSessionIDFromRequestBody(req);\n+ return {\n+ type: \"nonexistant\",\n+ cookieName: null,\n+ source: cookieSource.BODY,\n+ sessionID,\n+ };\n}\nif (!cookiePair || !(typeof cookiePair === \"string\")) {\nreturn null;\n}\nconst [ type, cookie ] = cookiePair.split(\"=\");\nif (type === cookieType.USER && cookie) {\n- return await fetchUserViewer(cookie, cookieSource.BODY);\n+ return await fetchUserViewer(cookie, cookieSource.BODY, req);\n} else if (type === cookieType.ANONYMOUS && cookie) {\n- return await fetchAnonymousViewer(cookie, cookieSource.BODY);\n+ return await fetchAnonymousViewer(cookie, cookieSource.BODY, req);\n}\nreturn null;\n}\n@@ -203,7 +249,7 @@ async function fetchViewerForJSONRequest(req: $Request): Promise<Viewer> {\nassertSecureRequest(req);\nlet result = await fetchViewerFromRequestBody(req);\nif (!result) {\n- result = await fetchViewerFromCookieData(req.cookies);\n+ result = await fetchViewerFromCookieData(req);\n}\nreturn await handleFetchViewerResult(result);\n}\n@@ -211,7 +257,7 @@ async function fetchViewerForJSONRequest(req: $Request): Promise<Viewer> {\nconst webPlatformDetails = { platform: \"web\" };\nasync function fetchViewerForHomeRequest(req: $Request): Promise<Viewer> {\nassertSecureRequest(req);\n- const result = await fetchViewerFromCookieData(req.cookies);\n+ const result = await fetchViewerFromCookieData(req);\nreturn await handleFetchViewerResult(result, webPlatformDetails);\n}\n@@ -228,14 +274,16 @@ async function handleFetchViewerResult(\nplatformDetails = result.platformDetails;\n}\n+ const sessionID = result ? result.sessionID : null;\nconst [ anonymousViewerData ] = await Promise.all([\ncreateNewAnonymousCookie(platformDetails),\nresult && result.type === \"invalidated\"\n? deleteCookie(result.cookieID)\n: null,\n]);\n+ const newViewerData = { ...anonymousViewerData, sessionID };\nconst source = result ? result.source : cookieSource.GENERATED;\n- const viewer = new Viewer(anonymousViewerData, source);\n+ const viewer = new Viewer(newViewerData, source);\nif (result) {\nviewer.cookieChanged = true;\n@@ -338,6 +386,7 @@ async function createNewAnonymousCookie(\ndeviceToken: null,\ncookieID: id,\ncookiePassword,\n+ sessionID: null,\ninsertionTime: time,\n};\n}\n@@ -378,6 +427,7 @@ async function createNewUserCookie(\ndeviceToken: null,\nuserID,\ncookieID,\n+ sessionID: null,\ncookiePassword,\ninsertionTime: time,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/session/viewer.js",
"new_path": "server/src/session/viewer.js",
"diff": "@@ -13,6 +13,7 @@ export type UserViewerData = {|\n+userID: string,\n+cookieID: string,\n+cookiePassword: string,\n+ +sessionID: ?string,\n+insertionTime?: ?number,\n|};\n@@ -23,6 +24,7 @@ export type AnonymousViewerData = {|\n+deviceToken: ?string,\n+cookieID: string,\n+cookiePassword: string,\n+ +sessionID: ?string,\n+insertionTime?: ?number,\n|};\n@@ -53,7 +55,14 @@ class Viewer {\n}\nsetNewCookie(data: ViewerData) {\n+ if (!data.sessionID && this.sessionID && data.loggedIn) {\n+ this.data = { ...data, sessionID: this.sessionID };\n+ } else if (!data.sessionID && this.sessionID && !data.loggedIn) {\n+ // This is a separate condition because of Flow\n+ this.data = { ...data, sessionID: this.sessionID };\n+ } else {\nthis.data = data;\n+ }\nthis.cookieChanged = true;\n// If the request explicitly sets a new cookie, there's no point in telling\n// the client that their old cookie is invalid. Note that clients treat\n@@ -77,6 +86,18 @@ class Viewer {\nreturn this.data.cookiePassword;\n}\n+ get sessionID(): ?string {\n+ return this.data.sessionID;\n+ }\n+\n+ get session(): string {\n+ if (this.sessionID) {\n+ return `${this.cookieID}|${this.sessionID}`;\n+ } else {\n+ return this.cookieID;\n+ }\n+ }\n+\nget userID(): string {\ninvariant(this.data.userID, \"should be set\");\nreturn this.data.userID;\n"
},
{
"change_type": "MODIFY",
"old_path": "web/app.react.js",
"new_path": "web/app.react.js",
"diff": "@@ -94,6 +94,7 @@ registerConfig({\n// no access to the cookies from JavaScript\ngetNewCookie: null,\nsetCookieOnRequest: false,\n+ setSessionIDOnRequest: true,\n// Never reset the calendar range\ncalendarRangeInactivityLimit: null,\nplatformDetails: { platform: \"web\" },\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Pass sessionID to the server on web
Server will have `sessionID` property on `Viewer` now to access the `sessionID` of web clients. This is necessary to uniquely identify different web sessions that are using the same cookie. |
129,187 | 15.08.2018 22:31:49 | 25,200 | 3ac1e4abecdf22c7593c77ec2a5bca87013bf59d | [server] Use new "session" concept instead of cookies for filters and updates | [
{
"change_type": "MODIFY",
"old_path": "lib/types/update-types.js",
"new_path": "lib/types/update-types.js",
"diff": "@@ -79,7 +79,7 @@ type EntryUpdateData = {|\nuserID: string,\ntime: number,\nentryID: string,\n- targetCookie: string,\n+ targetSession: string,\n|};\nexport type UpdateData =\n| AccountDeletionUpdateData\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/filter-creator.js",
"new_path": "server/src/creators/filter-creator.js",
"diff": "@@ -6,19 +6,19 @@ import type { CalendarQuery } from 'lib/types/entry-types';\nimport { dbQuery, SQL } from '../database';\n// \"Filter\" here refers to the \"filters\" table in MySQL, which stores\n-// CalendarQueries on a per-cookie basis\n+// CalendarQueries on a per-session basis\nasync function createFilter(\nviewer: Viewer,\ncalendarQuery: CalendarQuery,\n): Promise<void> {\nconst row = [\nviewer.id,\n- viewer.cookieID,\n+ viewer.session,\nJSON.stringify(calendarQuery),\nDate.now(),\n];\nconst query = SQL`\n- INSERT INTO filters (user, cookie, query, time)\n+ INSERT INTO filters (user, session, query, time)\nVALUES ${[row]}\nON DUPLICATE KEY UPDATE query = VALUES(query), time = VALUES(time)\n`;\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/update-creator.js",
"new_path": "server/src/creators/update-creator.js",
"diff": "@@ -77,7 +77,7 @@ const sortFunction = (\n// Creates rows in the updates table based on the inputed updateDatas. Returns\n// UpdateInfos pertaining to the provided viewerInfo, as well as related\n// UserInfos. If no viewerInfo is provided, no UpdateInfos will be returned. And\n-// the update row won't have an updater_cookie, meaning no cookie will be\n+// the update row won't have an updater column, meaning no session will be\n// excluded from the update.\nasync function createUpdates(\nupdateDatas: $ReadOnlyArray<UpdateData>,\n@@ -194,7 +194,7 @@ async function createUpdates(\nviewerUpdateDatas.push({ data: updateData, id: ids[i] });\n}\n- let content, targetCookie = null;\n+ let content, target = null;\nif (updateData.type === updateTypes.DELETE_ACCOUNT) {\ncontent = JSON.stringify({ deletedUserID: updateData.deletedUserID });\n} else if (updateData.type === updateTypes.UPDATE_THREAD) {\n@@ -209,13 +209,13 @@ async function createUpdates(\nconst { threadID } = updateData;\ncontent = JSON.stringify({ threadID });\n} else if (updateData.type === updateTypes.BAD_DEVICE_TOKEN) {\n- const { deviceToken, targetCookie: cookieFromData } = updateData;\n+ const { deviceToken, targetCookie } = updateData;\ncontent = JSON.stringify({ deviceToken });\n- targetCookie = cookieFromData;\n+ target = targetCookie;\n} else if (updateData.type === updateTypes.UPDATE_ENTRY) {\n- const { entryID, targetCookie: cookieFromData } = updateData;\n+ const { entryID, targetSession } = updateData;\ncontent = JSON.stringify({ entryID });\n- targetCookie = cookieFromData;\n+ target = targetSession;\n} else {\ninvariant(false, `unrecognized updateType ${updateData.type}`);\n}\n@@ -236,8 +236,8 @@ async function createUpdates(\nkey,\ncontent,\nupdateData.time,\n- viewerInfo ? viewerInfo.viewer.cookieID : null,\n- targetCookie,\n+ viewerInfo ? viewerInfo.viewer.session : null,\n+ target,\n];\ninsertRows.push(insertRow);\n}\n@@ -262,7 +262,7 @@ async function createUpdates(\nif (insertRows.length > 0) {\nconst insertQuery = SQL`\nINSERT INTO updates(id, user, type, \\`key\\`,\n- content, time, updater_cookie, target_cookie)\n+ content, time, updater, target)\n`;\ninsertQuery.append(SQL`VALUES ${insertRows}`);\npromises.insert = dbQuery(insertQuery);\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/cookie-deleters.js",
"new_path": "server/src/deleters/cookie-deleters.js",
"diff": "@@ -5,13 +5,17 @@ import { fetchDeviceTokensForCookie } from '../fetchers/device-token-fetchers';\nimport { cookieLifetime } from '../session/cookies';\nasync function deleteCookie(cookieID: string): Promise<void> {\n+ // Note that since the fi.session = c.id and u.target = c.id comparisons\n+ // compare a VARCHAR with an INT type, MySQL will caste the former to an INT.\n+ // This means it will parse off any prefixed numeral characters, and ignore\n+ // anything after the first non-numeral, which is exactly what we want.\nawait dbQuery(SQL`\nDELETE c, i, fo, fi, u, iu\nFROM cookies c\nLEFT JOIN ids i ON i.id = c.id\nLEFT JOIN focused fo ON fo.cookie = c.id\n- LEFT JOIN filters fi ON fi.cookie = c.id\n- LEFT JOIN updates u ON u.target_cookie = c.id\n+ LEFT JOIN filters fi ON fi.session = c.id\n+ LEFT JOIN updates u ON u.target = c.id\nLEFT JOIN ids iu ON iu.id = u.id\nWHERE c.id = ${cookieID}\n`);\n@@ -28,13 +32,17 @@ async function deleteCookiesOnLogOut(\nconditions.push(SQL`c.device_token = ${deviceToken}`);\n}\n+ // Note that since the fi.session = c.id and u.target = c.id comparisons\n+ // compare a VARCHAR with an INT type, MySQL will caste the former to an INT.\n+ // This means it will parse off any prefixed numeral characters, and ignore\n+ // anything after the first non-numeral, which is exactly what we want.\nconst query = SQL`\nDELETE c, i, fo, fi, u, iu\nFROM cookies c\nLEFT JOIN ids i ON i.id = c.id\nLEFT JOIN focused fo ON fo.cookie = c.id\n- LEFT JOIN filters fi ON fi.cookie = c.id\n- LEFT JOIN updates u ON u.target_cookie = c.id\n+ LEFT JOIN filters fi ON fi.session = c.id\n+ LEFT JOIN updates u ON u.target = c.id\nLEFT JOIN ids iu ON iu.id = u.id\nWHERE c.user = ${userID} AND\n`;\n@@ -45,13 +53,17 @@ async function deleteCookiesOnLogOut(\nasync function deleteExpiredCookies(): Promise<void> {\nconst earliestInvalidLastUpdate = Date.now() - cookieLifetime;\n+ // Note that since the fi.session = c.id and u.target = c.id comparisons\n+ // compare a VARCHAR with an INT type, MySQL will caste the former to an INT.\n+ // This means it will parse off any prefixed numeral characters, and ignore\n+ // anything after the first non-numeral, which is exactly what we want.\nconst query = SQL`\nDELETE c, i, fo, fi, u, iu\nFROM cookies c\nLEFT JOIN ids i ON i.id = c.id\nLEFT JOIN focused fo ON fo.cookie = c.id\n- LEFT JOIN filters fi ON fi.cookie = c.id\n- LEFT JOIN updates u ON u.target_cookie = c.id\n+ LEFT JOIN filters fi ON fi.session = c.id\n+ LEFT JOIN updates u ON u.target = c.id\nLEFT JOIN ids iu ON iu.id = u.id\nWHERE c.last_update <= ${earliestInvalidLastUpdate}\n`;\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/filter-deleters.js",
"new_path": "server/src/deleters/filter-deleters.js",
"diff": "import { dbQuery, SQL } from '../database';\nasync function deleteOrphanedFilters(): Promise<void> {\n+ // Note that since the f.session = c.id comparison compares a VARCHAR with an\n+ // INT type, MySQL will caste the former to an INT. This means it will parse\n+ // off any prefixed numeral characters, and ignore anything after the first\n+ // non-numeral, which is exactly what we want.\nawait dbQuery(SQL`\nDELETE f\nFROM filters f\nLEFT JOIN users u ON u.id = f.user\n- LEFT JOIN cookies c ON c.id = f.cookie\n+ LEFT JOIN cookies c ON f.session = c.id\nWHERE c.id IS NULL OR u.id IS NULL\n`);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/update-deleters.js",
"new_path": "server/src/deleters/update-deleters.js",
"diff": "@@ -42,7 +42,7 @@ async function deleteUpdatesBeforeTimeTargettingCookie(\nbeforeTime: number,\n): Promise<void> {\nconst condition =\n- SQL`u.target_cookie = ${viewer.cookieID} AND u.time <= ${beforeTime}`;\n+ SQL`u.target = ${viewer.session} AND u.time <= ${beforeTime}`;\nawait deleteUpdatesByConditions([condition]);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/fetchers/filter-fetchers.js",
"new_path": "server/src/fetchers/filter-fetchers.js",
"diff": "@@ -6,14 +6,14 @@ import type { CalendarQuery } from 'lib/types/entry-types';\nimport { dbQuery, SQL } from '../database';\n// \"Filter\" here refers to the \"filters\" table in MySQL, which stores\n-// CalendarQueries on a per-cookie basis\n+// CalendarQueries on a per-session basis\nasync function fetchCurrentFilter(\nviewer: Viewer,\n): Promise<?CalendarQuery> {\nconst query = SQL`\nSELECT query\nFROM filters\n- WHERE user = ${viewer.id} AND cookie = ${viewer.cookieID}\n+ WHERE user = ${viewer.id} AND session = ${viewer.session}\n`;\nconst [ result ] = await dbQuery(query);\nif (result.length === 0) {\n@@ -25,17 +25,16 @@ async function fetchCurrentFilter(\ntype CalendarFilterResult = {|\nuserID: string,\n- cookieID: string,\n+ session: string,\ncalendarQuery: CalendarQuery,\n|};\nasync function fetchFiltersForThread(\nthreadID: string,\n): Promise<CalendarFilterResult[]> {\nconst query = SQL`\n- SELECT m.user, c.id AS cookie, f.query\n+ SELECT f.user, f.session, f.query\nFROM memberships m\n- LEFT JOIN cookies c ON c.user = m.user\n- LEFT JOIN filters f ON f.cookie = c.id\n+ LEFT JOIN filters f ON f.user = m.user\nWHERE m.thread = ${threadID} AND f.query IS NOT NULL\n`;\nconst [ result ] = await dbQuery(query);\n@@ -43,7 +42,7 @@ async function fetchFiltersForThread(\nfor (let row of result) {\nfilters.push({\nuserID: row.user.toString(),\n- cookieID: row.cookie.toString(),\n+ session: row.session,\ncalendarQuery: row.query,\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/fetchers/update-fetchers.js",
"new_path": "server/src/fetchers/update-fetchers.js",
"diff": "@@ -31,8 +31,8 @@ async function fetchUpdateInfos(\nSELECT id, type, content, time\nFROM updates\nWHERE user = ${viewer.id} AND time > ${currentAsOf}\n- AND (updater_cookie IS NULL OR updater_cookie != ${viewer.cookieID})\n- AND (target_cookie IS NULL OR target_cookie = ${viewer.cookieID})\n+ AND (updater IS NULL OR updater != ${viewer.session})\n+ AND (target IS NULL OR target = ${viewer.session})\nORDER BY time ASC\n`;\nconst [ result ] = await dbQuery(query);\n@@ -115,8 +115,8 @@ function viewerUpdateDataFromRow(\ntime: row.time,\nentryID,\n// This UpdateData is only used to generate a UpdateInfo,\n- // and UpdateInfo doesn't care about the targetCookie field\n- targetCookie: \"\",\n+ // and UpdateInfo doesn't care about the targetSession field\n+ targetSession: \"\",\n};\n} else {\ninvariant(false, `unrecognized updateType ${type}`);\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/entry-updaters.js",
"new_path": "server/src/updaters/entry-updaters.js",
"diff": "@@ -203,13 +203,13 @@ async function createUpdateDatasForChangedEntryInfo(\nlet replaced = false;\nconst filters = fetchedFilters.map(\n- filter => filter.cookieID === viewer.cookieID && filter.userID === viewer.id\n+ filter => filter.session === viewer.session && filter.userID === viewer.id\n? (replaced = true && { ...filter, calendarQuery })\n: filter,\n);\nif (!replaced) {\n- const { id: userID, cookieID } = viewer;\n- filters.push({ userID, cookieID, calendarQuery });\n+ const { id: userID, session } = viewer;\n+ filters.push({ userID, session, calendarQuery });\n}\nconst time = Date.now();\n@@ -220,7 +220,7 @@ async function createUpdateDatasForChangedEntryInfo(\nuserID: filter.userID,\ntime,\nentryID,\n- targetCookie: filter.cookieID,\n+ targetSession: filter.session,\n}));\nconst { userInfos, ...updatesResult } = await createUpdates(\nupdateDatas,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Use new "session" concept instead of cookies for filters and updates |
129,187 | 15.08.2018 22:58:09 | 25,200 | b732ec82cabf85485c5cea40bfc2c1899e0bc3f4 | [server] deleteExpiredCookies should be using last_used, not last_update
The latter is for tracking update delivery, and is set to 0 for anonymous cookies, which means all of them are getting wiped every night. | [
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/cookie-deleters.js",
"new_path": "server/src/deleters/cookie-deleters.js",
"diff": "@@ -65,7 +65,7 @@ async function deleteExpiredCookies(): Promise<void> {\nLEFT JOIN filters fi ON fi.session = c.id\nLEFT JOIN updates u ON u.target = c.id\nLEFT JOIN ids iu ON iu.id = u.id\n- WHERE c.last_update <= ${earliestInvalidLastUpdate}\n+ WHERE c.last_used <= ${earliestInvalidLastUpdate}\n`;\nawait dbQuery(query);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/session/cookies.js",
"new_path": "server/src/session/cookies.js",
"diff": "@@ -36,8 +36,8 @@ const cookieType = Object.freeze({\n});\ntype CookieType = $Values<typeof cookieType>;\n-function cookieIsExpired(lastUpdate: number) {\n- return lastUpdate + cookieLifetime <= Date.now();\n+function cookieIsExpired(lastUsed: number) {\n+ return lastUsed + cookieLifetime <= Date.now();\n}\ntype FetchViewerResult =\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] deleteExpiredCookies should be using last_used, not last_update
The latter is for tracking update delivery, and is set to 0 for anonymous cookies, which means all of them are getting wiped every night. |
129,187 | 15.08.2018 23:09:59 | 25,200 | 198038d74d58f4ff5078f02e9b3672f9a839eafd | [server] Call createFilter from websiteResponder | [
{
"change_type": "MODIFY",
"old_path": "server/src/responders/website-responders.js",
"new_path": "server/src/responders/website-responders.js",
"diff": "@@ -42,6 +42,7 @@ import { fetchThreadInfos } from '../fetchers/thread-fetchers';\nimport { fetchEntryInfos } from '../fetchers/entry-fetchers';\nimport { fetchCurrentUserInfo } from '../fetchers/user-fetchers';\nimport { updateActivityTime } from '../updaters/activity-updaters';\n+import { createFilter } from '../creators/filter-creator';\nimport urlFacts from '../../facts/url';\nimport assets from '../../compiled/assets';\n@@ -105,8 +106,15 @@ async function websiteResponder(viewer: Viewer, url: string): Promise<string> {\n}\n}\n- // Do this one separately in case any of the above throw an exception\n- await updateActivityTime(viewer);\n+ // Do these ones separately in case any of the above throw an exception\n+ const sessionID = newSessionID();\n+ viewer.setSessionID(sessionID);\n+ await Promise.all([\n+ updateActivityTime(viewer),\n+ // We know we have to create a new filter since we just generated\n+ // the sessionID and web always passes up the sessionID\n+ createFilter(viewer, calendarQuery),\n+ ]);\nconst time = Date.now();\nconst store: Store<AppState, Action> = createStore(\n@@ -114,7 +122,7 @@ async function websiteResponder(viewer: Viewer, url: string): Promise<string> {\n({\nnavInfo,\ncurrentUserInfo,\n- sessionID: newSessionID(),\n+ sessionID,\nverifyField: verificationResult && verificationResult.field,\nresetPasswordUsername:\nverificationResult && verificationResult.resetPasswordUsername\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/session/viewer.js",
"new_path": "server/src/session/viewer.js",
"diff": "@@ -70,6 +70,15 @@ class Viewer {\nthis.cookieInvalidated = false;\n}\n+ setSessionID(sessionID: string) {\n+ if (this.data.loggedIn) {\n+ this.data = { ...this.data, sessionID };\n+ } else {\n+ // This is a separate condition because of Flow\n+ this.data = { ...this.data, sessionID };\n+ }\n+ }\n+\nget id(): string {\nreturn this.data.id;\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Call createFilter from websiteResponder |
129,187 | 13.09.2018 00:59:38 | 14,400 | fb736dc93a207dd66d2e3d12535dfd39343ee1f1 | Centralize Object.values $FlowFixMe | [
{
"change_type": "MODIFY",
"old_path": "lib/actions/entry-actions.js",
"new_path": "lib/actions/entry-actions.js",
"diff": "@@ -22,6 +22,7 @@ import type { RawMessageInfo } from '../types/message-types';\nimport { dateFromString } from '../utils/date-utils'\nimport { getNewLocalID } from '../utils/local-ids';\n+import { values } from '../utils/objects';\nconst fetchEntriesActionTypes = Object.freeze({\nstarted: \"FETCH_ENTRIES_STARTED\",\n@@ -33,10 +34,9 @@ async function fetchEntries(\ncalendarQuery: CalendarQuery,\n): Promise<FetchEntryInfosResult> {\nconst response = await fetchJSON('fetch_entries', calendarQuery);\n- const userInfos: any = Object.values(response.userInfos);\nreturn {\nrawEntryInfos: response.rawEntryInfos,\n- userInfos,\n+ userInfos: values(response.userInfos),\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/actions/message-actions.js",
"new_path": "lib/actions/message-actions.js",
"diff": "@@ -9,6 +9,8 @@ import type {\n} from '../types/message-types';\nimport type { UserInfo } from '../types/user-types';\n+import { values } from '../utils/objects';\n+\nconst fetchMessagesBeforeCursorActionTypes = Object.freeze({\nstarted: \"FETCH_MESSAGES_BEFORE_CURSOR_STARTED\",\nsuccess: \"FETCH_MESSAGES_BEFORE_CURSOR_SUCCESS\",\n@@ -24,13 +26,11 @@ async function fetchMessagesBeforeCursor(\n[threadID]: beforeMessageID,\n},\n});\n- // https://github.com/facebook/flow/issues/2221\n- const userInfos: any = Object.values(response.userInfos);\nreturn {\nthreadID,\nrawMessageInfos: response.rawMessageInfos,\ntruncationStatus: response.truncationStatuses[threadID],\n- userInfos,\n+ userInfos: values(response.userInfos),\n};\n}\n@@ -48,13 +48,11 @@ async function fetchMostRecentMessages(\n[threadID]: null,\n},\n});\n- // https://github.com/facebook/flow/issues/2221\n- const userInfos: any = Object.values(response.userInfos);\nreturn {\nthreadID,\nrawMessageInfos: response.rawMessageInfos,\ntruncationStatus: response.truncationStatuses[threadID],\n- userInfos,\n+ userInfos: values(response.userInfos),\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/actions/thread-actions.js",
"new_path": "lib/actions/thread-actions.js",
"diff": "@@ -20,6 +20,8 @@ import type { UserInfo } from '../types/user-types';\nimport invariant from 'invariant';\n+import { values } from '../utils/objects';\n+\nconst deleteThreadActionTypes = Object.freeze({\nstarted: \"DELETE_THREAD_STARTED\",\nsuccess: \"DELETE_THREAD_SUCCESS\",\n@@ -136,10 +138,7 @@ async function joinThread(\nrequest: ClientThreadJoinRequest,\n): Promise<ThreadJoinPayload> {\nconst response = await fetchJSON('join_thread', request);\n-\n- // https://github.com/facebook/flow/issues/2221\n- const userInfos: any = Object.values(response.userInfos);\n-\n+ const userInfos = values(response.userInfos);\nreturn {\nthreadID: request.threadID,\nthreadInfos: response.threadInfos,\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/selectors/calendar-selectors.js",
"new_path": "lib/selectors/calendar-selectors.js",
"diff": "@@ -12,6 +12,7 @@ import { currentCalendarQuery } from './nav-selectors';\nimport { rawEntryInfoWithinActiveRange } from '../shared/entry-utils';\nimport { threadInFilterList } from '../shared/thread-utils';\nimport SearchIndex from '../shared/search-index';\n+import { values } from '../utils/objects';\nconst filterThreadInfos = createSelector(\nthreadInfoSelector,\n@@ -52,8 +53,7 @@ const filterThreadInfos = createSelector(\n};\n}\n}\n- const resultArray: FilterThreadInfo[] = (Object.values(result): any);\n- return resultArray.sort(\n+ return values(result).sort(\n(first: FilterThreadInfo, second: FilterThreadInfo) =>\nsecond.numVisibleEntries - first.numVisibleEntries,\n);\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/selectors/loading-selectors.js",
"new_path": "lib/selectors/loading-selectors.js",
"diff": "@@ -11,6 +11,7 @@ import _memoize from 'lodash/memoize';\nimport invariant from 'invariant';\nimport { registerFetchKey } from '../reducers/loading-reducer';\n+import { values } from '../utils/objects';\nfunction loadingStatusFromInfo(\nloadingStatusInfo: {[idx: number]: LoadingStatus},\n@@ -79,10 +80,7 @@ const globalLoadingStatusSelector = createSelector(\n(\nloadingStatusInfos: {[key: string]: {[idx: number]: LoadingStatus}},\n): LoadingStatus => {\n- const loadingStatusInfoValues = (\n- (Object.values(loadingStatusInfos): any):\n- $ReadOnlyArray<{[idx: number]: LoadingStatus}>\n- );\n+ const loadingStatusInfoValues = values(loadingStatusInfos);\nconst loadingStatuses = loadingStatusInfoValues.map(loadingStatusFromInfo);\nreturn combineLoadingStatuses(...loadingStatuses);\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/shared/notif-utils.js",
"new_path": "lib/shared/notif-utils.js",
"diff": "@@ -20,6 +20,7 @@ import { threadIsTwoPersonChat } from './thread-utils';\nimport { stringForUser } from './user-utils';\nimport { prettyDate } from '../utils/date-utils';\nimport { pluralize } from '../utils/text-utils';\n+import { values } from '../utils/objects';\nconst notificationPressActionType = \"NOTIFICATION_PRESS\";\n@@ -134,9 +135,7 @@ function fullNotifTextForMessageInfo(\naddedMembersObject[member.id] = member;\n}\n}\n- // https://github.com/facebook/flow/issues/2221\n- const addedMembers =\n- ((Object.values(addedMembersObject): any): RelativeUserInfo[]);\n+ const addedMembers = values(addedMembersObject);\nconst mostRecentMessageInfo = messageInfos[0];\ninvariant(\n@@ -172,9 +171,7 @@ function fullNotifTextForMessageInfo(\nremovedMembersObject[member.id] = member;\n}\n}\n- // https://github.com/facebook/flow/issues/2221\n- const removedMembers =\n- ((Object.values(removedMembersObject): any): RelativeUserInfo[]);\n+ const removedMembers = values(removedMembersObject);\nconst mostRecentMessageInfo = messageInfos[0];\ninvariant(\n@@ -199,8 +196,7 @@ function fullNotifTextForMessageInfo(\nmembersObject[member.id] = member;\n}\n}\n- // https://github.com/facebook/flow/issues/2221\n- const members = ((Object.values(membersObject): any): RelativeUserInfo[]);\n+ const members = values(membersObject);\nconst mostRecentMessageInfo = messageInfos[0];\ninvariant(\n@@ -223,9 +219,7 @@ function fullNotifTextForMessageInfo(\n);\nleaverBeavers[messageInfo.creator.id] = messageInfo.creator;\n}\n- // https://github.com/facebook/flow/issues/2221\n- const leavers =\n- ((Object.values(leaverBeavers): any): RelativeUserInfo[]);\n+ const leavers = values(leaverBeavers);\nconst leaversString = pluralize(leavers.map(stringForUser));\nreturn `${leaversString} left ${notifThreadName(threadInfo)}`;\n@@ -238,9 +232,7 @@ function fullNotifTextForMessageInfo(\n);\njoinerArray[messageInfo.creator.id] = messageInfo.creator;\n}\n- // https://github.com/facebook/flow/issues/2221\n- const joiners =\n- ((Object.values(joinerArray): any): RelativeUserInfo[]);\n+ const joiners = values(joinerArray);\nconst joinersString = pluralize(joiners.map(stringForUser));\nreturn `${joinersString} joined ${notifThreadName(threadInfo)}`;\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/utils/objects.js",
"new_path": "lib/utils/objects.js",
"diff": "@@ -27,6 +27,16 @@ function findMaximumDepth(obj: Object): ?{ path: string, depth: number } {\nreturn { path: longestPath, depth: longestDepth };\n}\n+type Map<T> = {[key: Id]: T};\n+function values<T>(map: Map<T>): T[] {\n+ return Object.values\n+ ? // https://github.com/facebook/flow/issues/2221\n+ // $FlowFixMe - Object.values currently does not have good flow support\n+ Object.values(map)\n+ : Object.keys(map).map((key: Id): T => map[key]);\n+}\n+\nexport {\nfindMaximumDepth,\n+ values,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/fetchers/report-fetchers.js",
"new_path": "server/src/fetchers/report-fetchers.js",
"diff": "@@ -9,6 +9,7 @@ import type {\nimport { ServerError } from 'lib/utils/errors';\nimport { isStaff } from 'lib/shared/user-utils';\n+import { values } from 'lib/utils/objects';\nimport { dbQuery, SQL } from '../database';\n@@ -52,9 +53,8 @@ async function fetchErrorReportInfos(\n};\n}\n}\n- const userInfoArray: any = Object.values(userInfos);\n- return { reports, userInfos: userInfoArray };\n+ return { reports, userInfos: values(userInfos) };\n}\nasync function fetchReduxToolsImport(\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/entry-responders.js",
"new_path": "server/src/responders/entry-responders.js",
"diff": "@@ -24,6 +24,7 @@ import t from 'tcomb';\nimport { ServerError } from 'lib/utils/errors';\nimport { filteredThreadIDs } from 'lib/selectors/calendar-filter-selectors';\n+import { values } from 'lib/utils/objects';\nimport {\nvalidateInput,\n@@ -224,7 +225,7 @@ async function calendarQueryUpdateResponder(\n]);\nreturn {\nrawEntryInfos: response.rawEntryInfos,\n- userInfos: (Object.values(response.userInfos): any),\n+ userInfos: values(response.userInfos),\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -18,6 +18,7 @@ import { ServerError } from 'lib/utils/errors';\nimport { mostRecentMessageTimestamp } from 'lib/shared/message-utils';\nimport { mostRecentUpdateTimestamp } from 'lib/shared/update-utils';\nimport { promiseAll } from 'lib/utils/promises';\n+import { values } from 'lib/utils/objects';\nimport {\nvalidateInput,\n@@ -266,7 +267,7 @@ async function pingResponder(\n};\n}\n- const userInfos: any = Object.values({\n+ const userInfos = values({\n...messagesResult.userInfos,\n...entriesResult.userInfos,\n...threadsResult.userInfos,\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/user-responders.js",
"new_path": "server/src/responders/user-responders.js",
"diff": "@@ -24,6 +24,7 @@ import bcrypt from 'twin-bcrypt';\nimport { ServerError } from 'lib/utils/errors';\nimport { promiseAll } from 'lib/utils/promises';\nimport { defaultNumberPerThread } from 'lib/types/message-types';\n+import { values } from 'lib/utils/objects';\nimport {\nuserSubscriptionUpdater,\n@@ -254,7 +255,6 @@ async function logInResponder(\nconst userInfos = entriesResult\n? { ...messagesResult.userInfos, ...entriesResult.userInfos }\n: messagesResult.userInfos;\n- const userInfosArray: any = Object.values(userInfos);\nconst response: LogInResponse = {\ncurrentUserInfo: {\nid,\n@@ -265,7 +265,7 @@ async function logInResponder(\nrawMessageInfos: messagesResult.rawMessageInfos,\ntruncationStatuses: messagesResult.truncationStatuses,\nserverTime: newPingTime,\n- userInfos: userInfosArray,\n+ userInfos: values(userInfos),\n};\nif (rawEntryInfos) {\nresponse.rawEntryInfos = rawEntryInfos;\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/session/cookies.js",
"new_path": "server/src/session/cookies.js",
"diff": "@@ -22,6 +22,7 @@ import url from 'url';\nimport crypto from 'crypto';\nimport { ServerError } from 'lib/utils/errors';\n+import { values } from 'lib/utils/objects';\nimport { dbQuery, SQL } from '../database';\nimport { Viewer } from './viewer';\n@@ -334,13 +335,12 @@ async function addSessionChangeInfoToResult(\nresult: Object,\n) {\nconst { threadInfos, userInfos } = await fetchThreadInfos(viewer);\n- const userInfosArray: any = Object.values(userInfos);\nlet sessionChange;\nif (viewer.cookieInvalidated) {\nsessionChange = ({\ncookieInvalidated: true,\nthreadInfos,\n- userInfos: userInfosArray,\n+ userInfos: values(userInfos),\ncurrentUserInfo: {\nid: viewer.cookieID,\nanonymous: true,\n@@ -350,7 +350,7 @@ async function addSessionChangeInfoToResult(\nsessionChange = ({\ncookieInvalidated: false,\nthreadInfos,\n- userInfos: userInfosArray,\n+ userInfos: values(userInfos),\n}: SessionChange);\n}\nif (viewer.cookieSource === cookieSources.BODY) {\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/account-updaters.js",
"new_path": "server/src/updaters/account-updaters.js",
"diff": "@@ -15,6 +15,7 @@ import { promiseAll } from 'lib/utils/promises';\nimport { ServerError } from 'lib/utils/errors';\nimport { verifyField } from 'lib/types/verify-types';\nimport { defaultNumberPerThread } from 'lib/types/message-types';\n+import { values } from 'lib/utils/objects';\nimport { dbQuery, SQL } from '../database';\nimport { sendEmailAddressVerificationEmail } from '../emails/verification';\n@@ -201,7 +202,6 @@ async function updatePassword(\nconst userInfos = entriesResult\n? { ...messagesResult.userInfos, ...entriesResult.userInfos }\n: messagesResult.userInfos;\n- const userInfosArray: any = Object.values(userInfos);\nconst response: LogInResponse = {\ncurrentUserInfo: {\nid: userID,\n@@ -212,7 +212,7 @@ async function updatePassword(\nrawMessageInfos: messagesResult.rawMessageInfos,\ntruncationStatuses: messagesResult.truncationStatuses,\nserverTime: newPingTime,\n- userInfos: userInfosArray,\n+ userInfos: values(userInfos),\n};\nif (rawEntryInfos) {\nresponse.rawEntryInfos = rawEntryInfos;\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/entry-updaters.js",
"new_path": "server/src/updaters/entry-updaters.js",
"diff": "@@ -19,6 +19,7 @@ import {\nrawEntryInfoWithinCalendarQuery,\ndefaultCalendarQuery,\n} from 'lib/shared/entry-utils';\n+import { values } from 'lib/utils/objects';\nimport { dbQuery, SQL } from '../database';\nimport {\n@@ -237,7 +238,7 @@ async function createUpdateDatasForChangedEntryInfo(\n);\nreturn {\n...updatesResult,\n- userInfos: (Object.values(userInfos): any),\n+ userInfos: values(userInfos),\n};\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Centralize Object.values $FlowFixMe |
129,187 | 13.09.2018 13:33:56 | 14,400 | fb747142328792ba73f91cf68e8e98bf1f72b711 | setNewSession function that generates new sessionIDs | [
{
"change_type": "MODIFY",
"old_path": "server/src/creators/account-creator.js",
"new_path": "server/src/creators/account-creator.js",
"diff": "@@ -25,7 +25,7 @@ import { sendEmailAddressVerificationEmail } from '../emails/verification';\nimport createMessages from './message-creator';\nimport createThread from './thread-creator';\nimport { verifyCalendarQueryThreadIDs } from '../responders/entry-responders';\n-import { createFilter } from './filter-creator';\n+import { setNewSession } from '../session/cookies';\nconst ashoatMessages = [\n\"welcome to SquadCal! thanks for helping to test the alpha.\",\n@@ -93,6 +93,9 @@ async function createAccount(\n),\n]);\nviewer.setNewCookie(userViewerData);\n+ if (calendarQuery) {\n+ await setNewSession(viewer, calendarQuery);\n+ }\nconst [\npersonalThreadResult,\n@@ -113,7 +116,6 @@ async function createAccount(\ninitialMemberIDs: [ashoat.id],\n},\n),\n- calendarQuery ? createFilter(viewer, calendarQuery) : undefined,\n]);\nlet messageTime = Date.now();\nconst ashoatMessageDatas = ashoatMessages.map(message => ({\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/user-responders.js",
"new_path": "server/src/responders/user-responders.js",
"diff": "@@ -65,7 +65,7 @@ import { fetchEntryInfos } from '../fetchers/entry-fetchers';\nimport { deviceTokenUpdater } from '../updaters/device-token-updaters';\nimport { deviceTokenUpdateRequestInputValidator } from './device-responders';\nimport { sendAccessRequestEmailToAshoat } from '../emails/access-request';\n-import { createFilter } from '../creators/filter-creator';\n+import { setNewSession } from '../session/cookies';\nconst subscriptionUpdateRequestInputValidator = tShape({\nthreadID: t.String,\n@@ -231,6 +231,9 @@ async function logInResponder(\ndeleteCookie(viewer.getData().cookieID),\n]);\nviewer.setNewCookie(userViewerData);\n+ if (calendarQuery) {\n+ await setNewSession(viewer, calendarQuery);\n+ }\nconst threadCursors = {};\nfor (let watchedThreadID of request.watchedIDs) {\n@@ -248,7 +251,6 @@ async function logInResponder(\nrequest.deviceTokenUpdateRequest\n? deviceTokenUpdater(viewer, request.deviceTokenUpdateRequest)\n: undefined,\n- calendarQuery ? createFilter(viewer, calendarQuery) : undefined,\n]);\nconst rawEntryInfos = entriesResult ? entriesResult.rawEntryInfos : null;\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/website-responders.js",
"new_path": "server/src/responders/website-responders.js",
"diff": "@@ -40,8 +40,7 @@ import { fetchMessageInfos } from '../fetchers/message-fetchers';\nimport { fetchThreadInfos } from '../fetchers/thread-fetchers';\nimport { fetchEntryInfos } from '../fetchers/entry-fetchers';\nimport { fetchCurrentUserInfo } from '../fetchers/user-fetchers';\n-import { updateActivityTime } from '../updaters/activity-updaters';\n-import { createFilter } from '../creators/filter-creator';\n+import { setNewSession } from '../session/cookies';\nimport urlFacts from '../../facts/url';\nimport assets from '../../compiled/assets';\n@@ -104,18 +103,11 @@ async function websiteResponder(viewer: Viewer, url: string): Promise<string> {\nnavInfo.activeChatThreadID = mostRecentThread;\n}\n}\n+ // TODO if thread currently in view, call activityUpdater with that thread\n- // Do these ones separately in case any of the above throw an exception\n- let sessionID = null;\n- // TODO we need to generate a new sessionID at this time iff the user is logged in\n- if (sessionID) {\n- viewer.setSessionID(sessionID);\n+ if (viewer.loggedIn) {\n+ await setNewSession(viewer, calendarQuery);\n}\n- await Promise.all([\n- updateActivityTime(viewer),\n- // TODO we should only be doing this if the client is logged in\n- createFilter(viewer, calendarQuery),\n- ]);\nconst time = Date.now();\nconst store: Store<AppState, Action> = createStore(\n@@ -123,7 +115,7 @@ async function websiteResponder(viewer: Viewer, url: string): Promise<string> {\n({\nnavInfo,\ncurrentUserInfo,\n- sessionID,\n+ sessionID: viewer.sessionID,\nverifyField: verificationResult && verificationResult.field,\nresetPasswordUsername:\nverificationResult && verificationResult.resetPasswordUsername\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/session/cookies.js",
"new_path": "server/src/session/cookies.js",
"diff": "@@ -16,6 +16,7 @@ import {\ntype PlatformDetails,\nisDeviceType,\n} from 'lib/types/device-types';\n+import type { CalendarQuery } from 'lib/types/entry-types';\nimport bcrypt from 'twin-bcrypt';\nimport url from 'url';\n@@ -32,6 +33,7 @@ import createIDs from '../creators/id-creator';\nimport { assertSecureRequest } from '../utils/security-utils';\nimport { deleteCookie } from '../deleters/cookie-deleters';\nimport { handleAsyncPromise } from '../responders/handlers';\n+import { createFilter } from '../creators/filter-creator';\nconst { baseDomain, basePath, https } = urlFacts;\n@@ -463,6 +465,20 @@ async function createNewUserCookie(\n};\n}\n+// This gets called after createNewUserCookie and from websiteResponder. If the\n+// Viewer's sessionIdentifierType is COOKIE_ID then the cookieID is used as the\n+// session identifier; otherwise, a new ID is create for the session.\n+async function setNewSession(viewer: Viewer, calendarQuery: CalendarQuery) {\n+ let sessionID;\n+ if (viewer.sessionIdentifierType === sessionIdentifierTypes.COOKIE_ID) {\n+ sessionID = viewer.cookieID;\n+ } else {\n+ [ sessionID ] = await createIDs(\"sessions\", 1);\n+ }\n+ viewer.setSessionID(sessionID);\n+ await createFilter(viewer, calendarQuery);\n+}\n+\nasync function extendCookieLifespan(cookieID: string) {\nconst time = Date.now();\nconst query = SQL`\n@@ -556,6 +572,7 @@ export {\nfetchViewerForHomeRequest,\ncreateNewAnonymousCookie,\ncreateNewUserCookie,\n+ setNewSession,\nrecordDeliveredUpdate,\naddCookieToJSONResponse,\naddCookieToHomeResponse,\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/session/viewer.js",
"new_path": "server/src/session/viewer.js",
"diff": "@@ -147,6 +147,9 @@ class Viewer {\nreturn sessionIdentifierType;\n}\n+ // This is used in the case of sessionIdentifierTypes.BODY_SESSION_ID only.\n+ // It will be falsey otherwise. Use session below if you want the actual\n+ // session identifier in all cases.\nget sessionID(): ?string {\nreturn this.data.sessionID;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/account-updaters.js",
"new_path": "server/src/updaters/account-updaters.js",
"diff": "@@ -25,7 +25,7 @@ import { createNewUserCookie } from '../session/cookies';\nimport { fetchMessageInfos } from '../fetchers/message-fetchers';\nimport { fetchEntryInfos } from '../fetchers/entry-fetchers';\nimport { verifyCalendarQueryThreadIDs } from '../responders/entry-responders';\n-import { createFilter } from '../creators/filter-creator';\n+import { setNewSession } from '../session/cookies';\nasync function accountUpdater(\nviewer: Viewer,\n@@ -181,6 +181,9 @@ async function updatePassword(\nclearVerifyCodes(verificationResult),\n]);\nviewer.setNewCookie(userViewerData);\n+ if (calendarQuery) {\n+ await setNewSession(viewer, calendarQuery);\n+ }\nconst threadCursors = {};\nfor (let watchedThreadID of request.watchedIDs) {\n@@ -195,7 +198,6 @@ async function updatePassword(\ndefaultNumberPerThread,\n),\ncalendarQuery ? fetchEntryInfos(viewer, calendarQuery) : undefined,\n- calendarQuery ? createFilter(viewer, calendarQuery) : undefined,\n]);\nconst rawEntryInfos = entriesResult ? entriesResult.rawEntryInfos : null;\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | setNewSession function that generates new sessionIDs |
129,187 | 13.09.2018 14:21:08 | 14,400 | 2a027858f34ea753cea64469ab26b4ec1d2efafa | [server] filters -> sessions | [
{
"change_type": "RENAME",
"old_path": "server/src/creators/filter-creator.js",
"new_path": "server/src/creators/session-creator.js",
"diff": "@@ -5,20 +5,19 @@ import type { CalendarQuery } from 'lib/types/entry-types';\nimport { dbQuery, SQL } from '../database';\n-// \"Filter\" here refers to the \"filters\" table in MySQL, which stores\n-// CalendarQueries on a per-session basis\n-async function createFilter(\n+async function createSession(\nviewer: Viewer,\ncalendarQuery: CalendarQuery,\n): Promise<void> {\nconst row = [\n- viewer.id,\nviewer.session,\n+ viewer.userID,\n+ viewer.cookieID,\nJSON.stringify(calendarQuery),\nDate.now(),\n];\nconst query = SQL`\n- INSERT INTO filters (user, session, query, time)\n+ INSERT INTO sessions (id, user, cookie, query, time)\nVALUES ${[row]}\nON DUPLICATE KEY UPDATE query = VALUES(query), time = VALUES(time)\n`;\n@@ -26,5 +25,5 @@ async function createFilter(\n}\nexport {\n- createFilter,\n+ createSession,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/update-creator.js",
"new_path": "server/src/creators/update-creator.js",
"diff": "@@ -53,7 +53,7 @@ import {\nfetchEntryInfos,\nfetchEntryInfosByID,\n} from '../fetchers/entry-fetchers';\n-import { fetchCurrentFilter } from '../fetchers/filter-fetchers';\n+import { fetchSessionCalendarQuery } from '../fetchers/session-fetchers';\nimport { fetchUserInfos } from '../fetchers/user-fetchers';\nexport type ViewerInfo =\n@@ -337,7 +337,7 @@ async function fetchUpdateInfosWithUpdateDatas(\n// This should only ever happen for \"legacy\" clients who call in without\n// providing this information. These clients wouldn't know how to deal with\n// the corresponding UpdateInfos anyways, so no reason to be worried.\n- calendarQuery = await fetchCurrentFilter(viewerInfo.viewer);\n+ calendarQuery = await fetchSessionCalendarQuery(viewerInfo.viewer);\n}\nif (!calendarQuery) {\ncalendarQuery = defaultCalendarQuery();\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/cron.js",
"new_path": "server/src/cron.js",
"diff": "@@ -15,7 +15,7 @@ import { deleteOrphanedMessages } from './deleters/message-deleters';\nimport { deleteOrphanedFocused } from './deleters/activity-deleters';\nimport { deleteOrphanedNotifs } from './deleters/notif-deleters';\nimport { deleteExpiredUpdates } from './deleters/update-deleters';\n-import { deleteOrphanedFilters } from './deleters/filter-deleters';\n+import { deleteOrphanedSessions } from './deleters/session-deleters';\nimport { backupDB } from './backups';\nif (cluster.isMaster) {\n@@ -37,7 +37,7 @@ if (cluster.isMaster) {\nawait deleteOrphanedFocused();\nawait deleteOrphanedNotifs();\nawait deleteExpiredUpdates();\n- await deleteOrphanedFilters();\n+ await deleteOrphanedSessions();\n} catch (e) {\nconsole.warn(\n\"encountered error while trying to clean database\",\n"
},
{
"change_type": "DELETE",
"old_path": "server/src/deleters/filter-deleters.js",
"new_path": null,
"diff": "-// @flow\n-\n-import { dbQuery, SQL } from '../database';\n-\n-async function deleteOrphanedFilters(): Promise<void> {\n- // Note that since the f.session = c.id comparison compares a VARCHAR with an\n- // INT type, MySQL will caste the former to an INT. This means it will parse\n- // off any prefixed numeral characters, and ignore anything after the first\n- // non-numeral, which is exactly what we want.\n- await dbQuery(SQL`\n- DELETE f\n- FROM filters f\n- LEFT JOIN users u ON u.id = f.user\n- LEFT JOIN cookies c ON f.session = c.id\n- WHERE c.id IS NULL OR u.id IS NULL\n- `);\n-}\n-\n-export {\n- deleteOrphanedFilters,\n-};\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "server/src/deleters/session-deleters.js",
"diff": "+// @flow\n+\n+import { dbQuery, SQL } from '../database';\n+\n+async function deleteOrphanedSessions(): Promise<void> {\n+ await dbQuery(SQL`\n+ DELETE s, i\n+ FROM filters s\n+ LEFT JOIN ids i ON i.id = s.id\n+ LEFT JOIN users u ON u.id = s.user\n+ LEFT JOIN cookies c ON c.id = s.cookie\n+ WHERE c.id IS NULL OR u.id IS NULL\n+ `);\n+}\n+\n+export {\n+ deleteOrphanedSessions,\n+};\n"
},
{
"change_type": "RENAME",
"old_path": "server/src/fetchers/filter-fetchers.js",
"new_path": "server/src/fetchers/session-fetchers.js",
"diff": "@@ -7,13 +7,13 @@ import { dbQuery, SQL } from '../database';\n// \"Filter\" here refers to the \"filters\" table in MySQL, which stores\n// CalendarQueries on a per-session basis\n-async function fetchCurrentFilter(\n+async function fetchSessionCalendarQuery(\nviewer: Viewer,\n): Promise<?CalendarQuery> {\nconst query = SQL`\nSELECT query\n- FROM filters\n- WHERE user = ${viewer.id} AND session = ${viewer.session}\n+ FROM sessions\n+ WHERE user = ${viewer.userID} AND id = ${viewer.session}\n`;\nconst [ result ] = await dbQuery(query);\nif (result.length === 0) {\n@@ -23,26 +23,26 @@ async function fetchCurrentFilter(\nreturn row.query;\n}\n-type CalendarFilterResult = {|\n+type CalendarSessionResult = {|\nuserID: string,\nsession: string,\ncalendarQuery: CalendarQuery,\n|};\n-async function fetchFiltersForThread(\n+async function fetchActiveSessionsForThread(\nthreadID: string,\n-): Promise<CalendarFilterResult[]> {\n+): Promise<CalendarSessionResult[]> {\nconst query = SQL`\n- SELECT f.user, f.session, f.query\n+ SELECT s.id, s.user, s.query\nFROM memberships m\n- LEFT JOIN filters f ON f.user = m.user\n- WHERE m.thread = ${threadID} AND f.query IS NOT NULL\n+ LEFT JOIN sessions s ON s.user = m.user\n+ WHERE m.thread = ${threadID} AND s.query IS NOT NULL\n`;\nconst [ result ] = await dbQuery(query);\nconst filters = [];\nfor (let row of result) {\nfilters.push({\nuserID: row.user.toString(),\n- session: row.session,\n+ session: row.id,\ncalendarQuery: row.query,\n});\n}\n@@ -50,6 +50,6 @@ async function fetchFiltersForThread(\n}\nexport {\n- fetchCurrentFilter,\n- fetchFiltersForThread,\n+ fetchSessionCalendarQuery,\n+ fetchActiveSessionsForThread,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/entry-responders.js",
"new_path": "server/src/responders/entry-responders.js",
"diff": "@@ -40,7 +40,7 @@ import {\nimport createEntry from '../creators/entry-creator';\nimport { updateEntry } from '../updaters/entry-updaters';\nimport { deleteEntry, restoreEntry } from '../deleters/entry-deleters';\n-import { updateFilterIfChanged } from '../updaters/filter-updaters';\n+import { updateSessionCalendarQuery } from '../updaters/session-updaters';\nconst entryQueryInputValidator = tShape({\nnavID: t.maybe(t.String),\n@@ -217,11 +217,12 @@ async function calendarQueryUpdateResponder(\nthrow new ServerError('not_logged_in');\n}\n- // TODO: updateFilterIfChanged should actually return the EntryInfos directly,\n- // and should only include the diff between the previous and the new filter.\n+ // TODO: updateSessionCalendarQuery should actually return the EntryInfos\n+ // directly, and should only include the diff between the previous and the new\n+ // filter.\nconst [ response ] = await Promise.all([\nfetchEntryInfos(viewer, request),\n- updateFilterIfChanged(viewer, request),\n+ updateSessionCalendarQuery(viewer, request),\n]);\nreturn {\nrawEntryInfos: response.rawEntryInfos,\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -47,7 +47,7 @@ import {\n} from '../session/cookies';\nimport { deviceTokenUpdater } from '../updaters/device-token-updaters';\nimport createReport from '../creators/report-creator';\n-import { updateFilterIfChanged } from '../updaters/filter-updaters';\n+import { updateSessionCalendarQuery } from '../updaters/session-updaters';\nimport {\ndeleteUpdatesBeforeTimeTargettingCookie,\n} from '../deleters/update-deleters';\n@@ -221,7 +221,7 @@ async function pingResponder(\nfetchEntryInfos(viewer, calendarQuery),\nfetchCurrentUserInfo(viewer),\nviewer.loggedIn && calendarQuery\n- ? updateFilterIfChanged(viewer, calendarQuery)\n+ ? updateSessionCalendarQuery(viewer, calendarQuery)\n: undefined,\n]);\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/session/cookies.js",
"new_path": "server/src/session/cookies.js",
"diff": "@@ -33,7 +33,7 @@ import createIDs from '../creators/id-creator';\nimport { assertSecureRequest } from '../utils/security-utils';\nimport { deleteCookie } from '../deleters/cookie-deleters';\nimport { handleAsyncPromise } from '../responders/handlers';\n-import { createFilter } from '../creators/filter-creator';\n+import { createSession } from '../creators/session-creator';\nconst { baseDomain, basePath, https } = urlFacts;\n@@ -476,7 +476,7 @@ async function setNewSession(viewer: Viewer, calendarQuery: CalendarQuery) {\n[ sessionID ] = await createIDs(\"sessions\", 1);\n}\nviewer.setSessionID(sessionID);\n- await createFilter(viewer, calendarQuery);\n+ await createSession(viewer, calendarQuery);\n}\nasync function extendCookieLifespan(cookieID: string) {\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/entry-updaters.js",
"new_path": "server/src/updaters/entry-updaters.js",
"diff": "@@ -29,9 +29,9 @@ import {\nimport createIDs from '../creators/id-creator';\nimport createMessages from '../creators/message-creator';\nimport {\n- fetchCurrentFilter,\n- fetchFiltersForThread,\n-} from '../fetchers/filter-fetchers';\n+ fetchSessionCalendarQuery,\n+ fetchActiveSessionsForThread,\n+} from '../fetchers/session-fetchers';\nimport { createUpdates } from '../creators/update-creator';\nconst defaultUpdateCreationResponse = { viewerUpdates: [], userInfos: [] };\n@@ -194,8 +194,8 @@ async function createUpdateDatasForChangedEntryInfo(\nconst entryID = entryInfo.id;\ninvariant(entryID, \"should be set\");\nconst [ fetchedFilters, fetchedCalendarQuery ] = await Promise.all([\n- fetchFiltersForThread(entryInfo.threadID),\n- inputCalendarQuery ? undefined : fetchCurrentFilter(viewer),\n+ fetchActiveSessionsForThread(entryInfo.threadID),\n+ inputCalendarQuery ? undefined : fetchSessionCalendarQuery(viewer),\n]);\nlet calendarQuery;\n"
},
{
"change_type": "DELETE",
"old_path": "server/src/updaters/filter-updaters.js",
"new_path": null,
"diff": "-// @flow\n-\n-import type { Viewer } from '../session/viewer';\n-import type { CalendarQuery } from 'lib/types/entry-types';\n-\n-import _isEqual from 'lodash/fp/isEqual';\n-\n-import { dbQuery, SQL } from '../database';\n-import { fetchCurrentFilter } from '../fetchers/filter-fetchers';\n-import { createFilter } from '../creators/filter-creator';\n-\n-// \"Filter\" here refers to the \"filters\" table in MySQL, which stores\n-// CalendarQueries on a per-cookie basis\n-async function updateFilterIfChanged(\n- viewer: Viewer,\n- newCalendarQuery: CalendarQuery,\n-): Promise<void> {\n- const oldCalendarQuery = await fetchCurrentFilter(viewer);\n- if (oldCalendarQuery && _isEqual(oldCalendarQuery)(newCalendarQuery)) {\n- return;\n- }\n- await createFilter(viewer, newCalendarQuery);\n-}\n-\n-export {\n- updateFilterIfChanged,\n-};\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "server/src/updaters/session-updaters.js",
"diff": "+// @flow\n+\n+import type { Viewer } from '../session/viewer';\n+import type { CalendarQuery } from 'lib/types/entry-types';\n+\n+import _isEqual from 'lodash/fp/isEqual';\n+\n+import { dbQuery, SQL } from '../database';\n+import { fetchSessionCalendarQuery } from '../fetchers/session-fetchers';\n+import { createSession } from '../creators/session-creator';\n+\n+async function updateSessionCalendarQuery(\n+ viewer: Viewer,\n+ newCalendarQuery: CalendarQuery,\n+): Promise<void> {\n+ const oldCalendarQuery = await fetchSessionCalendarQuery(viewer);\n+ if (oldCalendarQuery && _isEqual(oldCalendarQuery)(newCalendarQuery)) {\n+ return;\n+ }\n+ await createSession(viewer, newCalendarQuery);\n+}\n+\n+export {\n+ updateSessionCalendarQuery,\n+};\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] filters -> sessions |
129,187 | 13.09.2018 14:51:26 | 14,400 | 10aeeef2bb3283897e6a4c53f29ea3b2a539baf0 | [server] Update deleters for new cookies/sessions/focused table structures | [
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/account-deleters.js",
"new_path": "server/src/deleters/account-deleters.js",
"diff": "@@ -38,7 +38,7 @@ async function deleteAccount(\n// TODO: if this results in any orphaned orgs, convert them to chats\nconst deletedUserID = viewer.userID;\nconst deletionQuery = SQL`\n- DELETE u, iu, v, iv, c, ic, m, f, n, ino, up, iup, fi\n+ DELETE u, iu, v, iv, c, ic, m, f, n, ino, up, iup, s, is\nFROM users u\nLEFT JOIN ids iu ON iu.id = u.id\nLEFT JOIN verifications v ON v.user = u.id\n@@ -51,7 +51,8 @@ async function deleteAccount(\nLEFT JOIN ids ino ON ino.id = n.id\nLEFT JOIN updates up ON up.user = u.id\nLEFT JOIN ids iup ON iup.id = up.id\n- LEFT JOIN filters fi ON fi.user = u.id\n+ LEFT JOIN sessions s ON u.id = s.user\n+ LEFT JOIN ids is ON is.id = s.id\nWHERE u.id = ${deletedUserID}\n`;\nconst [ anonymousViewerData ] = await Promise.all([\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/activity-deleters.js",
"new_path": "server/src/deleters/activity-deleters.js",
"diff": "@@ -8,8 +8,8 @@ async function deleteOrphanedFocused(): Promise<void> {\nFROM focused f\nLEFT JOIN threads t ON t.id = f.thread\nLEFT JOIN users u ON u.id = f.user\n- LEFT JOIN cookies c ON c.id = f.cookie\n- WHERE t.id IS NULL OR u.id IS NULL OR c.id IS NULL\n+ LEFT JOIN sessions s ON s.id = f.session\n+ WHERE t.id IS NULL OR u.id IS NULL OR s.id IS NULL\n`);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/cookie-deleters.js",
"new_path": "server/src/deleters/cookie-deleters.js",
"diff": "@@ -6,18 +6,15 @@ import { dbQuery, SQL, mergeOrConditions } from '../database';\nimport { fetchDeviceTokensForCookie } from '../fetchers/device-token-fetchers';\nasync function deleteCookie(cookieID: string): Promise<void> {\n- // Note that since the fi.session = c.id and u.target = c.id comparisons\n- // compare a VARCHAR with an INT type, MySQL will caste the former to an INT.\n- // This means it will parse off any prefixed numeral characters, and ignore\n- // anything after the first non-numeral, which is exactly what we want.\nawait dbQuery(SQL`\n- DELETE c, i, fo, fi, u, iu\n+ DELETE c, i, u, iu, s, is, fo\nFROM cookies c\nLEFT JOIN ids i ON i.id = c.id\n- LEFT JOIN focused fo ON fo.cookie = c.id\n- LEFT JOIN filters fi ON fi.session = c.id\nLEFT JOIN updates u ON u.target = c.id\nLEFT JOIN ids iu ON iu.id = u.id\n+ LEFT JOIN sessions s ON s.cookie = c.id\n+ LEFT JOIN ids is ON is.id = s.id\n+ LEFT JOIN focused fo ON fo.session = s.id\nWHERE c.id = ${cookieID}\n`);\n}\n@@ -33,18 +30,15 @@ async function deleteCookiesOnLogOut(\nconditions.push(SQL`c.device_token = ${deviceToken}`);\n}\n- // Note that since the fi.session = c.id and u.target = c.id comparisons\n- // compare a VARCHAR with an INT type, MySQL will caste the former to an INT.\n- // This means it will parse off any prefixed numeral characters, and ignore\n- // anything after the first non-numeral, which is exactly what we want.\nconst query = SQL`\n- DELETE c, i, fo, fi, u, iu\n+ DELETE c, i, u, iu, s, is, fo\nFROM cookies c\nLEFT JOIN ids i ON i.id = c.id\n- LEFT JOIN focused fo ON fo.cookie = c.id\n- LEFT JOIN filters fi ON fi.session = c.id\nLEFT JOIN updates u ON u.target = c.id\nLEFT JOIN ids iu ON iu.id = u.id\n+ LEFT JOIN sessions s ON s.cookie = c.id\n+ LEFT JOIN ids is ON is.id = s.id\n+ LEFT JOIN focused fo ON fo.session = s.id\nWHERE c.user = ${userID} AND\n`;\nquery.append(mergeOrConditions(conditions));\n@@ -54,18 +48,15 @@ async function deleteCookiesOnLogOut(\nasync function deleteExpiredCookies(): Promise<void> {\nconst earliestInvalidLastUpdate = Date.now() - cookieLifetime;\n- // Note that since the fi.session = c.id and u.target = c.id comparisons\n- // compare a VARCHAR with an INT type, MySQL will caste the former to an INT.\n- // This means it will parse off any prefixed numeral characters, and ignore\n- // anything after the first non-numeral, which is exactly what we want.\nconst query = SQL`\n- DELETE c, i, fo, fi, u, iu\n+ DELETE c, i, u, iu, s, is, fo\nFROM cookies c\nLEFT JOIN ids i ON i.id = c.id\n- LEFT JOIN focused fo ON fo.cookie = c.id\n- LEFT JOIN filters fi ON fi.session = c.id\nLEFT JOIN updates u ON u.target = c.id\nLEFT JOIN ids iu ON iu.id = u.id\n+ LEFT JOIN sessions s ON s.cookie = c.id\n+ LEFT JOIN ids is ON is.id = s.id\n+ LEFT JOIN focused fo ON fo.session = s.id\nWHERE c.last_used <= ${earliestInvalidLastUpdate}\n`;\nawait dbQuery(query);\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/session-deleters.js",
"new_path": "server/src/deleters/session-deleters.js",
"diff": "@@ -4,9 +4,10 @@ import { dbQuery, SQL } from '../database';\nasync function deleteOrphanedSessions(): Promise<void> {\nawait dbQuery(SQL`\n- DELETE s, i\n- FROM filters s\n+ DELETE s, i, f\n+ FROM sessions s\nLEFT JOIN ids i ON i.id = s.id\n+ LEFT JOIN focused f ON f.session = s.id\nLEFT JOIN users u ON u.id = s.user\nLEFT JOIN cookies c ON c.id = s.cookie\nWHERE c.id IS NULL OR u.id IS NULL\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/update-deleters.js",
"new_path": "server/src/deleters/update-deleters.js",
"diff": "@@ -28,9 +28,9 @@ async function deleteExpiredUpdates(): Promise<void> {\nLEFT JOIN ids i ON i.id = u.id\nLEFT JOIN (\nSELECT u.id AS user,\n- COALESCE(MIN(c.last_update), 99999999999999) AS oldest_last_update\n- FROM cookies c\n- RIGHT JOIN users u ON u.id = c.user\n+ COALESCE(MIN(s.last_update), 99999999999999) AS oldest_last_update\n+ FROM sessions s\n+ RIGHT JOIN users u ON u.id = s.user\nGROUP BY u.id\n) o ON o.user = u.user\nWHERE o.user IS NULL OR u.time < o.oldest_last_update\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Update deleters for new cookies/sessions/focused table structures |
129,187 | 13.09.2018 14:52:36 | 14,400 | a6da417a22a215100eabfee84d7d798952037940 | [server] sessions table owns last_update now instead of cookies table | [
{
"change_type": "MODIFY",
"old_path": "server/src/creators/account-creator.js",
"new_path": "server/src/creators/account-creator.js",
"diff": "@@ -82,7 +82,7 @@ async function createAccount(\nVALUES ${[newUserRow]}\n`;\nconst [ userViewerData ] = await Promise.all([\n- createNewUserCookie(id, 0, request.platformDetails),\n+ createNewUserCookie(id, request.platformDetails),\ndeleteCookie(viewer.getData().cookieID),\ndbQuery(newUserQuery),\nsendEmailAddressVerificationEmail(\n@@ -94,7 +94,7 @@ async function createAccount(\n]);\nviewer.setNewCookie(userViewerData);\nif (calendarQuery) {\n- await setNewSession(viewer, calendarQuery);\n+ await setNewSession(viewer, calendarQuery, 0);\n}\nconst [\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/session-creator.js",
"new_path": "server/src/creators/session-creator.js",
"diff": "@@ -8,6 +8,7 @@ import { dbQuery, SQL } from '../database';\nasync function createSession(\nviewer: Viewer,\ncalendarQuery: CalendarQuery,\n+ initialLastUpdate: number,\n): Promise<void> {\nconst row = [\nviewer.session,\n@@ -15,9 +16,10 @@ async function createSession(\nviewer.cookieID,\nJSON.stringify(calendarQuery),\nDate.now(),\n+ initialLastUpdate,\n];\nconst query = SQL`\n- INSERT INTO sessions (id, user, cookie, query, time)\n+ INSERT INTO sessions (id, user, cookie, query, time, last_update)\nVALUES ${[row]}\nON DUPLICATE KEY UPDATE query = VALUES(query), time = VALUES(time)\n`;\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -242,7 +242,7 @@ async function pingResponder(\n{ ...threadsResult, calendarQuery },\n);\npromises.recordDelivery = recordDeliveredUpdate(\n- viewer.cookieID,\n+ viewer.session,\noldUpdatesCurrentAsOf,\n);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/user-responders.js",
"new_path": "server/src/responders/user-responders.js",
"diff": "@@ -227,12 +227,12 @@ async function logInResponder(\nconst newPingTime = Date.now();\nconst [ userViewerData ] = await Promise.all([\n- createNewUserCookie(id, newPingTime, request.platformDetails),\n+ createNewUserCookie(id, request.platformDetails),\ndeleteCookie(viewer.getData().cookieID),\n]);\nviewer.setNewCookie(userViewerData);\nif (calendarQuery) {\n- await setNewSession(viewer, calendarQuery);\n+ await setNewSession(viewer, calendarQuery, newPingTime);\n}\nconst threadCursors = {};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/website-responders.js",
"new_path": "server/src/responders/website-responders.js",
"diff": "@@ -106,10 +106,9 @@ async function websiteResponder(viewer: Viewer, url: string): Promise<string> {\n// TODO if thread currently in view, call activityUpdater with that thread\nif (viewer.loggedIn) {\n- await setNewSession(viewer, calendarQuery);\n+ await setNewSession(viewer, calendarQuery, initialTime);\n}\n- const time = Date.now();\nconst store: Store<AppState, Action> = createStore(\nreducer,\n({\n@@ -125,7 +124,7 @@ async function websiteResponder(viewer: Viewer, url: string): Promise<string> {\nentryInfos: _keyBy('id')(rawEntryInfos),\ndaysToEntries: daysToEntriesFromEntryInfos(rawEntryInfos),\nactualizedCalendarQuery: calendarQuery,\n- lastUserInteractionCalendar: time,\n+ lastUserInteractionCalendar: initialTime,\ninconsistencyResponses: [],\n},\nthreadStore: {\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/session/cookies.js",
"new_path": "server/src/session/cookies.js",
"diff": "@@ -392,12 +392,11 @@ async function createNewAnonymousCookie(\nplatform,\ntime,\ntime,\n- 0,\nversionsString,\n];\nconst query = SQL`\nINSERT INTO cookies(id, hash, user, platform, creation_time, last_used,\n- last_update, versions)\n+ versions)\nVALUES ${[cookieRow]}\n`;\nawait dbQuery(query);\n@@ -425,7 +424,6 @@ async function createNewAnonymousCookie(\n// result is never passed directly to the Viewer constructor.\nasync function createNewUserCookie(\nuserID: string,\n- initialLastUpdate: number,\nplatformDetails: ?PlatformDetails,\n): Promise<UserViewerData> {\nconst time = Date.now();\n@@ -443,12 +441,11 @@ async function createNewUserCookie(\nplatform,\ntime,\ntime,\n- initialLastUpdate,\nversionsString,\n];\nconst query = SQL`\nINSERT INTO cookies(id, hash, user, platform, creation_time, last_used,\n- last_update, versions)\n+ versions)\nVALUES ${[cookieRow]}\n`;\nawait dbQuery(query);\n@@ -468,7 +465,11 @@ async function createNewUserCookie(\n// This gets called after createNewUserCookie and from websiteResponder. If the\n// Viewer's sessionIdentifierType is COOKIE_ID then the cookieID is used as the\n// session identifier; otherwise, a new ID is create for the session.\n-async function setNewSession(viewer: Viewer, calendarQuery: CalendarQuery) {\n+async function setNewSession(\n+ viewer: Viewer,\n+ calendarQuery: CalendarQuery,\n+ initialLastUpdate: number,\n+): Promise<void> {\nlet sessionID;\nif (viewer.sessionIdentifierType === sessionIdentifierTypes.COOKIE_ID) {\nsessionID = viewer.cookieID;\n@@ -476,7 +477,7 @@ async function setNewSession(viewer: Viewer, calendarQuery: CalendarQuery) {\n[ sessionID ] = await createIDs(\"sessions\", 1);\n}\nviewer.setSessionID(sessionID);\n- await createSession(viewer, calendarQuery);\n+ await createSession(viewer, calendarQuery, initialLastUpdate);\n}\nasync function extendCookieLifespan(cookieID: string) {\n@@ -488,13 +489,13 @@ async function extendCookieLifespan(cookieID: string) {\n}\nasync function recordDeliveredUpdate(\n- cookieID: string,\n+ sessionID: string,\nmostRecentUpdateTimestamp: number,\n) {\nconst query = SQL`\n- UPDATE cookies\n+ UPDATE sessions\nSET last_update = ${mostRecentUpdateTimestamp}\n- WHERE id = ${cookieID}\n+ WHERE id = ${sessionID}\n`;\nawait dbQuery(query);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/account-updaters.js",
"new_path": "server/src/updaters/account-updaters.js",
"diff": "@@ -177,12 +177,12 @@ async function updatePassword(\nconst newPingTime = Date.now();\nconst [ userViewerData ] = await Promise.all([\n- createNewUserCookie(userID, newPingTime, request.platformDetails),\n+ createNewUserCookie(userID, request.platformDetails),\nclearVerifyCodes(verificationResult),\n]);\nviewer.setNewCookie(userViewerData);\nif (calendarQuery) {\n- await setNewSession(viewer, calendarQuery);\n+ await setNewSession(viewer, calendarQuery, newPingTime);\n}\nconst threadCursors = {};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/session-updaters.js",
"new_path": "server/src/updaters/session-updaters.js",
"diff": "@@ -5,19 +5,28 @@ import type { CalendarQuery } from 'lib/types/entry-types';\nimport _isEqual from 'lodash/fp/isEqual';\n+import { ServerError } from 'lib/utils/errors';\n+\nimport { dbQuery, SQL } from '../database';\nimport { fetchSessionCalendarQuery } from '../fetchers/session-fetchers';\n-import { createSession } from '../creators/session-creator';\nasync function updateSessionCalendarQuery(\nviewer: Viewer,\nnewCalendarQuery: CalendarQuery,\n): Promise<void> {\nconst oldCalendarQuery = await fetchSessionCalendarQuery(viewer);\n- if (oldCalendarQuery && _isEqual(oldCalendarQuery)(newCalendarQuery)) {\n+ if (!oldCalendarQuery) {\n+ throw new ServerError('unknown_error');\n+ }\n+ if (_isEqual(oldCalendarQuery)(newCalendarQuery)) {\nreturn;\n}\n- await createSession(viewer, newCalendarQuery);\n+ const query = SQL`\n+ UPDATE sessions\n+ SET query = ${JSON.stringify(newCalendarQuery)}, time = ${Date.now()}\n+ WHERE id = ${viewer.session}\n+ `;\n+ await dbQuery(query);\n}\nexport {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] sessions table owns last_update now instead of cookies table |
129,187 | 13.09.2018 15:12:04 | 14,400 | c603407c8d1225057e06bcd9e5046b0c7b3c4ef6 | [server] Change focused table to be session-based instead of cookie-based | [
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/activity-updaters.js",
"new_path": "server/src/updaters/activity-updaters.js",
"diff": "@@ -121,19 +121,19 @@ async function updateFocusedRows(\nif (threadIDs.length > 0) {\nconst focusedInsertRows = threadIDs.map(threadID => [\nviewer.userID,\n- viewer.cookieID,\n+ viewer.session,\nthreadID,\ntime,\n]);\nawait dbQuery(SQL`\n- INSERT INTO focused (user, cookie, thread, time)\n+ INSERT INTO focused (user, session, thread, time)\nVALUES ${focusedInsertRows}\nON DUPLICATE KEY UPDATE time = VALUES(time)\n`);\n}\nawait dbQuery(SQL`\nDELETE FROM focused\n- WHERE user = ${viewer.userID} AND cookie = ${viewer.cookieID}\n+ WHERE user = ${viewer.userID} AND session = ${viewer.session}\nAND time < ${time}\n`);\n}\n@@ -259,7 +259,7 @@ async function updateActivityTime(viewer: Viewer): Promise<void> {\nconst focusedQuery = SQL`\nUPDATE focused\nSET time = ${time}\n- WHERE user = ${viewer.userID} AND cookie = ${viewer.cookieID}\n+ WHERE user = ${viewer.userID} AND session = ${viewer.session}\n`;\nawait dbQuery(focusedQuery);\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Change focused table to be session-based instead of cookie-based |
129,187 | 13.09.2018 15:22:17 | 14,400 | 4bb70cda347d26ebaea26de43fa0eab8ca595e1e | Use Viewer.session instead of separately passing up sessionID
Also updates the column in the `revisions` table to be called `session` instead of `session_id`. | [
{
"change_type": "MODIFY",
"old_path": "lib/types/entry-types.js",
"new_path": "lib/types/entry-types.js",
"diff": "@@ -85,7 +85,6 @@ export type SaveEntryInfo = {|\nentryID: string,\ntext: string,\nprevText: string,\n- sessionID: string,\ntimestamp: number,\ncalendarQuery: CalendarQuery,\n|};\n@@ -94,7 +93,6 @@ export type SaveEntryRequest = {|\nentryID: string,\ntext: string,\nprevText: string,\n- sessionID: string,\ntimestamp: number,\ncalendarQuery?: CalendarQuery,\n|};\n@@ -117,7 +115,6 @@ export type SaveEntryPayload = {|\nexport type CreateEntryInfo = {|\ntext: string,\n- sessionID: string,\ntimestamp: number,\ndate: string,\nthreadID: string,\n@@ -126,7 +123,6 @@ export type CreateEntryInfo = {|\nexport type CreateEntryRequest = {|\ntext: string,\n- sessionID: string,\ntimestamp: number,\ndate: string,\nthreadID: string,\n@@ -141,27 +137,23 @@ export type CreateEntryResponse = {|\nexport type DeleteEntryInfo = {|\nentryID: string,\nprevText: string,\n- sessionID: string,\ncalendarQuery: CalendarQuery,\n|};\nexport type DeleteEntryRequest = {|\nentryID: string,\nprevText: string,\n- sessionID: string,\ntimestamp: number,\ncalendarQuery?: CalendarQuery,\n|};\nexport type RestoreEntryInfo = {|\nentryID: string,\n- sessionID: string,\ncalendarQuery: CalendarQuery,\n|};\nexport type RestoreEntryRequest = {|\nentryID: string,\n- sessionID: string,\ntimestamp: number,\ncalendarQuery?: CalendarQuery,\n|};\n"
},
{
"change_type": "MODIFY",
"old_path": "native/calendar/entry.react.js",
"new_path": "native/calendar/entry.react.js",
"diff": "@@ -83,7 +83,6 @@ type Props = {\nentryRef: (entryKey: string, entry: ?InternalEntry) => void,\n// Redux state\nthreadInfo: ThreadInfo,\n- sessionID: string,\ncalendarQuery: () => CalendarQuery,\n// Redux dispatch functions\ndispatchActionPayload: DispatchActionPayload,\n@@ -112,7 +111,6 @@ class InternalEntry extends React.Component<Props, State> {\nonPressWhitespace: PropTypes.func.isRequired,\nentryRef: PropTypes.func.isRequired,\nthreadInfo: threadInfoPropType.isRequired,\n- sessionID: PropTypes.string.isRequired,\ncalendarQuery: PropTypes.func.isRequired,\ndispatchActionPayload: PropTypes.func.isRequired,\ndispatchActionPromise: PropTypes.func.isRequired,\n@@ -467,7 +465,6 @@ class InternalEntry extends React.Component<Props, State> {\ntry {\nconst response = await this.props.createEntry({\ntext,\n- sessionID: this.props.sessionID,\ntimestamp: this.props.entryInfo.creationTime,\ndate: dateString(\nthis.props.entryInfo.year,\n@@ -506,7 +503,6 @@ class InternalEntry extends React.Component<Props, State> {\nentryID,\ntext: newText,\nprevText: this.props.entryInfo.text,\n- sessionID: this.props.sessionID,\ntimestamp: Date.now(),\ncalendarQuery: this.props.calendarQuery(),\n});\n@@ -572,7 +568,6 @@ class InternalEntry extends React.Component<Props, State> {\nreturn await this.props.deleteEntry({\nentryID: serverID,\nprevText: this.props.entryInfo.text,\n- sessionID: this.props.sessionID,\ncalendarQuery: this.props.calendarQuery(),\n});\n} else if (this.creating) {\n@@ -684,7 +679,6 @@ registerFetchKey(deleteEntryActionTypes);\nconst Entry = connect(\n(state: AppState, ownProps: { entryInfo: EntryInfoWithHeight }) => ({\nthreadInfo: threadInfoSelector(state)[ownProps.entryInfo.threadID],\n- sessionID: state.sessionID,\ncalendarQuery: nonThreadCalendarQuery(state),\n}),\n{ createEntry, saveEntry, deleteEntry },\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/entry-creator.js",
"new_path": "server/src/creators/entry-creator.js",
"diff": "@@ -65,7 +65,7 @@ async function createEntry(\nviewerID,\nrequest.text,\nrequest.timestamp,\n- request.sessionID,\n+ viewer.session,\nrequest.timestamp,\n0,\n];\n@@ -75,7 +75,7 @@ async function createEntry(\nVALUES ${[entryRow]}\n`;\nconst revisionInsertQuery = SQL`\n- INSERT INTO revisions(id, entry, author, text, creation_time, session_id,\n+ INSERT INTO revisions(id, entry, author, text, creation_time, session,\nlast_update, deleted)\nVALUES ${[revisionRow]}\n`;\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/entry-deleters.js",
"new_path": "server/src/deleters/entry-deleters.js",
"diff": "@@ -24,7 +24,7 @@ import {\nconst lastRevisionQuery = (entryID: string) =>\n(SQL`\n- SELECT r.id, r.author, r.text, r.session_id, r.last_update, r.deleted,\n+ SELECT r.id, r.author, r.text, r.session, r.last_update, r.deleted,\nDAY(d.date) AS day, MONTH(d.date) AS month, YEAR(d.date) AS year,\nd.thread, d.date, e.creation_time, e.creator\nFROM revisions r\n@@ -63,10 +63,7 @@ async function deleteEntry(\nconst text = lastRevisionRow.text;\nconst viewerID = viewer.userID;\n- if (\n- request.sessionID !== lastRevisionRow.session_id &&\n- request.prevText !== text\n- ) {\n+ if (viewer.session !== lastRevisionRow.session && request.prevText !== text) {\nthrow new ServerError(\n'concurrent_modification',\n{ db: text, ui: request.prevText },\n@@ -89,12 +86,12 @@ async function deleteEntry(\nviewerID,\ntext,\nrequest.timestamp,\n- request.sessionID,\n+ viewer.session,\nrequest.timestamp,\n1,\n];\ndbPromises.push(dbQuery(SQL`\n- INSERT INTO revisions(id, entry, author, text, creation_time, session_id,\n+ INSERT INTO revisions(id, entry, author, text, creation_time, session,\nlast_update, deleted)\nVALUES ${[revisionRow]}\n`));\n@@ -174,12 +171,12 @@ async function restoreEntry(\nviewerID,\ntext,\nrequest.timestamp,\n- request.sessionID,\n+ viewer.session,\nrequest.timestamp,\n0,\n];\ndbPromises.push(dbQuery(SQL`\n- INSERT INTO revisions(id, entry, author, text, creation_time, session_id,\n+ INSERT INTO revisions(id, entry, author, text, creation_time, session,\nlast_update, deleted)\nVALUES ${[revisionRow]}\n`));\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/entry-responders.js",
"new_path": "server/src/responders/entry-responders.js",
"diff": "@@ -138,7 +138,7 @@ async function entryRevisionFetchResponder(\nconst createEntryRequestInputValidator = tShape({\ntext: t.String,\n- sessionID: t.String,\n+ sessionID: t.maybe(t.String),\ntimestamp: t.Number,\ndate: tDate,\nthreadID: t.String,\n@@ -158,7 +158,7 @@ const saveEntryRequestInputValidator = tShape({\nentryID: t.String,\ntext: t.String,\nprevText: t.String,\n- sessionID: t.String,\n+ sessionID: t.maybe(t.String),\ntimestamp: t.Number,\ncalendarQuery: t.maybe(newEntryQueryInputValidator),\n});\n@@ -175,7 +175,7 @@ async function entryUpdateResponder(\nconst deleteEntryRequestInputValidator = tShape({\nentryID: t.String,\nprevText: t.String,\n- sessionID: t.String,\n+ sessionID: t.maybe(t.String),\ntimestamp: t.Number,\ncalendarQuery: t.maybe(newEntryQueryInputValidator),\n});\n@@ -191,7 +191,7 @@ async function entryDeletionResponder(\nconst restoreEntryRequestInputValidator = tShape({\nentryID: t.String,\n- sessionID: t.String,\n+ sessionID: t.maybe(t.String),\ntimestamp: t.Number,\ncalendarQuery: t.maybe(newEntryQueryInputValidator),\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/entry-updaters.js",
"new_path": "server/src/updaters/entry-updaters.js",
"diff": "@@ -44,7 +44,7 @@ async function updateEntry(\n}\nconst lastRevisionQuery = SQL`\n- SELECT r.id, r.author, r.text, r.session_id,\n+ SELECT r.id, r.author, r.text, r.session,\nr.last_update, r.deleted, e.text AS entryText\nFROM revisions r\nLEFT JOIN entries e ON r.entry = e.id\n@@ -92,7 +92,7 @@ async function updateEntry(\nlet updateEntry = false;\nif (\nviewerID === lastRevisionRow.author &&\n- request.sessionID === lastRevisionRow.session_id\n+ viewer.session === lastRevisionRow.session\n) {\nif (lastRevisionRow.last_update >= request.timestamp) {\n// Updates got sent out of order and as a result an update newer than us\n@@ -114,7 +114,7 @@ async function updateEntry(\ninsertNewRevision = true;\n}\n} else if (\n- request.sessionID !== lastRevisionRow.session_id &&\n+ viewer.session !== lastRevisionRow.session &&\nrequest.prevText !== lastRevisionRow.text\n) {\nthrow new ServerError(\n@@ -145,13 +145,13 @@ async function updateEntry(\nviewerID,\nrequest.text,\nrequest.timestamp,\n- request.sessionID,\n+ viewer.session,\nrequest.timestamp,\n0,\n];\ndbPromises.push(dbQuery(SQL`\nINSERT INTO revisions(id, entry, author, text, creation_time,\n- session_id, last_update, deleted)\n+ session, last_update, deleted)\nVALUES ${[revisionRow]}\n`));\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "web/calendar/entry.react.js",
"new_path": "web/calendar/entry.react.js",
"diff": "@@ -57,7 +57,6 @@ type Props = {\ntabIndex: number,\n// Redux state\nthreadInfo: ThreadInfo,\n- sessionID: string,\nloggedIn: bool,\ncalendarQuery: () => CalendarQuery,\n// Redux dispatch functions\n@@ -303,7 +302,6 @@ class Entry extends React.PureComponent<Props, State> {\ntry {\nconst response = await this.props.createEntry({\ntext,\n- sessionID: this.props.sessionID,\ntimestamp: this.props.entryInfo.creationTime,\ndate: dateString(\nthis.props.entryInfo.year,\n@@ -342,7 +340,6 @@ class Entry extends React.PureComponent<Props, State> {\nentryID,\ntext: newText,\nprevText: this.props.entryInfo.text,\n- sessionID: this.props.sessionID,\ntimestamp: Date.now(),\ncalendarQuery: this.props.calendarQuery(),\n});\n@@ -413,7 +410,6 @@ class Entry extends React.PureComponent<Props, State> {\nreturn await this.props.deleteEntry({\nentryID: serverID,\nprevText: this.props.entryInfo.text,\n- sessionID: this.props.sessionID,\ncalendarQuery: this.props.calendarQuery(),\n});\n} else if (this.creating) {\n@@ -453,7 +449,6 @@ Entry.propTypes = {\nsetModal: PropTypes.func.isRequired,\ntabIndex: PropTypes.number.isRequired,\nthreadInfo: threadInfoPropType.isRequired,\n- sessionID: PropTypes.string.isRequired,\nloggedIn: PropTypes.bool.isRequired,\ncalendarQuery: PropTypes.func.isRequired,\ndispatchActionPayload: PropTypes.func.isRequired,\n@@ -469,7 +464,6 @@ type OwnProps = {\nexport default connect(\n(state: AppState, ownProps: OwnProps) => ({\nthreadInfo: threadInfoSelector(state)[ownProps.entryInfo.threadID],\n- sessionID: state.sessionID,\nloggedIn: !!(state.currentUserInfo &&\n!state.currentUserInfo.anonymous && true),\ncalendarQuery: nonThreadCalendarQuery(state),\n"
},
{
"change_type": "MODIFY",
"old_path": "web/modals/history/history-entry.react.js",
"new_path": "web/modals/history/history-entry.react.js",
"diff": "@@ -38,7 +38,6 @@ type Props = {\nanimateAndLoadEntry: (entryID: string) => void,\n// Redux state\nthreadInfo: ThreadInfo,\n- sessionID: string,\nloggedIn: bool,\nrestoreLoadingStatus: LoadingStatus,\ncalendarQuery: () => CalendarQuery,\n@@ -139,7 +138,6 @@ class HistoryEntry extends React.PureComponent<Props> {\ninvariant(entryID, \"entry should have ID\");\nconst result = await this.props.restoreEntry({\nentryID,\n- sessionID: this.props.sessionID,\ncalendarQuery: this.props.calendarQuery(),\n});\nthis.props.animateAndLoadEntry(entryID);\n@@ -153,7 +151,6 @@ HistoryEntry.propTypes = {\nonClick: PropTypes.func.isRequired,\nanimateAndLoadEntry: PropTypes.func.isRequired,\nthreadInfo: threadInfoPropType,\n- sessionID: PropTypes.string.isRequired,\nloggedIn: PropTypes.bool.isRequired,\nrestoreLoadingStatus: PropTypes.string.isRequired,\ncalendarQuery: PropTypes.func.isRequired,\n@@ -167,7 +164,6 @@ export default connect(\ninvariant(entryID, \"entryInfo.id (serverID) should be set\");\nreturn {\nthreadInfo: threadInfoSelector(state)[ownProps.entryInfo.threadID],\n- sessionID: state.sessionID,\nloggedIn: !!(state.currentUserInfo &&\n!state.currentUserInfo.anonymous && true),\nrestoreLoadingStatus: createLoadingStatusSelector(\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Use Viewer.session instead of separately passing up sessionID
Also updates the column in the `revisions` table to be called `session` instead of `session_id`. |
129,187 | 13.09.2018 21:45:27 | 14,400 | c1a9e5305ac3ba1c7ec464bc5761ea7df5a7beb6 | Forgot to enabled Flow in objects.js... | [
{
"change_type": "MODIFY",
"old_path": "lib/utils/objects.js",
"new_path": "lib/utils/objects.js",
"diff": "+// @flow\n+\nfunction findMaximumDepth(obj: Object): ?{ path: string, depth: number } {\nlet longestPath = null;\nlet longestDepth = null\n@@ -27,13 +29,13 @@ function findMaximumDepth(obj: Object): ?{ path: string, depth: number } {\nreturn { path: longestPath, depth: longestDepth };\n}\n-type Map<T> = {[key: Id]: T};\n-function values<T>(map: Map<T>): T[] {\n+type Map<K, T> = {[key: K]: T};\n+function values<K, T>(map: Map<K, T>): T[] {\nreturn Object.values\n? // https://github.com/facebook/flow/issues/2221\n// $FlowFixMe - Object.values currently does not have good flow support\nObject.values(map)\n- : Object.keys(map).map((key: Id): T => map[key]);\n+ : Object.keys(map).map((key: K): T => map[key]);\n}\nexport {\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/session/cookies.js",
"new_path": "server/src/session/cookies.js",
"diff": "@@ -17,6 +17,7 @@ import {\nisDeviceType,\n} from 'lib/types/device-types';\nimport type { CalendarQuery } from 'lib/types/entry-types';\n+import type { UserInfo } from 'lib/types/user-types';\nimport bcrypt from 'twin-bcrypt';\nimport url from 'url';\n@@ -342,7 +343,7 @@ async function addSessionChangeInfoToResult(\nsessionChange = ({\ncookieInvalidated: true,\nthreadInfos,\n- userInfos: values(userInfos),\n+ userInfos: (values(userInfos).map(a => a): UserInfo[]),\ncurrentUserInfo: {\nid: viewer.cookieID,\nanonymous: true,\n@@ -352,7 +353,7 @@ async function addSessionChangeInfoToResult(\nsessionChange = ({\ncookieInvalidated: false,\nthreadInfos,\n- userInfos: values(userInfos),\n+ userInfos: (values(userInfos).map(a => a): UserInfo[]),\n}: SessionChange);\n}\nif (viewer.cookieSource === cookieSources.BODY) {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Forgot to enabled Flow in objects.js... |
129,187 | 13.09.2018 22:47:01 | 14,400 | e2dc9328824c74d1d0a294e1d62dd5388fd296ed | [server] Introducing scripts folder and first step of session migration script | [
{
"change_type": "MODIFY",
"old_path": "server/package.json",
"new_path": "server/package.json",
"diff": "\"scripts\": {\n\"babel\": \"babel src/ --out-dir dist/ --ignore 'lib/flow-typed','lib/node_modules','lib/package.json','web/flow-typed','web/node_modules','web/package.json','web/dist/hot','web/dist/dev.build.js','web/dist/prod.**.build.js','web/dist/prod.build.css','web/webpack.config.js','web/account-bar.react.js','web/app.react.js','web/calendar','web/chat','web/flow','web/loading-indicator.react.js','web/modals','web/root.js','web/router-history.js','web/script.js','web/selectors/chat-selectors.js','web/selectors/entry-selectors.js','web/splash','web/style.css','web/vector-utils.js','web/vectors.react.js' --copy-files\",\n\"prod\": \"node --experimental-modules --loader ./loader.mjs dist/server\",\n- \"dev\": \"NODE_ENV=dev concurrently \\\"npm run babel -- --watch\\\" \\\"nodemon -e js,json,build --watch dist --experimental-modules --loader ./loader.mjs dist/server\\\"\"\n+ \"dev\": \"NODE_ENV=dev concurrently \\\"npm run babel -- --watch\\\" \\\"nodemon -e js,json,build --watch dist --experimental-modules --loader ./loader.mjs dist/server\\\"\",\n+ \"script\": \"node --experimental-modules --loader ./loader.mjs\"\n},\n\"author\": \"\",\n\"license\": \"ISC\",\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/database.js",
"new_path": "server/src/database.js",
"diff": "@@ -71,6 +71,7 @@ function rawSQL(statement: SQLStatement) {\n}\nexport {\n+ pool,\nSQL,\nSQLStatement,\nappendSQLArray,\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "server/src/scripts/session-migration.js",
"diff": "+// @flow\n+\n+import { pool, dbQuery, SQL } from '../database';\n+import createIDs from '../creators/id-creator';\n+\n+async function main() {\n+ try {\n+ await migrateFiltersToSessions();\n+ pool.end();\n+ } catch (e) {\n+ pool.end();\n+ console.warn(e);\n+ }\n+}\n+\n+async function migrateFiltersToSessions() {\n+ await dbQuery(SQL`RENAME TABLE filters TO sessions`);\n+ await dbQuery(SQL`ALTER TABLE sessions ADD id BIGINT(20) NOT NULL FIRST`);\n+ await dbQuery(\n+ SQL`ALTER TABLE sessions ADD cookie BIGINT(20) NOT NULL AFTER user`,\n+ );\n+ await dbQuery(\n+ SQL`ALTER TABLE sessions ADD last_update BIGINT(20) NOT NULL AFTER time`\n+ );\n+\n+ const [ result ] = await dbQuery(SQL`\n+ SELECT s.session, s.user, s.query, s.time,\n+ SUBSTRING_INDEX(s.session, '|', 1) AS cookie,\n+ IF(\n+ s.session LIKE '%|%',\n+ SUBSTRING_INDEX(s.session, '|', -1),\n+ NULL\n+ ) AS old_session_id,\n+ c.last_update\n+ FROM sessions s\n+ LEFT JOIN cookies c ON c.id = SUBSTRING_INDEX(s.session, '|', 1)\n+ WHERE s.id = 0\n+ `);\n+ const newColumns = [], needID = [];\n+ for (let row of result) {\n+ if (!row.old_session_id) {\n+ newColumns.push([\n+ row.cookie,\n+ row.user,\n+ row.cookie,\n+ row.session,\n+ JSON.stringify(row.query),\n+ row.time,\n+ row.last_update,\n+ ]);\n+ } else {\n+ needID.push([\n+ row.user,\n+ row.cookie,\n+ row.session,\n+ JSON.stringify(row.query),\n+ row.time,\n+ row.last_update,\n+ ]);\n+ }\n+ }\n+ const ids = await createIDs(\"sessions\", needID.length);\n+ for (let row of needID) {\n+ const id = ids.pop();\n+ newColumns.push([ id, ...row ]);\n+ }\n+ if (newColumns.length > 0) {\n+ await dbQuery(SQL`\n+ INSERT INTO sessions (id, user, cookie, session, query, time, last_update)\n+ VALUES ${newColumns}\n+ ON DUPLICATE KEY UPDATE\n+ id = VALUES(id),\n+ cookie = VALUES(cookie),\n+ last_update = VALUES(last_update)\n+ `);\n+ }\n+\n+ await dbQuery(SQL`ALTER TABLE sessions DROP PRIMARY KEY`);\n+ await dbQuery(SQL`ALTER TABLE sessions ADD PRIMARY KEY(id)`);\n+ await dbQuery(SQL`ALTER TABLE sessions DROP session`);\n+}\n+\n+main();\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Introducing scripts folder and first step of session migration script |
129,187 | 13.09.2018 22:59:11 | 14,400 | 92e4e7f4914d38c3c164371c8e603a69614ace01 | [server] Initialize uninitialized sessions in pingResponder | [
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -9,6 +9,7 @@ import {\n} from 'lib/types/request-types';\nimport { isDeviceType, assertDeviceType } from 'lib/types/device-types';\nimport { reportTypes } from 'lib/types/report-types';\n+import type { CalendarQuery } from 'lib/types/entry-types';\nimport t from 'tcomb';\nimport invariant from 'invariant';\n@@ -51,6 +52,7 @@ import { updateSessionCalendarQuery } from '../updaters/session-updaters';\nimport {\ndeleteUpdatesBeforeTimeTargettingCookie,\n} from '../deleters/update-deleters';\n+import { createSession } from '../creators/session-creator';\nconst pingRequestInputValidator = tShape({\ncalendarQuery: entryQueryInputValidator,\n@@ -220,9 +222,7 @@ async function pingResponder(\nfetchThreadInfos(viewer),\nfetchEntryInfos(viewer, calendarQuery),\nfetchCurrentUserInfo(viewer),\n- viewer.loggedIn && calendarQuery\n- ? updateSessionCalendarQuery(viewer, calendarQuery)\n- : undefined,\n+ initializeSession(viewer, calendarQuery, oldUpdatesCurrentAsOf),\n]);\nconst promises = {};\n@@ -319,6 +319,30 @@ async function recordThreadPollPushInconsistency(\nawait createReport(viewer, reportCreationRequest);\n}\n+async function initializeSession(\n+ viewer: Viewer,\n+ calendarQuery: ?CalendarQuery,\n+ initialLastUpdate: ?number,\n+): Promise<void> {\n+ if (!viewer.loggedIn || !calendarQuery) {\n+ return;\n+ }\n+\n+ try {\n+ await updateSessionCalendarQuery(viewer, calendarQuery);\n+ return;\n+ } catch (e) {\n+ if (e.message !== \"unknown_error\") {\n+ throw e;\n+ }\n+ }\n+\n+ // If we're still here, that's because the session doesn't exist\n+ if (initialLastUpdate !== null && initialLastUpdate !== undefined) {\n+ await createSession(viewer, calendarQuery, initialLastUpdate);\n+ }\n+}\n+\nexport {\npingResponder,\n};\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Initialize uninitialized sessions in pingResponder |
129,187 | 14.09.2018 13:41:31 | 14,400 | c5e2ad82362fe76e7721671a40bdadd7a254e994 | [server] Completed session migration script | [
{
"change_type": "MODIFY",
"old_path": "server/src/scripts/session-migration.js",
"new_path": "server/src/scripts/session-migration.js",
"diff": "@@ -5,7 +5,10 @@ import createIDs from '../creators/id-creator';\nasync function main() {\ntry {\n- await migrateFiltersToSessions();\n+ await migrateFiltersTableToSessions();\n+ await migrateSessionsRelatedColumns();\n+ await migrateUpdatesTable();\n+ //await cleanup();\npool.end();\n} catch (e) {\npool.end();\n@@ -13,7 +16,7 @@ async function main() {\n}\n}\n-async function migrateFiltersToSessions() {\n+async function migrateFiltersTableToSessions() {\nawait dbQuery(SQL`RENAME TABLE filters TO sessions`);\nawait dbQuery(SQL`ALTER TABLE sessions ADD id BIGINT(20) NOT NULL FIRST`);\nawait dbQuery(\n@@ -74,10 +77,46 @@ async function migrateFiltersToSessions() {\nlast_update = VALUES(last_update)\n`);\n}\n+}\n+\n+async function migrateSessionsRelatedColumns() {\n+ await dbQuery(\n+ SQL`ALTER TABLE focused CHANGE cookie session BIGINT(20) NOT NULL`\n+ );\n+ await dbQuery(SQL`ALTER TABLE revisions DROP session_id`);\n+ await dbQuery(SQL`\n+ ALTER TABLE revisions ADD session BIGINT(20) NOT NULL AFTER creation_time\n+ `);\n+}\n+\n+async function migrateUpdatesTable() {\n+ await dbQuery(SQL`\n+ ALTER TABLE updates CHANGE updater old_updater VARCHAR(255)\n+ CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL\n+ `);\n+ await dbQuery(SQL`\n+ ALTER TABLE updates CHANGE target old_target VARCHAR(255)\n+ CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL\n+ `);\n+ await dbQuery(SQL`\n+ ALTER TABLE updates\n+ ADD updater BIGINT(20) NULL DEFAULT NULL AFTER \\`key\\`,\n+ ADD target BIGINT(20) NULL DEFAULT NULL AFTER updater\n+ `);\n+ await dbQuery(SQL`\n+ UPDATE updates u\n+ LEFT JOIN sessions s1 ON s1.session = u.old_updater\n+ LEFT JOIN sessions s2 ON s2.session = u.old_target\n+ SET u.updater = s1.id, u.target = s2.id\n+ `);\n+}\n+async function cleanup() {\nawait dbQuery(SQL`ALTER TABLE sessions DROP PRIMARY KEY`);\nawait dbQuery(SQL`ALTER TABLE sessions ADD PRIMARY KEY(id)`);\nawait dbQuery(SQL`ALTER TABLE sessions DROP session`);\n+ await dbQuery(SQL`ALTER TABLE cookies DROP last_update`);\n+ await dbQuery(SQL`ALTER TABLE updates DROP old_updater, DROP old_target`);\n}\nmain();\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Completed session migration script |
129,187 | 14.09.2018 13:57:57 | 14,400 | 8dffd6e70c31af8efeee5c934ef74c61c09060df | [server] Avoid SQL keyword "is" | [
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/account-deleters.js",
"new_path": "server/src/deleters/account-deleters.js",
"diff": "@@ -38,7 +38,7 @@ async function deleteAccount(\n// TODO: if this results in any orphaned orgs, convert them to chats\nconst deletedUserID = viewer.userID;\nconst deletionQuery = SQL`\n- DELETE u, iu, v, iv, c, ic, m, f, n, ino, up, iup, s, is\n+ DELETE u, iu, v, iv, c, ic, m, f, n, ino, up, iup, s, si\nFROM users u\nLEFT JOIN ids iu ON iu.id = u.id\nLEFT JOIN verifications v ON v.user = u.id\n@@ -52,7 +52,7 @@ async function deleteAccount(\nLEFT JOIN updates up ON up.user = u.id\nLEFT JOIN ids iup ON iup.id = up.id\nLEFT JOIN sessions s ON u.id = s.user\n- LEFT JOIN ids is ON is.id = s.id\n+ LEFT JOIN ids si ON si.id = s.id\nWHERE u.id = ${deletedUserID}\n`;\nconst [ anonymousViewerData ] = await Promise.all([\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/cookie-deleters.js",
"new_path": "server/src/deleters/cookie-deleters.js",
"diff": "@@ -7,13 +7,13 @@ import { fetchDeviceTokensForCookie } from '../fetchers/device-token-fetchers';\nasync function deleteCookie(cookieID: string): Promise<void> {\nawait dbQuery(SQL`\n- DELETE c, i, u, iu, s, is, fo\n+ DELETE c, i, u, iu, s, si, fo\nFROM cookies c\nLEFT JOIN ids i ON i.id = c.id\nLEFT JOIN updates u ON u.target = c.id\nLEFT JOIN ids iu ON iu.id = u.id\nLEFT JOIN sessions s ON s.cookie = c.id\n- LEFT JOIN ids is ON is.id = s.id\n+ LEFT JOIN ids si ON si.id = s.id\nLEFT JOIN focused fo ON fo.session = s.id\nWHERE c.id = ${cookieID}\n`);\n@@ -31,13 +31,13 @@ async function deleteCookiesOnLogOut(\n}\nconst query = SQL`\n- DELETE c, i, u, iu, s, is, fo\n+ DELETE c, i, u, iu, s, si, fo\nFROM cookies c\nLEFT JOIN ids i ON i.id = c.id\nLEFT JOIN updates u ON u.target = c.id\nLEFT JOIN ids iu ON iu.id = u.id\nLEFT JOIN sessions s ON s.cookie = c.id\n- LEFT JOIN ids is ON is.id = s.id\n+ LEFT JOIN ids si ON si.id = s.id\nLEFT JOIN focused fo ON fo.session = s.id\nWHERE c.user = ${userID} AND\n`;\n@@ -49,13 +49,13 @@ async function deleteCookiesOnLogOut(\nasync function deleteExpiredCookies(): Promise<void> {\nconst earliestInvalidLastUpdate = Date.now() - cookieLifetime;\nconst query = SQL`\n- DELETE c, i, u, iu, s, is, fo\n+ DELETE c, i, u, iu, s, si, fo\nFROM cookies c\nLEFT JOIN ids i ON i.id = c.id\nLEFT JOIN updates u ON u.target = c.id\nLEFT JOIN ids iu ON iu.id = u.id\nLEFT JOIN sessions s ON s.cookie = c.id\n- LEFT JOIN ids is ON is.id = s.id\n+ LEFT JOIN ids si ON si.id = s.id\nLEFT JOIN focused fo ON fo.session = s.id\nWHERE c.last_used <= ${earliestInvalidLastUpdate}\n`;\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Avoid SQL keyword "is" |
129,187 | 14.09.2018 14:11:46 | 14,400 | 44d2a52a4c00b6bd5b37513ca942779ca9d7a6e9 | [server] Minor final updates to session-migration | [
{
"change_type": "MODIFY",
"old_path": "server/src/scripts/session-migration.js",
"new_path": "server/src/scripts/session-migration.js",
"diff": "@@ -8,7 +8,7 @@ async function main() {\nawait migrateFiltersTableToSessions();\nawait migrateSessionsRelatedColumns();\nawait migrateUpdatesTable();\n- //await cleanup();\n+ await cleanup();\npool.end();\n} catch (e) {\npool.end();\n@@ -41,6 +41,9 @@ async function migrateFiltersTableToSessions() {\n`);\nconst newColumns = [], needID = [];\nfor (let row of result) {\n+ if (!row.last_update) {\n+ continue;\n+ }\nif (!row.old_session_id) {\nnewColumns.push([\nrow.cookie,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Minor final updates to session-migration |
129,187 | 14.09.2018 14:39:17 | 14,400 | f9dfd7e4f9fa803c60dee22c99518ba95c0e7e0c | [server] Force BODY_SESSION_ID on GET | [
{
"change_type": "MODIFY",
"old_path": "server/src/session/cookies.js",
"new_path": "server/src/session/cookies.js",
"diff": "@@ -209,6 +209,9 @@ function getSessionIDFromRequestBody(req: $Request): ?string {\nfunction getSessionIdentifierTypeFromRequestBody(\nreq: $Request,\n): SessionIdentifierType {\n+ if (req.method === \"GET\") {\n+ return sessionIdentifierTypes.BODY_SESSION_ID;\n+ }\nconst sessionID = getSessionIDFromRequestBody(req);\nreturn sessionID === undefined\n? sessionIdentifierTypes.COOKIE_ID\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Force BODY_SESSION_ID on GET |
129,187 | 14.09.2018 17:46:13 | 14,400 | d755fafa5d323567f58eb3297220c0787c49c4b8 | [server] Validate sessionID before setting it | [
{
"change_type": "MODIFY",
"old_path": "server/src/session/cookies.js",
"new_path": "server/src/session/cookies.js",
"diff": "@@ -80,7 +80,10 @@ async function fetchUserViewer(\nFROM cookies\nWHERE id = ${cookieID} AND user IS NOT NULL\n`;\n- const [ result ] = await dbQuery(query);\n+ const [ [ result ], sessionID ] = await Promise.all([\n+ dbQuery(query),\n+ getValidatedSessionIDFromRequestBody(req, cookieID),\n+ ]);\nif (result.length === 0) {\nreturn {\ntype: \"nonexistant\",\n@@ -126,7 +129,7 @@ async function fetchUserViewer(\ncookieID,\ncookiePassword,\nsessionIdentifierType,\n- sessionID: getSessionIDFromRequestBody(req),\n+ sessionID,\n});\nreturn { type: \"valid\", viewer };\n}\n@@ -152,7 +155,10 @@ async function fetchAnonymousViewer(\nFROM cookies\nWHERE id = ${cookieID} AND user IS NULL\n`;\n- const [ result ] = await dbQuery(query);\n+ const [ [ result ], sessionID ] = await Promise.all([\n+ dbQuery(query),\n+ getValidatedSessionIDFromRequestBody(req, cookieID),\n+ ]);\nif (result.length === 0) {\nreturn {\ntype: \"nonexistant\",\n@@ -196,7 +202,7 @@ async function fetchAnonymousViewer(\ncookieID,\ncookiePassword,\nsessionIdentifierType,\n- sessionID: getSessionIDFromRequestBody(req),\n+ sessionID,\n});\nreturn { type: \"valid\", viewer };\n}\n@@ -218,6 +224,23 @@ function getSessionIdentifierTypeFromRequestBody(\n: sessionIdentifierTypes.BODY_SESSION_ID;\n}\n+async function getValidatedSessionIDFromRequestBody(\n+ req: $Request,\n+ cookieID: string,\n+): Promise<?string> {\n+ const sessionID = getSessionIDFromRequestBody(req);\n+ if (!sessionID) {\n+ return sessionID;\n+ }\n+ const query = SQL`\n+ SELECT id\n+ FROM sessions\n+ WHERE id = ${sessionID} AND cookie = ${cookieID}\n+ `;\n+ const [ result ] = await dbQuery(query);\n+ return result.length > 0 ? sessionID : null;\n+}\n+\n// This function is meant to consume a cookie that has already been processed.\n// That means it doesn't have any logic to handle an invalid cookie, and it\n// doesn't update the cookie's last_used timestamp.\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Validate sessionID before setting it |
129,187 | 14.09.2018 18:41:13 | 14,400 | fca05784a4600a386783187900563a4e35404954 | [server] Refine session-updating before in pingResponder and calendarQueryUpdateResponder | [
{
"change_type": "MODIFY",
"old_path": "server/src/creators/session-creator.js",
"new_path": "server/src/creators/session-creator.js",
"diff": "@@ -21,7 +21,10 @@ async function createSession(\nconst query = SQL`\nINSERT INTO sessions (id, user, cookie, query, time, last_update)\nVALUES ${[row]}\n- ON DUPLICATE KEY UPDATE query = VALUES(query), time = VALUES(time)\n+ ON DUPLICATE KEY UPDATE\n+ query = VALUES(query),\n+ time = VALUES(time),\n+ last_update = VALUES(last_update)\n`;\nawait dbQuery(query);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/entry-responders.js",
"new_path": "server/src/responders/entry-responders.js",
"diff": "@@ -40,7 +40,10 @@ import {\nimport createEntry from '../creators/entry-creator';\nimport { updateEntry } from '../updaters/entry-updaters';\nimport { deleteEntry, restoreEntry } from '../deleters/entry-deleters';\n-import { updateSessionCalendarQuery } from '../updaters/session-updaters';\n+import {\n+ compareNewCalendarQuery,\n+ commitSessionUpdate,\n+} from '../updaters/session-updaters';\nconst entryQueryInputValidator = tShape({\nnavID: t.maybe(t.String),\n@@ -217,13 +220,12 @@ async function calendarQueryUpdateResponder(\nthrow new ServerError('not_logged_in');\n}\n- // TODO: updateSessionCalendarQuery should actually return the EntryInfos\n- // directly, and should only include the diff between the previous and the new\n- // filter.\n- const [ response ] = await Promise.all([\n+ const [ response, sessionUpdate ] = await Promise.all([\nfetchEntryInfos(viewer, request),\n- updateSessionCalendarQuery(viewer, request),\n+ compareNewCalendarQuery(viewer, request),\n]);\n+ await commitSessionUpdate(viewer, sessionUpdate);\n+\nreturn {\nrawEntryInfos: response.rawEntryInfos,\nuserInfos: values(response.userInfos),\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -42,13 +42,15 @@ import {\nimport { fetchCurrentUserInfo } from '../fetchers/user-fetchers';\nimport { fetchUpdateInfos } from '../fetchers/update-fetchers';\nimport {\n- recordDeliveredUpdate,\nsetCookiePlatform,\nsetCookiePlatformDetails,\n} from '../session/cookies';\nimport { deviceTokenUpdater } from '../updaters/device-token-updaters';\nimport createReport from '../creators/report-creator';\n-import { updateSessionCalendarQuery } from '../updaters/session-updaters';\n+import {\n+ compareNewCalendarQuery,\n+ commitSessionUpdate,\n+} from '../updaters/session-updaters';\nimport {\ndeleteUpdatesBeforeTimeTargettingCookie,\n} from '../deleters/update-deleters';\n@@ -241,10 +243,6 @@ async function pingResponder(\noldUpdatesCurrentAsOf,\n{ ...threadsResult, calendarQuery },\n);\n- promises.recordDelivery = recordDeliveredUpdate(\n- viewer.session,\n- oldUpdatesCurrentAsOf,\n- );\n}\nconst { fetchUpdateResult } = await promiseAll(promises);\n@@ -321,25 +319,31 @@ async function recordThreadPollPushInconsistency(\nasync function initializeSession(\nviewer: Viewer,\n- calendarQuery: ?CalendarQuery,\n- initialLastUpdate: ?number,\n+ calendarQuery: CalendarQuery,\n+ oldLastUpdate: ?number,\n): Promise<void> {\n- if (!viewer.loggedIn || !calendarQuery) {\n+ if (!viewer.loggedIn) {\nreturn;\n}\n+ let sessionInitialized = true, sessionUpdate = {};\ntry {\n- await updateSessionCalendarQuery(viewer, calendarQuery);\n- return;\n+ sessionUpdate = await compareNewCalendarQuery(viewer, calendarQuery);\n} catch (e) {\nif (e.message !== \"unknown_error\") {\nthrow e;\n}\n+ sessionInitialized = false;\n}\n- // If we're still here, that's because the session doesn't exist\n- if (initialLastUpdate !== null && initialLastUpdate !== undefined) {\n- await createSession(viewer, calendarQuery, initialLastUpdate);\n+ if (sessionInitialized) {\n+ if (oldLastUpdate !== null && oldLastUpdate !== undefined) {\n+ sessionUpdate.lastUpdate = oldLastUpdate;\n+ }\n+ await commitSessionUpdate(viewer, sessionUpdate);\n+ } else if (oldLastUpdate !== null && oldLastUpdate !== undefined) {\n+ // We're only able to create the session if we have oldLastUpdate\n+ await createSession(viewer, calendarQuery, oldLastUpdate);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/session/cookies.js",
"new_path": "server/src/session/cookies.js",
"diff": "@@ -515,18 +515,6 @@ async function extendCookieLifespan(cookieID: string) {\nawait dbQuery(query);\n}\n-async function recordDeliveredUpdate(\n- sessionID: string,\n- mostRecentUpdateTimestamp: number,\n-) {\n- const query = SQL`\n- UPDATE sessions\n- SET last_update = ${mostRecentUpdateTimestamp}\n- WHERE id = ${sessionID}\n- `;\n- await dbQuery(query);\n-}\n-\nasync function addCookieToJSONResponse(\nviewer: Viewer,\nres: $Response,\n@@ -601,7 +589,6 @@ export {\ncreateNewAnonymousCookie,\ncreateNewUserCookie,\nsetNewSession,\n- recordDeliveredUpdate,\naddCookieToJSONResponse,\naddCookieToHomeResponse,\nsetCookiePlatform,\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/session-updaters.js",
"new_path": "server/src/updaters/session-updaters.js",
"diff": "@@ -10,25 +10,50 @@ import { ServerError } from 'lib/utils/errors';\nimport { dbQuery, SQL } from '../database';\nimport { fetchSessionCalendarQuery } from '../fetchers/session-fetchers';\n-async function updateSessionCalendarQuery(\n+type SessionUpdate = $Shape<{|\n+ query: CalendarQuery,\n+ lastUpdate: number,\n+|}>;\n+\n+// TODO: this function should return the difference between the old and new\n+// CalendarQueries. pingResponder and calendarQueryUpdateResponder will use this\n+// info to fetch EntryInfos. In the pingResponder case, if this function throws,\n+// initializeSession will just fetch the full range of EntryInfos.\n+async function compareNewCalendarQuery(\nviewer: Viewer,\nnewCalendarQuery: CalendarQuery,\n-): Promise<void> {\n+): Promise<SessionUpdate> {\nconst oldCalendarQuery = await fetchSessionCalendarQuery(viewer);\nif (!oldCalendarQuery) {\nthrow new ServerError('unknown_error');\n}\nif (_isEqual(oldCalendarQuery)(newCalendarQuery)) {\n- return;\n+ return {};\n+ }\n+ return { query: newCalendarQuery };\n+}\n+\n+async function commitSessionUpdate(\n+ viewer: Viewer,\n+ sessionUpdate: SessionUpdate,\n+): Promise<void> {\n+ const sqlUpdate = {};\n+ if (sessionUpdate.query) {\n+ sqlUpdate.query = JSON.stringify(sessionUpdate.query);\n+ }\n+ const { lastUpdate } = sessionUpdate;\n+ if (lastUpdate !== null && lastUpdate !== undefined) {\n+ sqlUpdate.last_update = lastUpdate;\n}\nconst query = SQL`\nUPDATE sessions\n- SET query = ${JSON.stringify(newCalendarQuery)}, time = ${Date.now()}\n+ SET ${sqlUpdate}\nWHERE id = ${viewer.session}\n`;\nawait dbQuery(query);\n}\nexport {\n- updateSessionCalendarQuery,\n+ compareNewCalendarQuery,\n+ commitSessionUpdate,\n};\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Refine session-updating before in pingResponder and calendarQueryUpdateResponder |
129,187 | 14.09.2018 19:16:00 | 14,400 | 680b00480041255286df8ba4c6fa568e0d310855 | [server] Assorted fixes to new session code | [
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -42,6 +42,7 @@ import {\nimport { fetchCurrentUserInfo } from '../fetchers/user-fetchers';\nimport { fetchUpdateInfos } from '../fetchers/update-fetchers';\nimport {\n+ setNewSession,\nsetCookiePlatform,\nsetCookiePlatformDetails,\n} from '../session/cookies';\n@@ -54,7 +55,6 @@ import {\nimport {\ndeleteUpdatesBeforeTimeTargettingCookie,\n} from '../deleters/update-deleters';\n-import { createSession } from '../creators/session-creator';\nconst pingRequestInputValidator = tShape({\ncalendarQuery: entryQueryInputValidator,\n@@ -343,7 +343,7 @@ async function initializeSession(\nawait commitSessionUpdate(viewer, sessionUpdate);\n} else if (oldLastUpdate !== null && oldLastUpdate !== undefined) {\n// We're only able to create the session if we have oldLastUpdate\n- await createSession(viewer, calendarQuery, oldLastUpdate);\n+ await setNewSession(viewer, calendarQuery, oldLastUpdate);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/session/cookies.js",
"new_path": "server/src/session/cookies.js",
"diff": "@@ -209,6 +209,11 @@ async function fetchAnonymousViewer(\nfunction getSessionIDFromRequestBody(req: $Request): ?string {\nconst body = (req.body: any);\n+ if (req.method === \"GET\" && body.sessionID === undefined) {\n+ // GET requests are only done from web, and web requests should always\n+ // specify a sessionID since the cookieID can't be guaranteed unique\n+ return null;\n+ }\nreturn body.sessionID;\n}\n@@ -216,6 +221,8 @@ function getSessionIdentifierTypeFromRequestBody(\nreq: $Request,\n): SessionIdentifierType {\nif (req.method === \"GET\") {\n+ // GET requests are only done from web, and web requests should always\n+ // specify a sessionID since the cookieID can't be guaranteed unique\nreturn sessionIdentifierTypes.BODY_SESSION_ID;\n}\nconst sessionID = getSessionIDFromRequestBody(req);\n@@ -497,13 +504,10 @@ async function setNewSession(\ncalendarQuery: CalendarQuery,\ninitialLastUpdate: number,\n): Promise<void> {\n- let sessionID;\n- if (viewer.sessionIdentifierType === sessionIdentifierTypes.COOKIE_ID) {\n- sessionID = viewer.cookieID;\n- } else {\n- [ sessionID ] = await createIDs(\"sessions\", 1);\n- }\n+ if (viewer.sessionIdentifierType !== sessionIdentifierTypes.COOKIE_ID) {\n+ const [ sessionID ] = await createIDs(\"sessions\", 1);\nviewer.setSessionID(sessionID);\n+ }\nawait createSession(viewer, calendarQuery, initialLastUpdate);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/session/viewer.js",
"new_path": "server/src/session/viewer.js",
"diff": "@@ -4,6 +4,7 @@ import {\ntype CookieSource,\ntype SessionIdentifierType,\ncookieTypes,\n+ sessionIdentifierTypes,\n} from 'lib/types/session-types';\nimport type { Platform, PlatformDetails } from 'lib/types/device-types';\n@@ -155,10 +156,10 @@ class Viewer {\n}\nget session(): string {\n- if (this.sessionID) {\n- return this.sessionID;\n- } else if (this.sessionID === undefined) {\n+ if (this.sessionIdentifierType === sessionIdentifierTypes.COOKIE_ID) {\nreturn this.cookieID;\n+ } else if (this.sessionID) {\n+ return this.sessionID;\n} else if (!this.loggedIn) {\n// If the sessionID was explicitly set to null, that means that the\n// cookieID can't be used as a unique session identifier, but for some\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Assorted fixes to new session code |
129,187 | 14.09.2018 19:37:09 | 14,400 | 961704122ff8167a289a9534dae074ac1dd9875c | [server] Return sessionContinued from initializeSession | [
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -317,26 +317,32 @@ async function recordThreadPollPushInconsistency(\nawait createReport(viewer, reportCreationRequest);\n}\n+type SessionInitializationResult = {|\n+ // If this request is part of an already initialized session, then the\n+ // session is being continued, and we don't have to return as much stuff\n+ // TODO actually consume this info\n+ sessionContinued: bool,\n+|};\nasync function initializeSession(\nviewer: Viewer,\ncalendarQuery: CalendarQuery,\noldLastUpdate: ?number,\n-): Promise<void> {\n+): Promise<SessionInitializationResult> {\nif (!viewer.loggedIn) {\n- return;\n+ return { sessionContinued: false };\n}\n- let sessionInitialized = true, sessionUpdate = {};\n+ let sessionAlreadyInitialized = true, sessionUpdate = {};\ntry {\nsessionUpdate = await compareNewCalendarQuery(viewer, calendarQuery);\n} catch (e) {\nif (e.message !== \"unknown_error\") {\nthrow e;\n}\n- sessionInitialized = false;\n+ sessionAlreadyInitialized = false;\n}\n- if (sessionInitialized) {\n+ if (sessionAlreadyInitialized) {\nif (oldLastUpdate !== null && oldLastUpdate !== undefined) {\nsessionUpdate.lastUpdate = oldLastUpdate;\n}\n@@ -345,6 +351,8 @@ async function initializeSession(\n// We're only able to create the session if we have oldLastUpdate\nawait setNewSession(viewer, calendarQuery, oldLastUpdate);\n}\n+\n+ return { sessionContinued: sessionAlreadyInitialized };\n}\nexport {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Return sessionContinued from initializeSession |
129,187 | 15.09.2018 13:58:04 | 14,400 | 39b1c9a4c81343044d3cd4f74ef7ded9d5f7751f | [server] Fix bug where valid body cookie was being ignored | [
{
"change_type": "MODIFY",
"old_path": "server/src/session/cookies.js",
"new_path": "server/src/session/cookies.js",
"diff": "@@ -306,7 +306,10 @@ async function fetchViewerFromRequestBody(\nasync function fetchViewerForJSONRequest(req: $Request): Promise<Viewer> {\nassertSecureRequest(req);\nlet result = await fetchViewerFromRequestBody(req);\n- if (result.cookieSource === null || result.cookieSource === undefined) {\n+ if (\n+ result.type === \"nonexistant\" &&\n+ (result.cookieSource === null || result.cookieSource === undefined)\n+ ) {\nresult = await fetchViewerFromCookieData(req);\n}\nreturn await handleFetchViewerResult(result);\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Fix bug where valid body cookie was being ignored |
129,187 | 17.09.2018 11:07:04 | 14,400 | 232d4c6f2efde5914c513f1a9c101400d3c2ae72 | [server] Call activityUpdater from websiteResponder
If the user is loading a chat thread, immediately specify it as active. | [
{
"change_type": "MODIFY",
"old_path": "server/src/responders/website-responders.js",
"new_path": "server/src/responders/website-responders.js",
"diff": "@@ -33,6 +33,7 @@ import 'web/server-rendering';\nimport * as ReduxSetup from 'web/redux-setup';\nimport App from 'web/dist/app.build';\nimport { navInfoFromURL } from 'web/url-utils';\n+import { activeThreadFromNavInfo } from 'web/selectors/nav-selectors';\nimport { Viewer } from '../session/viewer';\nimport { handleCodeVerificationRequest } from '../models/verification';\n@@ -41,6 +42,7 @@ import { fetchThreadInfos } from '../fetchers/thread-fetchers';\nimport { fetchEntryInfos } from '../fetchers/entry-fetchers';\nimport { fetchCurrentUserInfo } from '../fetchers/user-fetchers';\nimport { setNewSession } from '../session/cookies';\n+import { activityUpdater } from '../updaters/activity-updaters';\nimport urlFacts from '../../facts/url';\nimport assets from '../../compiled/assets';\n@@ -82,6 +84,7 @@ async function websiteResponder(viewer: Viewer, url: string): Promise<string> {\ndefaultNumberPerThread,\n),\nnavInfo.verify ? handleCodeVerificationRequest(navInfo.verify) : null,\n+ viewer.loggedIn ? setNewSession(viewer, calendarQuery, initialTime) : null,\n]);\nconst messageStore = freshMessageStore(\n@@ -90,6 +93,7 @@ async function websiteResponder(viewer: Viewer, url: string): Promise<string> {\nmostRecentMessageTimestamp(rawMessageInfos, initialTime),\nthreadInfos,\n);\n+\nconst threadID = navInfo.activeChatThreadID;\nif (\nthreadID &&\n@@ -103,10 +107,12 @@ async function websiteResponder(viewer: Viewer, url: string): Promise<string> {\nnavInfo.activeChatThreadID = mostRecentThread;\n}\n}\n- // TODO if thread currently in view, call activityUpdater with that thread\n-\n- if (viewer.loggedIn) {\n- await setNewSession(viewer, calendarQuery, initialTime);\n+ const activeThread = activeThreadFromNavInfo(navInfo);\n+ if (activeThread) {\n+ await activityUpdater(\n+ viewer,\n+ { updates: [ { focus: true, threadID: activeThread } ] },\n+ );\n}\nconst store: Store<AppState, Action> = createStore(\n"
},
{
"change_type": "MODIFY",
"old_path": "web/selectors/nav-selectors.js",
"new_path": "web/selectors/nav-selectors.js",
"diff": "// @flow\n-import type { AppState } from '../redux-setup';\n+import type { AppState, NavInfo } from '../redux-setup';\nimport { createSelector } from 'reselect';\nimport invariant from 'invariant';\n@@ -67,10 +67,12 @@ const monthAssertingSelector = createSelector(\nmonthAssertingExtractor,\n);\n+function activeThreadFromNavInfo(navInfo: NavInfo): ?string {\n+ return navInfo.tab === \"chat\" ? navInfo.activeChatThreadID : null;\n+}\n+\nfunction activeThreadSelector(state: AppState): ?string {\n- return state.navInfo.tab === \"chat\"\n- ? state.navInfo.activeChatThreadID\n- : null;\n+ return activeThreadFromNavInfo(state.navInfo);\n}\nexport {\n@@ -78,5 +80,6 @@ export {\nyearAssertingSelector,\nmonthExtractor,\nmonthAssertingSelector,\n+ activeThreadFromNavInfo,\nactiveThreadSelector,\n};\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Call activityUpdater from websiteResponder
If the user is loading a chat thread, immediately specify it as active. |
129,187 | 17.09.2018 11:14:17 | 14,400 | ab7a296c91e5bee8efbd664f4878062b785bc377 | [server] Delete expired rows from the focused table in the nightly cronjob | [
{
"change_type": "MODIFY",
"old_path": "lib/shared/ping-utils.js",
"new_path": "lib/shared/ping-utils.js",
"diff": "@@ -15,10 +15,20 @@ import { pingActionTypes } from '../actions/ping-actions';\n// app is active and the user is logged in.\nconst pingFrequency = 3000; // in milliseconds\n+// If the time column for a given entry in the focused table has a time later\n+// than this, then that entry is considered current, and consequently the thread\n+// in question is considered in focus.\nfunction earliestTimeConsideredCurrent() {\nreturn Date.now() - pingFrequency - 1500;\n}\n+// If the time column for a given entry in the focused table has a time earlier\n+// than this, then that entry is considered expired, and consequently we will\n+// remove it from the table in the nightly cronjob.\n+function earliestTimeConsideredExpired() {\n+ return Date.now() - pingFrequency * 2 - 1500;\n+}\n+\ntype Props = {\npingStartingPayload: () => PingStartingPayload,\npingActionInput: (\n@@ -67,6 +77,7 @@ const pingActionInputSelector = (\nexport {\npingFrequency,\nearliestTimeConsideredCurrent,\n+ earliestTimeConsideredExpired,\ndispatchPing,\npingActionInputSelector,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/activity-deleters.js",
"new_path": "server/src/deleters/activity-deleters.js",
"diff": "// @flow\n+import { earliestTimeConsideredExpired } from 'lib/shared/ping-utils';\n+\nimport { dbQuery, SQL } from '../database';\nasync function deleteOrphanedFocused(): Promise<void> {\n+ const time = earliestTimeConsideredExpired();\nawait dbQuery(SQL`\nDELETE f\nFROM focused f\nLEFT JOIN threads t ON t.id = f.thread\nLEFT JOIN users u ON u.id = f.user\nLEFT JOIN sessions s ON s.id = f.session\n- WHERE t.id IS NULL OR u.id IS NULL OR s.id IS NULL\n+ WHERE t.id IS NULL OR u.id IS NULL OR s.id IS NULL OR f.time <= ${time}\n`);\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Delete expired rows from the focused table in the nightly cronjob |
129,187 | 17.09.2018 11:21:42 | 14,400 | 1a9f5df7e61b0a2508c29a627db5774bccbde750 | [server] Delete session-targeted updates when the session is deleted
And also rows in the `focused` table pertaining to those sessions. | [
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/cookie-deleters.js",
"new_path": "server/src/deleters/cookie-deleters.js",
"diff": "@@ -7,14 +7,14 @@ import { fetchDeviceTokensForCookie } from '../fetchers/device-token-fetchers';\nasync function deleteCookie(cookieID: string): Promise<void> {\nawait dbQuery(SQL`\n- DELETE c, i, u, iu, s, si, fo\n+ DELETE c, i, s, si, u, iu, fo\nFROM cookies c\nLEFT JOIN ids i ON i.id = c.id\n- LEFT JOIN updates u ON u.target = c.id\n- LEFT JOIN ids iu ON iu.id = u.id\nLEFT JOIN sessions s ON s.cookie = c.id\nLEFT JOIN ids si ON si.id = s.id\n- LEFT JOIN focused fo ON fo.session = s.id\n+ LEFT JOIN updates u ON u.target = c.id OR u.target = s.id\n+ LEFT JOIN ids iu ON iu.id = u.id\n+ LEFT JOIN focused fo ON fo.session = c.id OR fo.session = s.id\nWHERE c.id = ${cookieID}\n`);\n}\n@@ -31,14 +31,14 @@ async function deleteCookiesOnLogOut(\n}\nconst query = SQL`\n- DELETE c, i, u, iu, s, si, fo\n+ DELETE c, i, s, si, u, iu, fo\nFROM cookies c\nLEFT JOIN ids i ON i.id = c.id\n- LEFT JOIN updates u ON u.target = c.id\n- LEFT JOIN ids iu ON iu.id = u.id\nLEFT JOIN sessions s ON s.cookie = c.id\nLEFT JOIN ids si ON si.id = s.id\n- LEFT JOIN focused fo ON fo.session = s.id\n+ LEFT JOIN updates u ON u.target = c.id OR u.target = s.id\n+ LEFT JOIN ids iu ON iu.id = u.id\n+ LEFT JOIN focused fo ON fo.session = c.id OR fo.session = s.id\nWHERE c.user = ${userID} AND\n`;\nquery.append(mergeOrConditions(conditions));\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/session-deleters.js",
"new_path": "server/src/deleters/session-deleters.js",
"diff": "@@ -4,10 +4,12 @@ import { dbQuery, SQL } from '../database';\nasync function deleteOrphanedSessions(): Promise<void> {\nawait dbQuery(SQL`\n- DELETE s, i, f\n+ DELETE s, i, f, up, iup\nFROM sessions s\nLEFT JOIN ids i ON i.id = s.id\nLEFT JOIN focused f ON f.session = s.id\n+ LEFT JOIN updates up ON up.target = s.id\n+ LEFT JOIN ids iup ON iup.id = up.id\nLEFT JOIN users u ON u.id = s.user\nLEFT JOIN cookies c ON c.id = s.cookie\nWHERE c.id IS NULL OR u.id IS NULL\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Delete session-targeted updates when the session is deleted
And also rows in the `focused` table pertaining to those sessions. |
129,187 | 17.09.2018 11:26:33 | 14,400 | 534346bbc6387f45d80c3c7a12d25674c5de83b8 | [web] Give everyone web chat
I'm not actively working on this right now, but I don't want to block people from using it. It's not very good yet but it sorta works... | [
{
"change_type": "MODIFY",
"old_path": "lib/shared/user-utils.js",
"new_path": "lib/shared/user-utils.js",
"diff": "@@ -30,12 +30,7 @@ function isStaff(userID: string) {\nreturn false;\n}\n-function hasWebChat(userID: string) {\n- return isStaff(userID) || userID === friends.larry;\n-}\n-\nexport {\nstringForUser,\nisStaff,\n- hasWebChat,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "web/app.react.js",
"new_path": "web/app.react.js",
"diff": "@@ -64,7 +64,6 @@ import {\nupdateActivityActionTypes,\nupdateActivity,\n} from 'lib/actions/ping-actions';\n-import { hasWebChat } from 'lib/shared/user-utils';\nimport { activeThreadSelector } from './selectors/nav-selectors';\nimport { canonicalURLFromReduxState, navInfoFromURL } from './url-utils';\n@@ -465,7 +464,7 @@ class App extends React.PureComponent<Props, State> {\nconst { viewerID, unreadCount } = this.props;\ninvariant(viewerID, \"should be set\");\nlet chatBadge = null;\n- if (hasWebChat(viewerID) && unreadCount > 0) {\n+ if (unreadCount > 0) {\nchatBadge = (\n<div className={css.chatBadge}>\n{unreadCount}\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/chat.react.js",
"new_path": "web/chat/chat.react.js",
"diff": "// @flow\n-import type { AppState } from '../redux-setup'\n-\nimport * as React from 'react';\n-import PropTypes from 'prop-types';\n-\n-import { connect } from 'lib/utils/redux-utils';\n-import { hasWebChat } from 'lib/shared/user-utils';\n-import css from './chat.css';\nimport ChatThreadList from './chat-thread-list.react';\nimport ChatMessageList from './chat-message-list.react';\ntype Props = {|\n- // Redux state\n- viewerID: ?string,\n|};\nclass Chat extends React.PureComponent<Props> {\n- static propTypes = {\n- viewerID: PropTypes.string,\n- };\n-\nrender() {\n- if (!this.props.viewerID || !hasWebChat(this.props.viewerID)) {\n- return (\n- <div className={css.chatComingSoon}>\n- Chat coming soon!\n- </div>\n- );\n- }\nreturn (\n<React.Fragment>\n<ChatThreadList />\n@@ -40,6 +20,4 @@ class Chat extends React.PureComponent<Props> {\n}\n-export default connect((state: AppState) => ({\n- viewerID: state.currentUserInfo && state.currentUserInfo.id,\n-}))(Chat);\n+export default Chat;\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [web] Give everyone web chat
I'm not actively working on this right now, but I don't want to block people from using it. It's not very good yet but it sorta works... |
129,187 | 17.09.2018 15:04:43 | 14,400 | 9fc38ffe8d4f6653a29b780513d511fb161f05af | [server] Introduce calendarQueryDifference
Subtracts one `CalendarQuery` from another, returning an array of `CalendarQueries`. Will be used to fetch only the `EntryInfo`s that are in the new and not the old. | [
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/update-deleters.js",
"new_path": "server/src/deleters/update-deleters.js",
"diff": "@@ -37,7 +37,7 @@ async function deleteExpiredUpdates(): Promise<void> {\n`);\n}\n-async function deleteUpdatesBeforeTimeTargettingCookie(\n+async function deleteUpdatesBeforeTimeTargettingSession(\nviewer: Viewer,\nbeforeTime: number,\n): Promise<void> {\n@@ -49,5 +49,5 @@ async function deleteUpdatesBeforeTimeTargettingCookie(\nexport {\ndeleteExpiredUpdates,\ndeleteUpdatesByConditions,\n- deleteUpdatesBeforeTimeTargettingCookie,\n+ deleteUpdatesBeforeTimeTargettingSession,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/entry-responders.js",
"new_path": "server/src/responders/entry-responders.js",
"diff": "@@ -220,7 +220,7 @@ async function calendarQueryUpdateResponder(\nthrow new ServerError('not_logged_in');\n}\n- const [ response, sessionUpdate ] = await Promise.all([\n+ const [ response, { difference, sessionUpdate } ] = await Promise.all([\nfetchEntryInfos(viewer, request),\ncompareNewCalendarQuery(viewer, request),\n]);\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -53,7 +53,7 @@ import {\ncommitSessionUpdate,\n} from '../updaters/session-updaters';\nimport {\n- deleteUpdatesBeforeTimeTargettingCookie,\n+ deleteUpdatesBeforeTimeTargettingSession,\n} from '../deleters/update-deleters';\nconst pingRequestInputValidator = tShape({\n@@ -234,7 +234,7 @@ async function pingResponder(\noldUpdatesCurrentAsOf !== null &&\noldUpdatesCurrentAsOf !== undefined\n) {\n- promises.deleteExpiredUpdates = deleteUpdatesBeforeTimeTargettingCookie(\n+ promises.deleteExpiredUpdates = deleteUpdatesBeforeTimeTargettingSession(\nviewer,\noldUpdatesCurrentAsOf,\n);\n@@ -317,11 +317,11 @@ async function recordThreadPollPushInconsistency(\nawait createReport(viewer, reportCreationRequest);\n}\n-type SessionInitializationResult = {|\n- // If this request is part of an already initialized session, then the\n- // session is being continued, and we don't have to return as much stuff\n- // TODO actually consume this info\n- sessionContinued: bool,\n+type SessionInitializationResult =\n+ | {| sessionContinued: false |}\n+ | {|\n+ sessionContinued: true,\n+ calendarQueryDifference: $ReadOnlyArray<CalendarQuery>,\n|};\nasync function initializeSession(\nviewer: Viewer,\n@@ -332,27 +332,31 @@ async function initializeSession(\nreturn { sessionContinued: false };\n}\n- let sessionAlreadyInitialized = true, sessionUpdate = {};\n+ let comparisonResult = null;\ntry {\n- sessionUpdate = await compareNewCalendarQuery(viewer, calendarQuery);\n+ comparisonResult = await compareNewCalendarQuery(viewer, calendarQuery);\n} catch (e) {\nif (e.message !== \"unknown_error\") {\nthrow e;\n}\n- sessionAlreadyInitialized = false;\n}\n- if (sessionAlreadyInitialized) {\n+ if (comparisonResult) {\n+ const { difference, sessionUpdate } = comparisonResult;\nif (oldLastUpdate !== null && oldLastUpdate !== undefined) {\nsessionUpdate.lastUpdate = oldLastUpdate;\n}\nawait commitSessionUpdate(viewer, sessionUpdate);\n+ return { sessionContinued: true, calendarQueryDifference: difference };\n} else if (oldLastUpdate !== null && oldLastUpdate !== undefined) {\n- // We're only able to create the session if we have oldLastUpdate\nawait setNewSession(viewer, calendarQuery, oldLastUpdate);\n+ return { sessionContinued: false };\n+ } else {\n+ // We're only able to create the session if we have oldLastUpdate. At this\n+ // time the only code in pingResponder that uses viewer.session should be\n+ // gated on oldLastUpdate anyways, so we should be okay just returning.\n+ return { sessionContinued: false };\n}\n-\n- return { sessionContinued: sessionAlreadyInitialized };\n}\nexport {\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/session/viewer.js",
"new_path": "server/src/session/viewer.js",
"diff": "@@ -161,13 +161,10 @@ class Viewer {\n} else if (this.sessionID) {\nreturn this.sessionID;\n} else if (!this.loggedIn) {\n- // If the sessionID was explicitly set to null, that means that the\n- // cookieID can't be used as a unique session identifier, but for some\n- // reason the client doesn't have a sessionID. This should only happen\n- // when the user is logged out.\nthrow new ServerError('not_logged_in');\n} else {\n- // That's weird...\n+ // If the session identifier is sessionIdentifierTypes.BODY_SESSION_ID and\n+ // the user is logged in, then the sessionID should be set.\nthrow new ServerError('unknown_error');\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/session-updaters.js",
"new_path": "server/src/updaters/session-updaters.js",
"diff": "import type { Viewer } from '../session/viewer';\nimport type { CalendarQuery } from 'lib/types/entry-types';\n+import { calendarThreadFilterTypes } from 'lib/types/filter-types';\nimport _isEqual from 'lodash/fp/isEqual';\nimport { ServerError } from 'lib/utils/errors';\n+import {\n+ filteredThreadIDs,\n+ nonThreadCalendarFilters,\n+ filterExists,\n+} from 'lib/selectors/calendar-filter-selectors';\n+import { dateString, dateFromString } from 'lib/utils/date-utils';\nimport { dbQuery, SQL } from '../database';\nimport { fetchSessionCalendarQuery } from '../fetchers/session-fetchers';\n@@ -14,23 +21,122 @@ type SessionUpdate = $Shape<{|\nquery: CalendarQuery,\nlastUpdate: number,\n|}>;\n+type CalendarQueryComparisonResult = {|\n+ difference: $ReadOnlyArray<CalendarQuery>,\n+ sessionUpdate: SessionUpdate,\n+|};\n-// TODO: this function should return the difference between the old and new\n-// CalendarQueries. pingResponder and calendarQueryUpdateResponder will use this\n-// info to fetch EntryInfos. In the pingResponder case, if this function throws,\n-// initializeSession will just fetch the full range of EntryInfos.\nasync function compareNewCalendarQuery(\nviewer: Viewer,\nnewCalendarQuery: CalendarQuery,\n-): Promise<SessionUpdate> {\n+): Promise<CalendarQueryComparisonResult> {\nconst oldCalendarQuery = await fetchSessionCalendarQuery(viewer);\nif (!oldCalendarQuery) {\nthrow new ServerError('unknown_error');\n}\n+ const difference = calendarQueryDifference(\n+ oldCalendarQuery,\n+ newCalendarQuery,\n+ );\n+ const sessionUpdate = difference.length > 0\n+ ? { query: newCalendarQuery }\n+ : {};\n+ return { difference, sessionUpdate };\n+}\n+\n+function calendarQueryDifference(\n+ oldCalendarQuery: CalendarQuery,\n+ newCalendarQuery: CalendarQuery,\n+): CalendarQuery[] {\nif (_isEqual(oldCalendarQuery)(newCalendarQuery)) {\n- return {};\n+ return [];\n}\n- return { query: newCalendarQuery };\n+\n+ const deletedEntriesWereIncluded = filterExists(\n+ oldCalendarQuery.filters,\n+ calendarThreadFilterTypes.NOT_DELETED,\n+ );\n+ const deletedEntriesAreIncluded = filterExists(\n+ newCalendarQuery.filters,\n+ calendarThreadFilterTypes.NOT_DELETED,\n+ );\n+ if (!deletedEntriesWereIncluded && deletedEntriesAreIncluded) {\n+ // The new query includes all deleted entries, but the old one didn't. Since\n+ // we have no way to include ONLY deleted entries in a CalendarQuery, we\n+ // can't separate newCalendarQuery into a query for just deleted entries on\n+ // the old range, and a query for all entries on the full range. We'll have\n+ // to just query for the whole newCalendarQuery range directly.\n+ return [ newCalendarQuery ];\n+ }\n+\n+ const oldFilteredThreadIDs = filteredThreadIDs(oldCalendarQuery.filters);\n+ const newFilteredThreadIDs = filteredThreadIDs(newCalendarQuery.filters);\n+ if (oldFilteredThreadIDs && !newFilteredThreadIDs) {\n+ // The new query is for all thread IDs, but the old one had a THREAD_LIST.\n+ // Since we have no way to exclude particular thread IDs from a\n+ // CalendarQuery, we can't separate newCalendarQuery into a query for just\n+ // the new thread IDs on the old range, and a query for all the thread IDs\n+ // on the full range. We'll have to just query for the whole\n+ // newCalendarQuery range directly.\n+ return [ newCalendarQuery ];\n+ }\n+\n+ const difference = [];\n+ const oldStartDate = dateFromString(oldCalendarQuery.startDate);\n+ const oldEndDate = dateFromString(oldCalendarQuery.endDate);\n+ const newStartDate = dateFromString(newCalendarQuery.startDate);\n+ const newEndDate = dateFromString(newCalendarQuery.endDate);\n+\n+ if (\n+ oldFilteredThreadIDs && newFilteredThreadIDs &&\n+ // This checks that there exists an intersection at all\n+ oldStartDate <= newEndDate && oldEndDate >= newStartDate\n+ ) {\n+ const newNotInOld =\n+ [...newFilteredThreadIDs].filter(x => !oldFilteredThreadIDs.has(x));\n+ if (newNotInOld.length > 0) {\n+ // In this case, we have added new threadIDs to the THREAD_LIST.\n+ // We should query the calendar range for these threads.\n+ const intersectionStartDate = oldStartDate < newStartDate\n+ ? newCalendarQuery.startDate\n+ : oldCalendarQuery.startDate;\n+ const intersectionEndDate = oldEndDate > newEndDate\n+ ? newCalendarQuery.endDate\n+ : oldCalendarQuery.endDate;\n+ difference.push({\n+ startDate: intersectionStartDate,\n+ endDate: intersectionEndDate,\n+ filters: [\n+ ...nonThreadCalendarFilters(newCalendarQuery.filters),\n+ {\n+ type: calendarThreadFilterTypes.THREAD_LIST,\n+ threadIDs: newNotInOld,\n+ },\n+ ],\n+ });\n+ }\n+ }\n+\n+ if (newStartDate < oldStartDate) {\n+ const partialEndDate = new Date(oldStartDate.getTime());\n+ partialEndDate.setDate(partialEndDate.getDate() - 1);\n+ difference.push({\n+ filters: newCalendarQuery.filters,\n+ startDate: newCalendarQuery.startDate,\n+ endDate: dateString(partialEndDate),\n+ });\n+ }\n+ if (newEndDate > oldEndDate) {\n+ const partialStartDate = new Date(oldEndDate.getTime());\n+ partialStartDate.setDate(partialStartDate.getDate() + 1);\n+ difference.push({\n+ filters: newCalendarQuery.filters,\n+ startDate: dateString(partialStartDate),\n+ endDate: newCalendarQuery.endDate,\n+ });\n+ }\n+\n+ return difference;\n}\nasync function commitSessionUpdate(\n@@ -45,6 +151,9 @@ async function commitSessionUpdate(\nif (lastUpdate !== null && lastUpdate !== undefined) {\nsqlUpdate.last_update = lastUpdate;\n}\n+ if (Object.keys(sqlUpdate).length === 0) {\n+ return;\n+ }\nconst query = SQL`\nUPDATE sessions\nSET ${sqlUpdate}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Introduce calendarQueryDifference
Subtracts one `CalendarQuery` from another, returning an array of `CalendarQueries`. Will be used to fetch only the `EntryInfo`s that are in the new and not the old. |
129,187 | 18.09.2018 11:03:09 | 14,400 | c30ec7f01e9d448b713edd7d97344bc1831fce0d | [server] Support fetching entries for multiple CalendarQueries at once | [
{
"change_type": "MODIFY",
"old_path": "server/src/creators/update-creator.js",
"new_path": "server/src/creators/update-creator.js",
"diff": "@@ -361,7 +361,7 @@ async function fetchUpdateInfosWithUpdateDatas(\n};\npromises.calendarResult = fetchEntryInfos(\nviewerInfo.viewer,\n- threadCalendarQuery,\n+ [ threadCalendarQuery ],\n);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/fetchers/entry-fetchers.js",
"new_path": "server/src/fetchers/entry-fetchers.js",
"diff": "@@ -22,7 +22,13 @@ import {\nfilterExists,\n} from 'lib/selectors/calendar-filter-selectors';\n-import { dbQuery, SQL } from '../database';\n+import {\n+ dbQuery,\n+ SQL,\n+ SQLStatement,\n+ mergeAndConditions,\n+ mergeOrConditions,\n+} from '../database';\nasync function fetchEntryInfo(\nviewer: Viewer,\n@@ -68,25 +74,42 @@ async function fetchEntryInfosByID(\n}));\n}\n-async function fetchEntryInfos(\n- viewer: Viewer,\n- entryQuery: CalendarQuery,\n-): Promise<FetchEntryInfosResponse> {\n- let navCondition;\n- const filterToThreadIDs = filteredThreadIDs(entryQuery.filters);\n+function sqlConditionForCalendarQuery(\n+ calendarQuery: CalendarQuery,\n+): ?SQLStatement {\n+ const { filters, startDate, endDate } = calendarQuery;\n+ const conditions = [];\n+\n+ conditions.push(SQL`d.date BETWEEN ${startDate} AND ${endDate}`);\n+\n+ const filterToThreadIDs = filteredThreadIDs(filters);\nif (filterToThreadIDs && filterToThreadIDs.size > 0) {\n- navCondition = SQL`AND d.thread IN (${[...filterToThreadIDs]}) `;\n+ conditions.push(SQL`d.thread IN (${[...filterToThreadIDs]})`);\n} else if (filterToThreadIDs) {\n// Filter to empty set means the result is empty\n- return { rawEntryInfos: [], userInfos: {} };\n+ return null;\n} else {\n- navCondition = SQL`AND m.role != 0 `;\n+ conditions.push(SQL`m.role != 0`);\n+ }\n+\n+ if (filterExists(filters, calendarThreadFilterTypes.NOT_DELETED)) {\n+ conditions.push(SQL`e.deleted = 0`);\n}\n- const deletedCondition =\n- filterExists(entryQuery.filters, calendarThreadFilterTypes.NOT_DELETED)\n- ? SQL`AND e.deleted = 0 `\n- : null;\n+ return mergeAndConditions(conditions);\n+}\n+\n+async function fetchEntryInfos(\n+ viewer: Viewer,\n+ calendarQueries: $ReadOnlyArray<CalendarQuery>,\n+): Promise<FetchEntryInfosResponse> {\n+ const queryConditions = calendarQueries\n+ .map(sqlConditionForCalendarQuery)\n+ .filter(condition => condition);\n+ if (queryConditions.length === 0) {\n+ return { rawEntryInfos: [], userInfos: {} };\n+ }\n+ const queryCondition = mergeOrConditions(queryConditions);\nconst viewerID = viewer.id;\nconst query = SQL`\n@@ -98,12 +121,8 @@ async function fetchEntryInfos(\nLEFT JOIN memberships m ON m.thread = d.thread AND m.user = ${viewerID}\nLEFT JOIN users u ON u.id = e.creator\nWHERE JSON_EXTRACT(m.permissions, ${visPermissionExtractString}) IS TRUE AND\n- d.date BETWEEN ${entryQuery.startDate} AND ${entryQuery.endDate}\n`;\n- query.append(navCondition);\n- if (deletedCondition) {\n- query.append(deletedCondition);\n- }\n+ query.append(queryCondition);\nquery.append(SQL`ORDER BY e.creation_time DESC`);\nconst [ result ] = await dbQuery(query);\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/entry-responders.js",
"new_path": "server/src/responders/entry-responders.js",
"diff": "@@ -122,7 +122,7 @@ async function entryFetchResponder(\nawait verifyCalendarQueryThreadIDs(request);\n- return await fetchEntryInfos(viewer, request);\n+ return await fetchEntryInfos(viewer, [ request ]);\n}\nconst entryRevisionHistoryFetchInputValidator = tShape({\n@@ -221,7 +221,7 @@ async function calendarQueryUpdateResponder(\n}\nconst [ response, { difference, sessionUpdate } ] = await Promise.all([\n- fetchEntryInfos(viewer, request),\n+ fetchEntryInfos(viewer, [ request ]),\ncompareNewCalendarQuery(viewer, request),\n]);\nawait commitSessionUpdate(viewer, sessionUpdate);\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -222,7 +222,7 @@ async function pingResponder(\ndefaultNumberPerThread,\n),\nfetchThreadInfos(viewer),\n- fetchEntryInfos(viewer, calendarQuery),\n+ fetchEntryInfos(viewer, [ calendarQuery ]),\nfetchCurrentUserInfo(viewer),\ninitializeSession(viewer, calendarQuery, oldUpdatesCurrentAsOf),\n]);\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/user-responders.js",
"new_path": "server/src/responders/user-responders.js",
"diff": "@@ -247,7 +247,7 @@ async function logInResponder(\nthreadSelectionCriteria,\ndefaultNumberPerThread,\n),\n- calendarQuery ? fetchEntryInfos(viewer, calendarQuery) : undefined,\n+ calendarQuery ? fetchEntryInfos(viewer, [ calendarQuery ]) : undefined,\nrequest.deviceTokenUpdateRequest\n? deviceTokenUpdater(viewer, request.deviceTokenUpdateRequest)\n: undefined,\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/website-responders.js",
"new_path": "server/src/responders/website-responders.js",
"diff": "@@ -77,7 +77,7 @@ async function websiteResponder(viewer: Viewer, url: string): Promise<string> {\n] = await Promise.all([\nfetchThreadInfos(viewer),\nfetchCurrentUserInfo(viewer),\n- fetchEntryInfos(viewer, calendarQuery),\n+ fetchEntryInfos(viewer, [ calendarQuery ]),\nfetchMessageInfos(\nviewer,\nthreadSelectionCriteria,\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/account-updaters.js",
"new_path": "server/src/updaters/account-updaters.js",
"diff": "@@ -197,7 +197,7 @@ async function updatePassword(\nthreadSelectionCriteria,\ndefaultNumberPerThread,\n),\n- calendarQuery ? fetchEntryInfos(viewer, calendarQuery) : undefined,\n+ calendarQuery ? fetchEntryInfos(viewer, [ calendarQuery ]) : undefined,\n]);\nconst rawEntryInfos = entriesResult ? entriesResult.rawEntryInfos : null;\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/thread-updaters.js",
"new_path": "server/src/updaters/thread-updaters.js",
"diff": "@@ -613,7 +613,7 @@ async function joinThread(\nthreadSelectionCriteria,\ndefaultNumberPerThread,\n),\n- calendarQuery ? fetchEntryInfos(viewer, calendarQuery) : undefined,\n+ calendarQuery ? fetchEntryInfos(viewer, [ calendarQuery ]) : undefined,\n]);\nlet userInfos = {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Support fetching entries for multiple CalendarQueries at once |
129,187 | 18.09.2018 11:12:29 | 14,400 | 155ca5682dc16ea63098eaff588bbcabd93a51db | Move calendarQueryDifference to lib | [
{
"change_type": "MODIFY",
"old_path": "lib/shared/entry-utils.js",
"new_path": "lib/shared/entry-utils.js",
"diff": "@@ -13,8 +13,10 @@ import {\n} from '../types/filter-types';\nimport invariant from 'invariant';\n+import _isEqual from 'lodash/fp/isEqual';\nimport {\n+ dateString,\ngetDate,\ndateFromString,\nfifteenDaysEarlier,\n@@ -22,6 +24,7 @@ import {\n} from '../utils/date-utils';\nimport {\nfilteredThreadIDs,\n+ nonThreadCalendarFilters,\nfilterExists,\n} from '../selectors/calendar-filter-selectors';\n@@ -122,6 +125,101 @@ function usersInRawEntryInfos(\nreturn [...userIDs];\n}\n+function calendarQueryDifference(\n+ oldCalendarQuery: CalendarQuery,\n+ newCalendarQuery: CalendarQuery,\n+): CalendarQuery[] {\n+ if (_isEqual(oldCalendarQuery)(newCalendarQuery)) {\n+ return [];\n+ }\n+\n+ const deletedEntriesWereIncluded = filterExists(\n+ oldCalendarQuery.filters,\n+ calendarThreadFilterTypes.NOT_DELETED,\n+ );\n+ const deletedEntriesAreIncluded = filterExists(\n+ newCalendarQuery.filters,\n+ calendarThreadFilterTypes.NOT_DELETED,\n+ );\n+ if (!deletedEntriesWereIncluded && deletedEntriesAreIncluded) {\n+ // The new query includes all deleted entries, but the old one didn't. Since\n+ // we have no way to include ONLY deleted entries in a CalendarQuery, we\n+ // can't separate newCalendarQuery into a query for just deleted entries on\n+ // the old range, and a query for all entries on the full range. We'll have\n+ // to just query for the whole newCalendarQuery range directly.\n+ return [ newCalendarQuery ];\n+ }\n+\n+ const oldFilteredThreadIDs = filteredThreadIDs(oldCalendarQuery.filters);\n+ const newFilteredThreadIDs = filteredThreadIDs(newCalendarQuery.filters);\n+ if (oldFilteredThreadIDs && !newFilteredThreadIDs) {\n+ // The new query is for all thread IDs, but the old one had a THREAD_LIST.\n+ // Since we have no way to exclude particular thread IDs from a\n+ // CalendarQuery, we can't separate newCalendarQuery into a query for just\n+ // the new thread IDs on the old range, and a query for all the thread IDs\n+ // on the full range. We'll have to just query for the whole\n+ // newCalendarQuery range directly.\n+ return [ newCalendarQuery ];\n+ }\n+\n+ const difference = [];\n+ const oldStartDate = dateFromString(oldCalendarQuery.startDate);\n+ const oldEndDate = dateFromString(oldCalendarQuery.endDate);\n+ const newStartDate = dateFromString(newCalendarQuery.startDate);\n+ const newEndDate = dateFromString(newCalendarQuery.endDate);\n+\n+ if (\n+ oldFilteredThreadIDs && newFilteredThreadIDs &&\n+ // This checks that there exists an intersection at all\n+ oldStartDate <= newEndDate && oldEndDate >= newStartDate\n+ ) {\n+ const newNotInOld =\n+ [...newFilteredThreadIDs].filter(x => !oldFilteredThreadIDs.has(x));\n+ if (newNotInOld.length > 0) {\n+ // In this case, we have added new threadIDs to the THREAD_LIST.\n+ // We should query the calendar range for these threads.\n+ const intersectionStartDate = oldStartDate < newStartDate\n+ ? newCalendarQuery.startDate\n+ : oldCalendarQuery.startDate;\n+ const intersectionEndDate = oldEndDate > newEndDate\n+ ? newCalendarQuery.endDate\n+ : oldCalendarQuery.endDate;\n+ difference.push({\n+ startDate: intersectionStartDate,\n+ endDate: intersectionEndDate,\n+ filters: [\n+ ...nonThreadCalendarFilters(newCalendarQuery.filters),\n+ {\n+ type: calendarThreadFilterTypes.THREAD_LIST,\n+ threadIDs: newNotInOld,\n+ },\n+ ],\n+ });\n+ }\n+ }\n+\n+ if (newStartDate < oldStartDate) {\n+ const partialEndDate = new Date(oldStartDate.getTime());\n+ partialEndDate.setDate(partialEndDate.getDate() - 1);\n+ difference.push({\n+ filters: newCalendarQuery.filters,\n+ startDate: newCalendarQuery.startDate,\n+ endDate: dateString(partialEndDate),\n+ });\n+ }\n+ if (newEndDate > oldEndDate) {\n+ const partialStartDate = new Date(oldEndDate.getTime());\n+ partialStartDate.setDate(partialStartDate.getDate() + 1);\n+ difference.push({\n+ filters: newCalendarQuery.filters,\n+ startDate: dateString(partialStartDate),\n+ endDate: newCalendarQuery.endDate,\n+ });\n+ }\n+\n+ return difference;\n+}\n+\nexport {\nentryKey,\nentryID,\n@@ -130,4 +228,5 @@ export {\nrawEntryInfoWithinCalendarQuery,\ndefaultCalendarQuery,\nusersInRawEntryInfos,\n+ calendarQueryDifference,\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/session-updaters.js",
"new_path": "server/src/updaters/session-updaters.js",
"diff": "import type { Viewer } from '../session/viewer';\nimport type { CalendarQuery } from 'lib/types/entry-types';\n-import { calendarThreadFilterTypes } from 'lib/types/filter-types';\n-\n-import _isEqual from 'lodash/fp/isEqual';\nimport { ServerError } from 'lib/utils/errors';\n-import {\n- filteredThreadIDs,\n- nonThreadCalendarFilters,\n- filterExists,\n-} from 'lib/selectors/calendar-filter-selectors';\n-import { dateString, dateFromString } from 'lib/utils/date-utils';\n+import { calendarQueryDifference } from 'lib/shared/entry-utils';\nimport { dbQuery, SQL } from '../database';\nimport { fetchSessionCalendarQuery } from '../fetchers/session-fetchers';\n@@ -44,101 +36,6 @@ async function compareNewCalendarQuery(\nreturn { difference, sessionUpdate };\n}\n-function calendarQueryDifference(\n- oldCalendarQuery: CalendarQuery,\n- newCalendarQuery: CalendarQuery,\n-): CalendarQuery[] {\n- if (_isEqual(oldCalendarQuery)(newCalendarQuery)) {\n- return [];\n- }\n-\n- const deletedEntriesWereIncluded = filterExists(\n- oldCalendarQuery.filters,\n- calendarThreadFilterTypes.NOT_DELETED,\n- );\n- const deletedEntriesAreIncluded = filterExists(\n- newCalendarQuery.filters,\n- calendarThreadFilterTypes.NOT_DELETED,\n- );\n- if (!deletedEntriesWereIncluded && deletedEntriesAreIncluded) {\n- // The new query includes all deleted entries, but the old one didn't. Since\n- // we have no way to include ONLY deleted entries in a CalendarQuery, we\n- // can't separate newCalendarQuery into a query for just deleted entries on\n- // the old range, and a query for all entries on the full range. We'll have\n- // to just query for the whole newCalendarQuery range directly.\n- return [ newCalendarQuery ];\n- }\n-\n- const oldFilteredThreadIDs = filteredThreadIDs(oldCalendarQuery.filters);\n- const newFilteredThreadIDs = filteredThreadIDs(newCalendarQuery.filters);\n- if (oldFilteredThreadIDs && !newFilteredThreadIDs) {\n- // The new query is for all thread IDs, but the old one had a THREAD_LIST.\n- // Since we have no way to exclude particular thread IDs from a\n- // CalendarQuery, we can't separate newCalendarQuery into a query for just\n- // the new thread IDs on the old range, and a query for all the thread IDs\n- // on the full range. We'll have to just query for the whole\n- // newCalendarQuery range directly.\n- return [ newCalendarQuery ];\n- }\n-\n- const difference = [];\n- const oldStartDate = dateFromString(oldCalendarQuery.startDate);\n- const oldEndDate = dateFromString(oldCalendarQuery.endDate);\n- const newStartDate = dateFromString(newCalendarQuery.startDate);\n- const newEndDate = dateFromString(newCalendarQuery.endDate);\n-\n- if (\n- oldFilteredThreadIDs && newFilteredThreadIDs &&\n- // This checks that there exists an intersection at all\n- oldStartDate <= newEndDate && oldEndDate >= newStartDate\n- ) {\n- const newNotInOld =\n- [...newFilteredThreadIDs].filter(x => !oldFilteredThreadIDs.has(x));\n- if (newNotInOld.length > 0) {\n- // In this case, we have added new threadIDs to the THREAD_LIST.\n- // We should query the calendar range for these threads.\n- const intersectionStartDate = oldStartDate < newStartDate\n- ? newCalendarQuery.startDate\n- : oldCalendarQuery.startDate;\n- const intersectionEndDate = oldEndDate > newEndDate\n- ? newCalendarQuery.endDate\n- : oldCalendarQuery.endDate;\n- difference.push({\n- startDate: intersectionStartDate,\n- endDate: intersectionEndDate,\n- filters: [\n- ...nonThreadCalendarFilters(newCalendarQuery.filters),\n- {\n- type: calendarThreadFilterTypes.THREAD_LIST,\n- threadIDs: newNotInOld,\n- },\n- ],\n- });\n- }\n- }\n-\n- if (newStartDate < oldStartDate) {\n- const partialEndDate = new Date(oldStartDate.getTime());\n- partialEndDate.setDate(partialEndDate.getDate() - 1);\n- difference.push({\n- filters: newCalendarQuery.filters,\n- startDate: newCalendarQuery.startDate,\n- endDate: dateString(partialEndDate),\n- });\n- }\n- if (newEndDate > oldEndDate) {\n- const partialStartDate = new Date(oldEndDate.getTime());\n- partialStartDate.setDate(partialStartDate.getDate() + 1);\n- difference.push({\n- filters: newCalendarQuery.filters,\n- startDate: dateString(partialStartDate),\n- endDate: newCalendarQuery.endDate,\n- });\n- }\n-\n- return difference;\n-}\n-\nasync function commitSessionUpdate(\nviewer: Viewer,\nsessionUpdate: SessionUpdate,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Move calendarQueryDifference to lib |
129,187 | 18.09.2018 11:45:15 | 14,400 | 41ef25b90671b85069e4266d9c74ec089a280bd8 | [server] Return delta EntryInfos from calendarQueryUpdateResponder and pingResponder | [
{
"change_type": "MODIFY",
"old_path": "lib/types/ping-types.js",
"new_path": "lib/types/ping-types.js",
"diff": "@@ -38,6 +38,7 @@ export type PingResponse = {|\nuserInfos: $ReadOnlyArray<UserInfo>,\nupdatesResult?: UpdatesResult,\nserverRequests?: $ReadOnlyArray<ServerRequest>,\n+ deltaEntryInfos?: $ReadOnlyArray<RawEntryInfo>,\n|};\nexport type PingPrevState = {|\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/fetchers/entry-fetchers.js",
"new_path": "server/src/fetchers/entry-fetchers.js",
"diff": "@@ -21,6 +21,7 @@ import {\nfilteredThreadIDs,\nfilterExists,\n} from 'lib/selectors/calendar-filter-selectors';\n+import { rawEntryInfoWithinCalendarQuery } from 'lib/shared/entry-utils';\nimport {\ndbQuery,\n@@ -217,10 +218,44 @@ async function fetchEntryRevisionInfo(\nreturn revisions;\n}\n+// calendarQueries are the \"difference\" queries we get from subtracting the old\n+// CalendarQuery from the new one. See calendarQueryDifference.\n+// oldCalendarQuery is the old CalendarQuery. We make sure none of the returned\n+// RawEntryInfos match the old CalendarQuery, so that only the difference is\n+// returned.\n+async function fetchEntriesForSession(\n+ viewer: Viewer,\n+ calendarQueries: $ReadOnlyArray<CalendarQuery>,\n+ oldCalendarQuery: CalendarQuery,\n+): Promise<FetchEntryInfosResponse> {\n+ const { rawEntryInfos, userInfos } = await fetchEntryInfos(\n+ viewer,\n+ calendarQueries,\n+ );\n+ const filteredRawEntryInfos = rawEntryInfos.filter(\n+ rawEntryInfo => !rawEntryInfoWithinCalendarQuery(\n+ rawEntryInfo,\n+ oldCalendarQuery,\n+ ),\n+ );\n+ const userIDs = new Set(filteredRawEntryInfos.map(\n+ rawEntryInfo => rawEntryInfo.creatorID,\n+ ));\n+ const filteredUserInfos = {};\n+ for (let userID in userInfos) {\n+ if (!userIDs.has(userID)) {\n+ continue;\n+ }\n+ filteredUserInfos[userID] = userInfos[userID];\n+ }\n+ return { rawEntryInfos: filteredRawEntryInfos, userInfos: filteredUserInfos };\n+}\n+\nexport {\nfetchEntryInfo,\nfetchEntryInfosByID,\nfetchEntryInfos,\ncheckThreadPermissionForEntry,\nfetchEntryRevisionInfo,\n+ fetchEntriesForSession,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/entry-responders.js",
"new_path": "server/src/responders/entry-responders.js",
"diff": "@@ -36,6 +36,7 @@ import { verifyThreadIDs } from '../fetchers/thread-fetchers';\nimport {\nfetchEntryInfos,\nfetchEntryRevisionInfo,\n+ fetchEntriesForSession,\n} from '../fetchers/entry-fetchers';\nimport createEntry from '../creators/entry-creator';\nimport { updateEntry } from '../updaters/entry-updaters';\n@@ -220,11 +221,16 @@ async function calendarQueryUpdateResponder(\nthrow new ServerError('not_logged_in');\n}\n- const [ response, { difference, sessionUpdate } ] = await Promise.all([\n- fetchEntryInfos(viewer, [ request ]),\n- compareNewCalendarQuery(viewer, request),\n+ const {\n+ difference,\n+ oldCalendarQuery,\n+ sessionUpdate,\n+ } = await compareNewCalendarQuery(viewer, request);\n+\n+ const [ response ] = await Promise.all([\n+ fetchEntriesForSession(viewer, difference, oldCalendarQuery),\n+ commitSessionUpdate(viewer, sessionUpdate),\n]);\n- await commitSessionUpdate(viewer, sessionUpdate);\nreturn {\nrawEntryInfos: response.rawEntryInfos,\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -9,7 +9,10 @@ import {\n} from 'lib/types/request-types';\nimport { isDeviceType, assertDeviceType } from 'lib/types/device-types';\nimport { reportTypes } from 'lib/types/report-types';\n-import type { CalendarQuery } from 'lib/types/entry-types';\n+import type {\n+ CalendarQuery,\n+ FetchEntryInfosResponse,\n+} from 'lib/types/entry-types';\nimport t from 'tcomb';\nimport invariant from 'invariant';\n@@ -34,7 +37,10 @@ import {\n} from './entry-responders';\nimport { fetchMessageInfosSince } from '../fetchers/message-fetchers';\nimport { fetchThreadInfos } from '../fetchers/thread-fetchers';\n-import { fetchEntryInfos } from '../fetchers/entry-fetchers';\n+import {\n+ fetchEntryInfos,\n+ fetchEntriesForSession,\n+} from '../fetchers/entry-fetchers';\nimport {\nupdateActivityTime,\nactivityUpdater,\n@@ -214,6 +220,7 @@ async function pingResponder(\nthreadsResult,\nentriesResult,\ncurrentUserInfo,\n+ sessionInitializationResult,\n] = await Promise.all([\nfetchMessageInfosSince(\nviewer,\n@@ -244,7 +251,6 @@ async function pingResponder(\n{ ...threadsResult, calendarQuery },\n);\n}\n-\nconst { fetchUpdateResult } = await promiseAll(promises);\nlet updateUserInfos = {}, updatesResult = null;\n@@ -265,11 +271,15 @@ async function pingResponder(\n};\n}\n+ const deltaEntriesUserInfos = sessionInitializationResult.sessionContinued\n+ ? sessionInitializationResult.deltaEntryInfoResult.userInfos\n+ : undefined;\nconst userInfos = values({\n...messagesResult.userInfos,\n...entriesResult.userInfos,\n...threadsResult.userInfos,\n...updateUserInfos,\n+ ...deltaEntriesUserInfos,\n});\nconst serverRequests = [];\n@@ -301,6 +311,10 @@ async function pingResponder(\nif (updatesResult) {\nresponse.updatesResult = updatesResult;\n}\n+ if (sessionInitializationResult.sessionContinued) {\n+ response.deltaEntryInfos =\n+ sessionInitializationResult.deltaEntryInfoResult.rawEntryInfos;\n+ }\nreturn response;\n}\n@@ -321,7 +335,7 @@ type SessionInitializationResult =\n| {| sessionContinued: false |}\n| {|\nsessionContinued: true,\n- calendarQueryDifference: $ReadOnlyArray<CalendarQuery>,\n+ deltaEntryInfoResult: FetchEntryInfosResponse,\n|};\nasync function initializeSession(\nviewer: Viewer,\n@@ -342,12 +356,15 @@ async function initializeSession(\n}\nif (comparisonResult) {\n- const { difference, sessionUpdate } = comparisonResult;\n+ const { difference, sessionUpdate, oldCalendarQuery } = comparisonResult;\nif (oldLastUpdate !== null && oldLastUpdate !== undefined) {\nsessionUpdate.lastUpdate = oldLastUpdate;\n}\n- await commitSessionUpdate(viewer, sessionUpdate);\n- return { sessionContinued: true, calendarQueryDifference: difference };\n+ const [ deltaEntryInfoResult ] = await Promise.all([\n+ fetchEntriesForSession(viewer, difference, oldCalendarQuery),\n+ commitSessionUpdate(viewer, sessionUpdate),\n+ ]);\n+ return { sessionContinued: true, deltaEntryInfoResult };\n} else if (oldLastUpdate !== null && oldLastUpdate !== undefined) {\nawait setNewSession(viewer, calendarQuery, oldLastUpdate);\nreturn { sessionContinued: false };\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/session-updaters.js",
"new_path": "server/src/updaters/session-updaters.js",
"diff": "@@ -15,6 +15,7 @@ type SessionUpdate = $Shape<{|\n|}>;\ntype CalendarQueryComparisonResult = {|\ndifference: $ReadOnlyArray<CalendarQuery>,\n+ oldCalendarQuery: CalendarQuery,\nsessionUpdate: SessionUpdate,\n|};\n@@ -33,7 +34,7 @@ async function compareNewCalendarQuery(\nconst sessionUpdate = difference.length > 0\n? { query: newCalendarQuery }\n: {};\n- return { difference, sessionUpdate };\n+ return { difference, oldCalendarQuery, sessionUpdate };\n}\nasync function commitSessionUpdate(\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Return delta EntryInfos from calendarQueryUpdateResponder and pingResponder |
129,187 | 18.09.2018 12:57:46 | 14,400 | 1eb54e634253bb39f0280b3a56cd99862d1f3282 | [server] Delete old web sessions | [
{
"change_type": "MODIFY",
"old_path": "server/src/cron.js",
"new_path": "server/src/cron.js",
"diff": "@@ -15,7 +15,10 @@ import { deleteOrphanedMessages } from './deleters/message-deleters';\nimport { deleteOrphanedFocused } from './deleters/activity-deleters';\nimport { deleteOrphanedNotifs } from './deleters/notif-deleters';\nimport { deleteExpiredUpdates } from './deleters/update-deleters';\n-import { deleteOrphanedSessions } from './deleters/session-deleters';\n+import {\n+ deleteOrphanedSessions,\n+ deleteOldWebSessions,\n+} from './deleters/session-deleters';\nimport { backupDB } from './backups';\nif (cluster.isMaster) {\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/session-deleters.js",
"new_path": "server/src/deleters/session-deleters.js",
"diff": "@@ -16,6 +16,21 @@ async function deleteOrphanedSessions(): Promise<void> {\n`);\n}\n+const maxWebSessionAge = 3 * 24 * 60 * 60 * 1000;\n+async function deleteOldWebSessions(): Promise<void> {\n+ const oldestWebSessionToKeep = Date.now() - maxWebSessionAge;\n+ await dbQuery(SQL`\n+ DELETE s, i, f, up, iup\n+ FROM sessions s\n+ LEFT JOIN ids i ON i.id = s.id\n+ LEFT JOIN focused f ON f.session = s.id\n+ LEFT JOIN updates up ON up.target = s.id\n+ LEFT JOIN ids iup ON iup.id = up.id\n+ WHERE s.id != s.cookie AND s.last_update < ${oldestWebSessionToKeep}\n+ `);\n+}\n+\nexport {\ndeleteOrphanedSessions,\n+ deleteOldWebSessions,\n};\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Delete old web sessions |
129,187 | 18.09.2018 15:27:58 | 14,400 | dd7042249bceef2cd889001fc23efb84d3c3c173 | Check entry consistency on entry mutation actions | [
{
"change_type": "MODIFY",
"old_path": "lib/actions/entry-actions.js",
"new_path": "lib/actions/entry-actions.js",
"diff": "@@ -4,13 +4,13 @@ import type {\nRawEntryInfo,\nCalendarQuery,\nSaveEntryInfo,\n- SaveEntryResponse,\n+ SaveEntryResult,\nCreateEntryInfo,\nSaveEntryPayload,\nDeleteEntryInfo,\n- DeleteEntryResponse,\n+ DeleteEntryPayload,\nRestoreEntryInfo,\n- RestoreEntryResponse,\n+ RestoreEntryPayload,\nFetchEntryInfosResult,\nCalendarResult,\nCalendarQueryUpdateResult,\n@@ -96,6 +96,7 @@ async function createEntry(\nnewMessageInfos: result.newMessageInfos,\nthreadID: request.threadID,\nupdatesResult: result.updatesResult,\n+ calendarQuery: request.calendarQuery,\n};\n}\n@@ -108,13 +109,14 @@ const concurrentModificationResetActionType = \"CONCURRENT_MODIFICATION_RESET\";\nasync function saveEntry(\nfetchJSON: FetchJSON,\nrequest: SaveEntryInfo,\n-): Promise<SaveEntryResponse> {\n+): Promise<SaveEntryResult> {\nconst result = await fetchJSON('update_entry', request);\nreturn {\nentryID: result.entryID,\ntext: request.text,\nnewMessageInfos: result.newMessageInfos,\nupdatesResult: result.updatesResult,\n+ calendarQuery: request.calendarQuery,\n};\n}\n@@ -126,7 +128,7 @@ const deleteEntryActionTypes = Object.freeze({\nasync function deleteEntry(\nfetchJSON: FetchJSON,\ninfo: DeleteEntryInfo,\n-): Promise<DeleteEntryResponse> {\n+): Promise<DeleteEntryPayload> {\nconst response = await fetchJSON('delete_entry', {\n...info,\ntimestamp: Date.now(),\n@@ -135,6 +137,7 @@ async function deleteEntry(\nnewMessageInfos: response.newMessageInfos,\nthreadID: response.threadID,\nupdatesResult: response.updatesResult,\n+ calendarQuery: info.calendarQuery,\n};\n}\n@@ -159,7 +162,7 @@ const restoreEntryActionTypes = Object.freeze({\nasync function restoreEntry(\nfetchJSON: FetchJSON,\ninfo: RestoreEntryInfo,\n-): Promise<RestoreEntryResponse> {\n+): Promise<RestoreEntryPayload> {\nconst response = await fetchJSON('restore_entry', {\n...info,\ntimestamp: Date.now(),\n@@ -168,6 +171,7 @@ async function restoreEntry(\nnewMessageInfos: response.newMessageInfos,\nentryInfo: response.entryInfo,\nupdatesResult: response.updatesResult,\n+ calendarQuery: info.calendarQuery,\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/entry-reducer.js",
"new_path": "lib/reducers/entry-reducer.js",
"diff": "@@ -23,7 +23,6 @@ import _filter from 'lodash/fp/filter';\nimport _union from 'lodash/fp/union';\nimport _mapKeys from 'lodash/fp/mapKeys';\nimport _groupBy from 'lodash/fp/groupBy';\n-import _without from 'lodash/fp/without';\nimport _isEqual from 'lodash/fp/isEqual';\nimport _isEmpty from 'lodash/fp/isEmpty';\nimport _values from 'lodash/fp/values';\n@@ -357,16 +356,16 @@ function reduceEntryInfos(\nconst serverID = action.payload.entryID;\n// If an entry with this serverID already got into the store somehow\n// (likely through an unrelated request), we need to dedup them.\n- let newEntryInfos;\n+ let rekeyedEntryInfos;\nif (entryInfos[serverID]) {\n// It's fair to assume the serverID entry is newer than the localID\n// entry, and this probably won't happen often, so for now we can just\n// keep the serverID entry.\n- newEntryInfos = _omitBy(\n+ rekeyedEntryInfos = _omitBy(\n(candidate: RawEntryInfo) => candidate.localID === localID,\n)(entryInfos);\n} else if (entryInfos[localID]) {\n- newEntryInfos = _mapKeys(\n+ rekeyedEntryInfos = _mapKeys(\n(oldKey: string) =>\nentryInfos[oldKey].localID === localID ? serverID : oldKey,\n)(entryInfos);\n@@ -374,30 +373,46 @@ function reduceEntryInfos(\n// This happens if the entry is deauthorized before it's saved\nreturn entryStore;\n}\n- // Setting directly like this is okay because it's a new object anyways\n- newEntryInfos[serverID] = {\n- ...newEntryInfos[serverID],\n+\n+ const pollEntryInfos = {\n+ ...rekeyedEntryInfos,\n+ [serverID]: {\n+ ...rekeyedEntryInfos[serverID],\nid: serverID,\nlocalID,\ntext: action.payload.text,\n+ },\n};\n- const entryInfo = newEntryInfos[serverID];\n- const dayString =\n- dateString(entryInfo.year, entryInfo.month, entryInfo.day);\n- const newDayEntryList = _flow(\n- _without([localID]),\n- _union([serverID]),\n- )(daysToEntries[dayString]);\n- const newDaysToEntries = {\n- ...daysToEntries,\n- [dayString]: newDayEntryList,\n- };\n+ const newDaysToEntries = daysToEntriesFromEntryInfos(\n+ _values(pollEntryInfos),\n+ );\n+\n+ const pushNewEntryInfos = mergeUpdateEntryInfos(\n+ [],\n+ action.payload.updatesResult.viewerUpdates,\n+ );\n+ const [pushEntryInfos] = mergeNewEntryInfos(\n+ rekeyedEntryInfos,\n+ pushNewEntryInfos,\n+ newThreadInfos,\n+ );\n+ const newInconsistencies = findInconsistencies(\n+ entryInfos,\n+ action,\n+ pollEntryInfos,\n+ pushEntryInfos,\n+ action.payload.calendarQuery,\n+ );\n+\nreturn {\n- entryInfos: newEntryInfos,\n+ entryInfos: pollEntryInfos,\ndaysToEntries: newDaysToEntries,\nactualizedCalendarQuery,\nlastUserInteractionCalendar: Date.now(),\n- inconsistencyResponses,\n+ inconsistencyResponses: [\n+ ...inconsistencyResponses,\n+ ...newInconsistencies,\n+ ],\n};\n} else if (action.type === saveEntryActionTypes.success) {\nconst serverID = action.payload.entryID;\n@@ -408,19 +423,40 @@ function reduceEntryInfos(\n// This happens if the entry is deauthorized before it's saved\nreturn entryStore;\n}\n- const newEntryInfos = {\n+ const updatedEntryInfos = {\n...entryInfos,\n[serverID]: {\n...entryInfos[serverID],\ntext: action.payload.text,\n},\n};\n+\n+ const pushNewEntryInfos = mergeUpdateEntryInfos(\n+ [],\n+ action.payload.updatesResult.viewerUpdates,\n+ );\n+ const [pushEntryInfos] = mergeNewEntryInfos(\n+ entryInfos,\n+ pushNewEntryInfos,\n+ newThreadInfos,\n+ );\n+ const newInconsistencies = findInconsistencies(\n+ entryInfos,\n+ action,\n+ updatedEntryInfos,\n+ pushEntryInfos,\n+ action.payload.calendarQuery,\n+ );\n+\nreturn {\n- entryInfos: newEntryInfos,\n+ entryInfos: updatedEntryInfos,\ndaysToEntries,\nactualizedCalendarQuery,\nlastUserInteractionCalendar: Date.now(),\n- inconsistencyResponses,\n+ inconsistencyResponses: [\n+ ...inconsistencyResponses,\n+ ...newInconsistencies,\n+ ],\n};\n} else if (action.type === concurrentModificationResetActionType) {\nconst payload = action.payload;\n@@ -465,6 +501,34 @@ function reduceEntryInfos(\nlastUserInteractionCalendar: Date.now(),\ninconsistencyResponses,\n};\n+ } else if (action.type === deleteEntryActionTypes.success && action.payload) {\n+ const { payload } = action;\n+ const pushNewEntryInfos = mergeUpdateEntryInfos(\n+ [],\n+ payload.updatesResult.viewerUpdates,\n+ );\n+ const [pushEntryInfos] = mergeNewEntryInfos(\n+ entryInfos,\n+ pushNewEntryInfos,\n+ newThreadInfos,\n+ );\n+ const newInconsistencies = findInconsistencies(\n+ entryInfos,\n+ action,\n+ entryInfos,\n+ pushEntryInfos,\n+ payload.calendarQuery,\n+ );\n+ return {\n+ entryInfos,\n+ daysToEntries,\n+ actualizedCalendarQuery,\n+ lastUserInteractionCalendar,\n+ inconsistencyResponses: [\n+ ...inconsistencyResponses,\n+ ...newInconsistencies,\n+ ],\n+ };\n} else if (action.type === fetchRevisionsForEntryActionTypes.success) {\nconst id = action.payload.entryID;\nif (\n@@ -493,16 +557,37 @@ function reduceEntryInfos(\n} else if (action.type === restoreEntryActionTypes.success) {\nconst entryInfo = action.payload.entryInfo;\nconst key = entryID(entryInfo);\n- const newEntryInfos = {\n+ const updatedEntryInfos = {\n...entryInfos,\n[key]: entryInfo,\n};\n+\n+ const pushNewEntryInfos = mergeUpdateEntryInfos(\n+ [],\n+ action.payload.updatesResult.viewerUpdates,\n+ );\n+ const [pushEntryInfos] = mergeNewEntryInfos(\n+ entryInfos,\n+ pushNewEntryInfos,\n+ newThreadInfos,\n+ );\n+ const newInconsistencies = findInconsistencies(\n+ entryInfos,\n+ action,\n+ updatedEntryInfos,\n+ pushEntryInfos,\n+ action.payload.calendarQuery,\n+ );\n+\nreturn {\n- entryInfos: newEntryInfos,\n+ entryInfos: updatedEntryInfos,\ndaysToEntries,\nactualizedCalendarQuery,\nlastUserInteractionCalendar: Date.now(),\n- inconsistencyResponses,\n+ inconsistencyResponses: [\n+ ...inconsistencyResponses,\n+ ...newInconsistencies,\n+ ],\n};\n} else if (\naction.type === logInActionTypes.success ||\n@@ -662,7 +747,6 @@ function findInconsistencies(\npushResult,\ncalendarQuery,\n);\n- // TODO: we should call findInconsistencies from the 4 entry endpoints as well\nif (_isEqual(filteredPollResult)(filteredPushResult)) {\nreturn emptyArray;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/entry-types.js",
"new_path": "lib/types/entry-types.js",
"diff": "@@ -97,19 +97,20 @@ export type SaveEntryRequest = {|\ncalendarQuery?: CalendarQuery,\n|};\n-export type SaveEntryResult = {|\n+export type SaveEntryResponse = {|\nentryID: string,\nnewMessageInfos: $ReadOnlyArray<RawMessageInfo>,\nupdatesResult: CreateUpdatesResponse,\n|};\n-export type SaveEntryResponse = {|\n- ...SaveEntryResult,\n+export type SaveEntryResult = {|\n+ ...SaveEntryResponse,\ntext: string,\n+ calendarQuery: CalendarQuery,\n|};\nexport type SaveEntryPayload = {|\n- ...SaveEntryResponse,\n+ ...SaveEntryResult,\nthreadID: string,\n|};\n@@ -129,7 +130,7 @@ export type CreateEntryRequest = {|\ncalendarQuery?: CalendarQuery,\n|};\n-export type CreateEntryResponse = {|\n+export type CreateEntryPayload = {|\n...SaveEntryPayload,\nlocalID: string,\n|};\n@@ -163,12 +164,20 @@ export type DeleteEntryResponse = {|\nthreadID: string,\nupdatesResult: CreateUpdatesResponse,\n|};\n+export type DeleteEntryPayload = {|\n+ ...DeleteEntryResponse,\n+ calendarQuery: CalendarQuery,\n+|};\nexport type RestoreEntryResponse = {|\nnewMessageInfos: $ReadOnlyArray<RawMessageInfo>,\nentryInfo: RawEntryInfo,\nupdatesResult: CreateUpdatesResponse,\n|};\n+export type RestoreEntryPayload = {|\n+ ...RestoreEntryResponse,\n+ calendarQuery: CalendarQuery,\n+|};\nexport type FetchEntryInfosResponse = {|\nrawEntryInfos: $ReadOnlyArray<RawEntryInfo>,\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/redux-types.js",
"new_path": "lib/types/redux-types.js",
"diff": "@@ -12,9 +12,9 @@ import type {\nEntryStore,\nCalendarQuery,\nSaveEntryPayload,\n- CreateEntryResponse,\n- DeleteEntryResponse,\n- RestoreEntryResponse,\n+ CreateEntryPayload,\n+ DeleteEntryPayload,\n+ RestoreEntryPayload,\nFetchEntryInfosResult,\nCalendarResult,\nCalendarQueryUpdateResult,\n@@ -130,7 +130,7 @@ export type BaseAction =\nloadingInfo: LoadingInfo,\n|} | {|\ntype: \"CREATE_ENTRY_SUCCESS\",\n- payload: CreateEntryResponse,\n+ payload: CreateEntryPayload,\nloadingInfo: LoadingInfo,\n|} | {|\ntype: \"SAVE_ENTRY_STARTED\",\n@@ -164,7 +164,7 @@ export type BaseAction =\nloadingInfo: LoadingInfo,\n|} | {|\ntype: \"DELETE_ENTRY_SUCCESS\",\n- payload: ?DeleteEntryResponse,\n+ payload: ?DeleteEntryPayload,\nloadingInfo: LoadingInfo,\n|} | {|\ntype: \"LOG_IN_STARTED\",\n@@ -327,7 +327,7 @@ export type BaseAction =\nloadingInfo: LoadingInfo,\n|} | {|\ntype: \"RESTORE_ENTRY_SUCCESS\",\n- payload: RestoreEntryResponse,\n+ payload: RestoreEntryPayload,\nloadingInfo: LoadingInfo,\n|} | {|\ntype: \"JOIN_THREAD_STARTED\",\n"
},
{
"change_type": "MODIFY",
"old_path": "native/calendar/entry.react.js",
"new_path": "native/calendar/entry.react.js",
"diff": "@@ -5,9 +5,10 @@ import {\nentryInfoPropType,\ntype CreateEntryInfo,\ntype SaveEntryInfo,\n- type SaveEntryResponse,\n+ type SaveEntryResult,\n+ type SaveEntryPayload,\ntype DeleteEntryInfo,\n- type DeleteEntryResponse,\n+ type DeleteEntryPayload,\ntype CalendarQuery,\n} from 'lib/types/entry-types';\nimport type { ThreadInfo } from 'lib/types/thread-types';\n@@ -88,9 +89,9 @@ type Props = {\ndispatchActionPayload: DispatchActionPayload,\ndispatchActionPromise: DispatchActionPromise,\n// async functions that hit server APIs\n- createEntry: (info: CreateEntryInfo) => Promise<SaveEntryResponse>,\n- saveEntry: (info: SaveEntryInfo) => Promise<SaveEntryResponse>,\n- deleteEntry: (info: DeleteEntryInfo) => Promise<DeleteEntryResponse>,\n+ createEntry: (info: CreateEntryInfo) => Promise<SaveEntryPayload>,\n+ saveEntry: (info: SaveEntryInfo) => Promise<SaveEntryResult>,\n+ deleteEntry: (info: DeleteEntryInfo) => Promise<DeleteEntryPayload>,\n};\ntype State = {|\nediting: bool,\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/entry-creator.js",
"new_path": "server/src/creators/entry-creator.js",
"diff": "import type {\nCreateEntryRequest,\n- SaveEntryResult,\n+ SaveEntryResponse,\n} from 'lib/types/entry-types';\nimport type { Viewer } from '../session/viewer';\nimport { messageTypes } from 'lib/types/message-types';\n@@ -23,7 +23,7 @@ import {\nasync function createEntry(\nviewer: Viewer,\nrequest: CreateEntryRequest,\n-): Promise<SaveEntryResult> {\n+): Promise<SaveEntryResponse> {\nif (!viewer.loggedIn) {\nthrow new ServerError('not_logged_in');\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/entry-responders.js",
"new_path": "server/src/responders/entry-responders.js",
"diff": "@@ -11,7 +11,7 @@ import type {\nRestoreEntryResponse,\nFetchEntryInfosResponse,\nFetchEntryInfosResult,\n- SaveEntryResult,\n+ SaveEntryResponse,\n} from 'lib/types/entry-types';\nimport type {\nFetchEntryRevisionInfosResult,\n@@ -152,7 +152,7 @@ const createEntryRequestInputValidator = tShape({\nasync function entryCreationResponder(\nviewer: Viewer,\ninput: any,\n-): Promise<SaveEntryResult> {\n+): Promise<SaveEntryResponse> {\nconst request: CreateEntryRequest = input;\nvalidateInput(createEntryRequestInputValidator, request);\nreturn await createEntry(viewer, request);\n@@ -170,7 +170,7 @@ const saveEntryRequestInputValidator = tShape({\nasync function entryUpdateResponder(\nviewer: Viewer,\ninput: any,\n-): Promise<SaveEntryResult> {\n+): Promise<SaveEntryResponse> {\nconst request: SaveEntryRequest = input;\nvalidateInput(saveEntryRequestInputValidator, request);\nreturn await updateEntry(viewer, request);\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/entry-updaters.js",
"new_path": "server/src/updaters/entry-updaters.js",
"diff": "import type {\nSaveEntryRequest,\n- SaveEntryResult,\n+ SaveEntryResponse,\nRawEntryInfo,\nCalendarQuery,\n} from 'lib/types/entry-types';\n@@ -38,7 +38,7 @@ const defaultUpdateCreationResponse = { viewerUpdates: [], userInfos: [] };\nasync function updateEntry(\nviewer: Viewer,\nrequest: SaveEntryRequest,\n-): Promise<SaveEntryResult> {\n+): Promise<SaveEntryResponse> {\nif (!viewer.loggedIn) {\nthrow new ServerError('not_logged_in');\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "web/calendar/entry.react.js",
"new_path": "web/calendar/entry.react.js",
"diff": "@@ -5,9 +5,10 @@ import {\nentryInfoPropType,\ntype CreateEntryInfo,\ntype SaveEntryInfo,\n- type SaveEntryResponse,\n+ type SaveEntryResult,\n+ type SaveEntryPayload,\ntype DeleteEntryInfo,\n- type DeleteEntryResponse,\n+ type DeleteEntryPayload,\ntype CalendarQuery,\n} from 'lib/types/entry-types';\nimport type { ThreadInfo } from 'lib/types/thread-types';\n@@ -63,9 +64,9 @@ type Props = {\ndispatchActionPayload: DispatchActionPayload,\ndispatchActionPromise: DispatchActionPromise,\n// async functions that hit server APIs\n- createEntry: (info: CreateEntryInfo) => Promise<SaveEntryResponse>,\n- saveEntry: (info: SaveEntryInfo) => Promise<SaveEntryResponse>,\n- deleteEntry: (info: DeleteEntryInfo) => Promise<DeleteEntryResponse>,\n+ createEntry: (info: CreateEntryInfo) => Promise<SaveEntryPayload>,\n+ saveEntry: (info: SaveEntryInfo) => Promise<SaveEntryResult>,\n+ deleteEntry: (info: DeleteEntryInfo) => Promise<DeleteEntryPayload>,\n};\ntype State = {\nfocused: bool,\n"
},
{
"change_type": "MODIFY",
"old_path": "web/modals/history/history-entry.react.js",
"new_path": "web/modals/history/history-entry.react.js",
"diff": "@@ -6,7 +6,7 @@ import {\ntype EntryInfo,\nentryInfoPropType,\ntype RestoreEntryInfo,\n- type RestoreEntryResponse,\n+ type RestoreEntryPayload,\ntype CalendarQuery,\n} from 'lib/types/entry-types';\nimport type { AppState } from '../../redux-setup';\n@@ -44,7 +44,7 @@ type Props = {\n// Redux dispatch functions\ndispatchActionPromise: DispatchActionPromise,\n// async functions that hit server APIs\n- restoreEntry: (info: RestoreEntryInfo) => Promise<RestoreEntryResponse>,\n+ restoreEntry: (info: RestoreEntryInfo) => Promise<RestoreEntryPayload>,\n};\nclass HistoryEntry extends React.PureComponent<Props> {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Check entry consistency on entry mutation actions |
129,187 | 19.09.2018 10:34:21 | 14,400 | c33c340be3daf166bf68b8fee0ce39a6e1c93b52 | [native] Update calendar reset mechanism
We can no longer rely on the `sessionID` to detect when `currentCalendarQuery` is reset. | [
{
"change_type": "MODIFY",
"old_path": "native/calendar/calendar.react.js",
"new_path": "native/calendar/calendar.react.js",
"diff": "@@ -109,7 +109,6 @@ type Props = {\n// Redux state\nlistData: ?$ReadOnlyArray<CalendarItem>,\ntabActive: bool,\n- sessionID: string,\nstartDate: string,\nendDate: string,\ncalendarFilters: $ReadOnlyArray<CalendarFilter>,\n@@ -155,7 +154,6 @@ class InnerCalendar extends React.PureComponent<Props, State> {\n}),\n])),\ntabActive: PropTypes.bool.isRequired,\n- sessionID: PropTypes.string.isRequired,\nstartDate: PropTypes.string.isRequired,\nendDate: PropTypes.string.isRequired,\ncalendarFilters: PropTypes.arrayOf(calendarFilterPropType).isRequired,\n@@ -186,7 +184,7 @@ class InnerCalendar extends React.PureComponent<Props, State> {\ntextHeights: ?Map<string, number> = null;\ncurrentState: ?string = NativeAppState.currentState;\nlastForegrounded = 0;\n- lastSessionReset = 0;\n+ lastCalendarReset = 0;\nloadingFromScroll = false;\ncurrentScrollPosition: ?number = null;\n// We don't always want an extraData update to trigger a state update, so we\n@@ -275,13 +273,13 @@ class InnerCalendar extends React.PureComponent<Props, State> {\n// We're only handling foregrounding here\nreturn;\n}\n- if (Date.now() - this.lastSessionReset < 500) {\n- // If the session got reset right before this callback triggered, that\n+ if (Date.now() - this.lastCalendarReset < 500) {\n+ // If the calendar got reset right before this callback triggered, that\n// indicates we should reset the scroll position\n- this.lastSessionReset = 0;\n+ this.lastCalendarReset = 0;\nthis.scrollToToday(false);\n} else {\n- // Otherwise, it's possible that the session is about to get reset. We\n+ // Otherwise, it's possible that the calendar is about to get reset. We\n// record a timestamp here so we can scrollToToday there.\nthis.lastForegrounded = Date.now();\n}\n@@ -367,21 +365,23 @@ class InnerCalendar extends React.PureComponent<Props, State> {\n}\nif (\n- nextProps.sessionID !== this.props.sessionID &&\n+ nextProps.listData &&\n+ this.props.listData &&\n+ nextProps.listData.length < this.props.listData.length &&\nthis.flatList\n) {\nif (!nextProps.tabActive) {\n- // If the sessionID gets reset and the user isn't looking we reset\n+ // If the currentCalendarQuery gets reset we scroll to the center\nthis.scrollToToday();\n} else if (Date.now() - this.lastForegrounded < 500) {\n- // If the app got foregrounded right before the session got reset, that\n+ // If the app got foregrounded right before the calendar got reset, that\n// indicates we should reset the scroll position\nthis.lastForegrounded = 0;\nthis.scrollToToday(false);\n} else {\n// Otherwise, it's possible that the foreground callback is about to get\n// triggered. We record a timestamp here so we can scrollToToday there.\n- this.lastSessionReset = Date.now();\n+ this.lastCalendarReset = Date.now();\n}\n}\n@@ -1144,7 +1144,6 @@ const Calendar = connect(\n(state: AppState) => ({\nlistData: calendarListData(state),\ntabActive: activeTabSelector(state),\n- sessionID: state.sessionID,\nstartDate: state.navInfo.startDate,\nendDate: state.navInfo.endDate,\ncalendarFilters: state.calendarFilters,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/persist.js",
"new_path": "native/persist.js",
"diff": "@@ -65,6 +65,7 @@ const migrations = {\n[7]: (state) => ({\n...state,\nlastUserInteraction: undefined,\n+ sessionID: undefined,\nentryStore: {\n...state.entryStore,\ninconsistencyResponses: [],\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Update calendar reset mechanism
We can no longer rely on the `sessionID` to detect when `currentCalendarQuery` is reset. |
129,187 | 19.09.2018 10:48:33 | 14,400 | 73c8192f359fe9109ae5f52d983686cc6dafb7ea | [web] Fix chat loading on log in | [
{
"change_type": "MODIFY",
"old_path": "web/chat/chat-message-list.react.js",
"new_path": "web/chat/chat-message-list.react.js",
"diff": "@@ -70,10 +70,6 @@ class ChatMessageList extends React.PureComponent<Props, State> {\nloadingFromScroll = false;\ncomponentDidMount() {\n- // In case we already have all the most recent messages,\n- // but they're not enough\n- this.onScroll();\n-\nconst { threadInfo } = this.props;\nif (!threadInfo || threadInChatList(threadInfo)) {\nreturn;\n@@ -108,15 +104,19 @@ class ChatMessageList extends React.PureComponent<Props, State> {\n) {\nthis.loadingFromScroll = false;\n}\n- if (prevProps.messageListData !== this.props.messageListData) {\n+ if (\n+ this.messageContainer &&\n+ prevProps.messageListData !== this.props.messageListData\n+ ) {\nthis.onScroll();\n}\n}\nscrollToBottom() {\n- invariant(this.messageContainer, \"should be set\");\n+ if (this.messageContainer) {\nthis.messageContainer.scrollTop = this.messageContainer.scrollHeight;\n}\n+ }\nstatic keyExtractor(item: ChatMessageItem) {\nif (item.itemType === \"loader\") {\n@@ -175,13 +175,18 @@ class ChatMessageList extends React.PureComponent<Props, State> {\nmessageContainerRef = (messageContainer: ?HTMLDivElement) => {\nthis.messageContainer = messageContainer;\n+ // In case we already have all the most recent messages,\n+ // but they're not enough\n+ this.onScroll();\nif (messageContainer) {\nmessageContainer.addEventListener(\"scroll\", this.onScroll);\n}\n}\nonScroll = () => {\n- invariant(this.messageContainer, \"should be set\");\n+ if (!this.messageContainer) {\n+ return;\n+ }\nif (this.messageContainer.scrollTop > 55 || this.props.startReached) {\nreturn;\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [web] Fix chat loading on log in |
129,187 | 19.09.2018 10:50:01 | 14,400 | 19593db23b8ade1d63b0e7419c4306f6b515658f | [native] codeVersion -> 17 | [
{
"change_type": "MODIFY",
"old_path": "native/android/app/build.gradle",
"new_path": "native/android/app/build.gradle",
"diff": "@@ -109,8 +109,8 @@ android {\napplicationId \"org.squadcal\"\nminSdkVersion rootProject.ext.minSdkVersion\ntargetSdkVersion rootProject.ext.targetSdkVersion\n- versionCode 16\n- versionName \"0.0.16\"\n+ versionCode 17\n+ versionName \"0.0.17\"\nndk {\nabiFilters \"armeabi-v7a\", \"x86\"\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/android/app/src/main/AndroidManifest.xml",
"new_path": "native/android/app/src/main/AndroidManifest.xml",
"diff": "xmlns:android=\"http://schemas.android.com/apk/res/android\"\nxmlns:tools=\"http://schemas.android.com/tools\"\npackage=\"org.squadcal\"\n- android:versionCode=\"16\"\n- android:versionName=\"0.0.16\"\n+ android:versionCode=\"17\"\n+ android:versionName=\"0.0.17\"\n>\n<uses-permission android:name=\"android.permission.INTERNET\" />\n<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "native/ios/SquadCal/Info.plist",
"new_path": "native/ios/SquadCal/Info.plist",
"diff": "<key>CFBundlePackageType</key>\n<string>APPL</string>\n<key>CFBundleShortVersionString</key>\n- <string>0.0.16</string>\n+ <string>0.0.17</string>\n<key>CFBundleSignature</key>\n<string>????</string>\n<key>CFBundleVersion</key>\n- <string>16</string>\n+ <string>17</string>\n<key>LSApplicationQueriesSchemes</key>\n<array>\n<string>org-appextension-feature-password-management</string>\n"
},
{
"change_type": "MODIFY",
"old_path": "native/persist.js",
"new_path": "native/persist.js",
"diff": "@@ -83,7 +83,7 @@ const persistConfig = {\nmigrate: createMigrate(migrations, { debug: __DEV__ }),\n};\n-const codeVersion = 16;\n+const codeVersion = 17;\n// This local exists to avoid a circular dependency where redux-setup needs to\n// import all the navigation and screen stuff, but some of those screens want to\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] codeVersion -> 17 |
129,187 | 19.09.2018 14:09:22 | 14,400 | 0a7aad4b280bac232142b77bb846c702b8c7570c | [server] Fix filtering logic for updateTypes.UPDATE_ENTRY | [
{
"change_type": "MODIFY",
"old_path": "server/src/creators/entry-creator.js",
"new_path": "server/src/creators/entry-creator.js",
"diff": "@@ -17,7 +17,7 @@ import createIDs from '../creators/id-creator';\nimport createMessages from '../creators/message-creator';\nimport { checkThreadPermission } from '../fetchers/thread-fetchers';\nimport {\n- createUpdateDatasForChangedEntryInfo\n+ createUpdateDatasForChangedEntryInfo,\n} from '../updaters/entry-updaters';\nasync function createEntry(\n@@ -107,6 +107,7 @@ async function createEntry(\ncreateMessages([messageData]),\ncreateUpdateDatasForChangedEntryInfo(\nviewer,\n+ null,\nrawEntryInfo,\nrequest.calendarQuery,\n),\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/update-creator.js",
"new_path": "server/src/creators/update-creator.js",
"diff": "@@ -38,7 +38,6 @@ import {\nkeyForUpdateInfo,\nconditionKeyForUpdateData,\n} from 'lib/shared/update-utils';\n-import { rawEntryInfoWithinCalendarQuery } from 'lib/shared/entry-utils';\nimport { ServerError } from 'lib/utils/errors';\nimport { dbQuery, SQL, SQLStatement, mergeAndConditions } from '../database';\n@@ -195,10 +194,6 @@ async function createUpdates(\nconst earliestTime: Map<string, number> = new Map();\nfor (let i = 0; i < filteredUpdateDatas.length; i++) {\nconst updateData = filteredUpdateDatas[i];\n- if (viewerInfo && updateData.userID === viewerInfo.viewer.id) {\n- viewerUpdateDatas.push({ data: updateData, id: ids[i] });\n- }\n-\nlet content, target = null;\nif (updateData.type === updateTypes.DELETE_ACCOUNT) {\ncontent = JSON.stringify({ deletedUserID: updateData.deletedUserID });\n@@ -225,6 +220,20 @@ async function createUpdates(\ninvariant(false, `unrecognized updateType ${updateData.type}`);\n}\n+ if (\n+ viewerInfo &&\n+ updateData.userID === viewerInfo.viewer.id &&\n+ (!target || target === viewerInfo.viewer.session)\n+ ) {\n+ viewerUpdateDatas.push({ data: updateData, id: ids[i] });\n+ }\n+\n+ if (viewerInfo && target && viewerInfo.viewer.session === target) {\n+ // In the case where this update is being created only for the current\n+ // session, there's no reason to insert a row into the updates table\n+ continue;\n+ }\n+\nconst key = keyForUpdateData(updateData);\nif (key) {\nconst conditionKey = `${updateData.userID}|${key}`;\n@@ -394,7 +403,6 @@ async function fetchUpdateInfosWithUpdateDatas(\n{\nthreadInfosResult,\nmessageInfosResult,\n- calendarQuery,\ncalendarResult,\nentryInfosResult,\n},\n@@ -404,7 +412,6 @@ async function fetchUpdateInfosWithUpdateDatas(\nexport type UpdateInfosRawData = {|\nthreadInfosResult: FetchThreadInfosResult,\nmessageInfosResult: ?FetchMessageInfosResult,\n- calendarQuery: CalendarQuery,\ncalendarResult: ?FetchEntryInfosResponse,\nentryInfosResult: ?$ReadOnlyArray<RawEntryInfo>,\n|};\n@@ -415,7 +422,6 @@ async function updateInfosFromUpdateDatas(\nconst {\nthreadInfosResult,\nmessageInfosResult,\n- calendarQuery,\ncalendarResult,\nentryInfosResult,\n} = rawData;\n@@ -503,9 +509,6 @@ async function updateInfosFromUpdateDatas(\ncandidate => candidate.id === updateData.entryID,\n);\ninvariant(entryInfo, \"should be set\");\n- if (!rawEntryInfoWithinCalendarQuery(entryInfo, calendarQuery)) {\n- continue;\n- }\nuserIDs = new Set([\n...userIDs,\n...usersInRawEntryInfos([entryInfo]),\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/entry-deleters.js",
"new_path": "server/src/deleters/entry-deleters.js",
"diff": "@@ -19,7 +19,7 @@ import { checkThreadPermissionForEntry } from '../fetchers/entry-fetchers';\nimport createIDs from '../creators/id-creator';\nimport createMessages from '../creators/message-creator';\nimport {\n- createUpdateDatasForChangedEntryInfo\n+ createUpdateDatasForChangedEntryInfo,\n} from '../updaters/entry-updaters';\nconst lastRevisionQuery = (entryID: string) =>\n@@ -107,7 +107,7 @@ async function deleteEntry(\ntext,\n};\n- const rawEntryInfo = {\n+ const oldEntryInfo = {\nid: request.entryID,\nthreadID,\ntext,\n@@ -116,14 +116,19 @@ async function deleteEntry(\nday: lastRevisionRow.day,\ncreationTime: lastRevisionRow.creation_time,\ncreatorID: lastRevisionRow.creator.toString(),\n+ deleted: false,\n+ };\n+ const newEntryInfo = {\n+ ...oldEntryInfo,\ndeleted: true,\n- }\n+ };\nconst [ newMessageInfos, updatesResult ] = await Promise.all([\ncreateMessages([messageData]),\ncreateUpdateDatasForChangedEntryInfo(\nviewer,\n- rawEntryInfo,\n+ oldEntryInfo,\n+ newEntryInfo,\nrequest.calendarQuery,\n),\nPromise.all(dbPromises),\n@@ -192,7 +197,7 @@ async function restoreEntry(\ntext,\n};\n- const entryInfo = {\n+ const oldEntryInfo = {\nid: request.entryID,\nthreadID,\ntext,\n@@ -201,6 +206,10 @@ async function restoreEntry(\nday: lastRevisionRow.day,\ncreationTime: lastRevisionRow.creation_time,\ncreatorID: lastRevisionRow.creator.toString(),\n+ deleted: true,\n+ };\n+ const newEntryInfo = {\n+ ...oldEntryInfo,\ndeleted: false,\n};\n@@ -208,13 +217,14 @@ async function restoreEntry(\ncreateMessages([messageData]),\ncreateUpdateDatasForChangedEntryInfo(\nviewer,\n- entryInfo,\n+ oldEntryInfo,\n+ newEntryInfo,\nrequest.calendarQuery,\n),\nPromise.all(dbPromises),\n]);\n- return { entryInfo, newMessageInfos, updatesResult };\n+ return { entryInfo: newEntryInfo, newMessageInfos, updatesResult };\n}\nasync function deleteOrphanedEntries(): Promise<void> {\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/fetchers/session-fetchers.js",
"new_path": "server/src/fetchers/session-fetchers.js",
"diff": "@@ -42,7 +42,7 @@ async function fetchActiveSessionsForThread(\nfor (let row of result) {\nfilters.push({\nuserID: row.user.toString(),\n- session: row.id,\n+ session: row.id.toString(),\ncalendarQuery: row.query,\n});\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/entry-updaters.js",
"new_path": "server/src/updaters/entry-updaters.js",
"diff": "@@ -155,6 +155,10 @@ async function updateEntry(\nVALUES ${[revisionRow]}\n`));\n}\n+ const updatedEntryInfo = {\n+ ...entryInfo,\n+ text: request.text,\n+ };\nconst [ newMessageInfos, updatesResult ] = await Promise.all([\ncreateMessages([{\n@@ -169,6 +173,7 @@ async function updateEntry(\ncreateUpdateDatasForChangedEntryInfo(\nviewer,\nentryInfo,\n+ updatedEntryInfo,\nrequest.calendarQuery,\n),\nPromise.all(dbPromises),\n@@ -176,25 +181,22 @@ async function updateEntry(\nreturn { entryID: request.entryID, newMessageInfos, updatesResult };\n}\n-// The passed-in RawEntryInfo doesn't need to be the version with updated text,\n-// as the returned UpdateInfos will have newly fetched RawEntryInfos. However,\n-// the passed-in RawEntryInfo's date is used for determining which clients need\n-// the update. Right now it's impossible to change an entry's date, but when it\n-// becomes possible, we will need to update both clients with the old date and\n-// clients with the new date.\nasync function createUpdateDatasForChangedEntryInfo(\nviewer: Viewer,\n- entryInfo: RawEntryInfo,\n+ oldEntryInfo: ?RawEntryInfo,\n+ newEntryInfo: RawEntryInfo,\ninputCalendarQuery: ?CalendarQuery,\n): Promise<CreateUpdatesResponse> {\nif (!viewer.loggedIn) {\nthrow new ServerError('not_logged_in');\n}\n- const entryID = entryInfo.id;\n+ const entryID = newEntryInfo.id;\ninvariant(entryID, \"should be set\");\nconst [ fetchedFilters, fetchedCalendarQuery ] = await Promise.all([\n- fetchActiveSessionsForThread(entryInfo.threadID),\n+ // If we ever make it possible to move entries from one thread to another,\n+ // we should update this code rto look at oldEntryInfo.threadID as well\n+ fetchActiveSessionsForThread(newEntryInfo.threadID),\ninputCalendarQuery ? undefined : fetchSessionCalendarQuery(viewer),\n]);\n@@ -224,7 +226,10 @@ async function createUpdateDatasForChangedEntryInfo(\nconst time = Date.now();\nconst updateDatas = filters.filter(\n- filter => rawEntryInfoWithinCalendarQuery(entryInfo, filter.calendarQuery),\n+ filter =>\n+ rawEntryInfoWithinCalendarQuery(newEntryInfo, filter.calendarQuery) ||\n+ (oldEntryInfo &&\n+ rawEntryInfoWithinCalendarQuery(oldEntryInfo, filter.calendarQuery)),\n).map(filter => ({\ntype: updateTypes.UPDATE_ENTRY,\nuserID: filter.userID,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Fix filtering logic for updateTypes.UPDATE_ENTRY |
129,187 | 19.09.2018 14:26:48 | 14,400 | a03655aa7188577737f2457e7c1fc47bb1e81721 | [native] Fix paging behavior in calendar | [
{
"change_type": "MODIFY",
"old_path": "lib/reducers/entry-reducer.js",
"new_path": "lib/reducers/entry-reducer.js",
"diff": "@@ -295,7 +295,7 @@ function reduceEntryInfos(\nentryInfos,\ndaysToEntries,\nactualizedCalendarQuery: action.payload.calendarQuery,\n- lastUserInteractionCalendar,\n+ lastUserInteractionCalendar: Date.now(),\ninconsistencyResponses,\n};\n} else if (\n"
},
{
"change_type": "MODIFY",
"old_path": "native/calendar/calendar.react.js",
"new_path": "native/calendar/calendar.react.js",
"diff": "@@ -1023,20 +1023,19 @@ class InnerCalendar extends React.PureComponent<Props, State> {\n});\n}\n- let start: ?Date = null;\n- let end: ?Date = null;\n+ let startDate = null, endDate = null;\nif (topLoader && !this.topLoaderWaitingToLeaveView) {\nthis.topLoaderWaitingToLeaveView = true;\n- start = dateFromString(this.props.startDate);\n+ const start = dateFromString(this.props.startDate);\nstart.setDate(start.getDate() - 31);\n- end = dateFromString(this.props.startDate);\n- end.setDate(end.getDate() - 1);\n+ startDate = dateString(start);\n+ endDate = this.props.endDate;\n} else if (bottomLoader && !this.bottomLoaderWaitingToLeaveView) {\nthis.bottomLoaderWaitingToLeaveView = true;\n- start = dateFromString(this.props.endDate);\n- start.setDate(start.getDate() + 1);\n- end = dateFromString(this.props.endDate);\n+ const end = dateFromString(this.props.endDate);\nend.setDate(end.getDate() + 31);\n+ endDate = dateString(end);\n+ startDate = this.props.startDate;\n} else {\nreturn;\n}\n@@ -1044,8 +1043,8 @@ class InnerCalendar extends React.PureComponent<Props, State> {\nthis.props.dispatchActionPromise(\nupdateCalendarQueryActionTypes,\nthis.props.updateCalendarQuery({\n- startDate: dateString(start),\n- endDate: dateString(end),\n+ startDate,\n+ endDate,\nfilters: this.props.calendarFilters,\n}),\n);\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Fix paging behavior in calendar |
129,187 | 19.09.2018 14:35:30 | 14,400 | 93fbd37471f650b4ba48efb7b1094b22fa131d26 | [native] codeVersion -> 18 | [
{
"change_type": "MODIFY",
"old_path": "native/android/app/build.gradle",
"new_path": "native/android/app/build.gradle",
"diff": "@@ -109,8 +109,8 @@ android {\napplicationId \"org.squadcal\"\nminSdkVersion rootProject.ext.minSdkVersion\ntargetSdkVersion rootProject.ext.targetSdkVersion\n- versionCode 17\n- versionName \"0.0.17\"\n+ versionCode 18\n+ versionName \"0.0.18\"\nndk {\nabiFilters \"armeabi-v7a\", \"x86\"\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/android/app/src/main/AndroidManifest.xml",
"new_path": "native/android/app/src/main/AndroidManifest.xml",
"diff": "xmlns:android=\"http://schemas.android.com/apk/res/android\"\nxmlns:tools=\"http://schemas.android.com/tools\"\npackage=\"org.squadcal\"\n- android:versionCode=\"17\"\n- android:versionName=\"0.0.17\"\n+ android:versionCode=\"18\"\n+ android:versionName=\"0.0.18\"\n>\n<uses-permission android:name=\"android.permission.INTERNET\" />\n<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "native/ios/SquadCal/Info.plist",
"new_path": "native/ios/SquadCal/Info.plist",
"diff": "<key>CFBundlePackageType</key>\n<string>APPL</string>\n<key>CFBundleShortVersionString</key>\n- <string>0.0.17</string>\n+ <string>0.0.18</string>\n<key>CFBundleSignature</key>\n<string>????</string>\n<key>CFBundleVersion</key>\n- <string>17</string>\n+ <string>18</string>\n<key>LSApplicationQueriesSchemes</key>\n<array>\n<string>org-appextension-feature-password-management</string>\n"
},
{
"change_type": "MODIFY",
"old_path": "native/persist.js",
"new_path": "native/persist.js",
"diff": "@@ -83,7 +83,7 @@ const persistConfig = {\nmigrate: createMigrate(migrations, { debug: __DEV__ }),\n};\n-const codeVersion = 17;\n+const codeVersion = 18;\n// This local exists to avoid a circular dependency where redux-setup needs to\n// import all the navigation and screen stuff, but some of those screens want to\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] codeVersion -> 18 |
129,187 | 20.09.2018 08:20:39 | 14,400 | 6787b5f3c118f7d5ee1ef1889d9b96c100d28711 | [server] Actually delete web sessions in cron, and do it after deleting updates | [
{
"change_type": "MODIFY",
"old_path": "server/src/cron.js",
"new_path": "server/src/cron.js",
"diff": "@@ -39,8 +39,9 @@ if (cluster.isMaster) {\nawait deleteOrphanedMessages();\nawait deleteOrphanedFocused();\nawait deleteOrphanedNotifs();\n- await deleteExpiredUpdates();\nawait deleteOrphanedSessions();\n+ await deleteOldWebSessions();\n+ await deleteExpiredUpdates();\n} catch (e) {\nconsole.warn(\n\"encountered error while trying to clean database\",\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Actually delete web sessions in cron, and do it after deleting updates |
129,187 | 20.09.2018 14:11:20 | 14,400 | a0b475df97a6f9524f5122e716c23aeeffc4f9b9 | [server] Extract ServerRequest/ClientResponder logic in pingResponder | [
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -7,6 +7,8 @@ import {\nserverRequestTypes,\ntype ThreadPollPushInconsistencyClientResponse,\ntype EntryPollPushInconsistencyClientResponse,\n+ type ClientResponse,\n+ type ServerRequest,\n} from 'lib/types/request-types';\nimport { isDeviceType, assertDeviceType } from 'lib/types/device-types';\nimport {\n@@ -156,91 +158,22 @@ async function pingResponder(\n) {\nthrow new ServerError('invalid_parameters');\n}\n-\nconst { calendarQuery } = request;\nawait verifyCalendarQueryThreadIDs(calendarQuery);\n+ // We do this before the following promises because INITIAL_ACTIVITY_UPDATE\n+ // can affect the unread status of the threadsResult\n+ const serverRequests = await processClientResponses(\n+ viewer,\n+ request.clientResponses,\n+ );\n+\nconst threadCursors = {};\nfor (let watchedThreadID of request.watchedIDs) {\nthreadCursors[watchedThreadID] = null;\n}\nconst threadSelectionCriteria = { threadCursors, joinedThreads: true };\n- let viewerMissingPlatform = !viewer.platform;\n- const platformDetails = viewer.platformDetails;\n- let viewerMissingPlatformDetails = !platformDetails ||\n- (isDeviceType(viewer.platform) &&\n- (platformDetails.codeVersion === null ||\n- platformDetails.codeVersion === undefined ||\n- platformDetails.stateVersion === null ||\n- platformDetails.stateVersion === undefined));\n- let viewerMissingDeviceToken =\n- isDeviceType(viewer.platform) && viewer.loggedIn && !viewer.deviceToken;\n-\n- const { clientResponses } = request;\n- const clientResponsePromises = [];\n- if (clientResponses) {\n- const clientSentPlatformDetails = clientResponses.some(\n- response => response.type === serverRequestTypes.PLATFORM_DETAILS,\n- );\n- for (let clientResponse of clientResponses) {\n- if (\n- clientResponse.type === serverRequestTypes.PLATFORM &&\n- !clientSentPlatformDetails\n- ) {\n- clientResponsePromises.push(setCookiePlatform(\n- viewer.cookieID,\n- clientResponse.platform,\n- ));\n- viewerMissingPlatform = false;\n- if (!isDeviceType(clientResponse.platform)) {\n- viewerMissingPlatformDetails = false;\n- }\n- } else if (clientResponse.type === serverRequestTypes.DEVICE_TOKEN) {\n- clientResponsePromises.push(deviceTokenUpdater(\n- viewer,\n- {\n- deviceToken: clientResponse.deviceToken,\n- deviceType: assertDeviceType(viewer.platform),\n- },\n- ));\n- viewerMissingDeviceToken = false;\n- } else if (\n- clientResponse.type ===\n- serverRequestTypes.THREAD_POLL_PUSH_INCONSISTENCY\n- ) {\n- clientResponsePromises.push(recordThreadPollPushInconsistency(\n- viewer,\n- clientResponse,\n- ));\n- } else if (\n- clientResponse.type === serverRequestTypes.ENTRY_POLL_PUSH_INCONSISTENCY\n- ) {\n- clientResponsePromises.push(recordEntryPollPushInconsistency(\n- viewer,\n- clientResponse,\n- ));\n- } else if (clientResponse.type === serverRequestTypes.PLATFORM_DETAILS) {\n- clientResponsePromises.push(setCookiePlatformDetails(\n- viewer.cookieID,\n- clientResponse.platformDetails,\n- ));\n- viewerMissingPlatform = false;\n- viewerMissingPlatformDetails = false;\n- } else if (\n- clientResponse.type === serverRequestTypes.INITIAL_ACTIVITY_UPDATE\n- ) {\n- clientResponsePromises.push(activityUpdater(\n- viewer,\n- { updates: [ { focus: true, threadID: clientResponse.threadID } ] },\n- ));\n- }\n- }\n- }\n- if (clientResponsePromises.length > 0) {\n- await Promise.all(clientResponsePromises);\n- }\n-\nconst oldUpdatesCurrentAsOf = request.updatesCurrentAsOf;\nconst [\nmessagesResult,\n@@ -309,17 +242,6 @@ async function pingResponder(\n...deltaEntriesUserInfos,\n});\n- const serverRequests = [];\n- if (viewerMissingPlatform) {\n- serverRequests.push({ type: serverRequestTypes.PLATFORM });\n- }\n- if (viewerMissingPlatformDetails) {\n- serverRequests.push({ type: serverRequestTypes.PLATFORM_DETAILS });\n- }\n- if (viewerMissingDeviceToken) {\n- serverRequests.push({ type: serverRequestTypes.DEVICE_TOKEN });\n- }\n-\nconst messagesCurrentAsOf = mostRecentMessageTimestamp(\nmessagesResult.rawMessageInfos,\nclientMessagesCurrentAsOf,\n@@ -346,6 +268,98 @@ async function pingResponder(\nreturn response;\n}\n+async function processClientResponses(\n+ viewer: Viewer,\n+ clientResponses: ?$ReadOnlyArray<ClientResponse>,\n+): Promise<ServerRequest[]> {\n+ let viewerMissingPlatform = !viewer.platform;\n+ const { platformDetails } = viewer;\n+ let viewerMissingPlatformDetails = !platformDetails ||\n+ (isDeviceType(viewer.platform) &&\n+ (platformDetails.codeVersion === null ||\n+ platformDetails.codeVersion === undefined ||\n+ platformDetails.stateVersion === null ||\n+ platformDetails.stateVersion === undefined));\n+ let viewerMissingDeviceToken =\n+ isDeviceType(viewer.platform) && viewer.loggedIn && !viewer.deviceToken;\n+\n+ const promises = [];\n+ if (clientResponses) {\n+ const clientSentPlatformDetails = clientResponses.some(\n+ response => response.type === serverRequestTypes.PLATFORM_DETAILS,\n+ );\n+ for (let clientResponse of clientResponses) {\n+ if (\n+ clientResponse.type === serverRequestTypes.PLATFORM &&\n+ !clientSentPlatformDetails\n+ ) {\n+ promises.push(setCookiePlatform(\n+ viewer.cookieID,\n+ clientResponse.platform,\n+ ));\n+ viewerMissingPlatform = false;\n+ if (!isDeviceType(clientResponse.platform)) {\n+ viewerMissingPlatformDetails = false;\n+ }\n+ } else if (clientResponse.type === serverRequestTypes.DEVICE_TOKEN) {\n+ promises.push(deviceTokenUpdater(\n+ viewer,\n+ {\n+ deviceToken: clientResponse.deviceToken,\n+ deviceType: assertDeviceType(viewer.platform),\n+ },\n+ ));\n+ viewerMissingDeviceToken = false;\n+ } else if (\n+ clientResponse.type ===\n+ serverRequestTypes.THREAD_POLL_PUSH_INCONSISTENCY\n+ ) {\n+ promises.push(recordThreadPollPushInconsistency(\n+ viewer,\n+ clientResponse,\n+ ));\n+ } else if (\n+ clientResponse.type === serverRequestTypes.ENTRY_POLL_PUSH_INCONSISTENCY\n+ ) {\n+ promises.push(recordEntryPollPushInconsistency(\n+ viewer,\n+ clientResponse,\n+ ));\n+ } else if (clientResponse.type === serverRequestTypes.PLATFORM_DETAILS) {\n+ promises.push(setCookiePlatformDetails(\n+ viewer.cookieID,\n+ clientResponse.platformDetails,\n+ ));\n+ viewerMissingPlatform = false;\n+ viewerMissingPlatformDetails = false;\n+ } else if (\n+ clientResponse.type === serverRequestTypes.INITIAL_ACTIVITY_UPDATE\n+ ) {\n+ promises.push(activityUpdater(\n+ viewer,\n+ { updates: [ { focus: true, threadID: clientResponse.threadID } ] },\n+ ));\n+ }\n+ }\n+ }\n+\n+ if (promises.length > 0) {\n+ await Promise.all(promises);\n+ }\n+\n+ const serverRequests = [];\n+ if (viewerMissingPlatform) {\n+ serverRequests.push({ type: serverRequestTypes.PLATFORM });\n+ }\n+ if (viewerMissingPlatformDetails) {\n+ serverRequests.push({ type: serverRequestTypes.PLATFORM_DETAILS });\n+ }\n+ if (viewerMissingDeviceToken) {\n+ serverRequests.push({ type: serverRequestTypes.DEVICE_TOKEN });\n+ }\n+ return serverRequests;\n+}\n+\nasync function recordThreadPollPushInconsistency(\nviewer: Viewer,\nresponse: ThreadPollPushInconsistencyClientResponse,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Extract ServerRequest/ClientResponder logic in pingResponder |
129,187 | 20.09.2018 14:48:29 | 14,400 | 12e1632eb98afdca461769bdaf57f06841363ecf | [server] Ping payload reduction step 1
Server support for only returning the delta. WebSockets coming soon... | [
{
"change_type": "MODIFY",
"old_path": "lib/types/message-types.js",
"new_path": "lib/types/message-types.js",
"diff": "@@ -535,6 +535,11 @@ export type FetchMessageInfosPayload = {|\ntruncationStatus: MessageTruncationStatus,\nuserInfos: UserInfo[],\n|};\n+export type MessagesPingResponse = {|\n+ rawMessageInfos: RawMessageInfo[],\n+ truncationStatuses: MessageTruncationStatuses,\n+ currentAsOf: number,\n+|};\nexport const defaultNumberPerThread = 20;\nexport type SendTextMessageRequest = {|\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/ping-types.js",
"new_path": "lib/types/ping-types.js",
"diff": "@@ -10,6 +10,7 @@ import type {\nimport type {\nRawMessageInfo,\nMessageTruncationStatuses,\n+ MessagesPingResponse,\nGenericMessagesResult,\n} from './message-types';\nimport type { UpdatesResult } from './update-types';\n@@ -19,6 +20,7 @@ import type { ServerRequest, ClientResponse } from './request-types';\nimport PropTypes from 'prop-types';\nexport type PingRequest = {|\n+ type?: PingResponseType,\ncalendarQuery: CalendarQuery,\nwatchedIDs: $ReadOnlyArray<string>,\nlastPing: ?number,\n@@ -27,7 +29,15 @@ export type PingRequest = {|\nclientResponses?: $ReadOnlyArray<ClientResponse>,\n|};\n-export type PingResponse = {|\n+export const pingResponseTypes = Object.freeze({\n+ FULL: 0,\n+ INCREMENTAL: 1,\n+});\n+type PingResponseType = $Values<typeof pingResponseTypes>;\n+\n+export type PingResponse =\n+ | {|\n+ type: 0,\nthreadInfos: {[id: string]: RawThreadInfo},\ncurrentUserInfo: CurrentUserInfo,\nrawMessageInfos: RawMessageInfo[],\n@@ -39,6 +49,14 @@ export type PingResponse = {|\nupdatesResult?: UpdatesResult,\nserverRequests?: $ReadOnlyArray<ServerRequest>,\ndeltaEntryInfos?: $ReadOnlyArray<RawEntryInfo>,\n+ |}\n+ | {|\n+ type: 1,\n+ messagesResult: MessagesPingResponse,\n+ updatesResult?: UpdatesResult,\n+ deltaEntryInfos: $ReadOnlyArray<RawEntryInfo>,\n+ userInfos: $ReadOnlyArray<UserInfo>,\n+ serverRequests: $ReadOnlyArray<ServerRequest>,\n|};\nexport type PingPrevState = {|\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/fetchers/update-fetchers.js",
"new_path": "server/src/fetchers/update-fetchers.js",
"diff": "@@ -7,7 +7,6 @@ import {\n} from 'lib/types/update-types';\nimport type { CalendarQuery } from 'lib/types/entry-types';\nimport type { Viewer } from '../session/viewer';\n-import type { FetchThreadInfosResult } from '../fetchers/thread-fetchers';\nimport invariant from 'invariant';\n@@ -20,14 +19,10 @@ import {\nfetchUpdateInfosWithUpdateDatas,\n} from '../creators/update-creator';\n-type UpdateInfoQueryInput = {|\n- ...FetchThreadInfosResult,\n- calendarQuery: CalendarQuery,\n-|};\nasync function fetchUpdateInfos(\nviewer: Viewer,\ncurrentAsOf: number,\n- queryInput: UpdateInfoQueryInput,\n+ calendarQuery: CalendarQuery,\n): Promise<FetchUpdatesResult> {\nif (!viewer.loggedIn) {\nthrow new ServerError('not_logged_in');\n@@ -50,7 +45,7 @@ async function fetchUpdateInfos(\nreturn await fetchUpdateInfosWithUpdateDatas(\nviewerUpdateDatas,\n- { viewer, ...queryInput },\n+ { viewer, calendarQuery },\n);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "// @flow\n-import type { PingRequest, PingResponse } from 'lib/types/ping-types';\n+import {\n+ type PingRequest,\n+ type PingResponse,\n+ pingResponseTypes,\n+} from 'lib/types/ping-types';\nimport { defaultNumberPerThread } from 'lib/types/message-types';\nimport type { Viewer } from '../session/viewer';\nimport {\n@@ -161,38 +165,35 @@ async function pingResponder(\nconst { calendarQuery } = request;\nawait verifyCalendarQueryThreadIDs(calendarQuery);\n- // We do this before the following promises because INITIAL_ACTIVITY_UPDATE\n- // can affect the unread status of the threadsResult\n- const serverRequests = await processClientResponses(\n- viewer,\n- request.clientResponses,\n- );\n-\n+ const oldUpdatesCurrentAsOf = request.updatesCurrentAsOf;\nconst threadCursors = {};\nfor (let watchedThreadID of request.watchedIDs) {\nthreadCursors[watchedThreadID] = null;\n}\nconst threadSelectionCriteria = { threadCursors, joinedThreads: true };\n-\n- const oldUpdatesCurrentAsOf = request.updatesCurrentAsOf;\nconst [\n- messagesResult,\n- threadsResult,\n- entriesResult,\n- currentUserInfo,\nsessionInitializationResult,\n+ messagesResult,\n+ serverRequests,\n] = await Promise.all([\n+ initializeSession(viewer, calendarQuery, oldUpdatesCurrentAsOf),\nfetchMessageInfosSince(\nviewer,\nthreadSelectionCriteria,\nclientMessagesCurrentAsOf,\ndefaultNumberPerThread,\n),\n- fetchThreadInfos(viewer),\n- fetchEntryInfos(viewer, [ calendarQuery ]),\n- fetchCurrentUserInfo(viewer),\n- initializeSession(viewer, calendarQuery, oldUpdatesCurrentAsOf),\n+ processClientResponses(\n+ viewer,\n+ request.clientResponses,\n+ ),\n]);\n+ const incrementalUpdate = request.type === pingResponseTypes.INCREMENTAL\n+ && sessionInitializationResult.sessionContinued;\n+ const messagesCurrentAsOf = mostRecentMessageTimestamp(\n+ messagesResult.rawMessageInfos,\n+ clientMessagesCurrentAsOf,\n+ );\nconst promises = {};\npromises.activityUpdate = updateActivityTime(viewer);\n@@ -208,7 +209,7 @@ async function pingResponder(\npromises.fetchUpdateResult = fetchUpdateInfos(\nviewer,\noldUpdatesCurrentAsOf,\n- { ...threadsResult, calendarQuery },\n+ calendarQuery,\n);\n}\nconst { fetchUpdateResult } = await promiseAll(promises);\n@@ -231,6 +232,41 @@ async function pingResponder(\n};\n}\n+ if (incrementalUpdate) {\n+ invariant(sessionInitializationResult.sessionContinued, \"should be set\");\n+ const userInfos = values({\n+ ...messagesResult.userInfos,\n+ ...updateUserInfos,\n+ ...sessionInitializationResult.deltaEntryInfoResult.userInfos,\n+ });\n+ const response: PingResponse = {\n+ type: pingResponseTypes.INCREMENTAL,\n+ messagesResult: {\n+ rawMessageInfos: messagesResult.rawMessageInfos,\n+ truncationStatuses: messagesResult.truncationStatuses,\n+ currentAsOf: messagesCurrentAsOf,\n+ },\n+ deltaEntryInfos:\n+ sessionInitializationResult.deltaEntryInfoResult.rawEntryInfos,\n+ userInfos,\n+ serverRequests,\n+ };\n+ if (updatesResult) {\n+ response.updatesResult = updatesResult;\n+ }\n+ return response;\n+ }\n+\n+ const [\n+ threadsResult,\n+ entriesResult,\n+ currentUserInfo,\n+ ] = await Promise.all([\n+ fetchThreadInfos(viewer),\n+ fetchEntryInfos(viewer, [ calendarQuery ]),\n+ fetchCurrentUserInfo(viewer),\n+ ]);\n+\nconst deltaEntriesUserInfos = sessionInitializationResult.sessionContinued\n? sessionInitializationResult.deltaEntryInfoResult.userInfos\n: undefined;\n@@ -242,11 +278,8 @@ async function pingResponder(\n...deltaEntriesUserInfos,\n});\n- const messagesCurrentAsOf = mostRecentMessageTimestamp(\n- messagesResult.rawMessageInfos,\n- clientMessagesCurrentAsOf,\n- );\nconst response: PingResponse = {\n+ type: pingResponseTypes.FULL,\nthreadInfos: threadsResult.threadInfos,\ncurrentUserInfo,\nrawMessageInfos: messagesResult.rawMessageInfos,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Ping payload reduction step 1
Server support for only returning the delta. WebSockets coming soon... |
129,187 | 20.09.2018 17:21:21 | 14,400 | d3d36448331cae94809989d501cc0a100cd4a8a2 | Client-side updates to handle ping payload reduction | [
{
"change_type": "MODIFY",
"old_path": "lib/actions/ping-actions.js",
"new_path": "lib/actions/ping-actions.js",
"diff": "// @flow\nimport type { FetchJSON } from '../utils/fetch-json';\n-import type { PingActionInput, PingResult } from '../types/ping-types';\n+import {\n+ type PingActionInput,\n+ type PingResult,\n+ pingResponseTypes,\n+} from '../types/ping-types';\nimport type {\nActivityUpdate,\nUpdateActivityResult,\n@@ -20,13 +24,38 @@ async function ping(\n): Promise<PingResult> {\nconst watchedIDs = threadWatcher.getWatchedIDs();\nconst response = await fetchJSON('ping', {\n+ type: pingResponseTypes.INCREMENTAL,\ncalendarQuery: actionInput.calendarQuery,\nmessagesCurrentAsOf: actionInput.messagesCurrentAsOf,\nupdatesCurrentAsOf: actionInput.updatesCurrentAsOf,\nclientResponses: actionInput.clientResponses,\nwatchedIDs,\n});\n+ const messagesResult = {\n+ messageInfos: response.rawMessageInfos,\n+ truncationStatus: response.truncationStatuses,\n+ watchedIDsAtRequestTime: watchedIDs,\n+ currentAsOf: response.messagesCurrentAsOf,\n+ };\n+ const requests = {\n+ serverRequests: response.serverRequests ? response.serverRequests : [],\n+ deliveredClientResponses: actionInput.clientResponses,\n+ };\n+ if (response.type === pingResponseTypes.INCREMENTAL) {\nreturn {\n+ type: pingResponseTypes.INCREMENTAL,\n+ loggedIn: actionInput.loggedIn,\n+ prevState: actionInput.prevState,\n+ messagesResult,\n+ updatesResult: response.updatesResult,\n+ deltaEntryInfos: response.deltaEntryInfos,\n+ calendarQuery: actionInput.calendarQuery,\n+ userInfos: response.userInfos,\n+ requests,\n+ };\n+ }\n+ return {\n+ type: pingResponseTypes.FULL,\nthreadInfos: response.threadInfos,\ncurrentUserInfo: response.currentUserInfo,\ncalendarResult: {\n@@ -34,20 +63,12 @@ async function ping(\nrawEntryInfos: response.rawEntryInfos,\nuserInfos: response.userInfos,\n},\n- messagesResult: {\n- messageInfos: response.rawMessageInfos,\n- truncationStatus: response.truncationStatuses,\n- watchedIDsAtRequestTime: watchedIDs,\n- currentAsOf: response.messagesCurrentAsOf,\n- },\n+ messagesResult,\nuserInfos: response.userInfos,\nloggedIn: actionInput.loggedIn,\nprevState: actionInput.prevState,\nupdatesResult: response.updatesResult,\n- requests: {\n- serverRequests: response.serverRequests ? response.serverRequests : [],\n- deliveredClientResponses: actionInput.clientResponses,\n- },\n+ requests,\ndeltaEntryInfos: response.deltaEntryInfos,\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/entry-reducer.js",
"new_path": "lib/reducers/entry-reducer.js",
"diff": "@@ -13,6 +13,7 @@ import {\ntype EntryPollPushInconsistencyClientResponse,\nserverRequestTypes,\n} from '../types/request-types';\n+import { pingResponseTypes } from '../types/ping-types';\nimport _flow from 'lodash/fp/flow';\nimport _map from 'lodash/fp/map';\n@@ -611,30 +612,41 @@ function reduceEntryInfos(\n}\n} else if (action.type === pingActionTypes.success) {\nconst { payload } = action;\n- const { calendarResult, updatesResult, deltaEntryInfos } = payload;\n- const { calendarQuery, rawEntryInfos: pullNewEntryInfos } = calendarResult;\n- const [ pollEntryInfos, updatedDaysToEntries ] = mergeNewEntryInfos(\n+ let calendarQuery, pollResult;\n+ if (payload.type === pingResponseTypes.FULL) {\n+ calendarQuery = payload.calendarResult.calendarQuery;\n+ pollResult = mergeNewEntryInfos(\nentryInfos,\n- pullNewEntryInfos,\n+ payload.calendarResult.rawEntryInfos,\nnewThreadInfos,\n{\nprevEntryInfos: payload.prevState.entryInfos,\ncalendarQuery,\n},\n);\n+ } else {\n+ ({ calendarQuery } = payload);\n+ }\n- let newInconsistencies = [];\n+ const { updatesResult, deltaEntryInfos } = payload;\n+ let pushResult;\nif (deltaEntryInfos) {\nconst pushNewEntryInfos = mergeUpdateEntryInfos(\ndeltaEntryInfos,\nupdatesResult.newUpdates,\n);\n- const [ pushEntryInfos ] = mergeNewEntryInfos(\n+ pushResult = mergeNewEntryInfos(\nentryInfos,\npushNewEntryInfos,\nnewThreadInfos,\n);\n+ }\n+\n+ let newInconsistencies = [];\n+ if (pollResult && pushResult) {\n+ const [ pollEntryInfos ] = pollResult;\n+ const [ pushEntryInfos ] = pushResult;\nnewInconsistencies = findInconsistencies(\nentryInfos,\naction,\n@@ -644,8 +656,17 @@ function reduceEntryInfos(\n);\n}\n+ let updatedEntryInfos, updatedDaysToEntries;\n+ if (payload.type === pingResponseTypes.FULL) {\n+ invariant(pollResult, \"should be set\");\n+ [ updatedEntryInfos, updatedDaysToEntries ] = pollResult;\n+ } else {\n+ invariant(pushResult, \"should be set\");\n+ [ updatedEntryInfos, updatedDaysToEntries ] = pushResult;\n+ }\n+\nreturn {\n- entryInfos: pollEntryInfos,\n+ entryInfos: updatedEntryInfos,\ndaysToEntries: updatedDaysToEntries,\nactualizedCalendarQuery,\nlastUserInteractionCalendar,\n@@ -751,6 +772,7 @@ function findInconsistencies(\nreturn emptyArray;\n}\nif (action.type === pingActionTypes.success) {\n+ if (action.payload.type === pingResponseTypes.FULL) {\n// We can get a memory leak if we include a previous\n// EntryPollPushInconsistencyClientResponse in this one\naction = {\n@@ -764,6 +786,20 @@ function findInconsistencies(\n},\n},\n};\n+ } else {\n+ // This is a separate condition because of Flow\n+ action = {\n+ type: \"PING_SUCCESS\",\n+ loadingInfo: action.loadingInfo,\n+ payload: {\n+ ...action.payload,\n+ requests: {\n+ ...action.payload.requests,\n+ deliveredClientResponses: [],\n+ },\n+ },\n+ };\n+ }\n}\nreturn [{\ntype: serverRequestTypes.ENTRY_POLL_PUSH_INCONSISTENCY,\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/thread-reducer.js",
"new_path": "lib/reducers/thread-reducer.js",
"diff": "import type { BaseAction } from '../types/redux-types';\nimport type { RawThreadInfo, ThreadStore } from '../types/thread-types';\n-import type { PingResult } from '../types/ping-types';\n+import { type PingResult, pingResponseTypes } from '../types/ping-types';\nimport { updateTypes, type UpdateInfo } from '../types/update-types';\nimport {\ntype ThreadPollPushInconsistencyClientResponse,\n@@ -42,7 +42,10 @@ function pingPoll(\nthreadInfos: {[id: string]: RawThreadInfo},\npayload: PingResult,\n): {[id: string]: RawThreadInfo} {\n- if (_isEqual(threadInfos)(payload.threadInfos)) {\n+ if (\n+ payload.type !== pingResponseTypes.FULL ||\n+ _isEqual(threadInfos)(payload.threadInfos)\n+ ) {\nreturn threadInfos;\n}\nconst newThreadInfos = {};\n@@ -183,8 +186,22 @@ function findInconsistencies(\nreturn emptyArray;\n}\nif (action.type === pingActionTypes.success) {\n+ if (action.payload.type === pingResponseTypes.FULL) {\n// We can get a memory leak if we include a previous\n- // ThreadPollPushInconsistencyClientResponse in this one\n+ // EntryPollPushInconsistencyClientResponse in this one\n+ action = {\n+ type: \"PING_SUCCESS\",\n+ loadingInfo: action.loadingInfo,\n+ payload: {\n+ ...action.payload,\n+ requests: {\n+ ...action.payload.requests,\n+ deliveredClientResponses: [],\n+ },\n+ },\n+ };\n+ } else {\n+ // This is a separate condition because of Flow\naction = {\ntype: \"PING_SUCCESS\",\nloadingInfo: action.loadingInfo,\n@@ -197,6 +214,7 @@ function findInconsistencies(\n},\n};\n}\n+ }\nreturn [{\ntype: serverRequestTypes.THREAD_POLL_PUSH_INCONSISTENCY,\nplatformDetails: getConfig().platformDetails,\n@@ -260,19 +278,28 @@ export default function reduceThreadInfos(\nconst payload = action.payload;\nconst pollResult = pingPoll(state.threadInfos, payload);\nconst pushResult = pingPush(state.threadInfos, payload);\n+\n+ let newInconsistencies = [], newThreadInfos;\n+ if (payload.type === pingResponseTypes.FULL) {\n+ newInconsistencies = findInconsistencies(\n+ state.threadInfos,\n+ action,\n+ pollResult,\n+ pushResult,\n+ );\n+ newThreadInfos = pollResult;\n+ } else {\n+ newThreadInfos = pushResult;\n+ }\n+\nreturn {\n- threadInfos: pollResult,\n+ threadInfos: newThreadInfos,\ninconsistencyResponses: [\n...state.inconsistencyResponses.filter(\nresponse =>\n!payload.requests.deliveredClientResponses.includes(response),\n),\n- ...findInconsistencies(\n- state.threadInfos,\n- action,\n- pollResult,\n- pushResult,\n- ),\n+ ...newInconsistencies,\n],\n};\n} else if (action.type === newThreadActionTypes.success) {\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/user-reducer.js",
"new_path": "lib/reducers/user-reducer.js",
"diff": "import type { BaseAction } from '../types/redux-types';\nimport type { CurrentUserInfo, UserInfo } from '../types/user-types';\nimport { updateTypes } from '../types/update-types';\n+import { pingResponseTypes } from '../types/ping-types';\nimport invariant from 'invariant';\nimport _keyBy from 'lodash/fp/keyBy';\n@@ -58,14 +59,8 @@ function reduceCurrentUserInfo(\n}\nreturn payload.currentUserInfo;\n} else if (action.type === pingActionTypes.success) {\n- const prevCurrentUserInfo = action.payload.prevState.currentUserInfo;\n- if (\n- !_isEqual(action.payload.currentUserInfo)(state) &&\n- !_isEqual(action.payload.currentUserInfo)(prevCurrentUserInfo)\n- ) {\n- return action.payload.currentUserInfo;\n- }\n- for (let update of action.payload.updatesResult.newUpdates) {\n+ const { payload } = action;\n+ for (let update of payload.updatesResult.newUpdates) {\nif (\nupdate.type === updateTypes.UPDATE_CURRENT_USER &&\n!_isEqual(update.currentUserInfo)(state)\n@@ -73,6 +68,15 @@ function reduceCurrentUserInfo(\nreturn update.currentUserInfo;\n}\n}\n+ if (payload.type === pingResponseTypes.FULL) {\n+ const prevCurrentUserInfo = payload.prevState.currentUserInfo;\n+ if (\n+ !_isEqual(payload.currentUserInfo)(state) &&\n+ !_isEqual(payload.currentUserInfo)(prevCurrentUserInfo)\n+ ) {\n+ return payload.currentUserInfo;\n+ }\n+ }\nreturn state;\n} else if (action.type === changeUserSettingsActionTypes.success) {\ninvariant(\n@@ -125,14 +129,6 @@ function reduceUserInfos(\nreturn newUserInfos;\n}\n} else if (action.type === pingActionTypes.success) {\n- const prevCurrentUserInfo = action.payload.prevState.currentUserInfo;\n- // If user has changed since ping started, don't do anything\n- if (\n- !prevCurrentUserInfo ||\n- action.payload.currentUserInfo.id !== prevCurrentUserInfo.id\n- ) {\n- return state;\n- }\nconst newUserInfos = _keyBy('id')(action.payload.userInfos);\nconst updated = { ...state, ...newUserInfos };\nfor (let update of action.payload.updatesResult.newUpdates) {\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/ping-types.js",
"new_path": "lib/types/ping-types.js",
"diff": "@@ -65,7 +65,13 @@ export type PingPrevState = {|\ncurrentUserInfo: ?CurrentUserInfo,\n|};\n-export type PingResult = {|\n+type ServerRequestPingResult = {|\n+ serverRequests: $ReadOnlyArray<ServerRequest>,\n+ deliveredClientResponses: $ReadOnlyArray<ClientResponse>,\n+|};\n+export type PingResult =\n+ | {|\n+ type: 0,\nthreadInfos: {[id: string]: RawThreadInfo},\ncurrentUserInfo: CurrentUserInfo,\nmessagesResult: GenericMessagesResult,\n@@ -74,11 +80,19 @@ export type PingResult = {|\nloggedIn: bool,\nprevState: PingPrevState,\nupdatesResult: UpdatesResult,\n- requests: {\n- serverRequests: $ReadOnlyArray<ServerRequest>,\n- deliveredClientResponses: $ReadOnlyArray<ClientResponse>,\n- },\n+ requests: ServerRequestPingResult,\ndeltaEntryInfos: ?$ReadOnlyArray<RawEntryInfo>,\n+ |}\n+ | {|\n+ type: 1,\n+ loggedIn: bool,\n+ prevState: PingPrevState,\n+ messagesResult: GenericMessagesResult,\n+ updatesResult: UpdatesResult,\n+ deltaEntryInfos: $ReadOnlyArray<RawEntryInfo>,\n+ calendarQuery: CalendarQuery,\n+ userInfos: $ReadOnlyArray<UserInfo>,\n+ requests: ServerRequestPingResult,\n|};\nexport type PingStartingPayload = {|\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/report-creator.js",
"new_path": "server/src/creators/report-creator.js",
"diff": "@@ -9,6 +9,7 @@ import {\nreportTypes,\n} from 'lib/types/report-types';\nimport { messageTypes } from 'lib/types/message-types';\n+import { pingResponseTypes } from 'lib/types/ping-types';\nimport bots from 'lib/facts/bots';\nimport _isEqual from 'lodash/fp/isEqual';\n@@ -124,9 +125,13 @@ function ignoreKnownInconsistencyReport(request: ReportCreationRequest): bool {\nif (request.action.type !== pingActionTypes.success) {\nreturn false;\n}\n+ const { payload } = request.action;\n+ if (payload.type !== pingResponseTypes.FULL) {\n+ return false;\n+ }\nconst { beforeAction, pollResult, pushResult } = request;\n- const payloadThreadInfos = request.action.payload.threadInfos;\n- const prevStateThreadInfos = request.action.payload.prevState.threadInfos;\n+ const payloadThreadInfos = payload.threadInfos;\n+ const prevStateThreadInfos = payload.prevState.threadInfos;\nconst nonMatchingThreadIDs = getInconsistentThreadIDsFromReport(request);\nfor (let threadID of nonMatchingThreadIDs) {\nconst newThreadInfo = payloadThreadInfos[threadID];\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Client-side updates to handle ping payload reduction |
129,187 | 20.09.2018 17:58:10 | 14,400 | 31513c659859689cf870473f7b1a3e5f77c50fff | [native] Stop using ping to resolve weird app start state | [
{
"change_type": "MODIFY",
"old_path": "native/account/logged-out-modal.react.js",
"new_path": "native/account/logged-out-modal.react.js",
"diff": "@@ -8,11 +8,6 @@ import type {\nimport type { Dispatch } from 'lib/types/redux-types';\nimport type { AppState } from '../redux-setup';\nimport type { Action } from '../navigation-setup';\n-import type {\n- PingStartingPayload,\n- PingActionInput,\n- PingResult,\n-} from 'lib/types/ping-types';\nimport type { KeyboardEvent, EmitterSubscription } from '../keyboard';\nimport type { LogInState } from './log-in-panel.react';\nimport type { RegisterState } from './register-panel.react';\n@@ -40,17 +35,12 @@ import PropTypes from 'prop-types';\nimport { SafeAreaView } from 'react-navigation';\nimport _isEqual from 'lodash/fp/isEqual';\n-import {\n- fetchNewCookieFromNativeCredentials,\n- createBoundServerCallsSelector,\n-} from 'lib/utils/action-utils';\n-import { ping } from 'lib/actions/ping-actions';\n+import { fetchNewCookieFromNativeCredentials } from 'lib/utils/action-utils';\nimport {\nappStartNativeCredentialsAutoLogIn,\nappStartReduxLoggedInButInvalidCookie,\n} from 'lib/actions/user-actions';\nimport sleep from 'lib/utils/sleep';\n-import { dispatchPing } from 'lib/shared/ping-utils';\nimport { connect } from 'lib/utils/redux-utils';\nimport { logInExtraInfoSelector } from 'lib/selectors/account-selectors';\n@@ -63,9 +53,8 @@ import LogInPanelContainer from './log-in-panel-container.react';\nimport RegisterPanel from './register-panel.react';\nimport ConnectedStatusBar from '../connected-status-bar.react';\nimport { createIsForegroundSelector } from '../selectors/nav-selectors';\n-import { pingNativeStartingPayload } from '../selectors/ping-selectors';\n-import { pingActionInput } from 'lib/selectors/ping-selectors';\nimport { navigateToAppActionType } from '../navigation-setup';\n+import { resetUserStateActionType } from '../redux-setup';\nimport { splashBackgroundURI } from './background-info';\nimport { splashStyle } from '../splash';\nimport {\n@@ -82,7 +71,6 @@ import {\nconst forceInset = { top: 'always', bottom: 'always' };\nlet initialAppLoad = true;\n-const boundPingSelector = createBoundServerCallsSelector(ping);\ntype LoggedOutMode = \"loading\" | \"prompt\" | \"log-in\" | \"register\";\ntype Props = {\n@@ -93,8 +81,6 @@ type Props = {\nurlPrefix: string,\nloggedIn: bool,\nisForeground: bool,\n- pingStartingPayload: () => PingStartingPayload,\n- pingActionInput: (startingPayload: PingStartingPayload) => PingActionInput,\nlogInExtraInfo: () => LogInExtraInfo,\n// Redux dispatch functions\ndispatch: Dispatch,\n@@ -125,8 +111,6 @@ class InnerLoggedOutModal extends React.PureComponent<Props, State> {\nurlPrefix: PropTypes.string.isRequired,\nloggedIn: PropTypes.bool.isRequired,\nisForeground: PropTypes.bool.isRequired,\n- pingStartingPayload: PropTypes.func.isRequired,\n- pingActionInput: PropTypes.func.isRequired,\nlogInExtraInfo: PropTypes.func.isRequired,\ndispatch: PropTypes.func.isRequired,\ndispatchActionPayload: PropTypes.func.isRequired,\n@@ -351,19 +335,7 @@ class InnerLoggedOutModal extends React.PureComponent<Props, State> {\n// We are here either because the user cookie exists but Redux says we're\n// not logged in, or because Redux says we're logged in but we don't have\n// a user cookie and we failed to acquire one above\n- InnerLoggedOutModal.dispatchPing(nextProps, cookie);\n- }\n-\n- static dispatchPing(props: Props, cookie: ?string) {\n- const boundPing = boundPingSelector({\n- dispatch: props.dispatch,\n- cookie,\n- urlPrefix: props.urlPrefix,\n- sessionID: null,\n- logInExtraInfo: props.logInExtraInfo,\n- loggedIn: props.loggedIn,\n- });\n- dispatchPing({ ...props, ping: boundPing }, true);\n+ nextProps.dispatchActionPayload(resetUserStateActionType, null);\n}\nhardwareBack = () => {\n@@ -850,8 +822,6 @@ const LoggedOutModal = connect(\nloggedIn: !!(state.currentUserInfo &&\n!state.currentUserInfo.anonymous && true),\nisForeground: isForegroundSelector(state),\n- pingStartingPayload: pingNativeStartingPayload(state),\n- pingActionInput: pingActionInput(state),\nlogInExtraInfo: logInExtraInfoSelector(state),\n}),\nnull,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation-setup.js",
"new_path": "native/navigation-setup.js",
"diff": "@@ -13,7 +13,6 @@ import type {\nNavigationRouter,\nNavigationRoute,\n} from 'react-navigation';\n-import type { PingResult } from 'lib/types/ping-types';\nimport type { AppState } from './redux-setup';\nimport type { SessionChange } from 'lib/types/session-types';\nimport type { NotificationPressPayload } from 'lib/shared/notif-utils';\n@@ -324,15 +323,6 @@ function reduceNavInfo(state: AppState, action: *): NavInfo {\nreturn resetNavInfoAndEnsureLoggedOutModalPresence(navInfoState);\n} else if (action.type === setNewSessionActionType) {\nreturn logOutIfCookieInvalidated(navInfoState, action.payload);\n- } else if (action.type === pingActionTypes.success) {\n- return {\n- startDate: navInfoState.startDate,\n- endDate: navInfoState.endDate,\n- navigationState: removeModalsIfPingIndicatesLoggedIn(\n- navInfoState.navigationState,\n- action.payload,\n- ),\n- };\n} else if (action.type === leaveThreadActionTypes.success) {\nreturn {\nstartDate: navInfoState.startDate,\n@@ -519,27 +509,6 @@ function logOutIfCookieInvalidated(\nreturn state;\n}\n-const justLoggedOutModal = [ LoggedOutModalRouteName ];\n-function removeModalsIfPingIndicatesLoggedIn(\n- state: NavigationState,\n- payload: PingResult,\n-): NavigationState {\n- if (payload.currentUserInfo.anonymous) {\n- // The SET_COOKIE action should handle logging somebody out as a result of a\n- // cookie invalidation triggered by a ping server call. PING_SUCCESS is only\n- // handling specific log ins that occur from LoggedOutModal.\n- return state;\n- }\n- if (payload.loggedIn) {\n- // If the user was logged in at the time the ping was started, then the only\n- // reason they would logged out now is either a cookie invalidation or a\n- // user-initiated log out. We only want to allow a ping to log somebody in\n- // when the app is started and the user is logged out.\n- return state;\n- }\n- return removeModals(state, justLoggedOutModal);\n-}\n-\nfunction popChatScreensForThreadID(\nstate: NavigationState,\nactionPayload: LeaveThreadPayload,\n@@ -738,11 +707,11 @@ function handleNotificationPress(\nexport {\nhandleURLActionType,\nnavigateToAppActionType,\n+ backgroundActionType,\n+ foregroundActionType,\nRootNavigator,\ndefaultNavInfo,\nreduceNavInfo,\nAppRouteName,\nremoveScreensFromStack,\n- backgroundActionType,\n- foregroundActionType,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "native/redux-setup.js",
"new_path": "native/redux-setup.js",
"diff": "@@ -74,6 +74,8 @@ import {\nimport { ComposeThreadRouteName } from './chat/compose-thread.react';\nimport reactotron from './reactotron';\n+const resetUserStateActionType = \"RESET_USER_STATE\";\n+\nconst createStore = reactotron\n? reactotron.createStore\n: defaultCreateStore;\n@@ -219,6 +221,19 @@ function reducer(state: AppState = defaultState, action: *) {\nlastAlertTime: action.payload.time,\n},\n};\n+ } else if (action.type === resetUserStateActionType) {\n+ const cookie = state.cookie && state.cookie.startsWith(\"anonymous=\")\n+ ? state.cookie\n+ : null;\n+ const currentUserInfo =\n+ state.currentUserInfo && state.currentUserInfo.anonymous\n+ ? state.currentUserInfo\n+ : null;\n+ return {\n+ ...state,\n+ currentUserInfo,\n+ cookie,\n+ };\n}\n// These action type are handled by reduceNavInfo above\n@@ -374,6 +389,7 @@ const persistor = persistStore(store);\nsetPersistor(persistor);\nexport {\n+ resetUserStateActionType,\nstore,\nappBecameInactive,\n};\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Stop using ping to resolve weird app start state |
129,187 | 20.09.2018 18:12:46 | 14,400 | 618999f440ba22b5af8ebaacd3d60e79cf8f960a | [lib] Don't include loggedIn in ping action payloads | [
{
"change_type": "MODIFY",
"old_path": "lib/actions/ping-actions.js",
"new_path": "lib/actions/ping-actions.js",
"diff": "@@ -31,6 +31,9 @@ async function ping(\nclientResponses: actionInput.clientResponses,\nwatchedIDs,\n});\n+ if (!response.updatesResult) {\n+ throw new Error(\"we have an anonymous cookie but think we're logged in\");\n+ }\nconst messagesResult = {\nmessageInfos: response.rawMessageInfos,\ntruncationStatus: response.truncationStatuses,\n@@ -44,7 +47,6 @@ async function ping(\nif (response.type === pingResponseTypes.INCREMENTAL) {\nreturn {\ntype: pingResponseTypes.INCREMENTAL,\n- loggedIn: actionInput.loggedIn,\nprevState: actionInput.prevState,\nmessagesResult,\nupdatesResult: response.updatesResult,\n@@ -65,7 +67,6 @@ async function ping(\n},\nmessagesResult,\nuserInfos: response.userInfos,\n- loggedIn: actionInput.loggedIn,\nprevState: actionInput.prevState,\nupdatesResult: response.updatesResult,\nrequests,\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/selectors/ping-selectors.js",
"new_path": "lib/selectors/ping-selectors.js",
"diff": "@@ -18,17 +18,14 @@ import { currentCalendarQuery } from './nav-selectors';\nimport { getConfig } from '../utils/config';\nconst pingStartingPayload = createSelector(\n- (state: AppState) => !!(state.currentUserInfo &&\n- !state.currentUserInfo.anonymous && true),\ncurrentCalendarQuery,\n(\n- loggedIn: bool,\ncurrentCalendarQuery: () => CalendarQuery,\n): () => PingStartingPayload => {\nreturn () => {\nconst calendarQuery = currentCalendarQuery();\nconst time = Date.now();\n- return { loggedIn, calendarQuery, time };\n+ return { calendarQuery, time };\n};\n},\n);\n@@ -107,7 +104,6 @@ const pingActionInput = createSelector(\n}\n}\nreturn (startingPayload: PingStartingPayload) => ({\n- loggedIn: startingPayload.loggedIn,\ncalendarQuery: startingPayload.calendarQuery,\nmessagesCurrentAsOf,\nupdatesCurrentAsOf,\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/shared/ping-utils.js",
"new_path": "lib/shared/ping-utils.js",
"diff": "@@ -35,12 +35,16 @@ type Props = {\nstartingPayload: PingStartingPayload,\njustForegrounded: bool,\n) => PingActionInput,\n+ loggedIn: bool,\n// Redux dispatch functions\ndispatchActionPromise: DispatchActionPromise,\n// async functions that hit server APIs\nping: (actionInput: PingActionInput) => Promise<PingResult>,\n};\nfunction dispatchPing(props: Props, justForegrounded: bool) {\n+ if (!props.loggedIn) {\n+ return;\n+ }\nconst startingPayload = props.pingStartingPayload();\nconst actionInput = props.pingActionInput(startingPayload, justForegrounded);\nprops.dispatchActionPromise(\n@@ -59,7 +63,7 @@ const pingActionInputSelector = (\njustForegrounded: bool,\n) => {\nconst genericActionInput = actionInput(startingPayload);\n- if (!justForegrounded || !genericActionInput.loggedIn || !activeThread) {\n+ if (!justForegrounded || !activeThread) {\nreturn genericActionInput;\n}\nreturn {\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/ping-types.js",
"new_path": "lib/types/ping-types.js",
"diff": "@@ -77,7 +77,6 @@ export type PingResult =\nmessagesResult: GenericMessagesResult,\ncalendarResult: CalendarResult,\nuserInfos: $ReadOnlyArray<UserInfo>,\n- loggedIn: bool,\nprevState: PingPrevState,\nupdatesResult: UpdatesResult,\nrequests: ServerRequestPingResult,\n@@ -85,7 +84,6 @@ export type PingResult =\n|}\n| {|\ntype: 1,\n- loggedIn: bool,\nprevState: PingPrevState,\nmessagesResult: GenericMessagesResult,\nupdatesResult: UpdatesResult,\n@@ -96,7 +94,6 @@ export type PingResult =\n|};\nexport type PingStartingPayload = {|\n- loggedIn: bool,\ncalendarQuery: CalendarQuery,\ntime: number,\nmessageStorePruneRequest?: {\n@@ -105,7 +102,6 @@ export type PingStartingPayload = {|\n|};\nexport type PingActionInput = {|\n- loggedIn: bool,\ncalendarQuery: CalendarQuery,\nmessagesCurrentAsOf: number,\nupdatesCurrentAsOf: number,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [lib] Don't include loggedIn in ping action payloads |
129,187 | 20.09.2018 19:23:41 | 14,400 | 883aa5412adcd77b761b2e7fc967fdae7f95d895 | [native] Fix require loop | [
{
"change_type": "MODIFY",
"old_path": "native/account/logged-out-modal.react.js",
"new_path": "native/account/logged-out-modal.react.js",
"diff": "@@ -53,8 +53,10 @@ import LogInPanelContainer from './log-in-panel-container.react';\nimport RegisterPanel from './register-panel.react';\nimport ConnectedStatusBar from '../connected-status-bar.react';\nimport { createIsForegroundSelector } from '../selectors/nav-selectors';\n-import { navigateToAppActionType } from '../navigation-setup';\n-import { resetUserStateActionType } from '../redux-setup';\n+import {\n+ navigateToAppActionType,\n+ resetUserStateActionType,\n+} from '../navigation-setup';\nimport { splashBackgroundURI } from './background-info';\nimport { splashStyle } from '../splash';\nimport {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation-setup.js",
"new_path": "native/navigation-setup.js",
"diff": "@@ -91,6 +91,7 @@ const handleURLActionType = \"HANDLE_URL\";\nconst navigateToAppActionType = \"NAVIGATE_TO_APP\";\nconst backgroundActionType = \"BACKGROUND\";\nconst foregroundActionType = \"FOREGROUND\";\n+const resetUserStateActionType = \"RESET_USER_STATE\";\nconst uniqueBaseId = `id-${Date.now()}`;\nlet uuidCount = 0;\n@@ -709,6 +710,7 @@ export {\nnavigateToAppActionType,\nbackgroundActionType,\nforegroundActionType,\n+ resetUserStateActionType,\nRootNavigator,\ndefaultNavInfo,\nreduceNavInfo,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/redux-setup.js",
"new_path": "native/redux-setup.js",
"diff": "@@ -51,6 +51,7 @@ import { activeThreadSelector } from './selectors/nav-selectors';\nimport {\nhandleURLActionType,\nnavigateToAppActionType,\n+ resetUserStateActionType,\ndefaultNavInfo,\nreduceNavInfo,\nremoveScreensFromStack,\n@@ -74,8 +75,6 @@ import {\nimport { ComposeThreadRouteName } from './chat/compose-thread.react';\nimport reactotron from './reactotron';\n-const resetUserStateActionType = \"RESET_USER_STATE\";\n-\nconst createStore = reactotron\n? reactotron.createStore\n: defaultCreateStore;\n@@ -389,7 +388,6 @@ const persistor = persistStore(store);\nsetPersistor(persistor);\nexport {\n- resetUserStateActionType,\nstore,\nappBecameInactive,\n};\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Fix require loop |
129,187 | 20.09.2018 19:40:43 | 14,400 | e4b02ef6e412a7cd4a1ee71e66297b284b80b682 | Two fixes to things I broke in ping | [
{
"change_type": "MODIFY",
"old_path": "lib/actions/ping-actions.js",
"new_path": "lib/actions/ping-actions.js",
"diff": "@@ -34,12 +34,6 @@ async function ping(\nif (!response.updatesResult) {\nthrow new Error(\"we have an anonymous cookie but think we're logged in\");\n}\n- const messagesResult = {\n- messageInfos: response.rawMessageInfos,\n- truncationStatus: response.truncationStatuses,\n- watchedIDsAtRequestTime: watchedIDs,\n- currentAsOf: response.messagesCurrentAsOf,\n- };\nconst requests = {\nserverRequests: response.serverRequests ? response.serverRequests : [],\ndeliveredClientResponses: actionInput.clientResponses,\n@@ -48,7 +42,12 @@ async function ping(\nreturn {\ntype: pingResponseTypes.INCREMENTAL,\nprevState: actionInput.prevState,\n- messagesResult,\n+ messagesResult: {\n+ messageInfos: response.messagesResult.rawMessageInfos,\n+ truncationStatus: response.messagesResult.truncationStatuses,\n+ watchedIDsAtRequestTime: watchedIDs,\n+ currentAsOf: response.messagesResult.currentAsOf,\n+ },\nupdatesResult: response.updatesResult,\ndeltaEntryInfos: response.deltaEntryInfos,\ncalendarQuery: actionInput.calendarQuery,\n@@ -65,7 +64,12 @@ async function ping(\nrawEntryInfos: response.rawEntryInfos,\nuserInfos: response.userInfos,\n},\n- messagesResult,\n+ messagesResult: {\n+ messageInfos: response.rawMessageInfos,\n+ truncationStatus: response.truncationStatuses,\n+ watchedIDsAtRequestTime: watchedIDs,\n+ currentAsOf: response.messagesCurrentAsOf,\n+ },\nuserInfos: response.userInfos,\nprevState: actionInput.prevState,\nupdatesResult: response.updatesResult,\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -75,6 +75,7 @@ import {\n} from '../deleters/update-deleters';\nconst pingRequestInputValidator = tShape({\n+ type: t.maybe(t.Number),\ncalendarQuery: entryQueryInputValidator,\nlastPing: t.maybe(t.Number), // deprecated\nmessagesCurrentAsOf: t.maybe(t.Number),\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Two fixes to things I broke in ping |
129,187 | 20.09.2018 20:17:01 | 14,400 | 91b37e960945d4bf361f5ad6e09e5797e65e1baf | [server] Include UPDATE_ENTRY's targetSession in conditionKey
Also updates SQL delete logic to consider session when specified in `conditionKey`. | [
{
"change_type": "MODIFY",
"old_path": "lib/shared/update-utils.js",
"new_path": "lib/shared/update-utils.js",
"diff": "@@ -58,7 +58,13 @@ function keyForUpdateInfo(updateInfo: UpdateInfo): ?string {\nfunction conditionKeyForUpdateData(updateData: UpdateData): ?string {\nconst key = keyForUpdateData(updateData);\n- return key ? `${updateData.userID}|${key}` : null;\n+ if (!key) {\n+ return null;\n+ }\n+ if (updateData.type === updateTypes.UPDATE_ENTRY) {\n+ return `${updateData.userID}|${key}|${updateData.targetSession}`;\n+ }\n+ return `${updateData.userID}|${key}`;\n}\nexport {\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/update-creator.js",
"new_path": "server/src/creators/update-creator.js",
"diff": "@@ -244,7 +244,7 @@ async function createUpdates(\nconst key = keyForUpdateData(updateData);\nif (key) {\n- const conditionKey = `${updateData.userID}|${key}`;\n+ const conditionKey = conditionKeyForUpdateData(updateData);\nconst currentEarliestTime = earliestTime.get(conditionKey);\nif (!currentEarliestTime || updateData.time < currentEarliestTime) {\nearliestTime.set(conditionKey, updateData.time);\n@@ -266,8 +266,11 @@ async function createUpdates(\nconst deleteSQLConditions: SQLStatement[] = [...deleteConditions].map(\n([ conditionKey: string, types: number[] ]) => {\n- const [ userID, key ] = conditionKey.split('|');\n+ const [ userID, key, target ] = conditionKey.split('|');\nconst conditions = [ SQL`u.user = ${userID}`, SQL`u.key = ${key}` ];\n+ if (target) {\n+ conditions.push(SQL`u.target = ${target}`);\n+ }\nif (types.length > 0) {\nconditions.push(SQL`u.type IN (${types})`);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/entry-updaters.js",
"new_path": "server/src/updaters/entry-updaters.js",
"diff": "@@ -212,11 +212,11 @@ async function createUpdateDatasForChangedEntryInfo(\ncalendarQuery = defaultCalendarQuery();\n}\n- let replaced = false;\n+ let replaced = null;\nconst { userID } = viewer;\nconst filters = fetchedFilters.map(\nfilter => filter.session === viewer.session && filter.userID === userID\n- ? (replaced = true && { ...filter, calendarQuery })\n+ ? (replaced = { ...filter, calendarQuery })\n: filter,\n);\nif (!replaced) {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Include UPDATE_ENTRY's targetSession in conditionKey
Also updates SQL delete logic to consider session when specified in `conditionKey`. |
129,187 | 20.09.2018 20:26:52 | 14,400 | 3e71606a5ae78c7407dd7dadf4703e0b80346eb1 | [native] Stop reseting calendar whenever tab is clicked
Only do this when it's clicked and the calendar view is already in focus. | [
{
"change_type": "MODIFY",
"old_path": "native/calendar/calendar.react.js",
"new_path": "native/calendar/calendar.react.js",
"diff": "@@ -174,8 +174,7 @@ class InnerCalendar extends React.PureComponent<Props, State> {\n}) => {\nif (!navigation.isFocused()) {\ndefaultHandler();\n- }\n- if (currentCalendarRef) {\n+ } else if (currentCalendarRef) {\ncurrentCalendarRef.scrollToToday();\n}\n},\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Stop reseting calendar whenever tab is clicked
Only do this when it's clicked and the calendar view is already in focus. |
129,187 | 24.09.2018 11:57:27 | 14,400 | ca8dd151ea6b8b648f02a928495a4b0541743dbd | [server] Introducing last_validated column on sessions table
Also changing `time` column to `creation_time`, since that's what it effectively is. | [
{
"change_type": "MODIFY",
"old_path": "server/src/creators/session-creator.js",
"new_path": "server/src/creators/session-creator.js",
"diff": "@@ -10,21 +10,24 @@ async function createSession(\ncalendarQuery: CalendarQuery,\ninitialLastUpdate: number,\n): Promise<void> {\n+ const time = Date.now();\nconst row = [\nviewer.session,\nviewer.userID,\nviewer.cookieID,\nJSON.stringify(calendarQuery),\n- Date.now(),\n+ time,\ninitialLastUpdate,\n+ time,\n];\nconst query = SQL`\n- INSERT INTO sessions (id, user, cookie, query, time, last_update)\n+ INSERT INTO sessions (id, user, cookie, query,\n+ creation_time, last_update, last_validated)\nVALUES ${[row]}\nON DUPLICATE KEY UPDATE\nquery = VALUES(query),\n- time = VALUES(time),\n- last_update = VALUES(last_update)\n+ last_update = VALUES(last_update),\n+ last_validated = VALUES(last_validated)\n`;\nawait dbQuery(query);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/session-deleters.js",
"new_path": "server/src/deleters/session-deleters.js",
"diff": "@@ -26,7 +26,9 @@ async function deleteOldWebSessions(): Promise<void> {\nLEFT JOIN focused f ON f.session = s.id\nLEFT JOIN updates up ON up.target = s.id\nLEFT JOIN ids iup ON iup.id = up.id\n- WHERE s.id != s.cookie AND s.last_update < ${oldestWebSessionToKeep}\n+ WHERE s.id != s.cookie\n+ AND s.last_update < ${oldestWebSessionToKeep}\n+ AND s.last_verified < ${oldestWebSessionToKeep}\n`);\n}\n"
},
{
"change_type": "DELETE",
"old_path": "server/src/scripts/session-migration.js",
"new_path": null,
"diff": "-// @flow\n-\n-import { pool, dbQuery, SQL } from '../database';\n-import createIDs from '../creators/id-creator';\n-\n-async function main() {\n- try {\n- await migrateFiltersTableToSessions();\n- await migrateSessionsRelatedColumns();\n- await migrateUpdatesTable();\n- await cleanup();\n- pool.end();\n- } catch (e) {\n- pool.end();\n- console.warn(e);\n- }\n-}\n-\n-async function migrateFiltersTableToSessions() {\n- await dbQuery(SQL`RENAME TABLE filters TO sessions`);\n- await dbQuery(SQL`ALTER TABLE sessions ADD id BIGINT(20) NOT NULL FIRST`);\n- await dbQuery(\n- SQL`ALTER TABLE sessions ADD cookie BIGINT(20) NOT NULL AFTER user`,\n- );\n- await dbQuery(\n- SQL`ALTER TABLE sessions ADD last_update BIGINT(20) NOT NULL AFTER time`\n- );\n-\n- const [ result ] = await dbQuery(SQL`\n- SELECT s.session, s.user, s.query, s.time,\n- SUBSTRING_INDEX(s.session, '|', 1) AS cookie,\n- IF(\n- s.session LIKE '%|%',\n- SUBSTRING_INDEX(s.session, '|', -1),\n- NULL\n- ) AS old_session_id,\n- c.last_update\n- FROM sessions s\n- LEFT JOIN cookies c ON c.id = SUBSTRING_INDEX(s.session, '|', 1)\n- WHERE s.id = 0\n- `);\n- const newColumns = [], needID = [];\n- for (let row of result) {\n- if (!row.last_update) {\n- continue;\n- }\n- if (!row.old_session_id) {\n- newColumns.push([\n- row.cookie,\n- row.user,\n- row.cookie,\n- row.session,\n- JSON.stringify(row.query),\n- row.time,\n- row.last_update,\n- ]);\n- } else {\n- needID.push([\n- row.user,\n- row.cookie,\n- row.session,\n- JSON.stringify(row.query),\n- row.time,\n- row.last_update,\n- ]);\n- }\n- }\n- const ids = await createIDs(\"sessions\", needID.length);\n- for (let row of needID) {\n- const id = ids.pop();\n- newColumns.push([ id, ...row ]);\n- }\n- if (newColumns.length > 0) {\n- await dbQuery(SQL`\n- INSERT INTO sessions (id, user, cookie, session, query, time, last_update)\n- VALUES ${newColumns}\n- ON DUPLICATE KEY UPDATE\n- id = VALUES(id),\n- cookie = VALUES(cookie),\n- last_update = VALUES(last_update)\n- `);\n- }\n-}\n-\n-async function migrateSessionsRelatedColumns() {\n- await dbQuery(\n- SQL`ALTER TABLE focused CHANGE cookie session BIGINT(20) NOT NULL`\n- );\n- await dbQuery(SQL`ALTER TABLE revisions DROP session_id`);\n- await dbQuery(SQL`\n- ALTER TABLE revisions ADD session BIGINT(20) NOT NULL AFTER creation_time\n- `);\n-}\n-\n-async function migrateUpdatesTable() {\n- await dbQuery(SQL`\n- ALTER TABLE updates CHANGE updater old_updater VARCHAR(255)\n- CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL\n- `);\n- await dbQuery(SQL`\n- ALTER TABLE updates CHANGE target old_target VARCHAR(255)\n- CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL\n- `);\n- await dbQuery(SQL`\n- ALTER TABLE updates\n- ADD updater BIGINT(20) NULL DEFAULT NULL AFTER \\`key\\`,\n- ADD target BIGINT(20) NULL DEFAULT NULL AFTER updater\n- `);\n- await dbQuery(SQL`\n- UPDATE updates u\n- LEFT JOIN sessions s1 ON s1.session = u.old_updater\n- LEFT JOIN sessions s2 ON s2.session = u.old_target\n- SET u.updater = s1.id, u.target = s2.id\n- `);\n-}\n-\n-async function cleanup() {\n- await dbQuery(SQL`ALTER TABLE sessions DROP PRIMARY KEY`);\n- await dbQuery(SQL`ALTER TABLE sessions ADD PRIMARY KEY(id)`);\n- await dbQuery(SQL`ALTER TABLE sessions DROP session`);\n- await dbQuery(SQL`ALTER TABLE cookies DROP last_update`);\n- await dbQuery(SQL`ALTER TABLE updates DROP old_updater, DROP old_target`);\n-}\n-\n-main();\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/session-updaters.js",
"new_path": "server/src/updaters/session-updaters.js",
"diff": "@@ -12,6 +12,7 @@ import { fetchSessionCalendarQuery } from '../fetchers/session-fetchers';\ntype SessionUpdate = $Shape<{|\nquery: CalendarQuery,\nlastUpdate: number,\n+ lastValidated: number,\n|}>;\ntype CalendarQueryComparisonResult = {|\ndifference: $ReadOnlyArray<CalendarQuery>,\n@@ -45,13 +46,17 @@ async function commitSessionUpdate(\nif (sessionUpdate.query) {\nsqlUpdate.query = JSON.stringify(sessionUpdate.query);\n}\n- const { lastUpdate } = sessionUpdate;\n+ const { lastUpdate, lastValidated } = sessionUpdate;\nif (lastUpdate !== null && lastUpdate !== undefined) {\nsqlUpdate.last_update = lastUpdate;\n}\n+ if (lastValidated !== null && lastValidated !== undefined) {\n+ sqlUpdate.last_validated = lastValidated;\n+ }\nif (Object.keys(sqlUpdate).length === 0) {\nreturn;\n}\n+\nconst query = SQL`\nUPDATE sessions\nSET ${sqlUpdate}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Introducing last_validated column on sessions table
Also changing `time` column to `creation_time`, since that's what it effectively is. |
129,187 | 24.09.2018 14:39:13 | 14,400 | 15a40cdffffee41d73231d6d1b5c98a41d44dc06 | [server] Fetch SessionInfo in initial validation query | [
{
"change_type": "MODIFY",
"old_path": "server/src/creators/session-creator.js",
"new_path": "server/src/creators/session-creator.js",
"diff": "@@ -30,6 +30,10 @@ async function createSession(\nlast_validated = VALUES(last_validated)\n`;\nawait dbQuery(query);\n+ viewer.setSessionInfo({\n+ lastValidated: time,\n+ calendarQuery,\n+ });\n}\nexport {\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/update-creator.js",
"new_path": "server/src/creators/update-creator.js",
"diff": "@@ -53,7 +53,6 @@ import {\nfetchEntryInfos,\nfetchEntryInfosByID,\n} from '../fetchers/entry-fetchers';\n-import { fetchSessionCalendarQuery } from '../fetchers/session-fetchers';\nimport {\nfetchUserInfos,\nfetchLoggedInUserInfos,\n@@ -357,13 +356,12 @@ async function fetchUpdateInfosWithUpdateDatas(\nlet calendarQuery: ?CalendarQuery = viewerInfo.calendarQuery\n? viewerInfo.calendarQuery\n: null;\n- if (!calendarQuery) {\n+ if (!calendarQuery && viewerInfo.viewer.hasSessionInfo) {\n// This should only ever happen for \"legacy\" clients who call in without\n// providing this information. These clients wouldn't know how to deal with\n// the corresponding UpdateInfos anyways, so no reason to be worried.\n- calendarQuery = await fetchSessionCalendarQuery(viewerInfo.viewer);\n- }\n- if (!calendarQuery) {\n+ calendarQuery = viewerInfo.viewer.calendarQuery;\n+ } else if (!calendarQuery) {\ncalendarQuery = defaultCalendarQuery();\n}\nif (threadIDsNeedingDetailedFetch.size > 0) {\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/fetchers/session-fetchers.js",
"new_path": "server/src/fetchers/session-fetchers.js",
"diff": "@@ -5,24 +5,6 @@ import type { CalendarQuery } from 'lib/types/entry-types';\nimport { dbQuery, SQL } from '../database';\n-// \"Filter\" here refers to the \"filters\" table in MySQL, which stores\n-// CalendarQueries on a per-session basis\n-async function fetchSessionCalendarQuery(\n- viewer: Viewer,\n-): Promise<?CalendarQuery> {\n- const query = SQL`\n- SELECT query\n- FROM sessions\n- WHERE user = ${viewer.userID} AND id = ${viewer.session}\n- `;\n- const [ result ] = await dbQuery(query);\n- if (result.length === 0) {\n- return null;\n- }\n- const row = result[0];\n- return row.query;\n-}\n-\ntype CalendarSessionResult = {|\nuserID: string,\nsession: string,\n@@ -50,6 +32,5 @@ async function fetchActiveSessionsForThread(\n}\nexport {\n- fetchSessionCalendarQuery,\nfetchActiveSessionsForThread,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/entry-responders.js",
"new_path": "server/src/responders/entry-responders.js",
"diff": "@@ -41,10 +41,8 @@ import {\nimport createEntry from '../creators/entry-creator';\nimport { updateEntry } from '../updaters/entry-updaters';\nimport { deleteEntry, restoreEntry } from '../deleters/entry-deleters';\n-import {\n- compareNewCalendarQuery,\n- commitSessionUpdate,\n-} from '../updaters/session-updaters';\n+import { commitSessionUpdate } from '../updaters/session-updaters';\n+import { compareNewCalendarQuery } from '../updaters/entry-updaters';\nconst entryQueryInputValidator = tShape({\nnavID: t.maybe(t.String),\n@@ -225,7 +223,7 @@ async function calendarQueryUpdateResponder(\ndifference,\noldCalendarQuery,\nsessionUpdate,\n- } = await compareNewCalendarQuery(viewer, request);\n+ } = compareNewCalendarQuery(viewer, request);\nconst [ response ] = await Promise.all([\nfetchEntriesForSession(viewer, difference, oldCalendarQuery),\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -66,10 +66,8 @@ import {\n} from '../session/cookies';\nimport { deviceTokenUpdater } from '../updaters/device-token-updaters';\nimport createReport from '../creators/report-creator';\n-import {\n- compareNewCalendarQuery,\n- commitSessionUpdate,\n-} from '../updaters/session-updaters';\n+import { commitSessionUpdate } from '../updaters/session-updaters';\n+import { compareNewCalendarQuery } from '../updaters/entry-updaters';\nimport {\ndeleteUpdatesBeforeTimeTargettingSession,\n} from '../deleters/update-deleters';\n@@ -442,7 +440,7 @@ async function initializeSession(\nlet comparisonResult = null;\ntry {\n- comparisonResult = await compareNewCalendarQuery(viewer, calendarQuery);\n+ comparisonResult = compareNewCalendarQuery(viewer, calendarQuery);\n} catch (e) {\nif (e.message !== \"unknown_error\") {\nthrow e;\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/session/cookies.js",
"new_path": "server/src/session/cookies.js",
"diff": "@@ -80,9 +80,9 @@ async function fetchUserViewer(\nFROM cookies\nWHERE id = ${cookieID} AND user IS NOT NULL\n`;\n- const [ [ result ], sessionID ] = await Promise.all([\n+ const [ [ result ], allSessionInfo ] = await Promise.all([\ndbQuery(query),\n- getValidatedSessionIDFromRequestBody(req, cookieID),\n+ fetchSessionInfo(req, cookieID),\n]);\nif (result.length === 0) {\nreturn {\n@@ -93,6 +93,11 @@ async function fetchUserViewer(\n};\n}\n+ let sessionID = null, sessionInfo = null;\n+ if (allSessionInfo) {\n+ ({ sessionID, ...sessionInfo } = allSessionInfo);\n+ }\n+\nconst cookieRow = result[0];\nlet platformDetails = null;\nif (cookieRow.platform && cookieRow.versions) {\n@@ -130,6 +135,7 @@ async function fetchUserViewer(\ncookiePassword,\nsessionIdentifierType,\nsessionID,\n+ sessionInfo,\n});\nreturn { type: \"valid\", viewer };\n}\n@@ -155,9 +161,9 @@ async function fetchAnonymousViewer(\nFROM cookies\nWHERE id = ${cookieID} AND user IS NULL\n`;\n- const [ [ result ], sessionID ] = await Promise.all([\n+ const [ [ result ], allSessionInfo ] = await Promise.all([\ndbQuery(query),\n- getValidatedSessionIDFromRequestBody(req, cookieID),\n+ fetchSessionInfo(req, cookieID),\n]);\nif (result.length === 0) {\nreturn {\n@@ -168,6 +174,11 @@ async function fetchAnonymousViewer(\n};\n}\n+ let sessionID = null, sessionInfo = null;\n+ if (allSessionInfo) {\n+ ({ sessionID, ...sessionInfo } = allSessionInfo);\n+ }\n+\nconst cookieRow = result[0];\nlet platformDetails = null;\nif (cookieRow.platform && cookieRow.versions) {\n@@ -203,6 +214,7 @@ async function fetchAnonymousViewer(\ncookiePassword,\nsessionIdentifierType,\nsessionID,\n+ sessionInfo,\n});\nreturn { type: \"valid\", viewer };\n}\n@@ -231,21 +243,33 @@ function getSessionIdentifierTypeFromRequestBody(\n: sessionIdentifierTypes.BODY_SESSION_ID;\n}\n-async function getValidatedSessionIDFromRequestBody(\n+type SessionInfo = {|\n+ sessionID: string,\n+ lastValidated: number,\n+ calendarQuery: CalendarQuery,\n+|};\n+async function fetchSessionInfo(\nreq: $Request,\ncookieID: string,\n-): Promise<?string> {\n+): Promise<?SessionInfo> {\nconst sessionID = getSessionIDFromRequestBody(req);\nif (!sessionID) {\n- return sessionID;\n+ return null;\n}\nconst query = SQL`\n- SELECT id\n+ SELECT query, last_validated\nFROM sessions\nWHERE id = ${sessionID} AND cookie = ${cookieID}\n`;\nconst [ result ] = await dbQuery(query);\n- return result.length > 0 ? sessionID : null;\n+ if (result.length === 0) {\n+ return null;\n+ }\n+ return {\n+ sessionID,\n+ lastValidated: result[0].last_validated,\n+ calendarQuery: result[0].query,\n+ };\n}\n// This function is meant to consume a cookie that has already been processed.\n@@ -445,6 +469,7 @@ async function createNewAnonymousCookie(\ncookieID: id,\ncookiePassword,\nsessionID: undefined,\n+ sessionInfo: null,\ncookieInsertedThisRequest: true,\n};\n}\n@@ -494,6 +519,7 @@ async function createNewUserCookie(\nuserID,\ncookieID,\nsessionID: undefined,\n+ sessionInfo: null,\ncookiePassword,\ncookieInsertedThisRequest: true,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/session/viewer.js",
"new_path": "server/src/session/viewer.js",
"diff": "@@ -7,6 +7,7 @@ import {\nsessionIdentifierTypes,\n} from 'lib/types/session-types';\nimport type { Platform, PlatformDetails } from 'lib/types/device-types';\n+import type { CalendarQuery } from 'lib/types/entry-types';\nimport invariant from 'invariant';\n@@ -24,6 +25,7 @@ export type UserViewerData = {|\n+cookieInsertedThisRequest?: bool,\n+sessionIdentifierType?: SessionIdentifierType,\n+sessionID: ?string,\n+ +sessionInfo: ?SessionInfo,\n|};\nexport type AnonymousViewerData = {|\n@@ -37,6 +39,12 @@ export type AnonymousViewerData = {|\n+cookieInsertedThisRequest?: bool,\n+sessionIdentifierType?: SessionIdentifierType,\n+sessionID: ?string,\n+ +sessionInfo: ?SessionInfo,\n+|};\n+\n+type SessionInfo = {|\n+ lastValidated: number,\n+ calendarQuery: CalendarQuery,\n|};\nexport type ViewerData = UserViewerData | AnonymousViewerData;\n@@ -114,6 +122,15 @@ class Viewer {\n}\n}\n+ setSessionInfo(sessionInfo: SessionInfo) {\n+ if (this.data.loggedIn) {\n+ this.data = { ...this.data, sessionInfo };\n+ } else {\n+ // This is a separate condition because of Flow\n+ this.data = { ...this.data, sessionInfo };\n+ }\n+ }\n+\nget id(): string {\nreturn this.data.id;\n}\n@@ -169,6 +186,29 @@ class Viewer {\n}\n}\n+ get hasSessionInfo(): bool {\n+ const { sessionInfo } = this.data;\n+ return !!sessionInfo;\n+ }\n+\n+ get sessionLastValidated(): number {\n+ const { sessionInfo } = this.data;\n+ invariant(\n+ sessionInfo !== null && sessionInfo !== undefined,\n+ \"Viewer.sessionInfo should be set\",\n+ );\n+ return sessionInfo.lastValidated;\n+ }\n+\n+ get calendarQuery(): CalendarQuery {\n+ const { sessionInfo } = this.data;\n+ invariant(\n+ sessionInfo !== null && sessionInfo !== undefined,\n+ \"Viewer.sessionInfo should be set\",\n+ );\n+ return sessionInfo.calendarQuery;\n+ }\n+\nget userID(): string {\nif (!this.data.userID) {\nthrow new ServerError('not_logged_in');\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/entry-updaters.js",
"new_path": "server/src/updaters/entry-updaters.js",
"diff": "@@ -8,6 +8,7 @@ import type {\n} from 'lib/types/entry-types';\nimport type { Viewer } from '../session/viewer';\nimport { updateTypes, type CreateUpdatesResponse } from 'lib/types/update-types';\n+import type { SessionUpdate } from './session-updaters';\nimport invariant from 'invariant';\n@@ -18,6 +19,7 @@ import { dateString } from 'lib/utils/date-utils';\nimport {\nrawEntryInfoWithinCalendarQuery,\ndefaultCalendarQuery,\n+ calendarQueryDifference,\n} from 'lib/shared/entry-utils';\nimport { values } from 'lib/utils/objects';\n@@ -28,10 +30,7 @@ import {\n} from '../fetchers/entry-fetchers';\nimport createIDs from '../creators/id-creator';\nimport createMessages from '../creators/message-creator';\n-import {\n- fetchSessionCalendarQuery,\n- fetchActiveSessionsForThread,\n-} from '../fetchers/session-fetchers';\n+import { fetchActiveSessionsForThread } from '../fetchers/session-fetchers';\nimport { createUpdates } from '../creators/update-creator';\nconst defaultUpdateCreationResponse = { viewerUpdates: [], userInfos: [] };\n@@ -190,24 +189,23 @@ async function createUpdateDatasForChangedEntryInfo(\nif (!viewer.loggedIn) {\nthrow new ServerError('not_logged_in');\n}\n-\nconst entryID = newEntryInfo.id;\ninvariant(entryID, \"should be set\");\n- const [ fetchedFilters, fetchedCalendarQuery ] = await Promise.all([\n+\n// If we ever make it possible to move entries from one thread to another,\n// we should update this code rto look at oldEntryInfo.threadID as well\n- fetchActiveSessionsForThread(newEntryInfo.threadID),\n- inputCalendarQuery ? undefined : fetchSessionCalendarQuery(viewer),\n- ]);\n+ const fetchedFilters = await fetchActiveSessionsForThread(\n+ newEntryInfo.threadID,\n+ );\nlet calendarQuery;\nif (inputCalendarQuery) {\ncalendarQuery = inputCalendarQuery;\n- } else if (fetchedCalendarQuery) {\n+ } else if (viewer.hasSessionInfo) {\n// This should only ever happen for \"legacy\" clients who call in without\n// providing this information. These clients wouldn't know how to deal with\n// the corresponding UpdateInfos anyways, so no reason to be worried.\n- calendarQuery = fetchedCalendarQuery;\n+ calendarQuery = viewer.calendarQuery;\n} else {\ncalendarQuery = defaultCalendarQuery();\n}\n@@ -247,7 +245,31 @@ async function createUpdateDatasForChangedEntryInfo(\n};\n}\n+type CalendarQueryComparisonResult = {|\n+ difference: $ReadOnlyArray<CalendarQuery>,\n+ oldCalendarQuery: CalendarQuery,\n+ sessionUpdate: SessionUpdate,\n+|};\n+function compareNewCalendarQuery(\n+ viewer: Viewer,\n+ newCalendarQuery: CalendarQuery,\n+): CalendarQueryComparisonResult {\n+ if (!viewer.hasSessionInfo) {\n+ throw new ServerError('unknown_error');\n+ }\n+ const oldCalendarQuery = viewer.calendarQuery;\n+ const difference = calendarQueryDifference(\n+ oldCalendarQuery,\n+ newCalendarQuery,\n+ );\n+ const sessionUpdate = difference.length > 0\n+ ? { query: newCalendarQuery }\n+ : {};\n+ return { difference, oldCalendarQuery, sessionUpdate };\n+}\n+\nexport {\nupdateEntry,\ncreateUpdateDatasForChangedEntryInfo,\n+ compareNewCalendarQuery,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/session-updaters.js",
"new_path": "server/src/updaters/session-updaters.js",
"diff": "import type { Viewer } from '../session/viewer';\nimport type { CalendarQuery } from 'lib/types/entry-types';\n-import { ServerError } from 'lib/utils/errors';\n-import { calendarQueryDifference } from 'lib/shared/entry-utils';\n-\nimport { dbQuery, SQL } from '../database';\n-import { fetchSessionCalendarQuery } from '../fetchers/session-fetchers';\n-type SessionUpdate = $Shape<{|\n+export type SessionUpdate = $Shape<{|\nquery: CalendarQuery,\nlastUpdate: number,\nlastValidated: number,\n|}>;\n-type CalendarQueryComparisonResult = {|\n- difference: $ReadOnlyArray<CalendarQuery>,\n- oldCalendarQuery: CalendarQuery,\n- sessionUpdate: SessionUpdate,\n-|};\n-\n-async function compareNewCalendarQuery(\n- viewer: Viewer,\n- newCalendarQuery: CalendarQuery,\n-): Promise<CalendarQueryComparisonResult> {\n- const oldCalendarQuery = await fetchSessionCalendarQuery(viewer);\n- if (!oldCalendarQuery) {\n- throw new ServerError('unknown_error');\n- }\n- const difference = calendarQueryDifference(\n- oldCalendarQuery,\n- newCalendarQuery,\n- );\n- const sessionUpdate = difference.length > 0\n- ? { query: newCalendarQuery }\n- : {};\n- return { difference, oldCalendarQuery, sessionUpdate };\n-}\n-\nasync function commitSessionUpdate(\nviewer: Viewer,\nsessionUpdate: SessionUpdate,\n@@ -66,6 +38,5 @@ async function commitSessionUpdate(\n}\nexport {\n- compareNewCalendarQuery,\ncommitSessionUpdate,\n};\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Fetch SessionInfo in initial validation query |
129,187 | 25.09.2018 17:24:15 | 14,400 | 56859459e97d2878c47520c2eb4d9e093893d7e1 | PollPushInconsistency -> Inconsistency | [
{
"change_type": "MODIFY",
"old_path": "lib/reducers/entry-reducer.js",
"new_path": "lib/reducers/entry-reducer.js",
"diff": "@@ -10,7 +10,7 @@ import type {\nimport { type RawThreadInfo } from '../types/thread-types';\nimport { updateTypes, type UpdateInfo } from '../types/update-types';\nimport {\n- type EntryPollPushInconsistencyClientResponse,\n+ type EntryInconsistencyClientResponse,\nserverRequestTypes,\n} from '../types/request-types';\nimport { pingResponseTypes } from '../types/ping-types';\n@@ -759,7 +759,7 @@ function findInconsistencies(\npollResult: {[id: string]: RawEntryInfo},\npushResult: {[id: string]: RawEntryInfo},\ncalendarQuery: CalendarQuery,\n-): EntryPollPushInconsistencyClientResponse[] {\n+): EntryInconsistencyClientResponse[] {\nconst filteredPollResult = filterRawEntryInfosByCalendarQuery(\npollResult,\ncalendarQuery,\n@@ -774,7 +774,7 @@ function findInconsistencies(\nif (action.type === pingActionTypes.success) {\nif (action.payload.type === pingResponseTypes.FULL) {\n// We can get a memory leak if we include a previous\n- // EntryPollPushInconsistencyClientResponse in this one\n+ // EntryInconsistencyClientResponse in this one\naction = {\ntype: \"PING_SUCCESS\",\nloadingInfo: action.loadingInfo,\n@@ -802,7 +802,7 @@ function findInconsistencies(\n}\n}\nreturn [{\n- type: serverRequestTypes.ENTRY_POLL_PUSH_INCONSISTENCY,\n+ type: serverRequestTypes.ENTRY_INCONSISTENCY,\nplatformDetails: getConfig().platformDetails,\nbeforeAction,\naction,\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/thread-reducer.js",
"new_path": "lib/reducers/thread-reducer.js",
"diff": "@@ -5,7 +5,7 @@ import type { RawThreadInfo, ThreadStore } from '../types/thread-types';\nimport { type PingResult, pingResponseTypes } from '../types/ping-types';\nimport { updateTypes, type UpdateInfo } from '../types/update-types';\nimport {\n- type ThreadPollPushInconsistencyClientResponse,\n+ type ThreadInconsistencyClientResponse,\nserverRequestTypes,\n} from '../types/request-types';\n@@ -181,14 +181,14 @@ function findInconsistencies(\naction: BaseAction,\npollResult: {[id: string]: RawThreadInfo},\npushResult: {[id: string]: RawThreadInfo},\n-): ThreadPollPushInconsistencyClientResponse[] {\n+): ThreadInconsistencyClientResponse[] {\nif (_isEqual(pollResult)(pushResult)) {\nreturn emptyArray;\n}\nif (action.type === pingActionTypes.success) {\nif (action.payload.type === pingResponseTypes.FULL) {\n// We can get a memory leak if we include a previous\n- // EntryPollPushInconsistencyClientResponse in this one\n+ // EntryInconsistencyClientResponse in this one\naction = {\ntype: \"PING_SUCCESS\",\nloadingInfo: action.loadingInfo,\n@@ -216,7 +216,7 @@ function findInconsistencies(\n}\n}\nreturn [{\n- type: serverRequestTypes.THREAD_POLL_PUSH_INCONSISTENCY,\n+ type: serverRequestTypes.THREAD_INCONSISTENCY,\nplatformDetails: getConfig().platformDetails,\nbeforeAction,\naction,\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/selectors/ping-selectors.js",
"new_path": "lib/selectors/ping-selectors.js",
"diff": "@@ -8,8 +8,8 @@ import type { RawThreadInfo } from '../types/thread-types';\nimport {\nserverRequestTypes,\ntype ServerRequest,\n- type ThreadPollPushInconsistencyClientResponse,\n- type EntryPollPushInconsistencyClientResponse,\n+ type ThreadInconsistencyClientResponse,\n+ type EntryInconsistencyClientResponse,\n} from '../types/request-types';\nimport { createSelector } from 'reselect';\n@@ -53,9 +53,9 @@ const pingActionInput = createSelector(\nactiveServerRequests: $ReadOnlyArray<ServerRequest>,\ndeviceToken: ?string,\nthreadInconsistencyResponses:\n- $ReadOnlyArray<ThreadPollPushInconsistencyClientResponse>,\n+ $ReadOnlyArray<ThreadInconsistencyClientResponse>,\nentryInconsistencyResponses:\n- $ReadOnlyArray<EntryPollPushInconsistencyClientResponse>,\n+ $ReadOnlyArray<EntryInconsistencyClientResponse>,\nlastSuccess: number,\n): (startingPayload: PingStartingPayload) => PingActionInput => {\nconst clientResponses = [\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/entry-types.js",
"new_path": "lib/types/entry-types.js",
"diff": "@@ -4,7 +4,7 @@ import type { RawMessageInfo } from './message-types';\nimport type { UserInfo, AccountUserInfo } from './user-types';\nimport { type CalendarFilter, calendarFilterPropType } from './filter-types';\nimport type { CreateUpdatesResponse } from './update-types';\n-import type { EntryPollPushInconsistencyClientResponse } from './request-types';\n+import type { EntryInconsistencyClientResponse } from './request-types';\nimport PropTypes from 'prop-types';\n@@ -65,8 +65,7 @@ export type EntryStore = {|\ndaysToEntries: {[day: string]: string[]},\nactualizedCalendarQuery: CalendarQuery,\nlastUserInteractionCalendar: number,\n- inconsistencyResponses:\n- $ReadOnlyArray<EntryPollPushInconsistencyClientResponse>,\n+ inconsistencyResponses: $ReadOnlyArray<EntryInconsistencyClientResponse>,\n|};\nexport type CalendarQuery = {|\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/report-types.js",
"new_path": "lib/types/report-types.js",
"diff": "@@ -10,8 +10,8 @@ import invariant from 'invariant';\nexport const reportTypes = Object.freeze({\nERROR: 0,\n- THREAD_POLL_PUSH_INCONSISTENCY: 1,\n- ENTRY_POLL_PUSH_INCONSISTENCY: 2,\n+ THREAD_INCONSISTENCY: 1,\n+ ENTRY_INCONSISTENCY: 2,\n});\ntype ReportType = $Values<typeof reportTypes>;\nfunction assertReportType(reportType: number): ReportType {\n@@ -39,7 +39,7 @@ type ErrorReportCreationRequest = {|\ncurrentState: BaseAppState<*>,\nactions: $ReadOnlyArray<BaseAction>,\n|};\n-export type ThreadPollPushInconsistencyReportCreationRequest = {|\n+export type ThreadInconsistencyReportCreationRequest = {|\ntype: 1,\nplatformDetails: PlatformDetails,\nbeforeAction: {[id: string]: RawThreadInfo},\n@@ -49,7 +49,7 @@ export type ThreadPollPushInconsistencyReportCreationRequest = {|\nlastActionTypes?: $ReadOnlyArray<$PropertyType<BaseAction, 'type'>>,\ntime?: number,\n|};\n-export type EntryPollPushInconsistencyReportCreationRequest = {|\n+export type EntryInconsistencyReportCreationRequest = {|\ntype: 2,\nplatformDetails: PlatformDetails,\nbeforeAction: {[id: string]: RawEntryInfo},\n@@ -62,8 +62,8 @@ export type EntryPollPushInconsistencyReportCreationRequest = {|\n|};\nexport type ReportCreationRequest =\n| ErrorReportCreationRequest\n- | ThreadPollPushInconsistencyReportCreationRequest\n- | EntryPollPushInconsistencyReportCreationRequest;\n+ | ThreadInconsistencyReportCreationRequest\n+ | EntryInconsistencyReportCreationRequest;\nexport type ReportCreationResponse = {|\nid: string,\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/request-types.js",
"new_path": "lib/types/request-types.js",
"diff": "@@ -13,10 +13,10 @@ import PropTypes from 'prop-types';\nexport const serverRequestTypes = Object.freeze({\nPLATFORM: 0,\nDEVICE_TOKEN: 1,\n- THREAD_POLL_PUSH_INCONSISTENCY: 2,\n+ THREAD_INCONSISTENCY: 2,\nPLATFORM_DETAILS: 3,\nINITIAL_ACTIVITY_UPDATE: 4,\n- ENTRY_POLL_PUSH_INCONSISTENCY: 5,\n+ ENTRY_INCONSISTENCY: 5,\nCHECK_STATE: 6,\n});\ntype ServerRequestType = $Values<typeof serverRequestTypes>;\n@@ -52,7 +52,7 @@ type DeviceTokenClientResponse = {|\ndeviceToken: string,\n|};\n-export type ThreadPollPushInconsistencyClientResponse = {|\n+export type ThreadInconsistencyClientResponse = {|\ntype: 2,\nplatformDetails: PlatformDetails,\nbeforeAction: {[id: string]: RawThreadInfo},\n@@ -76,7 +76,7 @@ type InitialActivityUpdateClientResponse = {|\nthreadID: string,\n|};\n-export type EntryPollPushInconsistencyClientResponse = {|\n+export type EntryInconsistencyClientResponse = {|\ntype: 5,\nplatformDetails: PlatformDetails,\nbeforeAction: {[id: string]: RawEntryInfo},\n@@ -121,8 +121,8 @@ export type ServerRequest =\nexport type ClientResponse =\n| PlatformClientResponse\n| DeviceTokenClientResponse\n- | ThreadPollPushInconsistencyClientResponse\n+ | ThreadInconsistencyClientResponse\n| PlatformDetailsClientResponse\n| InitialActivityUpdateClientResponse\n- | EntryPollPushInconsistencyClientResponse\n+ | EntryInconsistencyClientResponse\n| CheckStateClientResponse;\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/thread-types.js",
"new_path": "lib/types/thread-types.js",
"diff": "@@ -12,9 +12,7 @@ import type {\nRawEntryInfo,\n} from './entry-types';\nimport type { UpdateInfo } from './update-types';\n-import type {\n- ThreadPollPushInconsistencyClientResponse,\n-} from './request-types';\n+import type { ThreadInconsistencyClientResponse } from './request-types';\nimport PropTypes from 'prop-types';\nimport invariant from 'invariant';\n@@ -242,8 +240,7 @@ export type ServerThreadInfo = {|\nexport type ThreadStore = {|\nthreadInfos: {[id: string]: RawThreadInfo},\n- inconsistencyResponses:\n- $ReadOnlyArray<ThreadPollPushInconsistencyClientResponse>,\n+ inconsistencyResponses: $ReadOnlyArray<ThreadInconsistencyClientResponse>,\n|};\nexport type ThreadDeletionRequest = {|\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/report-creator.js",
"new_path": "server/src/creators/report-creator.js",
"diff": "@@ -4,8 +4,8 @@ import type { Viewer } from '../session/viewer';\nimport {\ntype ReportCreationRequest,\ntype ReportCreationResponse,\n- type ThreadPollPushInconsistencyReportCreationRequest,\n- type EntryPollPushInconsistencyReportCreationRequest,\n+ type ThreadInconsistencyReportCreationRequest,\n+ type EntryInconsistencyReportCreationRequest,\nreportTypes,\n} from 'lib/types/report-types';\nimport { messageTypes } from 'lib/types/message-types';\n@@ -37,10 +37,10 @@ async function createReport(\n}\nconst [ id ] = await createIDs(\"reports\", 1);\nlet type, platformDetails, report, time;\n- if (request.type === reportTypes.THREAD_POLL_PUSH_INCONSISTENCY) {\n+ if (request.type === reportTypes.THREAD_INCONSISTENCY) {\n({ type, platformDetails, time, ...report } = request);\ntime = time ? time : Date.now();\n- } else if (request.type === reportTypes.ENTRY_POLL_PUSH_INCONSISTENCY) {\n+ } else if (request.type === reportTypes.ENTRY_INCONSISTENCY) {\n({ type, platformDetails, time, ...report } = request);\n} else {\n({ type, platformDetails, ...report } = request);\n@@ -96,8 +96,8 @@ async function ignoreReport(\n}\n// The below logic is to avoid duplicate inconsistency reports\nif (\n- request.type !== reportTypes.THREAD_POLL_PUSH_INCONSISTENCY &&\n- request.type !== reportTypes.ENTRY_POLL_PUSH_INCONSISTENCY\n+ request.type !== reportTypes.THREAD_INCONSISTENCY &&\n+ request.type !== reportTypes.ENTRY_INCONSISTENCY\n) {\nreturn false;\n}\n@@ -119,7 +119,7 @@ async function ignoreReport(\n// Currently this only ignores cases that are the result of the thread-reducer\n// conditional with the comment above that starts with \"If the thread at the\"\nfunction ignoreKnownInconsistencyReport(request: ReportCreationRequest): bool {\n- if (request.type !== reportTypes.THREAD_POLL_PUSH_INCONSISTENCY) {\n+ if (request.type !== reportTypes.THREAD_INCONSISTENCY) {\nreturn false;\n}\nif (request.action.type !== pingActionTypes.success) {\n@@ -166,17 +166,17 @@ function getSquadbotMessage(\nreturn `${name} got an error :(\\n` +\n`using ${platformString}\\n` +\n`${baseDomain}${basePath}download_error_report/${reportID}`;\n- } else if (request.type === reportTypes.THREAD_POLL_PUSH_INCONSISTENCY) {\n+ } else if (request.type === reportTypes.THREAD_INCONSISTENCY) {\nconst nonMatchingThreadIDs = getInconsistentThreadIDsFromReport(request);\nconst nonMatchingString = [...nonMatchingThreadIDs].join(\", \");\n- return `system detected poll/push inconsistency for ${name}!\\n` +\n+ return `system detected inconsistency for ${name}!\\n` +\n`using ${platformString}\\n` +\n`occurred during ${request.action.type}\\n` +\n`thread IDs that are inconsistent: ${nonMatchingString}`;\n- } else if (request.type === reportTypes.ENTRY_POLL_PUSH_INCONSISTENCY) {\n+ } else if (request.type === reportTypes.ENTRY_INCONSISTENCY) {\nconst nonMatchingEntryIDs = getInconsistentEntryIDsFromReport(request);\nconst nonMatchingString = [...nonMatchingEntryIDs].join(\", \");\n- return `system detected poll/push inconsistency for ${name}!\\n` +\n+ return `system detected inconsistency for ${name}!\\n` +\n`using ${platformString}\\n` +\n`occurred during ${request.action.type}\\n` +\n`entry IDs that are inconsistent: ${nonMatchingString}`;\n@@ -204,14 +204,14 @@ function findInconsistentObjectKeys(\n}\nfunction getInconsistentThreadIDsFromReport(\n- request: ThreadPollPushInconsistencyReportCreationRequest,\n+ request: ThreadInconsistencyReportCreationRequest,\n): Set<string> {\nconst { pushResult, pollResult, action } = request;\nreturn findInconsistentObjectKeys(pollResult, pushResult);\n}\nfunction getInconsistentEntryIDsFromReport(\n- request: EntryPollPushInconsistencyReportCreationRequest,\n+ request: EntryInconsistencyReportCreationRequest,\n): Set<string> {\nconst { pushResult, pollResult, action, calendarQuery } = request;\nconst filteredPollResult = filterRawEntryInfosByCalendarQuery(\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -9,16 +9,16 @@ import { defaultNumberPerThread } from 'lib/types/message-types';\nimport type { Viewer } from '../session/viewer';\nimport {\nserverRequestTypes,\n- type ThreadPollPushInconsistencyClientResponse,\n- type EntryPollPushInconsistencyClientResponse,\n+ type ThreadInconsistencyClientResponse,\n+ type EntryInconsistencyClientResponse,\ntype ClientResponse,\ntype ServerRequest,\n} from 'lib/types/request-types';\nimport { isDeviceType, assertDeviceType } from 'lib/types/device-types';\nimport {\nreportTypes,\n- type ThreadPollPushInconsistencyReportCreationRequest,\n- type EntryPollPushInconsistencyReportCreationRequest,\n+ type ThreadInconsistencyReportCreationRequest,\n+ type EntryInconsistencyReportCreationRequest,\n} from 'lib/types/report-types';\nimport type {\nCalendarQuery,\n@@ -96,8 +96,8 @@ const pingRequestInputValidator = tShape({\n}),\ntShape({\ntype: t.irreducible(\n- 'serverRequestTypes.THREAD_POLL_PUSH_INCONSISTENCY',\n- x => x === serverRequestTypes.THREAD_POLL_PUSH_INCONSISTENCY,\n+ 'serverRequestTypes.THREAD_INCONSISTENCY',\n+ x => x === serverRequestTypes.THREAD_INCONSISTENCY,\n),\nplatformDetails: tPlatformDetails,\nbeforeAction: t.Object,\n@@ -109,8 +109,8 @@ const pingRequestInputValidator = tShape({\n}),\ntShape({\ntype: t.irreducible(\n- 'serverRequestTypes.ENTRY_POLL_PUSH_INCONSISTENCY',\n- x => x === serverRequestTypes.ENTRY_POLL_PUSH_INCONSISTENCY,\n+ 'serverRequestTypes.ENTRY_INCONSISTENCY',\n+ x => x === serverRequestTypes.ENTRY_INCONSISTENCY,\n),\nplatformDetails: tPlatformDetails,\nbeforeAction: t.Object,\n@@ -350,17 +350,16 @@ async function processClientResponses(\n));\nviewerMissingDeviceToken = false;\n} else if (\n- clientResponse.type ===\n- serverRequestTypes.THREAD_POLL_PUSH_INCONSISTENCY\n+ clientResponse.type === serverRequestTypes.THREAD_INCONSISTENCY\n) {\n- promises.push(recordThreadPollPushInconsistency(\n+ promises.push(recordThreadInconsistency(\nviewer,\nclientResponse,\n));\n} else if (\n- clientResponse.type === serverRequestTypes.ENTRY_POLL_PUSH_INCONSISTENCY\n+ clientResponse.type === serverRequestTypes.ENTRY_INCONSISTENCY\n) {\n- promises.push(recordEntryPollPushInconsistency(\n+ promises.push(recordEntryInconsistency(\nviewer,\nclientResponse,\n));\n@@ -399,27 +398,27 @@ async function processClientResponses(\nreturn serverRequests;\n}\n-async function recordThreadPollPushInconsistency(\n+async function recordThreadInconsistency(\nviewer: Viewer,\n- response: ThreadPollPushInconsistencyClientResponse,\n+ response: ThreadInconsistencyClientResponse,\n): Promise<void> {\nconst { type, ...rest } = response;\nconst reportCreationRequest = ({\n...rest,\n- type: reportTypes.THREAD_POLL_PUSH_INCONSISTENCY,\n- }: ThreadPollPushInconsistencyReportCreationRequest);\n+ type: reportTypes.THREAD_INCONSISTENCY,\n+ }: ThreadInconsistencyReportCreationRequest);\nawait createReport(viewer, reportCreationRequest);\n}\n-async function recordEntryPollPushInconsistency(\n+async function recordEntryInconsistency(\nviewer: Viewer,\n- response: EntryPollPushInconsistencyClientResponse,\n+ response: EntryInconsistencyClientResponse,\n): Promise<void> {\nconst { type, ...rest } = response;\nconst reportCreationRequest = ({\n...rest,\n- type: reportTypes.ENTRY_POLL_PUSH_INCONSISTENCY,\n- }: EntryPollPushInconsistencyReportCreationRequest);\n+ type: reportTypes.ENTRY_INCONSISTENCY,\n+ }: EntryInconsistencyReportCreationRequest);\nawait createReport(viewer, reportCreationRequest);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/report-responders.js",
"new_path": "server/src/responders/report-responders.js",
"diff": "@@ -47,8 +47,8 @@ const reportCreationRequestInputValidator = t.union([\n}),\ntShape({\ntype: t.irreducible(\n- 'reportTypes.THREAD_POLL_PUSH_INCONSISTENCY',\n- x => x === reportTypes.THREAD_POLL_PUSH_INCONSISTENCY,\n+ 'reportTypes.THREAD_INCONSISTENCY',\n+ x => x === reportTypes.THREAD_INCONSISTENCY,\n),\nplatformDetails: tPlatformDetails,\nbeforeAction: t.Object,\n@@ -60,8 +60,8 @@ const reportCreationRequestInputValidator = t.union([\n}),\ntShape({\ntype: t.irreducible(\n- 'reportTypes.ENTRY_POLL_PUSH_INCONSISTENCY',\n- x => x === reportTypes.ENTRY_POLL_PUSH_INCONSISTENCY,\n+ 'reportTypes.ENTRY_INCONSISTENCY',\n+ x => x === reportTypes.ENTRY_INCONSISTENCY,\n),\nplatformDetails: tPlatformDetails,\nbeforeAction: t.Object,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | PollPushInconsistency -> Inconsistency |
129,187 | 26.09.2018 10:38:58 | 14,400 | 860ea07280ffb8f4fa1ebe0111a4e3ed1c212154 | [server] Fix fetchSessionInfo to work with native | [
{
"change_type": "MODIFY",
"old_path": "server/src/session/cookies.js",
"new_path": "server/src/session/cookies.js",
"diff": "@@ -244,7 +244,7 @@ function getSessionIdentifierTypeFromRequestBody(\n}\ntype SessionInfo = {|\n- sessionID: string,\n+ sessionID: ?string,\nlastValidated: number,\ncalendarQuery: CalendarQuery,\n|};\n@@ -253,13 +253,14 @@ async function fetchSessionInfo(\ncookieID: string,\n): Promise<?SessionInfo> {\nconst sessionID = getSessionIDFromRequestBody(req);\n- if (!sessionID) {\n+ const session = sessionID !== undefined ? sessionID : cookieID;\n+ if (!session) {\nreturn null;\n}\nconst query = SQL`\nSELECT query, last_validated\nFROM sessions\n- WHERE id = ${sessionID} AND cookie = ${cookieID}\n+ WHERE id = ${session} AND cookie = ${cookieID}\n`;\nconst [ result ] = await dbQuery(query);\nif (result.length === 0) {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Fix fetchSessionInfo to work with native |
129,187 | 26.09.2018 12:34:47 | 14,400 | e310ca0252bbb4af77e792f15be34c0031e91a39 | Remove a bunch of extant jQuery references | [
{
"change_type": "DELETE",
"old_path": "lib/flow-typed/npm/jquery-param_vx.x.x.js",
"new_path": null,
"diff": "-// flow-typed signature: 181bade05b2c56f353250053c4c4e917\n-// flow-typed version: <<STUB>>/jquery-param_v^0.2.0/flow_v0.64.0\n-\n-/**\n- * This is an autogenerated libdef stub for:\n- *\n- * 'jquery-param'\n- *\n- * Fill this stub out by replacing all the `any` types.\n- *\n- * Once filled out, we encourage you to share your work with the\n- * community by sending a pull request to:\n- * https://github.com/flowtype/flow-typed\n- */\n-\n-declare module 'jquery-param' {\n- declare module.exports: any;\n-}\n-\n-/**\n- * We include stubs for each file inside this npm package in case you need to\n- * require those files directly. Feel free to delete any files that aren't\n- * needed.\n- */\n-declare module 'jquery-param/jquery-param' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery-param/jquery-param.min' {\n- declare module.exports: any;\n-}\n-\n-// Filename aliases\n-declare module 'jquery-param/jquery-param.js' {\n- declare module.exports: $Exports<'jquery-param/jquery-param'>;\n-}\n-declare module 'jquery-param/jquery-param.min.js' {\n- declare module.exports: $Exports<'jquery-param/jquery-param.min'>;\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "lib/flow-typed/npm/jquery_vx.x.x.js",
"new_path": null,
"diff": "-// flow-typed signature: efbde9c57bf153af779e66f187378ac7\n-// flow-typed version: <<STUB>>/jquery_v^3.1.1/flow_v0.38.0\n-\n-/**\n- * This is an autogenerated libdef stub for:\n- *\n- * 'jquery'\n- *\n- * Fill this stub out by replacing all the `any` types.\n- *\n- * Once filled out, we encourage you to share your work with the\n- * community by sending a pull request to:\n- * https://github.com/flowtype/flow-typed\n- */\n-\n-declare module 'jquery' {\n- declare module.exports: any;\n-}\n-\n-/**\n- * We include stubs for each file inside this npm package in case you need to\n- * require those files directly. Feel free to delete any files that aren't\n- * needed.\n- */\n-declare module 'jquery/dist/core' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/dist/jquery' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/dist/jquery.min' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/dist/jquery.slim' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/dist/jquery.slim.min' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/external/sizzle/dist/sizzle' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/external/sizzle/dist/sizzle.min' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/ajax' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/ajax/jsonp' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/ajax/load' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/ajax/parseXML' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/ajax/script' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/ajax/var/location' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/ajax/var/nonce' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/ajax/var/rquery' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/ajax/xhr' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/attributes' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/attributes/attr' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/attributes/classes' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/attributes/prop' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/attributes/support' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/attributes/val' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/callbacks' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/core' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/core/access' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/core/DOMEval' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/core/init' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/core/parseHTML' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/core/ready-no-deferred' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/core/ready' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/core/readyException' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/core/stripAndCollapse' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/core/support' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/core/var/rsingleTag' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/css' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/css/addGetHookIf' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/css/adjustCSS' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/css/curCSS' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/css/hiddenVisibleSelectors' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/css/showHide' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/css/support' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/css/var/cssExpand' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/css/var/getStyles' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/css/var/isHiddenWithinTree' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/css/var/rmargin' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/css/var/rnumnonpx' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/css/var/swap' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/data' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/data/Data' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/data/var/acceptData' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/data/var/dataPriv' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/data/var/dataUser' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/deferred' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/deferred/exceptionHook' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/deprecated' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/dimensions' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/effects' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/effects/animatedSelector' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/effects/Tween' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/event' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/event/ajax' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/event/alias' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/event/focusin' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/event/support' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/event/trigger' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/exports/amd' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/exports/global' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/jquery' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/manipulation' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/manipulation/_evalUrl' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/manipulation/buildFragment' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/manipulation/getAll' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/manipulation/setGlobalEval' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/manipulation/support' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/manipulation/var/rcheckableType' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/manipulation/var/rscriptType' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/manipulation/var/rtagName' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/manipulation/wrapMap' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/offset' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/queue' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/queue/delay' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/selector-native' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/selector-sizzle' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/selector' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/serialize' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/traversing' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/traversing/findFilter' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/traversing/var/dir' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/traversing/var/rneedsContext' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/traversing/var/siblings' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/var/arr' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/var/class2type' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/var/concat' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/var/document' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/var/documentElement' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/var/fnToString' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/var/getProto' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/var/hasOwn' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/var/indexOf' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/var/ObjectFunctionString' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/var/pnum' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/var/push' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/var/rcssNum' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/var/rnothtmlwhite' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/var/slice' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/var/support' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/var/toString' {\n- declare module.exports: any;\n-}\n-\n-declare module 'jquery/src/wrap' {\n- declare module.exports: any;\n-}\n-\n-// Filename aliases\n-declare module 'jquery/dist/core.js' {\n- declare module.exports: $Exports<'jquery/dist/core'>;\n-}\n-declare module 'jquery/dist/jquery.js' {\n- declare module.exports: $Exports<'jquery/dist/jquery'>;\n-}\n-declare module 'jquery/dist/jquery.min.js' {\n- declare module.exports: $Exports<'jquery/dist/jquery.min'>;\n-}\n-declare module 'jquery/dist/jquery.slim.js' {\n- declare module.exports: $Exports<'jquery/dist/jquery.slim'>;\n-}\n-declare module 'jquery/dist/jquery.slim.min.js' {\n- declare module.exports: $Exports<'jquery/dist/jquery.slim.min'>;\n-}\n-declare module 'jquery/external/sizzle/dist/sizzle.js' {\n- declare module.exports: $Exports<'jquery/external/sizzle/dist/sizzle'>;\n-}\n-declare module 'jquery/external/sizzle/dist/sizzle.min.js' {\n- declare module.exports: $Exports<'jquery/external/sizzle/dist/sizzle.min'>;\n-}\n-declare module 'jquery/src/ajax.js' {\n- declare module.exports: $Exports<'jquery/src/ajax'>;\n-}\n-declare module 'jquery/src/ajax/jsonp.js' {\n- declare module.exports: $Exports<'jquery/src/ajax/jsonp'>;\n-}\n-declare module 'jquery/src/ajax/load.js' {\n- declare module.exports: $Exports<'jquery/src/ajax/load'>;\n-}\n-declare module 'jquery/src/ajax/parseXML.js' {\n- declare module.exports: $Exports<'jquery/src/ajax/parseXML'>;\n-}\n-declare module 'jquery/src/ajax/script.js' {\n- declare module.exports: $Exports<'jquery/src/ajax/script'>;\n-}\n-declare module 'jquery/src/ajax/var/location.js' {\n- declare module.exports: $Exports<'jquery/src/ajax/var/location'>;\n-}\n-declare module 'jquery/src/ajax/var/nonce.js' {\n- declare module.exports: $Exports<'jquery/src/ajax/var/nonce'>;\n-}\n-declare module 'jquery/src/ajax/var/rquery.js' {\n- declare module.exports: $Exports<'jquery/src/ajax/var/rquery'>;\n-}\n-declare module 'jquery/src/ajax/xhr.js' {\n- declare module.exports: $Exports<'jquery/src/ajax/xhr'>;\n-}\n-declare module 'jquery/src/attributes.js' {\n- declare module.exports: $Exports<'jquery/src/attributes'>;\n-}\n-declare module 'jquery/src/attributes/attr.js' {\n- declare module.exports: $Exports<'jquery/src/attributes/attr'>;\n-}\n-declare module 'jquery/src/attributes/classes.js' {\n- declare module.exports: $Exports<'jquery/src/attributes/classes'>;\n-}\n-declare module 'jquery/src/attributes/prop.js' {\n- declare module.exports: $Exports<'jquery/src/attributes/prop'>;\n-}\n-declare module 'jquery/src/attributes/support.js' {\n- declare module.exports: $Exports<'jquery/src/attributes/support'>;\n-}\n-declare module 'jquery/src/attributes/val.js' {\n- declare module.exports: $Exports<'jquery/src/attributes/val'>;\n-}\n-declare module 'jquery/src/callbacks.js' {\n- declare module.exports: $Exports<'jquery/src/callbacks'>;\n-}\n-declare module 'jquery/src/core.js' {\n- declare module.exports: $Exports<'jquery/src/core'>;\n-}\n-declare module 'jquery/src/core/access.js' {\n- declare module.exports: $Exports<'jquery/src/core/access'>;\n-}\n-declare module 'jquery/src/core/DOMEval.js' {\n- declare module.exports: $Exports<'jquery/src/core/DOMEval'>;\n-}\n-declare module 'jquery/src/core/init.js' {\n- declare module.exports: $Exports<'jquery/src/core/init'>;\n-}\n-declare module 'jquery/src/core/parseHTML.js' {\n- declare module.exports: $Exports<'jquery/src/core/parseHTML'>;\n-}\n-declare module 'jquery/src/core/ready-no-deferred.js' {\n- declare module.exports: $Exports<'jquery/src/core/ready-no-deferred'>;\n-}\n-declare module 'jquery/src/core/ready.js' {\n- declare module.exports: $Exports<'jquery/src/core/ready'>;\n-}\n-declare module 'jquery/src/core/readyException.js' {\n- declare module.exports: $Exports<'jquery/src/core/readyException'>;\n-}\n-declare module 'jquery/src/core/stripAndCollapse.js' {\n- declare module.exports: $Exports<'jquery/src/core/stripAndCollapse'>;\n-}\n-declare module 'jquery/src/core/support.js' {\n- declare module.exports: $Exports<'jquery/src/core/support'>;\n-}\n-declare module 'jquery/src/core/var/rsingleTag.js' {\n- declare module.exports: $Exports<'jquery/src/core/var/rsingleTag'>;\n-}\n-declare module 'jquery/src/css.js' {\n- declare module.exports: $Exports<'jquery/src/css'>;\n-}\n-declare module 'jquery/src/css/addGetHookIf.js' {\n- declare module.exports: $Exports<'jquery/src/css/addGetHookIf'>;\n-}\n-declare module 'jquery/src/css/adjustCSS.js' {\n- declare module.exports: $Exports<'jquery/src/css/adjustCSS'>;\n-}\n-declare module 'jquery/src/css/curCSS.js' {\n- declare module.exports: $Exports<'jquery/src/css/curCSS'>;\n-}\n-declare module 'jquery/src/css/hiddenVisibleSelectors.js' {\n- declare module.exports: $Exports<'jquery/src/css/hiddenVisibleSelectors'>;\n-}\n-declare module 'jquery/src/css/showHide.js' {\n- declare module.exports: $Exports<'jquery/src/css/showHide'>;\n-}\n-declare module 'jquery/src/css/support.js' {\n- declare module.exports: $Exports<'jquery/src/css/support'>;\n-}\n-declare module 'jquery/src/css/var/cssExpand.js' {\n- declare module.exports: $Exports<'jquery/src/css/var/cssExpand'>;\n-}\n-declare module 'jquery/src/css/var/getStyles.js' {\n- declare module.exports: $Exports<'jquery/src/css/var/getStyles'>;\n-}\n-declare module 'jquery/src/css/var/isHiddenWithinTree.js' {\n- declare module.exports: $Exports<'jquery/src/css/var/isHiddenWithinTree'>;\n-}\n-declare module 'jquery/src/css/var/rmargin.js' {\n- declare module.exports: $Exports<'jquery/src/css/var/rmargin'>;\n-}\n-declare module 'jquery/src/css/var/rnumnonpx.js' {\n- declare module.exports: $Exports<'jquery/src/css/var/rnumnonpx'>;\n-}\n-declare module 'jquery/src/css/var/swap.js' {\n- declare module.exports: $Exports<'jquery/src/css/var/swap'>;\n-}\n-declare module 'jquery/src/data.js' {\n- declare module.exports: $Exports<'jquery/src/data'>;\n-}\n-declare module 'jquery/src/data/Data.js' {\n- declare module.exports: $Exports<'jquery/src/data/Data'>;\n-}\n-declare module 'jquery/src/data/var/acceptData.js' {\n- declare module.exports: $Exports<'jquery/src/data/var/acceptData'>;\n-}\n-declare module 'jquery/src/data/var/dataPriv.js' {\n- declare module.exports: $Exports<'jquery/src/data/var/dataPriv'>;\n-}\n-declare module 'jquery/src/data/var/dataUser.js' {\n- declare module.exports: $Exports<'jquery/src/data/var/dataUser'>;\n-}\n-declare module 'jquery/src/deferred.js' {\n- declare module.exports: $Exports<'jquery/src/deferred'>;\n-}\n-declare module 'jquery/src/deferred/exceptionHook.js' {\n- declare module.exports: $Exports<'jquery/src/deferred/exceptionHook'>;\n-}\n-declare module 'jquery/src/deprecated.js' {\n- declare module.exports: $Exports<'jquery/src/deprecated'>;\n-}\n-declare module 'jquery/src/dimensions.js' {\n- declare module.exports: $Exports<'jquery/src/dimensions'>;\n-}\n-declare module 'jquery/src/effects.js' {\n- declare module.exports: $Exports<'jquery/src/effects'>;\n-}\n-declare module 'jquery/src/effects/animatedSelector.js' {\n- declare module.exports: $Exports<'jquery/src/effects/animatedSelector'>;\n-}\n-declare module 'jquery/src/effects/Tween.js' {\n- declare module.exports: $Exports<'jquery/src/effects/Tween'>;\n-}\n-declare module 'jquery/src/event.js' {\n- declare module.exports: $Exports<'jquery/src/event'>;\n-}\n-declare module 'jquery/src/event/ajax.js' {\n- declare module.exports: $Exports<'jquery/src/event/ajax'>;\n-}\n-declare module 'jquery/src/event/alias.js' {\n- declare module.exports: $Exports<'jquery/src/event/alias'>;\n-}\n-declare module 'jquery/src/event/focusin.js' {\n- declare module.exports: $Exports<'jquery/src/event/focusin'>;\n-}\n-declare module 'jquery/src/event/support.js' {\n- declare module.exports: $Exports<'jquery/src/event/support'>;\n-}\n-declare module 'jquery/src/event/trigger.js' {\n- declare module.exports: $Exports<'jquery/src/event/trigger'>;\n-}\n-declare module 'jquery/src/exports/amd.js' {\n- declare module.exports: $Exports<'jquery/src/exports/amd'>;\n-}\n-declare module 'jquery/src/exports/global.js' {\n- declare module.exports: $Exports<'jquery/src/exports/global'>;\n-}\n-declare module 'jquery/src/jquery.js' {\n- declare module.exports: $Exports<'jquery/src/jquery'>;\n-}\n-declare module 'jquery/src/manipulation.js' {\n- declare module.exports: $Exports<'jquery/src/manipulation'>;\n-}\n-declare module 'jquery/src/manipulation/_evalUrl.js' {\n- declare module.exports: $Exports<'jquery/src/manipulation/_evalUrl'>;\n-}\n-declare module 'jquery/src/manipulation/buildFragment.js' {\n- declare module.exports: $Exports<'jquery/src/manipulation/buildFragment'>;\n-}\n-declare module 'jquery/src/manipulation/getAll.js' {\n- declare module.exports: $Exports<'jquery/src/manipulation/getAll'>;\n-}\n-declare module 'jquery/src/manipulation/setGlobalEval.js' {\n- declare module.exports: $Exports<'jquery/src/manipulation/setGlobalEval'>;\n-}\n-declare module 'jquery/src/manipulation/support.js' {\n- declare module.exports: $Exports<'jquery/src/manipulation/support'>;\n-}\n-declare module 'jquery/src/manipulation/var/rcheckableType.js' {\n- declare module.exports: $Exports<'jquery/src/manipulation/var/rcheckableType'>;\n-}\n-declare module 'jquery/src/manipulation/var/rscriptType.js' {\n- declare module.exports: $Exports<'jquery/src/manipulation/var/rscriptType'>;\n-}\n-declare module 'jquery/src/manipulation/var/rtagName.js' {\n- declare module.exports: $Exports<'jquery/src/manipulation/var/rtagName'>;\n-}\n-declare module 'jquery/src/manipulation/wrapMap.js' {\n- declare module.exports: $Exports<'jquery/src/manipulation/wrapMap'>;\n-}\n-declare module 'jquery/src/offset.js' {\n- declare module.exports: $Exports<'jquery/src/offset'>;\n-}\n-declare module 'jquery/src/queue.js' {\n- declare module.exports: $Exports<'jquery/src/queue'>;\n-}\n-declare module 'jquery/src/queue/delay.js' {\n- declare module.exports: $Exports<'jquery/src/queue/delay'>;\n-}\n-declare module 'jquery/src/selector-native.js' {\n- declare module.exports: $Exports<'jquery/src/selector-native'>;\n-}\n-declare module 'jquery/src/selector-sizzle.js' {\n- declare module.exports: $Exports<'jquery/src/selector-sizzle'>;\n-}\n-declare module 'jquery/src/selector.js' {\n- declare module.exports: $Exports<'jquery/src/selector'>;\n-}\n-declare module 'jquery/src/serialize.js' {\n- declare module.exports: $Exports<'jquery/src/serialize'>;\n-}\n-declare module 'jquery/src/traversing.js' {\n- declare module.exports: $Exports<'jquery/src/traversing'>;\n-}\n-declare module 'jquery/src/traversing/findFilter.js' {\n- declare module.exports: $Exports<'jquery/src/traversing/findFilter'>;\n-}\n-declare module 'jquery/src/traversing/var/dir.js' {\n- declare module.exports: $Exports<'jquery/src/traversing/var/dir'>;\n-}\n-declare module 'jquery/src/traversing/var/rneedsContext.js' {\n- declare module.exports: $Exports<'jquery/src/traversing/var/rneedsContext'>;\n-}\n-declare module 'jquery/src/traversing/var/siblings.js' {\n- declare module.exports: $Exports<'jquery/src/traversing/var/siblings'>;\n-}\n-declare module 'jquery/src/var/arr.js' {\n- declare module.exports: $Exports<'jquery/src/var/arr'>;\n-}\n-declare module 'jquery/src/var/class2type.js' {\n- declare module.exports: $Exports<'jquery/src/var/class2type'>;\n-}\n-declare module 'jquery/src/var/concat.js' {\n- declare module.exports: $Exports<'jquery/src/var/concat'>;\n-}\n-declare module 'jquery/src/var/document.js' {\n- declare module.exports: $Exports<'jquery/src/var/document'>;\n-}\n-declare module 'jquery/src/var/documentElement.js' {\n- declare module.exports: $Exports<'jquery/src/var/documentElement'>;\n-}\n-declare module 'jquery/src/var/fnToString.js' {\n- declare module.exports: $Exports<'jquery/src/var/fnToString'>;\n-}\n-declare module 'jquery/src/var/getProto.js' {\n- declare module.exports: $Exports<'jquery/src/var/getProto'>;\n-}\n-declare module 'jquery/src/var/hasOwn.js' {\n- declare module.exports: $Exports<'jquery/src/var/hasOwn'>;\n-}\n-declare module 'jquery/src/var/indexOf.js' {\n- declare module.exports: $Exports<'jquery/src/var/indexOf'>;\n-}\n-declare module 'jquery/src/var/ObjectFunctionString.js' {\n- declare module.exports: $Exports<'jquery/src/var/ObjectFunctionString'>;\n-}\n-declare module 'jquery/src/var/pnum.js' {\n- declare module.exports: $Exports<'jquery/src/var/pnum'>;\n-}\n-declare module 'jquery/src/var/push.js' {\n- declare module.exports: $Exports<'jquery/src/var/push'>;\n-}\n-declare module 'jquery/src/var/rcssNum.js' {\n- declare module.exports: $Exports<'jquery/src/var/rcssNum'>;\n-}\n-declare module 'jquery/src/var/rnothtmlwhite.js' {\n- declare module.exports: $Exports<'jquery/src/var/rnothtmlwhite'>;\n-}\n-declare module 'jquery/src/var/slice.js' {\n- declare module.exports: $Exports<'jquery/src/var/slice'>;\n-}\n-declare module 'jquery/src/var/support.js' {\n- declare module.exports: $Exports<'jquery/src/var/support'>;\n-}\n-declare module 'jquery/src/var/toString.js' {\n- declare module.exports: $Exports<'jquery/src/var/toString'>;\n-}\n-declare module 'jquery/src/wrap.js' {\n- declare module.exports: $Exports<'jquery/src/wrap'>;\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "lib/yarn.lock",
"new_path": null,
"diff": "-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.\n-# yarn lockfile v1\n-\n-\n-asap@~2.0.3:\n- version \"2.0.6\"\n- resolved \"https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46\"\n-\n-color-convert@^1.8.2:\n- version \"1.9.1\"\n- resolved \"https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed\"\n- dependencies:\n- color-name \"^1.1.1\"\n-\n-color-name@^1.0.0, color-name@^1.1.1:\n- version \"1.1.3\"\n- resolved \"https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25\"\n-\n-color-string@^1.4.0:\n- version \"1.5.2\"\n- resolved \"https://registry.yarnpkg.com/color-string/-/color-string-1.5.2.tgz#26e45814bc3c9a7cbd6751648a41434514a773a9\"\n- dependencies:\n- color-name \"^1.0.0\"\n- simple-swizzle \"^0.2.2\"\n-\n-color@^1.0.3:\n- version \"1.0.3\"\n- resolved \"https://registry.yarnpkg.com/color/-/color-1.0.3.tgz#e48e832d85f14ef694fb468811c2d5cfe729b55d\"\n- dependencies:\n- color-convert \"^1.8.2\"\n- color-string \"^1.4.0\"\n-\n-core-js@^1.0.0:\n- version \"1.2.7\"\n- resolved \"https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636\"\n-\n-dateformat@^2.0.0:\n- version \"2.2.0\"\n- resolved \"https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062\"\n-\n-encoding@^0.1.11:\n- version \"0.1.12\"\n- resolved \"https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb\"\n- dependencies:\n- iconv-lite \"~0.4.13\"\n-\n-fbjs@^0.8.16:\n- version \"0.8.16\"\n- resolved \"https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db\"\n- dependencies:\n- core-js \"^1.0.0\"\n- isomorphic-fetch \"^2.1.1\"\n- loose-envify \"^1.0.0\"\n- object-assign \"^4.1.0\"\n- promise \"^7.1.1\"\n- setimmediate \"^1.0.5\"\n- ua-parser-js \"^0.7.9\"\n-\n-flow-bin@^0.64.0:\n- version \"0.64.0\"\n- resolved \"https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.64.0.tgz#ddd3fb3b183ab1ab35a5d5dec9caf5ebbcded167\"\n-\n-iconv-lite@~0.4.13:\n- version \"0.4.19\"\n- resolved \"https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b\"\n-\n-invariant@^2.2.2:\n- version \"2.2.2\"\n- resolved \"https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360\"\n- dependencies:\n- loose-envify \"^1.0.0\"\n-\n-is-arrayish@^0.3.1:\n- version \"0.3.1\"\n- resolved \"https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.1.tgz#c2dfc386abaa0c3e33c48db3fe87059e69065efd\"\n-\n-is-stream@^1.0.1:\n- version \"1.1.0\"\n- resolved \"https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44\"\n-\n-isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:\n- version \"2.2.1\"\n- resolved \"https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9\"\n- dependencies:\n- node-fetch \"^1.0.1\"\n- whatwg-fetch \">=0.10.0\"\n-\n-jquery-param@^0.2.0:\n- version \"0.2.0\"\n- resolved \"https://registry.yarnpkg.com/jquery-param/-/jquery-param-0.2.0.tgz#55da8130428c50980eb516491c1b77cc78f0dcb1\"\n-\n-js-tokens@^3.0.0:\n- version \"3.0.2\"\n- resolved \"https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b\"\n-\n-lodash@^3.2.0:\n- version \"3.10.1\"\n- resolved \"https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6\"\n-\n-lodash@^4.17.5:\n- version \"4.17.5\"\n- resolved \"https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511\"\n-\n-loose-envify@^1.0.0, loose-envify@^1.3.1:\n- version \"1.3.1\"\n- resolved \"https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848\"\n- dependencies:\n- js-tokens \"^3.0.0\"\n-\n-node-fetch@^1.0.1:\n- version \"1.7.3\"\n- resolved \"https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef\"\n- dependencies:\n- encoding \"^0.1.11\"\n- is-stream \"^1.0.1\"\n-\n-object-assign@^4.1.0, object-assign@^4.1.1:\n- version \"4.1.1\"\n- resolved \"https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863\"\n-\n-promise@^7.1.1:\n- version \"7.3.1\"\n- resolved \"https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf\"\n- dependencies:\n- asap \"~2.0.3\"\n-\n-prop-types@^15.6.0:\n- version \"15.6.0\"\n- resolved \"https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856\"\n- dependencies:\n- fbjs \"^0.8.16\"\n- loose-envify \"^1.3.1\"\n- object-assign \"^4.1.1\"\n-\n-reselect@^3.0.1:\n- version \"3.0.1\"\n- resolved \"https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147\"\n-\n-setimmediate@^1.0.5:\n- version \"1.0.5\"\n- resolved \"https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285\"\n-\n-simple-swizzle@^0.2.2:\n- version \"0.2.2\"\n- resolved \"https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a\"\n- dependencies:\n- is-arrayish \"^0.3.1\"\n-\n-tokenize-text@^1.1.3:\n- version \"1.1.3\"\n- resolved \"https://registry.yarnpkg.com/tokenize-text/-/tokenize-text-1.1.3.tgz#8b059d6ada23618402f133db3808e37525cd5e7b\"\n- dependencies:\n- lodash \"^3.2.0\"\n-\n-ua-parser-js@^0.7.9:\n- version \"0.7.17\"\n- resolved \"https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac\"\n-\n-whatwg-fetch@>=0.10.0, whatwg-fetch@^2.0.3:\n- version \"2.0.3\"\n- resolved \"https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84\"\n"
},
{
"change_type": "MODIFY",
"old_path": "web/webpack.config.js",
"new_path": "web/webpack.config.js",
"diff": "@@ -62,7 +62,6 @@ const baseBrowserConfig = {\nalias: {\n'react': path.resolve('./node_modules/react'),\n'lodash': path.resolve('./node_modules/lodash'),\n- 'jquery': path.resolve('./node_modules/jquery'),\n'isomorphic-fetch': path.resolve('./node_modules/isomorphic-fetch'),\n'../images': path.resolve('../server/images'),\n},\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Remove a bunch of extant jQuery references |
129,187 | 26.09.2018 12:55:34 | 14,400 | 14272e28ad7ef1c411f3844f53079e921171709b | [server] Avoid crashing due to lack of sessionInfo
This can happen if the user isn't logged in, or if their session isn't correctly initialized before the `sessionInfo` is accessed. | [
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -192,17 +192,21 @@ async function pingResponder(\nawait verifyCalendarQueryThreadIDs(calendarQuery);\nconst oldUpdatesCurrentAsOf = request.updatesCurrentAsOf;\n+ const sessionInitializationResult = await initializeSession(\n+ viewer,\n+ calendarQuery,\n+ oldUpdatesCurrentAsOf,\n+ );\n+\nconst threadCursors = {};\nfor (let watchedThreadID of request.watchedIDs) {\nthreadCursors[watchedThreadID] = null;\n}\nconst threadSelectionCriteria = { threadCursors, joinedThreads: true };\nconst [\n- sessionInitializationResult,\nmessagesResult,\n{ serverRequests, stateCheckStatus },\n] = await Promise.all([\n- initializeSession(viewer, calendarQuery, oldUpdatesCurrentAsOf),\nfetchMessageInfosSince(\nviewer,\nthreadSelectionCriteria,\n@@ -440,6 +444,7 @@ async function processClientResponses(\nif (\n!stateCheckStatus &&\n+ viewer.loggedIn &&\nviewer.sessionLastValidated + sessionCheckFrequency < Date.now()\n) {\nstateCheckStatus = { status: \"state_check\" };\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Avoid crashing due to lack of sessionInfo
This can happen if the user isn't logged in, or if their session isn't correctly initialized before the `sessionInfo` is accessed. |
129,187 | 26.09.2018 12:59:27 | 14,400 | ca24e0cdef3be414e2d5f3d861e5716e313b3d27 | Constantly check state
Instead of doing this once every three hours, we're going to do it literally all the time.
Assuming the state is good, this is just three hashes per ping, and I got an inexplicable inconsistency this morning so I want to investigate it more. | [
{
"change_type": "MODIFY",
"old_path": "lib/types/session-types.js",
"new_path": "lib/types/session-types.js",
"diff": "@@ -8,7 +8,8 @@ import type {\n} from './user-types';\nexport const cookieLifetime = 30*24*60*60*1000; // in milliseconds\n-export const sessionCheckFrequency = 3*60*60*1000; // in milliseconds\n+//export const sessionCheckFrequency = 3*60*60*1000; // in milliseconds\n+export const sessionCheckFrequency = 0;\n// On native, we specify the cookie directly in the request and response body.\n// We do this because:\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Constantly check state
Instead of doing this once every three hours, we're going to do it literally all the time.
Assuming the state is good, this is just three hashes per ping, and I got an inexplicable inconsistency this morning so I want to investigate it more. |
129,187 | 26.09.2018 13:04:29 | 14,400 | 6d8823f83cc5023d32eeb7f3978bb35c2e8f867d | [server] Use usersInRawEntryInfos in fetchEntriesForSession | [
{
"change_type": "MODIFY",
"old_path": "server/src/fetchers/entry-fetchers.js",
"new_path": "server/src/fetchers/entry-fetchers.js",
"diff": "@@ -21,7 +21,10 @@ import {\nfilteredThreadIDs,\nfilterExists,\n} from 'lib/selectors/calendar-filter-selectors';\n-import { rawEntryInfoWithinCalendarQuery } from 'lib/shared/entry-utils';\n+import {\n+ rawEntryInfoWithinCalendarQuery,\n+ usersInRawEntryInfos,\n+} from 'lib/shared/entry-utils';\nimport {\ndbQuery,\n@@ -238,9 +241,7 @@ async function fetchEntriesForSession(\noldCalendarQuery,\n),\n);\n- const userIDs = new Set(filteredRawEntryInfos.map(\n- rawEntryInfo => rawEntryInfo.creatorID,\n- ));\n+ const userIDs = new Set(usersInRawEntryInfos(filteredRawEntryInfos));\nconst filteredUserInfos = {};\nfor (let userID in userInfos) {\nif (!userIDs.has(userID)) {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Use usersInRawEntryInfos in fetchEntriesForSession |
129,187 | 26.09.2018 16:34:38 | 14,400 | 5c07ad71955eb23b3e4a2b55932d33bd9fd4f168 | deltaEntryInfos only included in FULL when client requires FULL | [
{
"change_type": "MODIFY",
"old_path": "lib/actions/ping-actions.js",
"new_path": "lib/actions/ping-actions.js",
"diff": "@@ -74,7 +74,6 @@ async function ping(\nprevState: actionInput.prevState,\nupdatesResult: response.updatesResult,\nrequests,\n- deltaEntryInfos: response.deltaEntryInfos,\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/ping-types.js",
"new_path": "lib/types/ping-types.js",
"diff": "@@ -80,7 +80,6 @@ export type PingResult =\nprevState: PingPrevState,\nupdatesResult: UpdatesResult,\nrequests: ServerRequestPingResult,\n- deltaEntryInfos: ?$ReadOnlyArray<RawEntryInfo>,\n|}\n| {|\ntype: 1,\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -337,6 +337,9 @@ async function pingResponder(\nresponse.updatesResult = updatesResult;\n}\nif (sessionInitializationResult.sessionContinued) {\n+ // This will only happen when the client requests a FULL response, which\n+ // doesn't occur in recent client versions. The client will use the result\n+ // to identify entry inconsistencies.\nresponse.deltaEntryInfos =\nsessionInitializationResult.deltaEntryInfoResult.rawEntryInfos;\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | deltaEntryInfos only included in FULL when client requires FULL |
129,187 | 26.09.2018 17:01:49 | 14,400 | 123d72af48b308737f2a7792def2aaf10b0443a8 | Support for integrating corrected state from server in reducers | [
{
"change_type": "MODIFY",
"old_path": "lib/reducers/entry-reducer.js",
"new_path": "lib/reducers/entry-reducer.js",
"diff": "@@ -26,7 +26,6 @@ import _mapKeys from 'lodash/fp/mapKeys';\nimport _groupBy from 'lodash/fp/groupBy';\nimport _isEqual from 'lodash/fp/isEqual';\nimport _isEmpty from 'lodash/fp/isEmpty';\n-import _values from 'lodash/fp/values';\nimport invariant from 'invariant';\nimport { dateString } from '../utils/date-utils';\n@@ -68,6 +67,7 @@ import {\nimport { threadInFilterList } from '../shared/thread-utils';\nimport { getConfig } from '../utils/config';\nimport { reduxLogger } from '../utils/redux-logger';\n+import { values } from '../utils/objects';\nfunction daysToEntriesFromEntryInfos(entryInfos: $ReadOnlyArray<RawEntryInfo>) {\nreturn _flow(\n@@ -195,7 +195,7 @@ function mergeNewEntryInfos(\n}\n}\n- const daysToEntries = daysToEntriesFromEntryInfos(_values(mergedEntryInfos));\n+ const daysToEntries = daysToEntriesFromEntryInfos(values(mergedEntryInfos));\nreturn [mergedEntryInfos, daysToEntries];\n}\n@@ -375,7 +375,7 @@ function reduceEntryInfos(\nreturn entryStore;\n}\n- const pollEntryInfos = {\n+ const updatedEntryInfos = {\n...rekeyedEntryInfos,\n[serverID]: {\n...rekeyedEntryInfos[serverID],\n@@ -385,28 +385,28 @@ function reduceEntryInfos(\n},\n};\nconst newDaysToEntries = daysToEntriesFromEntryInfos(\n- _values(pollEntryInfos),\n+ values(updatedEntryInfos),\n);\n- const pushNewEntryInfos = mergeUpdateEntryInfos(\n+ const updateEntryInfos = mergeUpdateEntryInfos(\n[],\naction.payload.updatesResult.viewerUpdates,\n);\n- const [pushEntryInfos] = mergeNewEntryInfos(\n+ const [ newUpdatedEntryInfos ] = mergeNewEntryInfos(\nrekeyedEntryInfos,\n- pushNewEntryInfos,\n+ updateEntryInfos,\nnewThreadInfos,\n);\nconst newInconsistencies = findInconsistencies(\nentryInfos,\naction,\n- pollEntryInfos,\n- pushEntryInfos,\n+ updatedEntryInfos,\n+ newUpdatedEntryInfos,\naction.payload.calendarQuery,\n);\nreturn {\n- entryInfos: pollEntryInfos,\n+ entryInfos: updatedEntryInfos,\ndaysToEntries: newDaysToEntries,\nactualizedCalendarQuery,\nlastUserInteractionCalendar: Date.now(),\n@@ -432,20 +432,20 @@ function reduceEntryInfos(\n},\n};\n- const pushNewEntryInfos = mergeUpdateEntryInfos(\n+ const updateEntryInfos = mergeUpdateEntryInfos(\n[],\naction.payload.updatesResult.viewerUpdates,\n);\n- const [pushEntryInfos] = mergeNewEntryInfos(\n+ const [ newUpdatedEntryInfos ] = mergeNewEntryInfos(\nentryInfos,\n- pushNewEntryInfos,\n+ updateEntryInfos,\nnewThreadInfos,\n);\nconst newInconsistencies = findInconsistencies(\nentryInfos,\naction,\nupdatedEntryInfos,\n- pushEntryInfos,\n+ newUpdatedEntryInfos,\naction.payload.calendarQuery,\n);\n@@ -504,20 +504,20 @@ function reduceEntryInfos(\n};\n} else if (action.type === deleteEntryActionTypes.success && action.payload) {\nconst { payload } = action;\n- const pushNewEntryInfos = mergeUpdateEntryInfos(\n+ const updateEntryInfos = mergeUpdateEntryInfos(\n[],\npayload.updatesResult.viewerUpdates,\n);\n- const [pushEntryInfos] = mergeNewEntryInfos(\n+ const [ newUpdatedEntryInfos ] = mergeNewEntryInfos(\nentryInfos,\n- pushNewEntryInfos,\n+ updateEntryInfos,\nnewThreadInfos,\n);\nconst newInconsistencies = findInconsistencies(\nentryInfos,\naction,\nentryInfos,\n- pushEntryInfos,\n+ newUpdatedEntryInfos,\npayload.calendarQuery,\n);\nreturn {\n@@ -563,20 +563,20 @@ function reduceEntryInfos(\n[key]: entryInfo,\n};\n- const pushNewEntryInfos = mergeUpdateEntryInfos(\n+ const updateEntryInfos = mergeUpdateEntryInfos(\n[],\naction.payload.updatesResult.viewerUpdates,\n);\n- const [pushEntryInfos] = mergeNewEntryInfos(\n+ const [ newUpdatedEntryInfos ] = mergeNewEntryInfos(\nentryInfos,\n- pushNewEntryInfos,\n+ updateEntryInfos,\nnewThreadInfos,\n);\nconst newInconsistencies = findInconsistencies(\nentryInfos,\naction,\nupdatedEntryInfos,\n- pushEntryInfos,\n+ newUpdatedEntryInfos,\naction.payload.calendarQuery,\n);\n@@ -613,56 +613,52 @@ function reduceEntryInfos(\n} else if (action.type === pingActionTypes.success) {\nconst { payload } = action;\n- let calendarQuery, pollResult;\n+ let newInconsistencies = [], updatedEntryInfos, updatedDaysToEntries;\nif (payload.type === pingResponseTypes.FULL) {\n- calendarQuery = payload.calendarResult.calendarQuery;\n- pollResult = mergeNewEntryInfos(\n+ [ updatedEntryInfos, updatedDaysToEntries ] = mergeNewEntryInfos(\nentryInfos,\npayload.calendarResult.rawEntryInfos,\nnewThreadInfos,\n{\nprevEntryInfos: payload.prevState.entryInfos,\n- calendarQuery,\n+ calendarQuery: payload.calendarResult.calendarQuery,\n},\n);\n} else {\n- ({ calendarQuery } = payload);\n- }\n-\n- const { updatesResult, deltaEntryInfos } = payload;\n- let pushResult;\n- if (deltaEntryInfos) {\n- const pushNewEntryInfos = mergeUpdateEntryInfos(\n+ const { calendarQuery, updatesResult, deltaEntryInfos } = payload;\n+ const updateEntryInfos = mergeUpdateEntryInfos(\ndeltaEntryInfos,\nupdatesResult.newUpdates,\n);\n- pushResult = mergeNewEntryInfos(\n+ const updateResult = mergeNewEntryInfos(\nentryInfos,\n- pushNewEntryInfos,\n+ updateEntryInfos,\n+ newThreadInfos,\n+ );\n+ const checkStateRequest = payload.requests.serverRequests.find(\n+ candidate => candidate.type === serverRequestTypes.CHECK_STATE,\n+ );\n+ if (\n+ !checkStateRequest ||\n+ !checkStateRequest.stateChanges ||\n+ !checkStateRequest.stateChanges.rawEntryInfos\n+ ) {\n+ [ updatedEntryInfos, updatedDaysToEntries ] = updateResult;\n+ } else {\n+ const { rawEntryInfos } = checkStateRequest.stateChanges;\n+ [ updatedEntryInfos, updatedDaysToEntries ] = mergeNewEntryInfos(\n+ entryInfos,\n+ [ ...updateEntryInfos, ...rawEntryInfos ],\nnewThreadInfos,\n);\n- }\n-\n- let newInconsistencies = [];\n- if (pollResult && pushResult) {\n- const [ pollEntryInfos ] = pollResult;\n- const [ pushEntryInfos ] = pushResult;\nnewInconsistencies = findInconsistencies(\nentryInfos,\naction,\n- pollEntryInfos,\n- pushEntryInfos,\n+ updateResult[0],\n+ updatedEntryInfos,\ncalendarQuery,\n);\n}\n-\n- let updatedEntryInfos, updatedDaysToEntries;\n- if (payload.type === pingResponseTypes.FULL) {\n- invariant(pollResult, \"should be set\");\n- [ updatedEntryInfos, updatedDaysToEntries ] = pollResult;\n- } else {\n- invariant(pushResult, \"should be set\");\n- [ updatedEntryInfos, updatedDaysToEntries ] = pushResult;\n}\nreturn {\n@@ -756,16 +752,16 @@ const emptyArray = [];\nfunction findInconsistencies(\nbeforeAction: {[id: string]: RawEntryInfo},\naction: BaseAction,\n- pollResult: {[id: string]: RawEntryInfo},\n- pushResult: {[id: string]: RawEntryInfo},\n+ oldResult: {[id: string]: RawEntryInfo},\n+ newResult: {[id: string]: RawEntryInfo},\ncalendarQuery: CalendarQuery,\n): EntryInconsistencyClientResponse[] {\nconst filteredPollResult = filterRawEntryInfosByCalendarQuery(\n- pollResult,\n+ oldResult,\ncalendarQuery,\n);\nconst filteredPushResult = filterRawEntryInfosByCalendarQuery(\n- pushResult,\n+ newResult,\ncalendarQuery,\n);\nif (_isEqual(filteredPollResult)(filteredPushResult)) {\n@@ -807,8 +803,8 @@ function findInconsistencies(\nbeforeAction,\naction,\ncalendarQuery,\n- pollResult,\n- pushResult,\n+ pollResult: oldResult,\n+ pushResult: newResult,\nlastActionTypes: reduxLogger.actions.map(action => action.type),\ntime: Date.now(),\n}];\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/thread-reducer.js",
"new_path": "lib/reducers/thread-reducer.js",
"diff": "@@ -38,7 +38,9 @@ import { saveMessagesActionType } from '../actions/message-actions';\nimport { getConfig } from '../utils/config';\nimport { reduxLogger } from '../utils/redux-logger';\n-function pingPoll(\n+// If the user goes away for a while and the server stops keeping track of their\n+// session, the server will send down the full current set of threadInfos\n+function reduceFullState(\nthreadInfos: {[id: string]: RawThreadInfo},\npayload: PingResult,\n): {[id: string]: RawThreadInfo} {\n@@ -119,8 +121,7 @@ function pingPoll(\nreturn newThreadInfos;\n}\n-// ... PUSH.\n-function pingPush(\n+function reduceThreadUpdates(\nthreadInfos: {[id: string]: RawThreadInfo},\npayload: { +updatesResult: { newUpdates: $ReadOnlyArray<UpdateInfo> } },\n): {[id: string]: RawThreadInfo} {\n@@ -179,10 +180,10 @@ const emptyArray = [];\nfunction findInconsistencies(\nbeforeAction: {[id: string]: RawThreadInfo},\naction: BaseAction,\n- pollResult: {[id: string]: RawThreadInfo},\n- pushResult: {[id: string]: RawThreadInfo},\n+ oldResult: {[id: string]: RawThreadInfo},\n+ newResult: {[id: string]: RawThreadInfo},\n): ThreadInconsistencyClientResponse[] {\n- if (_isEqual(pollResult)(pushResult)) {\n+ if (_isEqual(oldResult)(newResult)) {\nreturn emptyArray;\n}\nif (action.type === pingActionTypes.success) {\n@@ -220,8 +221,8 @@ function findInconsistencies(\nplatformDetails: getConfig().platformDetails,\nbeforeAction,\naction,\n- pollResult,\n- pushResult,\n+ pollResult: oldResult,\n+ pushResult: newResult,\nlastActionTypes: reduxLogger.actions.map(action => action.type),\ntime: Date.now(),\n}];\n@@ -260,36 +261,50 @@ export default function reduceThreadInfos(\n) {\nreturn state;\n}\n- const pollResult = action.payload.threadInfos;\n- const pushResult = pingPush(state.threadInfos, action.payload);\n+ const oldResult = action.payload.threadInfos;\n+ const newResult = reduceThreadUpdates(state.threadInfos, action.payload);\nreturn {\n- threadInfos: pollResult,\n+ threadInfos: oldResult,\ninconsistencyResponses: [\n...state.inconsistencyResponses,\n...findInconsistencies(\nstate.threadInfos,\naction,\n- pollResult,\n- pushResult,\n+ oldResult,\n+ newResult,\n),\n],\n};\n} else if (action.type === pingActionTypes.success) {\nconst payload = action.payload;\n- const pollResult = pingPoll(state.threadInfos, payload);\n- const pushResult = pingPush(state.threadInfos, payload);\nlet newInconsistencies = [], newThreadInfos;\nif (payload.type === pingResponseTypes.FULL) {\n+ newThreadInfos = reduceFullState(state.threadInfos, payload);\n+ } else {\n+ const updateResult = reduceThreadUpdates(state.threadInfos, payload);\n+ const checkStateRequest = payload.requests.serverRequests.find(\n+ candidate => candidate.type === serverRequestTypes.CHECK_STATE,\n+ );\n+ if (\n+ !checkStateRequest ||\n+ !checkStateRequest.stateChanges ||\n+ !checkStateRequest.stateChanges.rawThreadInfos\n+ ) {\n+ newThreadInfos = updateResult;\n+ } else {\n+ const { rawThreadInfos } = checkStateRequest.stateChanges;\n+ newThreadInfos = { ...updateResult };\n+ for (let rawThreadInfo of rawThreadInfos) {\n+ newThreadInfos[rawThreadInfo.id] = rawThreadInfo;\n+ }\nnewInconsistencies = findInconsistencies(\nstate.threadInfos,\naction,\n- pollResult,\n- pushResult,\n+ updateResult,\n+ newThreadInfos,\n);\n- newThreadInfos = pollResult;\n- } else {\n- newThreadInfos = pushResult;\n+ }\n}\nreturn {\n@@ -310,20 +325,20 @@ export default function reduceThreadInfos(\n) {\nreturn state;\n}\n- const pollResult = {\n+ const oldResult = {\n...state.threadInfos,\n[newThreadInfo.id]: newThreadInfo,\n};\n- const pushResult = pingPush(state.threadInfos, action.payload);\n+ const newResult = reduceThreadUpdates(state.threadInfos, action.payload);\nreturn {\n- threadInfos: pollResult,\n+ threadInfos: oldResult,\ninconsistencyResponses: [\n...state.inconsistencyResponses,\n...findInconsistencies(\nstate.threadInfos,\naction,\n- pollResult,\n- pushResult,\n+ oldResult,\n+ newResult,\n),\n],\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/user-reducer.js",
"new_path": "lib/reducers/user-reducer.js",
"diff": "@@ -4,6 +4,7 @@ import type { BaseAction } from '../types/redux-types';\nimport type { CurrentUserInfo, UserInfo } from '../types/user-types';\nimport { updateTypes } from '../types/update-types';\nimport { pingResponseTypes } from '../types/ping-types';\n+import { serverRequestTypes } from '../types/request-types';\nimport invariant from 'invariant';\nimport _keyBy from 'lodash/fp/keyBy';\n@@ -68,8 +69,8 @@ function reduceCurrentUserInfo(\nreturn update.currentUserInfo;\n}\n}\n- if (payload.type === pingResponseTypes.FULL) {\nconst prevCurrentUserInfo = payload.prevState.currentUserInfo;\n+ if (payload.type === pingResponseTypes.FULL) {\nif (\n!_isEqual(payload.currentUserInfo)(state) &&\n!_isEqual(payload.currentUserInfo)(prevCurrentUserInfo)\n@@ -77,6 +78,19 @@ function reduceCurrentUserInfo(\nreturn payload.currentUserInfo;\n}\n}\n+ const checkStateRequest = payload.requests.serverRequests.find(\n+ candidate => candidate.type === serverRequestTypes.CHECK_STATE,\n+ );\n+ if (\n+ checkStateRequest &&\n+ checkStateRequest.stateChanges &&\n+ checkStateRequest.stateChanges.currentUserInfo &&\n+ !_isEqual(\n+ checkStateRequest.stateChanges.currentUserInfo,\n+ )(prevCurrentUserInfo)\n+ ) {\n+ return checkStateRequest.stateChanges.currentUserInfo;\n+ }\nreturn state;\n} else if (action.type === changeUserSettingsActionTypes.success) {\ninvariant(\n@@ -129,8 +143,24 @@ function reduceUserInfos(\nreturn newUserInfos;\n}\n} else if (action.type === pingActionTypes.success) {\n- const newUserInfos = _keyBy('id')(action.payload.userInfos);\n- const updated = { ...state, ...newUserInfos };\n+ let newUserInfos = action.payload.userInfos;\n+\n+ const checkStateRequest = action.payload.requests.serverRequests.find(\n+ candidate => candidate.type === serverRequestTypes.CHECK_STATE,\n+ );\n+ if (\n+ checkStateRequest &&\n+ checkStateRequest.stateChanges &&\n+ checkStateRequest.stateChanges.userInfos\n+ ) {\n+ newUserInfos = [\n+ ...newUserInfos,\n+ ...checkStateRequest.stateChanges.userInfos,\n+ ];\n+ }\n+\n+ const newUserInfoObject = _keyBy('id')(newUserInfos);\n+ const updated = { ...state, ...newUserInfoObject };\nfor (let update of action.payload.updatesResult.newUpdates) {\nif (update.type === updateTypes.DELETE_ACCOUNT) {\ndelete updated[update.deletedUserID];\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Support for integrating corrected state from server in reducers |
129,187 | 26.09.2018 17:58:18 | 14,400 | 9bfae551fdd7718ad1b4f94d2d11f7c4d72b5ffe | Client code to compare state hashes for state check | [
{
"change_type": "MODIFY",
"old_path": "lib/flow-typed/npm/color_vx.x.x.js",
"new_path": "lib/flow-typed/npm/color_vx.x.x.js",
"diff": "-// flow-typed signature: 602a4047914dc479daf79464738f1697\n-// flow-typed version: <<STUB>>/color_v^1.0.3/flow_v0.75.0\n+// flow-typed signature: 997311ffa0bc8ada9f86a95f3ee225f5\n+// flow-typed version: <<STUB>>/color_v^1.0.3/flow_v0.78.0\n/**\n* This is an autogenerated libdef stub for:\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "lib/flow-typed/npm/object-hash_vx.x.x.js",
"diff": "+// flow-typed signature: b5ce2117ae68a71cb7a71a0e916812a2\n+// flow-typed version: <<STUB>>/object-hash_v^1.3.0/flow_v0.78.0\n+\n+/**\n+ * This is an autogenerated libdef stub for:\n+ *\n+ * 'object-hash'\n+ *\n+ * Fill this stub out by replacing all the `any` types.\n+ *\n+ * Once filled out, we encourage you to share your work with the\n+ * community by sending a pull request to:\n+ * https://github.com/flowtype/flow-typed\n+ */\n+\n+declare module 'object-hash' {\n+ declare module.exports: any;\n+}\n+\n+/**\n+ * We include stubs for each file inside this npm package in case you need to\n+ * require those files directly. Feel free to delete any files that aren't\n+ * needed.\n+ */\n+declare module 'object-hash/dist/object_hash_test' {\n+ declare module.exports: any;\n+}\n+\n+declare module 'object-hash/dist/object_hash' {\n+ declare module.exports: any;\n+}\n+\n+declare module 'object-hash/gulpfile' {\n+ declare module.exports: any;\n+}\n+\n+declare module 'object-hash/karma.conf' {\n+ declare module.exports: any;\n+}\n+\n+declare module 'object-hash/test/blob' {\n+ declare module.exports: any;\n+}\n+\n+declare module 'object-hash/test/index' {\n+ declare module.exports: any;\n+}\n+\n+declare module 'object-hash/test/object-classes' {\n+ declare module.exports: any;\n+}\n+\n+declare module 'object-hash/test/old-crypto' {\n+ declare module.exports: any;\n+}\n+\n+declare module 'object-hash/test/replacer' {\n+ declare module.exports: any;\n+}\n+\n+declare module 'object-hash/test/types' {\n+ declare module.exports: any;\n+}\n+\n+declare module 'object-hash/test/writeToStream' {\n+ declare module.exports: any;\n+}\n+\n+// Filename aliases\n+declare module 'object-hash/dist/object_hash_test.js' {\n+ declare module.exports: $Exports<'object-hash/dist/object_hash_test'>;\n+}\n+declare module 'object-hash/dist/object_hash.js' {\n+ declare module.exports: $Exports<'object-hash/dist/object_hash'>;\n+}\n+declare module 'object-hash/gulpfile.js' {\n+ declare module.exports: $Exports<'object-hash/gulpfile'>;\n+}\n+declare module 'object-hash/index' {\n+ declare module.exports: $Exports<'object-hash'>;\n+}\n+declare module 'object-hash/index.js' {\n+ declare module.exports: $Exports<'object-hash'>;\n+}\n+declare module 'object-hash/karma.conf.js' {\n+ declare module.exports: $Exports<'object-hash/karma.conf'>;\n+}\n+declare module 'object-hash/test/blob.js' {\n+ declare module.exports: $Exports<'object-hash/test/blob'>;\n+}\n+declare module 'object-hash/test/index.js' {\n+ declare module.exports: $Exports<'object-hash/test/index'>;\n+}\n+declare module 'object-hash/test/object-classes.js' {\n+ declare module.exports: $Exports<'object-hash/test/object-classes'>;\n+}\n+declare module 'object-hash/test/old-crypto.js' {\n+ declare module.exports: $Exports<'object-hash/test/old-crypto'>;\n+}\n+declare module 'object-hash/test/replacer.js' {\n+ declare module.exports: $Exports<'object-hash/test/replacer'>;\n+}\n+declare module 'object-hash/test/types.js' {\n+ declare module.exports: $Exports<'object-hash/test/types'>;\n+}\n+declare module 'object-hash/test/writeToStream.js' {\n+ declare module.exports: $Exports<'object-hash/test/writeToStream'>;\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/flow-typed/npm/react-redux_v5.x.x.js",
"new_path": "lib/flow-typed/npm/react-redux_v5.x.x.js",
"diff": "-// flow-typed signature: d4e793bc07ef1dc9906a244b12960f7b\n-// flow-typed version: cf33ff8762/react-redux_v5.x.x/flow_>=v0.63.0\n-\n-import type { Dispatch, Store } from \"redux\";\n+// flow-typed signature: 502cfd4f5e95c6308f747cdf16dc93ce\n+// flow-typed version: 1751d5bf0a/react-redux_v5.x.x/flow_>=v0.68.0\ndeclare module \"react-redux\" {\nimport type { ComponentType, ElementConfig } from 'react';\n- declare export class Provider<S, A> extends React$Component<{\n- store: Store<S, A>,\n+ // These types are copied directly from the redux libdef. Importing them in\n+ // this libdef causes a loss in type coverage.\n+ declare type DispatchAPI<A> = (action: A) => A;\n+ declare type Dispatch<A: { type: $Subtype<string> }> = DispatchAPI<A>;\n+ declare type Reducer<S, A> = (state: S | void, action: A) => S;\n+ declare type Store<S, A, D = Dispatch<A>> = {\n+ dispatch: D;\n+ getState(): S;\n+ subscribe(listener: () => void): () => void;\n+ replaceReducer(nextReducer: Reducer<S, A>): void\n+ };\n+\n+ declare export class Provider<S, A, D> extends React$Component<{\n+ store: Store<S, A, D>,\nchildren?: any\n}> {}\ndeclare export function createProvider(\nstoreKey?: string,\nsubKey?: string\n- ): Provider<*, *>;\n+ ): Provider<*, *, *>;\n/*\n@@ -30,6 +40,8 @@ declare module \"react-redux\" {\nRMP = Returned merge props\nCP = Props for returned component\nCom = React Component\n+ ST = Static properties of Com\n+ EFO = Extra factory options (used only in connectAdvanced)\n*/\ndeclare type MapStateToProps<S: Object, SP: Object, RSP: Object> = (state: S, props: SP) => RSP;\n@@ -52,23 +64,71 @@ declare module \"react-redux\" {\nstoreKey?: string\n|};\n- declare type OmitDispatch<Component> = $Diff<Component, {dispatch: Dispatch<*>}>;\n+ declare type OmitDispatch<Component> = $Diff<Component, {dispatch?: Dispatch<*>}>;\n+\n+ declare type ConnectAdvancedOptions = {\n+ getDisplayName?: (name: string) => string,\n+ methodName?: string,\n+ renderCountProp?: string,\n+ shouldHandleStateChanges?: boolean,\n+ storeKey?: string,\n+ withRef?: boolean,\n+ };\n+\n+ declare type SelectorFactoryOptions<Com> = {\n+ getDisplayName: (name: string) => string,\n+ methodName: string,\n+ renderCountProp: ?string,\n+ shouldHandleStateChanges: boolean,\n+ storeKey: string,\n+ withRef: boolean,\n+ displayName: string,\n+ wrappedComponentName: string,\n+ WrappedComponent: Com,\n+ };\n+\n+ declare type SelectorFactory<\n+ Com: ComponentType<*>,\n+ A,\n+ S: Object,\n+ OP: Object,\n+ EFO: Object,\n+ CP: Object\n+ > = (dispatch: Dispatch<A>, factoryOptions: SelectorFactoryOptions<Com> & EFO) =>\n+ MapStateToProps<S, OP, CP>;\n+\n+ declare export function connectAdvanced<\n+ Com: ComponentType<*>,\n+ A,\n+ S: Object,\n+ OP: Object,\n+ CP: Object,\n+ EFO: Object,\n+ ST: {[_: $Keys<Com>]: any}\n+ >(\n+ selectorFactory: SelectorFactory<Com, A, S, OP, EFO, CP>,\n+ connectAdvancedOptions: ?(ConnectAdvancedOptions & EFO),\n+ ): (component: Com) => ComponentType<OP> & $Shape<ST>;\ndeclare export function connect<\nCom: ComponentType<*>,\nS: Object,\n- DP: Object,\n+ SP: Object,\nRSP: Object,\n- CP: $Diff<OmitDispatch<ElementConfig<Com>>, RSP>\n+ CP: $Diff<OmitDispatch<ElementConfig<Com>>, RSP>,\n+ ST: {[_: $Keys<Com>]: any}\n>(\n- mapStateToProps: MapStateToProps<S, DP, RSP>,\n+ mapStateToProps: MapStateToProps<S, SP, RSP>,\nmapDispatchToProps?: null\n- ): (component: Com) => ComponentType<CP & DP>;\n+ ): (component: Com) => ComponentType<CP & SP> & $Shape<ST>;\n- declare export function connect<Com: ComponentType<*>>(\n+ declare export function connect<\n+ Com: ComponentType<*>,\n+ ST: {[_: $Keys<Com>]: any}\n+ >(\nmapStateToProps?: null,\nmapDispatchToProps?: null\n- ): (component: Com) => ComponentType<OmitDispatch<ElementConfig<Com>>>;\n+ ): (component: Com) => ComponentType<OmitDispatch<ElementConfig<Com>>> & $Shape<ST>;\ndeclare export function connect<\nCom: ComponentType<*>,\n@@ -78,11 +138,12 @@ declare module \"react-redux\" {\nSP: Object,\nRSP: Object,\nRDP: Object,\n- CP: $Diff<$Diff<ElementConfig<Com>, RSP>, RDP>\n+ CP: $Diff<$Diff<ElementConfig<Com>, RSP>, RDP>,\n+ ST: $Subtype<{[_: $Keys<Com>]: any}>\n>(\nmapStateToProps: MapStateToProps<S, SP, RSP>,\nmapDispatchToProps: MapDispatchToProps<A, DP, RDP>\n- ): (component: Com) => ComponentType<CP & SP & DP>;\n+ ): (component: Com) => ComponentType<CP & SP & DP> & $Shape<ST>;\ndeclare export function connect<\nCom: ComponentType<*>,\n@@ -90,7 +151,8 @@ declare module \"react-redux\" {\nOP: Object,\nDP: Object,\nPR: Object,\n- CP: $Diff<ElementConfig<Com>, DP>\n+ CP: $Diff<ElementConfig<Com>, DP>,\n+ ST: $Subtype<{[_: $Keys<Com>]: any}>\n>(\nmapStateToProps?: null,\nmapDispatchToProps: MapDispatchToProps<A, OP, DP>\n@@ -98,11 +160,12 @@ declare module \"react-redux\" {\ndeclare export function connect<\nCom: ComponentType<*>,\n- MDP: Object\n+ MDP: Object,\n+ ST: $Subtype<{[_: $Keys<Com>]: any}>\n>(\nmapStateToProps?: null,\nmapDispatchToProps: MDP\n- ): (component: Com) => ComponentType<$Diff<ElementConfig<Com>, MDP>>;\n+ ): (component: Com) => ComponentType<$Diff<ElementConfig<Com>, MDP>> & $Shape<ST>;\ndeclare export function connect<\nCom: ComponentType<*>,\n@@ -110,11 +173,12 @@ declare module \"react-redux\" {\nSP: Object,\nRSP: Object,\nMDP: Object,\n- CP: $Diff<ElementConfig<Com>, RSP>\n+ CP: $Diff<ElementConfig<Com>, RSP>,\n+ ST: $Subtype<{[_: $Keys<Com>]: any}>\n>(\nmapStateToProps: MapStateToProps<S, SP, RSP>,\n- mapDispatchToPRops: MDP\n- ): (component: Com) => ComponentType<$Diff<CP, MDP> & SP>;\n+ mapDispatchToProps: MDP\n+ ): (component: Com) => ComponentType<$Diff<CP, MDP> & SP> & $Shape<ST>;\ndeclare export function connect<\nCom: ComponentType<*>,\n@@ -126,12 +190,13 @@ declare module \"react-redux\" {\nRDP: Object,\nMP: Object,\nRMP: Object,\n- CP: $Diff<ElementConfig<Com>, RMP>\n+ CP: $Diff<ElementConfig<Com>, RMP>,\n+ ST: $Subtype<{[_: $Keys<Com>]: any}>\n>(\nmapStateToProps: MapStateToProps<S, SP, RSP>,\nmapDispatchToProps: ?MapDispatchToProps<A, DP, RDP>,\nmergeProps: MergeProps<RSP, RDP, MP, RMP>\n- ): (component: Com) => ComponentType<CP & SP & DP & MP>;\n+ ): (component: Com) => ComponentType<CP & SP & DP & MP> & $Shape<ST>;\ndeclare export function connect<\nCom: ComponentType<*>,\n@@ -144,12 +209,13 @@ declare module \"react-redux\" {\nMDP: Object,\nMP: Object,\nRMP: Object,\n- CP: $Diff<ElementConfig<Com>, RMP>\n+ CP: $Diff<ElementConfig<Com>, RMP>,\n+ ST: $Subtype<{[_: $Keys<Com>]: any}>\n>(\nmapStateToProps: MapStateToProps<S, SP, RSP>,\nmapDispatchToProps: MDP,\nmergeProps: MergeProps<RSP, RDP, MP, RMP>\n- ): (component: Com) => ComponentType<CP & SP & DP & MP>;\n+ ): (component: Com) => ComponentType<CP & SP & DP & MP> & $Shape<ST>;\ndeclare export function connect<Com: ComponentType<*>,\nA,\n@@ -159,13 +225,14 @@ declare module \"react-redux\" {\nRSP: Object,\nRDP: Object,\nMP: Object,\n- RMP: Object\n+ RMP: Object,\n+ ST: $Subtype<{[_: $Keys<Com>]: any}>\n>(\nmapStateToProps: ?MapStateToProps<S, SP, RSP>,\nmapDispatchToProps: ?MapDispatchToProps<A, DP, RDP>,\nmergeProps: ?MergeProps<RSP, RDP, MP, RMP>,\noptions: ConnectOptions<S, SP & DP & MP, RSP, RMP>\n- ): (component: Com) => ComponentType<$Diff<ElementConfig<Com>, RMP> & SP & DP & MP>;\n+ ): (component: Com) => ComponentType<$Diff<ElementConfig<Com>, RMP> & SP & DP & MP> & $Shape<ST>;\ndeclare export function connect<Com: ComponentType<*>,\nA,\n@@ -176,17 +243,19 @@ declare module \"react-redux\" {\nRDP: Object,\nMDP: Object,\nMP: Object,\n- RMP: Object\n+ RMP: Object,\n+ ST: $Subtype<{[_: $Keys<Com>]: any}>\n>(\nmapStateToProps: ?MapStateToProps<S, SP, RSP>,\nmapDispatchToProps: ?MapDispatchToProps<A, DP, RDP>,\nmergeProps: MDP,\noptions: ConnectOptions<S, SP & DP & MP, RSP, RMP>\n- ): (component: Com) => ComponentType<$Diff<ElementConfig<Com>, RMP> & SP & DP & MP>;\n+ ): (component: Com) => ComponentType<$Diff<ElementConfig<Com>, RMP> & SP & DP & MP> & $Shape<ST>;\ndeclare export default {\nProvider: typeof Provider,\ncreateProvider: typeof createProvider,\nconnect: typeof connect,\n+ connectAdvanced: typeof connectAdvanced,\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/flow-typed/npm/tokenize-text_vx.x.x.js",
"new_path": "lib/flow-typed/npm/tokenize-text_vx.x.x.js",
"diff": "-// flow-typed signature: 8312ab5651d8ac985ae6bf36d76e4452\n-// flow-typed version: <<STUB>>/tokenize-text_v^1.1.3/flow_v0.75.0\n+// flow-typed signature: 6a50700692edd20663f7ae265909e976\n+// flow-typed version: <<STUB>>/tokenize-text_v^1.1.3/flow_v0.78.0\n/**\n* This is an autogenerated libdef stub for:\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/flow-typed/npm/whatwg-fetch_vx.x.x.js",
"new_path": "lib/flow-typed/npm/whatwg-fetch_vx.x.x.js",
"diff": "-// flow-typed signature: a6ee430f7b6bcc9cf6b60556754f9da8\n-// flow-typed version: <<STUB>>/whatwg-fetch_v^2.0.3/flow_v0.75.0\n+// flow-typed signature: 8ab76505781832f85e2eb4e2a2abe95b\n+// flow-typed version: <<STUB>>/whatwg-fetch_v^2.0.3/flow_v0.78.0\n/**\n* This is an autogenerated libdef stub for:\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/package.json",
"new_path": "lib/package.json",
"diff": "\"dateformat\": \"^2.0.0\",\n\"invariant\": \"^2.2.2\",\n\"lodash\": \"^4.17.5\",\n+ \"object-hash\": \"^1.3.0\",\n\"prop-types\": \"^15.6.0\",\n\"react-redux\": \"^5.0.5\",\n\"reselect\": \"^3.0.1\",\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/selectors/ping-selectors.js",
"new_path": "lib/selectors/ping-selectors.js",
"diff": "@@ -13,9 +13,15 @@ import {\n} from '../types/request-types';\nimport { createSelector } from 'reselect';\n+import hash from 'object-hash';\nimport { currentCalendarQuery } from './nav-selectors';\nimport { getConfig } from '../utils/config';\n+import {\n+ serverEntryInfo,\n+ serverEntryInfosObject,\n+} from '../shared/entry-utils';\n+import { values } from '../utils/objects';\nconst pingStartingPayload = createSelector(\ncurrentCalendarQuery,\n@@ -87,6 +93,34 @@ const pingActionInput = createSelector(\ntype: serverRequestTypes.PLATFORM_DETAILS,\nplatformDetails: getConfig().platformDetails,\n});\n+ } else if (serverRequest.type === serverRequestTypes.CHECK_STATE) {\n+ const hashResults = {};\n+ for (let key in serverRequest.hashesToCheck) {\n+ const expectedHashValue = serverRequest.hashesToCheck[key];\n+ let hashValue;\n+ if (key === \"threadInfos\") {\n+ hashValue = hash(threadInfos);\n+ } else if (key === \"entryInfos\") {\n+ hashValue = hash(serverEntryInfosObject(values(entryInfos)));\n+ } else if (key === \"currentUserInfo\") {\n+ hashValue = hash(currentUserInfo);\n+ } else if (key.startsWith(\"threadInfo|\")) {\n+ const [ ignore, threadID ] = key.split('|');\n+ hashValue = hash(threadInfos[threadID]);\n+ } else if (key.startsWith(\"entryInfo|\")) {\n+ const [ ignore, entryID ] = key.split('|');\n+ let rawEntryInfo = entryInfos[entryID];\n+ if (rawEntryInfo) {\n+ rawEntryInfo = serverEntryInfo(rawEntryInfo);\n+ }\n+ hashValue = hash(rawEntryInfo);\n+ }\n+ hashResults[key] = expectedHashValue === hashValue;\n+ }\n+ clientResponses.push({\n+ type: serverRequestTypes.CHECK_STATE,\n+ hashResults,\n+ });\n}\n}\n// Whenever the app starts up, it's possible that the version has updated.\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Client code to compare state hashes for state check |
129,187 | 26.09.2018 20:26:38 | 14,400 | 83d9bf072abd70798a796cb2f6750f6b4ec49d73 | Switch away from object-hash
It was giving inconsistent results | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "lib/flow-typed/npm/fast-json-stable-stringify_vx.x.x.js",
"diff": "+// flow-typed signature: 26bd885ae6cc09f69cd5a0b3926f5aed\n+// flow-typed version: <<STUB>>/fast-json-stable-stringify_v^2.0.0/flow_v0.78.0\n+\n+/**\n+ * This is an autogenerated libdef stub for:\n+ *\n+ * 'fast-json-stable-stringify'\n+ *\n+ * Fill this stub out by replacing all the `any` types.\n+ *\n+ * Once filled out, we encourage you to share your work with the\n+ * community by sending a pull request to:\n+ * https://github.com/flowtype/flow-typed\n+ */\n+\n+declare module 'fast-json-stable-stringify' {\n+ declare module.exports: any;\n+}\n+\n+/**\n+ * We include stubs for each file inside this npm package in case you need to\n+ * require those files directly. Feel free to delete any files that aren't\n+ * needed.\n+ */\n+declare module 'fast-json-stable-stringify/benchmark/index' {\n+ declare module.exports: any;\n+}\n+\n+declare module 'fast-json-stable-stringify/example/key_cmp' {\n+ declare module.exports: any;\n+}\n+\n+declare module 'fast-json-stable-stringify/example/nested' {\n+ declare module.exports: any;\n+}\n+\n+declare module 'fast-json-stable-stringify/example/str' {\n+ declare module.exports: any;\n+}\n+\n+declare module 'fast-json-stable-stringify/example/value_cmp' {\n+ declare module.exports: any;\n+}\n+\n+declare module 'fast-json-stable-stringify/test/cmp' {\n+ declare module.exports: any;\n+}\n+\n+declare module 'fast-json-stable-stringify/test/nested' {\n+ declare module.exports: any;\n+}\n+\n+declare module 'fast-json-stable-stringify/test/str' {\n+ declare module.exports: any;\n+}\n+\n+declare module 'fast-json-stable-stringify/test/to-json' {\n+ declare module.exports: any;\n+}\n+\n+// Filename aliases\n+declare module 'fast-json-stable-stringify/benchmark/index.js' {\n+ declare module.exports: $Exports<'fast-json-stable-stringify/benchmark/index'>;\n+}\n+declare module 'fast-json-stable-stringify/example/key_cmp.js' {\n+ declare module.exports: $Exports<'fast-json-stable-stringify/example/key_cmp'>;\n+}\n+declare module 'fast-json-stable-stringify/example/nested.js' {\n+ declare module.exports: $Exports<'fast-json-stable-stringify/example/nested'>;\n+}\n+declare module 'fast-json-stable-stringify/example/str.js' {\n+ declare module.exports: $Exports<'fast-json-stable-stringify/example/str'>;\n+}\n+declare module 'fast-json-stable-stringify/example/value_cmp.js' {\n+ declare module.exports: $Exports<'fast-json-stable-stringify/example/value_cmp'>;\n+}\n+declare module 'fast-json-stable-stringify/index' {\n+ declare module.exports: $Exports<'fast-json-stable-stringify'>;\n+}\n+declare module 'fast-json-stable-stringify/index.js' {\n+ declare module.exports: $Exports<'fast-json-stable-stringify'>;\n+}\n+declare module 'fast-json-stable-stringify/test/cmp.js' {\n+ declare module.exports: $Exports<'fast-json-stable-stringify/test/cmp'>;\n+}\n+declare module 'fast-json-stable-stringify/test/nested.js' {\n+ declare module.exports: $Exports<'fast-json-stable-stringify/test/nested'>;\n+}\n+declare module 'fast-json-stable-stringify/test/str.js' {\n+ declare module.exports: $Exports<'fast-json-stable-stringify/test/str'>;\n+}\n+declare module 'fast-json-stable-stringify/test/to-json.js' {\n+ declare module.exports: $Exports<'fast-json-stable-stringify/test/to-json'>;\n+}\n"
},
{
"change_type": "DELETE",
"old_path": "lib/flow-typed/npm/object-hash_vx.x.x.js",
"new_path": null,
"diff": "-// flow-typed signature: b5ce2117ae68a71cb7a71a0e916812a2\n-// flow-typed version: <<STUB>>/object-hash_v^1.3.0/flow_v0.78.0\n-\n-/**\n- * This is an autogenerated libdef stub for:\n- *\n- * 'object-hash'\n- *\n- * Fill this stub out by replacing all the `any` types.\n- *\n- * Once filled out, we encourage you to share your work with the\n- * community by sending a pull request to:\n- * https://github.com/flowtype/flow-typed\n- */\n-\n-declare module 'object-hash' {\n- declare module.exports: any;\n-}\n-\n-/**\n- * We include stubs for each file inside this npm package in case you need to\n- * require those files directly. Feel free to delete any files that aren't\n- * needed.\n- */\n-declare module 'object-hash/dist/object_hash_test' {\n- declare module.exports: any;\n-}\n-\n-declare module 'object-hash/dist/object_hash' {\n- declare module.exports: any;\n-}\n-\n-declare module 'object-hash/gulpfile' {\n- declare module.exports: any;\n-}\n-\n-declare module 'object-hash/karma.conf' {\n- declare module.exports: any;\n-}\n-\n-declare module 'object-hash/test/blob' {\n- declare module.exports: any;\n-}\n-\n-declare module 'object-hash/test/index' {\n- declare module.exports: any;\n-}\n-\n-declare module 'object-hash/test/object-classes' {\n- declare module.exports: any;\n-}\n-\n-declare module 'object-hash/test/old-crypto' {\n- declare module.exports: any;\n-}\n-\n-declare module 'object-hash/test/replacer' {\n- declare module.exports: any;\n-}\n-\n-declare module 'object-hash/test/types' {\n- declare module.exports: any;\n-}\n-\n-declare module 'object-hash/test/writeToStream' {\n- declare module.exports: any;\n-}\n-\n-// Filename aliases\n-declare module 'object-hash/dist/object_hash_test.js' {\n- declare module.exports: $Exports<'object-hash/dist/object_hash_test'>;\n-}\n-declare module 'object-hash/dist/object_hash.js' {\n- declare module.exports: $Exports<'object-hash/dist/object_hash'>;\n-}\n-declare module 'object-hash/gulpfile.js' {\n- declare module.exports: $Exports<'object-hash/gulpfile'>;\n-}\n-declare module 'object-hash/index' {\n- declare module.exports: $Exports<'object-hash'>;\n-}\n-declare module 'object-hash/index.js' {\n- declare module.exports: $Exports<'object-hash'>;\n-}\n-declare module 'object-hash/karma.conf.js' {\n- declare module.exports: $Exports<'object-hash/karma.conf'>;\n-}\n-declare module 'object-hash/test/blob.js' {\n- declare module.exports: $Exports<'object-hash/test/blob'>;\n-}\n-declare module 'object-hash/test/index.js' {\n- declare module.exports: $Exports<'object-hash/test/index'>;\n-}\n-declare module 'object-hash/test/object-classes.js' {\n- declare module.exports: $Exports<'object-hash/test/object-classes'>;\n-}\n-declare module 'object-hash/test/old-crypto.js' {\n- declare module.exports: $Exports<'object-hash/test/old-crypto'>;\n-}\n-declare module 'object-hash/test/replacer.js' {\n- declare module.exports: $Exports<'object-hash/test/replacer'>;\n-}\n-declare module 'object-hash/test/types.js' {\n- declare module.exports: $Exports<'object-hash/test/types'>;\n-}\n-declare module 'object-hash/test/writeToStream.js' {\n- declare module.exports: $Exports<'object-hash/test/writeToStream'>;\n-}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "lib/flow-typed/npm/string-hash_vx.x.x.js",
"diff": "+// flow-typed signature: 661596da0b92615ec5b0acb92a493ea7\n+// flow-typed version: <<STUB>>/string-hash_v^1.1.3/flow_v0.78.0\n+\n+/**\n+ * This is an autogenerated libdef stub for:\n+ *\n+ * 'string-hash'\n+ *\n+ * Fill this stub out by replacing all the `any` types.\n+ *\n+ * Once filled out, we encourage you to share your work with the\n+ * community by sending a pull request to:\n+ * https://github.com/flowtype/flow-typed\n+ */\n+\n+declare module 'string-hash' {\n+ declare module.exports: any;\n+}\n+\n+/**\n+ * We include stubs for each file inside this npm package in case you need to\n+ * require those files directly. Feel free to delete any files that aren't\n+ * needed.\n+ */\n+declare module 'string-hash/test' {\n+ declare module.exports: any;\n+}\n+\n+// Filename aliases\n+declare module 'string-hash/index' {\n+ declare module.exports: $Exports<'string-hash'>;\n+}\n+declare module 'string-hash/index.js' {\n+ declare module.exports: $Exports<'string-hash'>;\n+}\n+declare module 'string-hash/test.js' {\n+ declare module.exports: $Exports<'string-hash/test'>;\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/package.json",
"new_path": "lib/package.json",
"diff": "\"dependencies\": {\n\"color\": \"^1.0.3\",\n\"dateformat\": \"^2.0.0\",\n+ \"fast-json-stable-stringify\": \"^2.0.0\",\n\"invariant\": \"^2.2.2\",\n\"lodash\": \"^4.17.5\",\n- \"object-hash\": \"^1.3.0\",\n\"prop-types\": \"^15.6.0\",\n\"react-redux\": \"^5.0.5\",\n\"reselect\": \"^3.0.1\",\n+ \"string-hash\": \"^1.1.3\",\n\"tokenize-text\": \"^1.1.3\",\n\"whatwg-fetch\": \"^2.0.3\"\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/selectors/ping-selectors.js",
"new_path": "lib/selectors/ping-selectors.js",
"diff": "@@ -13,7 +13,6 @@ import {\n} from '../types/request-types';\nimport { createSelector } from 'reselect';\n-import hash from 'object-hash';\nimport { currentCalendarQuery } from './nav-selectors';\nimport { getConfig } from '../utils/config';\n@@ -21,7 +20,7 @@ import {\nserverEntryInfo,\nserverEntryInfosObject,\n} from '../shared/entry-utils';\n-import { values } from '../utils/objects';\n+import { values, hash } from '../utils/objects';\nconst pingStartingPayload = createSelector(\ncurrentCalendarQuery,\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/request-types.js",
"new_path": "lib/types/request-types.js",
"diff": "@@ -91,7 +91,7 @@ export type EntryInconsistencyClientResponse = {|\nexport type CheckStateServerRequest = {|\ntype: 6,\n- hashesToCheck: {[key: string]: string},\n+ hashesToCheck: {[key: string]: number},\nstateChanges?: $Shape<{|\nrawThreadInfos: RawThreadInfo[],\nrawEntryInfos: RawEntryInfo[],\n@@ -116,7 +116,7 @@ export const serverRequestPropType = PropTypes.oneOfType([\n}),\nPropTypes.shape({\ntype: PropTypes.oneOf([ serverRequestTypes.CHECK_STATE ]).isRequired,\n- hashesToCheck: PropTypes.objectOf(PropTypes.string).isRequired,\n+ hashesToCheck: PropTypes.objectOf(PropTypes.number).isRequired,\n}),\n]);\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/utils/objects.js",
"new_path": "lib/utils/objects.js",
"diff": "// @flow\n+import stringHash from \"string-hash\";\n+import stableStringify from \"fast-json-stable-stringify\";\n+\nfunction findMaximumDepth(obj: Object): ?{ path: string, depth: number } {\nlet longestPath = null;\nlet longestDepth = null\n@@ -38,7 +41,12 @@ function values<K, T>(map: Map<K, T>): T[] {\n: Object.keys(map).map((key: K): T => map[key]);\n}\n+function hash(obj: ?Object): number {\n+ return stringHash(stableStringify(obj));\n+}\n+\nexport {\nfindMaximumDepth,\nvalues,\n+ hash,\n};\n"
},
{
"change_type": "DELETE",
"old_path": "server/flow-typed/npm/object-hash_vx.x.x.js",
"new_path": null,
"diff": "-// flow-typed signature: f72bfde45b0fe356b9dc4195f21f5888\n-// flow-typed version: <<STUB>>/object-hash_v^1.3.0/flow_v0.75.0\n-\n-/**\n- * This is an autogenerated libdef stub for:\n- *\n- * 'object-hash'\n- *\n- * Fill this stub out by replacing all the `any` types.\n- *\n- * Once filled out, we encourage you to share your work with the\n- * community by sending a pull request to:\n- * https://github.com/flowtype/flow-typed\n- */\n-\n-declare module 'object-hash' {\n- declare module.exports: any;\n-}\n-\n-/**\n- * We include stubs for each file inside this npm package in case you need to\n- * require those files directly. Feel free to delete any files that aren't\n- * needed.\n- */\n-declare module 'object-hash/dist/object_hash_test' {\n- declare module.exports: any;\n-}\n-\n-declare module 'object-hash/dist/object_hash' {\n- declare module.exports: any;\n-}\n-\n-declare module 'object-hash/gulpfile' {\n- declare module.exports: any;\n-}\n-\n-declare module 'object-hash/karma.conf' {\n- declare module.exports: any;\n-}\n-\n-declare module 'object-hash/test/blob' {\n- declare module.exports: any;\n-}\n-\n-declare module 'object-hash/test/index' {\n- declare module.exports: any;\n-}\n-\n-declare module 'object-hash/test/object-classes' {\n- declare module.exports: any;\n-}\n-\n-declare module 'object-hash/test/old-crypto' {\n- declare module.exports: any;\n-}\n-\n-declare module 'object-hash/test/replacer' {\n- declare module.exports: any;\n-}\n-\n-declare module 'object-hash/test/types' {\n- declare module.exports: any;\n-}\n-\n-declare module 'object-hash/test/writeToStream' {\n- declare module.exports: any;\n-}\n-\n-// Filename aliases\n-declare module 'object-hash/dist/object_hash_test.js' {\n- declare module.exports: $Exports<'object-hash/dist/object_hash_test'>;\n-}\n-declare module 'object-hash/dist/object_hash.js' {\n- declare module.exports: $Exports<'object-hash/dist/object_hash'>;\n-}\n-declare module 'object-hash/gulpfile.js' {\n- declare module.exports: $Exports<'object-hash/gulpfile'>;\n-}\n-declare module 'object-hash/index' {\n- declare module.exports: $Exports<'object-hash'>;\n-}\n-declare module 'object-hash/index.js' {\n- declare module.exports: $Exports<'object-hash'>;\n-}\n-declare module 'object-hash/karma.conf.js' {\n- declare module.exports: $Exports<'object-hash/karma.conf'>;\n-}\n-declare module 'object-hash/test/blob.js' {\n- declare module.exports: $Exports<'object-hash/test/blob'>;\n-}\n-declare module 'object-hash/test/index.js' {\n- declare module.exports: $Exports<'object-hash/test/index'>;\n-}\n-declare module 'object-hash/test/object-classes.js' {\n- declare module.exports: $Exports<'object-hash/test/object-classes'>;\n-}\n-declare module 'object-hash/test/old-crypto.js' {\n- declare module.exports: $Exports<'object-hash/test/old-crypto'>;\n-}\n-declare module 'object-hash/test/replacer.js' {\n- declare module.exports: $Exports<'object-hash/test/replacer'>;\n-}\n-declare module 'object-hash/test/types.js' {\n- declare module.exports: $Exports<'object-hash/test/types'>;\n-}\n-declare module 'object-hash/test/writeToStream.js' {\n- declare module.exports: $Exports<'object-hash/test/writeToStream'>;\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/package.json",
"new_path": "server/package.json",
"diff": "\"mysql2\": \"^1.5.1\",\n\"node-schedule\": \"^1.3.0\",\n\"nodemailer\": \"^4.4.2\",\n- \"object-hash\": \"^1.3.0\",\n\"promise\": \"^8.0.1\",\n\"react\": \"^16.2.0\",\n\"react-dom\": \"^16.2.0\",\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -33,13 +33,12 @@ import type { SessionUpdate } from '../updaters/session-updaters';\nimport t from 'tcomb';\nimport invariant from 'invariant';\nimport _isEqual from 'lodash/fp/isEqual';\n-import hash from 'object-hash';\nimport { ServerError } from 'lib/utils/errors';\nimport { mostRecentMessageTimestamp } from 'lib/shared/message-utils';\nimport { mostRecentUpdateTimestamp } from 'lib/shared/update-utils';\nimport { promiseAll } from 'lib/utils/promises';\n-import { values } from 'lib/utils/objects';\n+import { values, hash } from 'lib/utils/objects';\nimport {\nusersInRawEntryInfos,\nserverEntryInfo,\n"
},
{
"change_type": "MODIFY",
"old_path": "yarn.lock",
"new_path": "yarn.lock",
"diff": "@@ -6722,10 +6722,6 @@ object-copy@^0.1.0:\ndefine-property \"^0.2.5\"\nkind-of \"^3.0.3\"\n-object-hash@^1.3.0:\n- version \"1.3.0\"\n- resolved \"https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.0.tgz#76d9ba6ff113cf8efc0d996102851fe6723963e2\"\n-\nobject-keys@^1.0.0, object-keys@^1.0.12:\nversion \"1.0.12\"\nresolved \"https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2\"\n@@ -9211,6 +9207,10 @@ string-format-obj@^1.1.0:\nversion \"1.1.1\"\nresolved \"https://registry.yarnpkg.com/string-format-obj/-/string-format-obj-1.1.1.tgz#c7612ca4e2ad923812a81db192dc291850aa1f65\"\n+string-hash@^1.1.3:\n+ version \"1.1.3\"\n+ resolved \"https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b\"\n+\nstring-length@^2.0.0:\nversion \"2.0.0\"\nresolved \"https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed\"\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Switch away from object-hash
It was giving inconsistent results |
129,187 | 26.09.2018 21:22:31 | 14,400 | 9aba2a98cab087f742322c724aa1dae3faf57618 | [native] Avoid require loops with action types | [
{
"change_type": "MODIFY",
"old_path": "native/account/logged-out-modal.react.js",
"new_path": "native/account/logged-out-modal.react.js",
"diff": "@@ -56,7 +56,7 @@ import { createIsForegroundSelector } from '../selectors/nav-selectors';\nimport {\nnavigateToAppActionType,\nresetUserStateActionType,\n-} from '../navigation/navigation-setup';\n+} from '../navigation/action-types';\nimport { splashBackgroundURI } from './background-info';\nimport { splashStyle } from '../splash';\nimport {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/account/verification-modal.react.js",
"new_path": "native/account/verification-modal.react.js",
"diff": "@@ -49,7 +49,7 @@ import { windowHeight } from '../dimensions';\nimport ConnectedStatusBar from '../connected-status-bar.react';\nimport ResetPasswordPanel from './reset-password-panel.react';\nimport { createIsForegroundSelector } from '../selectors/nav-selectors';\n-import { navigateToAppActionType } from '../navigation/navigation-setup';\n+import { navigateToAppActionType } from '../navigation/action-types';\nimport { splashBackgroundURI } from './background-info';\nimport { splashStyle } from '../splash';\nimport {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/app.react.js",
"new_path": "native/app.react.js",
"diff": "@@ -28,7 +28,6 @@ import type { DeviceType } from 'lib/types/device-types';\nimport {\ntype NotifPermissionAlertInfo,\nnotifPermissionAlertInfoPropType,\n- recordNotifPermissionAlertActionType,\n} from './push/alerts';\nimport type { RawMessageInfo } from 'lib/types/message-types';\nimport {\n@@ -75,11 +74,16 @@ import { pingFrequency, dispatchPing } from 'lib/shared/ping-utils';\nimport { saveMessagesActionType } from 'lib/actions/message-actions';\nimport {\n- handleURLActionType,\nRootNavigator,\n+} from './navigation/navigation-setup';\n+import {\n+ handleURLActionType,\nbackgroundActionType,\nforegroundActionType,\n-} from './navigation/navigation-setup';\n+ recordNotifPermissionAlertActionType,\n+ recordAndroidNotificationActionType,\n+ clearAndroidNotificationActionType,\n+} from './navigation/action-types';\nimport { store, appBecameInactive } from './redux-setup';\nimport { resolveInvalidatedCookie } from './account/native-credentials';\nimport {\n@@ -97,8 +101,6 @@ import {\n} from './push/ios';\nimport {\nrequestAndroidPushPermissions,\n- recordAndroidNotificationActionType,\n- clearAndroidNotificationActionType,\n} from './push/android';\nimport NotificationBody from './push/notification-body.react';\nimport ErrorBoundary from './error-boundary.react';\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "native/navigation/action-types.js",
"diff": "+// @flow\n+\n+export const handleURLActionType = \"HANDLE_URL\";\n+export const navigateToAppActionType = \"NAVIGATE_TO_APP\";\n+export const backgroundActionType = \"BACKGROUND\";\n+export const foregroundActionType = \"FOREGROUND\";\n+export const resetUserStateActionType = \"RESET_USER_STATE\";\n+export const recordNotifPermissionAlertActionType = \"RECORD_NOTIF_PERMISSION_ALERT\";\n+export const recordAndroidNotificationActionType = \"RECORD_ANDROID_NOTIFICATION\";\n+export const clearAndroidNotificationActionType = \"CLEAR_ANDROID_NOTIFICATION\";\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/navigation-setup.js",
"new_path": "native/navigation/navigation-setup.js",
"diff": "@@ -77,18 +77,16 @@ import {\nChatThreadListRouteName,\nCalendarRouteName,\n} from './route-names';\n+import {\n+ handleURLActionType,\n+ navigateToAppActionType,\n+} from './action-types';\nexport type NavInfo = {|\n...$Exact<BaseNavInfo>,\nnavigationState: NavigationState,\n|};\n-const handleURLActionType = \"HANDLE_URL\";\n-const navigateToAppActionType = \"NAVIGATE_TO_APP\";\n-const backgroundActionType = \"BACKGROUND\";\n-const foregroundActionType = \"FOREGROUND\";\n-const resetUserStateActionType = \"RESET_USER_STATE\";\n-\nconst uniqueBaseId = `id-${Date.now()}`;\nlet uuidCount = 0;\nfunction _getUuid() {\n@@ -702,11 +700,6 @@ function handleNotificationPress(\n}\nexport {\n- handleURLActionType,\n- navigateToAppActionType,\n- backgroundActionType,\n- foregroundActionType,\n- resetUserStateActionType,\nRootNavigator,\ndefaultNavInfo,\nreduceNavInfo,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/push/alerts.js",
"new_path": "native/push/alerts.js",
"diff": "@@ -17,10 +17,7 @@ const defaultNotifPermissionAlertInfo: NotifPermissionAlertInfo = {\nlastAlertTime: 0,\n};\n-const recordNotifPermissionAlertActionType = \"RECORD_NOTIF_PERMISSION_ALERT\";\n-\nexport {\ndefaultNotifPermissionAlertInfo,\nnotifPermissionAlertInfoPropType,\n- recordNotifPermissionAlertActionType,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "native/push/android.js",
"new_path": "native/push/android.js",
"diff": "import FCM from 'react-native-fcm';\n+import {\n+ recordAndroidNotificationActionType,\n+ clearAndroidNotificationActionType,\n+} from '../navigation/action-types';\n+\nasync function requestAndroidPushPermissions(): Promise<?string> {\nconst requestResult = await FCM.requestPermissions();\nif (!requestResult) {\n@@ -10,13 +15,11 @@ async function requestAndroidPushPermissions(): Promise<?string> {\nreturn await FCM.getFCMToken();\n}\n-const recordAndroidNotificationActionType = \"RECORD_ANDROID_NOTIFICATION\";\ntype RecordAndroidNotificationPayload = {|\nthreadID: string,\nnotifID: string,\n|};\n-const clearAndroidNotificationActionType = \"CLEAR_ANDROID_NOTIFICATION\";\ntype ClearAndroidNotificationPayload = {|\nthreadID: string,\n|};\n@@ -64,7 +67,5 @@ function reduceThreadIDsToNotifIDs(\nexport {\nrequestAndroidPushPermissions,\n- recordAndroidNotificationActionType,\n- clearAndroidNotificationActionType,\nreduceThreadIDsToNotifIDs,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "native/redux-setup.js",
"new_path": "native/redux-setup.js",
"diff": "@@ -10,7 +10,6 @@ import type { PersistState } from 'redux-persist/src/types';\nimport {\ntype NotifPermissionAlertInfo,\ndefaultNotifPermissionAlertInfo,\n- recordNotifPermissionAlertActionType,\n} from './push/alerts';\nimport type { NavigationStateRoute, NavigationRoute } from 'react-navigation';\nimport {\n@@ -51,13 +50,16 @@ import {\nhandleURLActionType,\nnavigateToAppActionType,\nresetUserStateActionType,\n+ recordNotifPermissionAlertActionType,\n+ recordAndroidNotificationActionType,\n+ clearAndroidNotificationActionType,\n+} from './navigation/action-types';\n+import {\ndefaultNavInfo,\nreduceNavInfo,\nremoveScreensFromStack,\n} from './navigation/navigation-setup';\nimport {\n- recordAndroidNotificationActionType,\n- clearAndroidNotificationActionType,\nreduceThreadIDsToNotifIDs,\n} from './push/android';\nimport { persistConfig, setPersistor } from './persist';\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Avoid require loops with action types |
129,187 | 27.09.2018 14:48:48 | 14,400 | 49c18d09225d7700085bc5e68b632cfb124d0d23 | [server] Separate notification sends by client codeVersion
In preparation with `RawMessageInfo`s depending on client `codeVersion`, since we'll be mapping future message types to `messageType.UNSUPPORTED`. | [
{
"change_type": "MODIFY",
"old_path": "server/src/creators/message-creator.js",
"new_path": "server/src/creators/message-creator.js",
"diff": "@@ -292,7 +292,7 @@ async function sendPushNotifsForNewMessages(\nconst time = earliestTimeConsideredCurrent();\nconst visibleExtractString = `$.${threadPermissions.VISIBLE}.value`;\nconst query = SQL`\n- SELECT m.user, m.thread, c.platform, c.device_token\n+ SELECT m.user, m.thread, c.platform, c.device_token, c.versions\n`;\nquery.append(subthreadSelects);\nquery.append(SQL`\n@@ -314,7 +314,7 @@ async function sendPushNotifsForNewMessages(\nconst userID = row.user.toString();\nconst threadID = row.thread.toString();\nconst deviceToken = row.device_token;\n- const platform = row.platform;\n+ const { platform, versions } = row;\nlet preUserPushInfo = prePushInfo.get(userID);\nif (!preUserPushInfo) {\npreUserPushInfo = {\n@@ -336,12 +336,11 @@ async function sendPushNotifsForNewMessages(\n}\n}\n}\n- if (deviceToken) {\npreUserPushInfo.devices.set(deviceToken, {\ndeviceType: platform,\ndeviceToken,\n+ codeVersion: versions ? versions.codeVersion : null,\n});\n- }\npreUserPushInfo.threadIDs.add(threadID);\nprePushInfo.set(userID, preUserPushInfo);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/push/rescind.js",
"new_path": "server/src/push/rescind.js",
"diff": "@@ -27,39 +27,52 @@ async function rescindPushNotifs(\nconst rescindedIDs = [];\nfor (let row of fetchResult) {\nif (row.delivery.iosID) {\n- const notification = new apn.Notification();\n- notification.contentAvailable = true;\n- notification.badge = row.unread_count;\n- notification.topic = \"org.squadcal.app\";\n- notification.payload = {\n- managedAps: {\n- action: \"CLEAR\",\n- notificationId: row.delivery.iosID,\n- },\n- };\n+ const notification = prepareIOSNotification(\n+ row.delivery.iosID,\n+ row.unread_count,\n+ );\npromises.push(apnPush(\nnotification,\nrow.delivery.iosDeviceTokens,\n- row.id,\n));\n}\nif (row.delivery.androidID) {\n- const notification = {\n- data: {\n- badge: row.unread_count.toString(),\n- custom_notification: JSON.stringify({\n- rescind: \"true\",\n- notifID: row.collapse_key ? row.collapse_key : row.id.toString(),\n- }),\n- },\n- };\n+ const notification = prepareAndroidNotification(\n+ row.collapse_key ? row.collapse_key : row.id.toString(),\n+ row.unread_count,\n+ );\npromises.push(fcmPush(\nnotification,\nrow.delivery.androidDeviceTokens,\nnull,\n- row.id,\n));\n}\n+ if (Array.isArray(row.delivery)) {\n+ for (let delivery of row.delivery) {\n+ if (delivery.deviceType === \"ios\") {\n+ const { iosID, deviceTokens } = delivery;\n+ const notification = prepareIOSNotification(\n+ iosID,\n+ row.unread_count,\n+ );\n+ promises.push(apnPush(\n+ notification,\n+ deviceTokens,\n+ ));\n+ } else if (delivery.deviceType === \"android\") {\n+ const { deviceTokens } = delivery;\n+ const notification = prepareAndroidNotification(\n+ row.collapse_key ? row.collapse_key : row.id.toString(),\n+ row.unread_count,\n+ );\n+ promises.push(fcmPush(\n+ notification,\n+ deviceTokens,\n+ null,\n+ ));\n+ }\n+ }\n+ }\nrescindedIDs.push(row.id);\n}\nif (rescindedIDs.length > 0) {\n@@ -72,6 +85,38 @@ async function rescindPushNotifs(\nawait Promise.all(promises);\n}\n+function prepareIOSNotification(\n+ iosID: string,\n+ unreadCount: number,\n+): apn.Notification {\n+ const notification = new apn.Notification();\n+ notification.contentAvailable = true;\n+ notification.badge = unreadCount;\n+ notification.topic = \"org.squadcal.app\";\n+ notification.payload = {\n+ managedAps: {\n+ action: \"CLEAR\",\n+ notificationId: iosID,\n+ },\n+ };\n+ return notification;\n+}\n+\n+function prepareAndroidNotification(\n+ notifID: string,\n+ unreadCount: number,\n+): Object {\n+ return {\n+ data: {\n+ badge: unreadCount.toString(),\n+ custom_notification: JSON.stringify({\n+ rescind: \"true\",\n+ notifID,\n+ }),\n+ },\n+ };\n+}\n+\nexport {\nrescindPushNotifs,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/push/send.js",
"new_path": "server/src/push/send.js",
"diff": "@@ -40,11 +40,15 @@ import { fetchCollapsableNotifs } from '../fetchers/message-fetchers';\nimport createIDs from '../creators/id-creator';\nimport { createUpdates } from '../creators/update-creator';\n-type Device = { deviceType: DeviceType, deviceToken: string };\n-type PushUserInfo = {\n+type Device = {|\n+ deviceType: DeviceType,\n+ deviceToken: string,\n+ codeVersion: ?number,\n+|};\n+type PushUserInfo = {|\ndevices: Device[],\nmessageInfos: RawMessageInfo[],\n-};\n+|};\nexport type PushInfo = { [userID: string]: PushUserInfo };\nasync function sendPushNotifs(pushInfo: PushInfo) {\n@@ -63,7 +67,7 @@ async function sendPushNotifs(pushInfo: PushInfo) {\n]);\nconst deliveryPromises = [];\n- const notifications = {};\n+ const notifications = [];\nfor (let userID in usersToCollapsableNotifInfo) {\nconst threadInfos = _flow(\n_mapValues(\n@@ -123,8 +127,18 @@ async function sendPushNotifs(pushInfo: PushInfo) {\nconst dbID = dbIDs.shift();\ninvariant(dbID, \"should have sufficient DB IDs\");\nconst byDeviceType = getDevicesByDeviceType(pushInfo[userID].devices);\n- const delivery = {};\n- if (byDeviceType.ios) {\n+ const notificationInfo = {\n+ dbID,\n+ userID,\n+ threadID,\n+ messageID: firstNewMessageInfo.id,\n+ collapseKey: notifInfo.collapseKey,\n+ };\n+\n+ const iosVersionsToTokens = byDeviceType.get(\"ios\");\n+ if (iosVersionsToTokens) {\n+ for (let [ codeVer, deviceTokens ] in iosVersionsToTokens) {\n+ const codeVersion = parseInt(codeVer); // only for Flow\nconst notification = prepareIOSNotification(\nallMessageInfos,\nnewRawMessageInfos,\n@@ -133,11 +147,17 @@ async function sendPushNotifs(pushInfo: PushInfo) {\nbadgeOnly,\nunreadCounts[userID],\n);\n- deliveryPromises.push(apnPush(notification, byDeviceType.ios, dbID));\n- delivery.iosDeviceTokens = byDeviceType.ios;\n- delivery.iosID = notification.id;\n+ deliveryPromises.push(sendIOSNotification(\n+ notification,\n+ [ ...deviceTokens ],\n+ { ...notificationInfo, codeVersion },\n+ ));\n}\n- if (byDeviceType.android) {\n+ }\n+ const androidVersionsToTokens = byDeviceType.get(\"android\");\n+ if (androidVersionsToTokens) {\n+ for (let [ codeVer, deviceTokens ] in androidVersionsToTokens) {\n+ const codeVersion = parseInt(codeVer); // only for Flow\nconst notification = prepareAndroidNotification(\nallMessageInfos,\nnewRawMessageInfos,\n@@ -147,36 +167,26 @@ async function sendPushNotifs(pushInfo: PushInfo) {\nunreadCounts[userID],\ndbID,\n);\n- deliveryPromises.push(fcmPush(\n+ deliveryPromises.push(sendAndroidNotification(\nnotification,\n- byDeviceType.android,\n- notifInfo.collapseKey,\n- dbID,\n+ [ ...deviceTokens ],\n+ { ...notificationInfo, codeVersion },\n));\n- delivery.androidDeviceTokens = byDeviceType.android;\n+ }\n}\n- notifications[dbID] = [\n- dbID,\n- userID,\n- threadID,\n- firstNewMessageInfo.id,\n- notifInfo.collapseKey,\n- delivery,\n- 0,\n- ];\nfor (let newMessageInfo of remainingNewMessageInfos) {\nconst newDBID = dbIDs.shift();\ninvariant(newDBID, \"should have sufficient DB IDs\");\n- notifications[newDBID] = [\n+ notifications.push([\nnewDBID,\nuserID,\nnewMessageInfo.threadID,\nnewMessageInfo.id,\nnotifInfo.collapseKey,\n- { collapsedInto: dbID },\n+ JSON.stringify({ collapsedInto: dbID }),\n0,\n- ];\n+ ]);\n}\n}\n}\n@@ -191,40 +201,36 @@ async function sendPushNotifs(pushInfo: PushInfo) {\nPromise.all(cleanUpPromises),\n]);\n- const invalidTokens = [];\n+ const allInvalidTokens = [];\nfor (let deliveryResult of deliveryResults) {\n- if (deliveryResult.errors) {\n- notifications[deliveryResult.dbID][5].errors = deliveryResult.errors;\n- }\n- if (deliveryResult.fcmIDs) {\n- notifications[deliveryResult.dbID][5].androidID =\n- deliveryResult.fcmIDs[0];\n- }\n- if (deliveryResult.invalidTokens) {\n- invalidTokens.push({\n- userID: notifications[deliveryResult.dbID][1],\n- tokens: deliveryResult.invalidTokens,\n+ const { info, delivery, invalidTokens } = deliveryResult;\n+ const { dbID, userID, threadID, messageID, collapseKey } = info;\n+ notifications.push([\n+ dbID,\n+ userID,\n+ threadID,\n+ messageID,\n+ collapseKey,\n+ JSON.stringify(delivery),\n+ 0,\n+ ]);\n+ if (invalidTokens) {\n+ allInvalidTokens.push({\n+ userID,\n+ tokens: invalidTokens,\n});\n}\n}\nconst dbPromises = [];\n- if (invalidTokens.length > 0) {\n- dbPromises.push(removeInvalidTokens(invalidTokens));\n- }\n-\n- const flattenedNotifications = [];\n- for (let dbID in notifications) {\n- const notification = notifications[dbID];\n- const jsonConverted = [...notification];\n- jsonConverted[5] = JSON.stringify(jsonConverted[5]);\n- flattenedNotifications.push(jsonConverted);\n+ if (allInvalidTokens.length > 0) {\n+ dbPromises.push(removeInvalidTokens(allInvalidTokens));\n}\n- if (flattenedNotifications.length > 0) {\n+ if (notifications.length > 0) {\nconst query = SQL`\nINSERT INTO notifications\n(id, user, thread, message, collapse_key, delivery, rescinded)\n- VALUES ${flattenedNotifications}\n+ VALUES ${notifications}\n`;\ndbPromises.push(dbQuery(query));\n}\n@@ -390,13 +396,24 @@ async function createDBIDs(pushInfo: PushInfo): Promise<string[]> {\nfunction getDevicesByDeviceType(\ndevices: Device[],\n-): { [deviceType: DeviceType]: string[] } {\n- const byDeviceType = {};\n+): Map<DeviceType, Map<number, Set<string>>> {\n+ const byDeviceType = new Map();\nfor (let device of devices) {\n- if (!byDeviceType[device.deviceType]) {\n- byDeviceType[device.deviceType] = [];\n- }\n- byDeviceType[device.deviceType].push(device.deviceToken);\n+ let innerMap = byDeviceType.get(device.deviceType);\n+ if (!innerMap) {\n+ innerMap = new Map();\n+ byDeviceType.set(device.deviceType, innerMap);\n+ }\n+ const codeVersion: number =\n+ device.codeVersion !== null && device.codeVersion !== undefined\n+ ? device.codeVersion\n+ : -1;\n+ let innerMostSet = innerMap.get(codeVersion);\n+ if (!innerMostSet) {\n+ innerMostSet = new Set();\n+ innerMap.set(codeVersion, innerMostSet);\n+ }\n+ innerMostSet.add(device.deviceToken);\n}\nreturn byDeviceType;\n}\n@@ -467,6 +484,96 @@ function prepareAndroidNotification(\n};\n}\n+type NotificationInfo = {|\n+ dbID: string,\n+ userID: string,\n+ threadID: string,\n+ messageID: string,\n+ collapseKey: ?string,\n+ codeVersion: number,\n+|};\n+\n+type IOSDelivery = {|\n+ deviceType: \"ios\",\n+ iosID: string,\n+ deviceTokens: $ReadOnlyArray<string>,\n+ codeVersion: number,\n+ errors?: $ReadOnlyArray<Object>,\n+|};\n+type IOSResult = {|\n+ info: NotificationInfo,\n+ delivery: IOSDelivery,\n+ invalidTokens?: $ReadOnlyArray<string>,\n+|};\n+async function sendIOSNotification(\n+ notification: apn.Notification,\n+ deviceTokens: $ReadOnlyArray<string>,\n+ notificationInfo: NotificationInfo,\n+): Promise<IOSResult> {\n+ const response = await apnPush(notification, deviceTokens);\n+ const delivery: IOSDelivery = {\n+ deviceType: \"ios\",\n+ iosID: notification.id,\n+ deviceTokens,\n+ codeVersion: notificationInfo.codeVersion,\n+ };\n+ if (response.errors) {\n+ delivery.errors = response.errors;\n+ }\n+ const result: IOSResult = {\n+ info: notificationInfo,\n+ delivery,\n+ };\n+ if (response.invalidTokens) {\n+ result.invalidTokens = response.invalidTokens;\n+ }\n+ return result;\n+}\n+\n+type AndroidDelivery = {|\n+ deviceType: \"android\",\n+ androidIDs: $ReadOnlyArray<string>,\n+ deviceTokens: $ReadOnlyArray<string>,\n+ codeVersion: number,\n+ errors?: $ReadOnlyArray<Object>,\n+|};\n+type AndroidResult = {|\n+ info: NotificationInfo,\n+ delivery: AndroidDelivery,\n+ invalidTokens?: $ReadOnlyArray<string>,\n+|};\n+async function sendAndroidNotification(\n+ notification: Object,\n+ deviceTokens: $ReadOnlyArray<string>,\n+ notificationInfo: NotificationInfo,\n+): Promise<AndroidResult> {\n+ const response = await fcmPush(\n+ notification,\n+ deviceTokens,\n+ notificationInfo.collapseKey,\n+ );\n+ const androidIDs = response.fcmIDs\n+ ? response.fcmIDs\n+ : [];\n+ const delivery: AndroidDelivery = {\n+ deviceType: \"android\",\n+ androidIDs,\n+ deviceTokens,\n+ codeVersion: notificationInfo.codeVersion,\n+ };\n+ if (response.errors) {\n+ delivery.errors = response.errors;\n+ }\n+ const result: AndroidResult = {\n+ info: notificationInfo,\n+ delivery,\n+ };\n+ if (response.invalidTokens) {\n+ result.invalidTokens = response.invalidTokens;\n+ }\n+ return result;\n+}\n+\ntype InvalidToken = {|\nuserID: string,\ntokens: string[],\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/push/utils.js",
"new_path": "server/src/push/utils.js",
"diff": "@@ -24,8 +24,7 @@ const apnBadTokenErrorString = \"BadDeviceToken\";\nasync function apnPush(\nnotification: apn.Notification,\n- deviceTokens: string[],\n- dbID: string,\n+ deviceTokens: $ReadOnlyArray<string>,\n) {\nconst result = await apnProvider.send(notification, deviceTokens);\nconst errors = [];\n@@ -41,19 +40,18 @@ async function apnPush(\n}\n}\nif (invalidTokens.length > 0) {\n- return { errors, invalidTokens, dbID };\n+ return { errors, invalidTokens };\n} else if (errors.length > 0) {\n- return { errors, dbID };\n+ return { errors };\n} else {\n- return { success: true, dbID };\n+ return { success: true };\n}\n}\nasync function fcmPush(\nnotification: Object,\n- deviceTokens: string[],\n+ deviceTokens: $ReadOnlyArray<string>,\ncollapseKey: ?string,\n- dbID: string,\n) {\nconst options: Object = {\npriority: 'high',\n@@ -92,7 +90,7 @@ async function fcmPush(\n}\n}\n- const result: Object = { dbID };\n+ const result = {};\nif (ids.length > 0) {\nresult.fcmIDs = ids;\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Separate notification sends by client codeVersion
In preparation with `RawMessageInfo`s depending on client `codeVersion`, since we'll be mapping future message types to `messageType.UNSUPPORTED`. |
129,187 | 27.09.2018 17:48:26 | 14,400 | 95562a2a2dcf4fb8709bf8c53b5005a634a98125 | [server] Pass Viewer to createMessages | [
{
"change_type": "MODIFY",
"old_path": "server/src/creators/account-creator.js",
"new_path": "server/src/creators/account-creator.js",
"diff": "@@ -125,7 +125,7 @@ async function createAccount(\ntime: messageTime++,\ntext: message,\n}));\n- const ashoatMessageInfos = await createMessages(ashoatMessageDatas);\n+ const ashoatMessageInfos = await createMessages(viewer, ashoatMessageDatas);\nconst rawMessageInfos = [\n...personalThreadResult.newMessageInfos,\n...ashoatThreadResult.newMessageInfos,\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/entry-creator.js",
"new_path": "server/src/creators/entry-creator.js",
"diff": "@@ -104,7 +104,7 @@ async function createEntry(\n};\nconst [ newMessageInfos, updatesResult ] = await Promise.all([\n- createMessages([messageData]),\n+ createMessages(viewer, [messageData]),\ncreateUpdateDatasForChangedEntryInfo(\nviewer,\nnull,\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/message-creator.js",
"new_path": "server/src/creators/message-creator.js",
"diff": "@@ -7,6 +7,7 @@ import {\n} from 'lib/types/message-types';\nimport { threadPermissions } from 'lib/types/thread-types';\nimport { updateTypes } from 'lib/types/update-types';\n+import type { Viewer } from '../session/viewer';\nimport invariant from 'invariant';\n@@ -37,6 +38,7 @@ type ThreadRestriction = {|\n// Does not do permission checks! (checkThreadPermission)\nasync function createMessages(\n+ viewer: Viewer,\nmessageDatas: $ReadOnlyArray<MessageData>,\n): Promise<RawMessageInfo[]> {\nif (messageDatas.length === 0) {\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/report-creator.js",
"new_path": "server/src/creators/report-creator.js",
"diff": "@@ -78,13 +78,16 @@ async function sendSquadbotMessage(\nreturn;\n}\nconst time = Date.now();\n- await createMessages([{\n+ await createMessages(\n+ viewer,\n+ [{\ntype: messageTypes.TEXT,\nthreadID: squadbot.ashoatThreadID,\ncreatorID: squadbot.userID,\ntime,\ntext: message,\n- }]);\n+ }],\n+ );\n}\nasync function ignoreReport(\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/thread-creator.js",
"new_path": "server/src/creators/thread-creator.js",
"diff": "@@ -149,7 +149,7 @@ async function createThread(\n}\nconst [ newMessageInfos, commitResult ] = await Promise.all([\n- createMessages(messageDatas),\n+ createMessages(viewer, messageDatas),\ncommitMembershipChangeset(viewer, changeset),\n]);\nconst { threadInfos, viewerUpdates } = commitResult;\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/deleters/entry-deleters.js",
"new_path": "server/src/deleters/entry-deleters.js",
"diff": "@@ -124,7 +124,7 @@ async function deleteEntry(\n};\nconst [ newMessageInfos, updatesResult ] = await Promise.all([\n- createMessages([messageData]),\n+ createMessages(viewer, [messageData]),\ncreateUpdateDatasForChangedEntryInfo(\nviewer,\noldEntryInfo,\n@@ -214,7 +214,7 @@ async function restoreEntry(\n};\nconst [ newMessageInfos, updatesResult ] = await Promise.all([\n- createMessages([messageData]),\n+ createMessages(viewer, [messageData]),\ncreateUpdateDatasForChangedEntryInfo(\nviewer,\noldEntryInfo,\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/message-responders.js",
"new_path": "server/src/responders/message-responders.js",
"diff": "@@ -55,7 +55,7 @@ async function textMessageCreationResponder(\ntime: Date.now(),\ntext,\n};\n- const rawMessageInfos = await createMessages([messageData]);\n+ const rawMessageInfos = await createMessages(viewer, [messageData]);\nreturn { newMessageInfo: rawMessageInfos[0] };\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/entry-updaters.js",
"new_path": "server/src/updaters/entry-updaters.js",
"diff": "@@ -160,7 +160,9 @@ async function updateEntry(\n};\nconst [ newMessageInfos, updatesResult ] = await Promise.all([\n- createMessages([{\n+ createMessages(\n+ viewer,\n+ [{\ntype: messageTypes.EDIT_ENTRY,\nthreadID: entryInfo.threadID,\ncreatorID: viewerID,\n@@ -168,7 +170,8 @@ async function updateEntry(\nentryID: request.entryID,\ndate: dateString(entryInfo.year, entryInfo.month, entryInfo.day),\ntext: request.text,\n- }]),\n+ }],\n+ ),\ncreateUpdateDatasForChangedEntryInfo(\nviewer,\nentryInfo,\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/thread-updaters.js",
"new_path": "server/src/updaters/thread-updaters.js",
"diff": "@@ -109,7 +109,7 @@ async function updateRole(\nnewMessageInfos,\n{ threadInfos, viewerUpdates },\n] = await Promise.all([\n- createMessages([messageData]),\n+ createMessages(viewer, [messageData]),\ncommitMembershipChangeset(viewer, changeset),\n]);\n@@ -198,7 +198,7 @@ async function removeMembers(\nnewMessageInfos,\n{ threadInfos, viewerUpdates },\n] = await Promise.all([\n- createMessages([messageData]),\n+ createMessages(viewer, [messageData]),\ncommitMembershipChangeset(viewer, changeset),\n]);\n@@ -266,7 +266,7 @@ async function leaveThread(\n};\nconst [ { threadInfos, viewerUpdates } ] = await Promise.all([\ncommitMembershipChangeset(viewer, changeset),\n- createMessages([messageData]),\n+ createMessages(viewer, [messageData]),\n]);\nreturn {\n@@ -515,7 +515,7 @@ async function updateThread(\nnewMessageInfos,\n{ threadInfos, viewerUpdates },\n] = await Promise.all([\n- createMessages(messageDatas),\n+ createMessages(viewer, messageDatas),\ncommitMembershipChangeset(\nviewer,\nchangeset,\n@@ -598,7 +598,7 @@ async function joinThread(\n};\nconst [ membershipResult ] = await Promise.all([\ncommitMembershipChangeset(viewer, changeset, new Set(), calendarQuery),\n- createMessages([messageData]),\n+ createMessages(viewer, [messageData]),\n]);\nconst threadSelectionCriteria = {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Pass Viewer to createMessages |
129,187 | 28.09.2018 00:32:25 | 14,400 | 6c88b5cd3dd9b38d0207c5bd7971ec41c6b407e7 | Way to handle future MessageTypes in older clients
shimUnsupportedRawMessageInfos | [
{
"change_type": "MODIFY",
"old_path": "lib/shared/message-utils.js",
"new_path": "lib/shared/message-utils.js",
"diff": "@@ -14,6 +14,7 @@ import {\nimport type { RelativeUserInfo } from '../types/user-types';\nimport type { UserInfo } from '../types/user-types';\nimport type { ThreadInfo } from '../types/thread-types';\n+import type { PlatformDetails } from '../types/device-types';\nimport invariant from 'invariant';\nimport _maxBy from 'lodash/fp/maxBy';\n@@ -154,8 +155,10 @@ function robotextForMessageInfo(\nconst date = prettyDate(messageInfo.date);\nreturn `${creator} restored an event scheduled for ${date}: ` +\n`\"${messageInfo.text}\"`;\n+ } else if (messageInfo.type === messageTypes.UNSUPPORTED) {\n+ return `${creator} ${messageInfo.robotext}\"`;\n}\n- invariant(false, `${messageInfo.type} is not a messageType!`);\n+ invariant(false, `we're not aware of messageType ${messageInfo.type}`);\n}\nfunction robotextToRawString(robotext: string): string {\n@@ -395,8 +398,22 @@ function createMessageInfo(\ndate: rawMessageInfo.date,\ntext: rawMessageInfo.text,\n};\n+ } else if (rawMessageInfo.type === messageTypes.UNSUPPORTED) {\n+ return {\n+ type: messageTypes.UNSUPPORTED,\n+ id: rawMessageInfo.id,\n+ threadID: rawMessageInfo.threadID,\n+ creator: {\n+ id: rawMessageInfo.creatorID,\n+ username: creatorInfo.username,\n+ isViewer: rawMessageInfo.creatorID === viewerID,\n+ },\n+ time: rawMessageInfo.time,\n+ robotext: rawMessageInfo.robotext,\n+ unsupportedMessageInfo: rawMessageInfo.unsupportedMessageInfo,\n+ };\n}\n- invariant(false, `${rawMessageInfo.type} is not a messageType!`);\n+ invariant(false, `we're not aware of messageType ${rawMessageInfo.type}`);\n}\nfunction sortMessageInfoList<T: MessageInfo | RawMessageInfo>(\n@@ -535,7 +552,7 @@ function rawMessageInfoFromMessageData(\ntext: messageData.text,\n};\n} else {\n- invariant(false, `unrecognized messageType ${messageData.type}`);\n+ invariant(false, `we're not aware of messageType ${messageData.type}`);\n}\n}\n@@ -603,6 +620,13 @@ function combineTruncationStatuses(\n}\n}\n+function shimUnsupportedRawMessageInfos(\n+ rawMessageInfos: $ReadOnlyArray<RawMessageInfo>,\n+ codeVersion: ?PlatformDetails,\n+): RawMessageInfo[] {\n+ return [ ...rawMessageInfos ];\n+}\n+\nexport {\nmessageKey,\nmessageID,\n@@ -617,4 +641,5 @@ export {\nparseRobotextEntity,\nusersInMessageInfos,\ncombineTruncationStatuses,\n+ shimUnsupportedRawMessageInfos,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/shared/notif-utils.js",
"new_path": "lib/shared/notif-utils.js",
"diff": "@@ -287,7 +287,7 @@ function fullNotifTextForMessageInfo(\n);\nreturn strippedRobotextForMessageInfo(mostRecentMessageInfo, threadInfo);\n} else {\n- invariant(false, `unrecognized messageTypes ${mostRecentType}`);\n+ invariant(false, `we're not aware of messageType ${mostRecentType}`);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/message-types.js",
"new_path": "lib/types/message-types.js",
"diff": "@@ -30,6 +30,12 @@ export const messageTypes = Object.freeze({\nEDIT_ENTRY: 10,\nDELETE_ENTRY: 11,\nRESTORE_ENTRY: 12,\n+ // When the server has a message to deliver that the client can't properly\n+ // render because the client is too old, the server will send this message\n+ // type instead. Consequently, there is no MessageData for UNSUPPORTED - just\n+ // a RawMessageInfo and a MessageInfo. Note that native/persist.js handles\n+ // converting these MessageInfos when the client is upgraded.\n+ UNSUPPORTED: 13,\n});\nexport type MessageType = $Values<typeof messageTypes>;\nexport function assertMessageType(\n@@ -48,7 +54,8 @@ export function assertMessageType(\nourMessageType === 9 ||\nourMessageType === 10 ||\nourMessageType === 11 ||\n- ourMessageType === 12,\n+ ourMessageType === 12 ||\n+ ourMessageType === 13,\n\"number is not MessageType enum\",\n);\nreturn ourMessageType;\n@@ -219,6 +226,14 @@ type RawRobotextMessageInfo = {|\n|} | {|\n...RestoreEntryMessageData,\nid: string,\n+|} | {|\n+ type: 13,\n+ id: string,\n+ threadID: string,\n+ creatorID: string,\n+ time: number,\n+ robotext: string,\n+ unsupportedMessageInfo: Object,\n|};\nexport type RawMessageInfo = RawTextMessageInfo | RawRobotextMessageInfo;\n@@ -329,6 +344,14 @@ export type RobotextMessageInfo = {|\nentryID: string,\ndate: string,\ntext: string,\n+|} | {|\n+ type: 13,\n+ id: string,\n+ threadID: string,\n+ creator: RelativeUserInfo,\n+ time: number,\n+ robotext: string,\n+ unsupportedMessageInfo: Object,\n|};\nexport type MessageInfo = TextMessageInfo | RobotextMessageInfo;\n@@ -455,6 +478,15 @@ export const messageInfoPropType = PropTypes.oneOfType([\ndate: PropTypes.string.isRequired,\ntext: PropTypes.string.isRequired,\n}),\n+ PropTypes.shape({\n+ type: PropTypes.oneOf([ messageTypes.UNSUPPORTED ]).isRequired,\n+ id: PropTypes.string.isRequired,\n+ threadID: PropTypes.string.isRequired,\n+ creator: relativeUserInfoPropType.isRequired,\n+ time: PropTypes.number.isRequired,\n+ robotext: PropTypes.string.isRequired,\n+ unsupportedMessageInfo: PropTypes.object.isRequired,\n+ }),\n]);\nexport type ThreadMessageInfo = {|\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/message-creator.js",
"new_path": "server/src/creators/message-creator.js",
"diff": "@@ -14,6 +14,7 @@ import invariant from 'invariant';\nimport {\nrawMessageInfoFromMessageData,\nmessageTypeGeneratesNotifs,\n+ shimUnsupportedRawMessageInfos,\n} from 'lib/shared/message-utils';\nimport { earliestTimeConsideredCurrent } from 'lib/shared/ping-utils';\nimport { permissionLookup } from 'lib/permissions/thread-permissions';\n@@ -169,7 +170,10 @@ async function createMessages(\n`;\nawait dbQuery(messageInsertQuery);\n- return messageInfos;\n+ return shimUnsupportedRawMessageInfos(\n+ messageInfos,\n+ viewer.platformDetails,\n+ );\n}\nconst knowOfExtractString = `$.${threadPermissions.KNOW_OF}.value`;\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/fetchers/message-fetchers.js",
"new_path": "server/src/fetchers/message-fetchers.js",
"diff": "@@ -18,7 +18,10 @@ import type { Viewer } from '../session/viewer';\nimport invariant from 'invariant';\nimport { notifCollapseKeyForRawMessageInfo } from 'lib/shared/notif-utils';\n-import { sortMessageInfoList } from 'lib/shared/message-utils';\n+import {\n+ sortMessageInfoList,\n+ shimUnsupportedRawMessageInfos,\n+} from 'lib/shared/message-utils';\nimport { permissionLookup } from 'lib/permissions/thread-permissions';\nimport { ServerError } from 'lib/utils/errors';\n@@ -35,6 +38,9 @@ export type FetchCollapsableNotifsResult = {|\nuserInfos: UserInfos,\n|};\n+// This function doesn't filter RawMessageInfos based on what messageTypes the\n+// client supports, since each user can have multiple clients. The caller must\n+// handle this filtering.\nasync function fetchCollapsableNotifs(\npushInfo: PushInfo,\n): Promise<FetchCollapsableNotifsResult> {\n@@ -367,9 +373,13 @@ async function fetchMessageInfos(\n}\nconst allUserInfos = await fetchAllUsers(rawMessageInfos, userInfos);\n+ const shimmedRawMessageInfos = shimUnsupportedRawMessageInfos(\n+ rawMessageInfos,\n+ viewer.platformDetails,\n+ );\nreturn {\n- rawMessageInfos,\n+ rawMessageInfos: shimmedRawMessageInfos,\ntruncationStatuses,\nuserInfos: allUserInfos,\n};\n@@ -503,9 +513,13 @@ async function fetchMessageInfosSince(\n}\nconst allUserInfos = await fetchAllUsers(rawMessageInfos, userInfos);\n+ const shimmedRawMessageInfos = shimUnsupportedRawMessageInfos(\n+ rawMessageInfos,\n+ viewer.platformDetails,\n+ );\nreturn {\n- rawMessageInfos,\n+ rawMessageInfos: shimmedRawMessageInfos,\ntruncationStatuses,\nuserInfos: allUserInfos,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/push/send.js",
"new_path": "server/src/push/send.js",
"diff": "@@ -25,6 +25,7 @@ import { notifTextForMessageInfo } from 'lib/shared/notif-utils';\nimport {\ncreateMessageInfo,\nsortMessageInfoList,\n+ shimUnsupportedRawMessageInfos,\n} from 'lib/shared/message-utils';\nimport {\nrawThreadInfoFromServerThreadInfo,\n@@ -139,9 +140,13 @@ async function sendPushNotifs(pushInfo: PushInfo) {\nif (iosVersionsToTokens) {\nfor (let [ codeVer, deviceTokens ] in iosVersionsToTokens) {\nconst codeVersion = parseInt(codeVer); // only for Flow\n+ const shimmedNewRawMessageInfos = shimUnsupportedRawMessageInfos(\n+ newRawMessageInfos,\n+ { platform: \"ios\", codeVersion },\n+ );\nconst notification = prepareIOSNotification(\nallMessageInfos,\n- newRawMessageInfos,\n+ shimmedNewRawMessageInfos,\nthreadInfo,\nnotifInfo.collapseKey,\nbadgeOnly,\n@@ -158,9 +163,13 @@ async function sendPushNotifs(pushInfo: PushInfo) {\nif (androidVersionsToTokens) {\nfor (let [ codeVer, deviceTokens ] in androidVersionsToTokens) {\nconst codeVersion = parseInt(codeVer); // only for Flow\n+ const shimmedNewRawMessageInfos = shimUnsupportedRawMessageInfos(\n+ newRawMessageInfos,\n+ { platform: \"android\", codeVersion },\n+ );\nconst notification = prepareAndroidNotification(\nallMessageInfos,\n- newRawMessageInfos,\n+ shimmedNewRawMessageInfos,\nthreadInfo,\nnotifInfo.collapseKey,\nbadgeOnly,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Way to handle future MessageTypes in older clients
shimUnsupportedRawMessageInfos |
129,187 | 28.09.2018 14:39:14 | 14,400 | 9293440b99df8ffc3ac626aa486bff60dafde1d6 | Every Saturday, bother monthly actives on old versions to update | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "lib/facts/version.json",
"diff": "+{\n+ \"currentCodeVersion\": 18\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/persist.js",
"new_path": "native/persist.js",
"diff": "@@ -9,6 +9,7 @@ import { createMigrate } from 'redux-persist';\nimport invariant from 'invariant';\nimport { currentCalendarQuery } from 'lib/selectors/nav-selectors';\n+import version from 'lib/facts/version';\nimport { defaultNotifPermissionAlertInfo } from './push/alerts';\n@@ -83,7 +84,7 @@ const persistConfig = {\nmigrate: createMigrate(migrations, { debug: __DEV__ }),\n};\n-const codeVersion = 18;\n+const codeVersion = version.currentCodeVersion;\n// This local exists to avoid a circular dependency where redux-setup needs to\n// import all the navigation and screen stuff, but some of those screens want to\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "server/src/bots/app-version-update.js",
"diff": "+// @flow\n+\n+import { messageTypes } from 'lib/types/message-types';\n+\n+import invariant from 'invariant';\n+\n+import version from 'lib/facts/version';\n+import bots from 'lib/facts/bots';\n+import { promiseAll } from 'lib/utils/promises'\n+\n+import { dbQuery, SQL } from '../database';\n+import { createSquadbotThread } from './squadbot';\n+import createMessages from '../creators/message-creator';\n+import { createBotViewer } from '../session/bots';\n+\n+const { currentCodeVersion } = version;\n+const thirtyDays = 30 * 24 * 60 * 60 * 1000;\n+const { squadbot } = bots;\n+\n+async function botherMonthlyActivesToUpdateAppVersion(): Promise<void> {\n+ const cutoff = Date.now() - thirtyDays;\n+ const query = SQL`\n+ SELECT x.user, x.min_code_version, MIN(t.id) AS squadbot_thread\n+ FROM (\n+ SELECT s.user,\n+ MIN(JSON_EXTRACT(c.versions, \"$.codeVersion\")) AS min_code_version\n+ FROM sessions s\n+ LEFT JOIN cookies c ON c.id = s.cookie\n+ WHERE s.last_update > ${cutoff} AND c.platform != \"web\"\n+ GROUP BY s.user\n+ ) x\n+ LEFT JOIN (\n+ SELECT t.id, m1.user, COUNT(m3.user) AS user_count\n+ FROM threads t\n+ LEFT JOIN memberships m1 ON m1.thread = t.id\n+ AND m1.user != ${squadbot.userID}\n+ LEFT JOIN memberships m2 ON m2.thread = t.id\n+ AND m2.user = ${squadbot.userID}\n+ LEFT JOIN memberships m3 ON m3.thread = t.id\n+ WHERE m1.user IS NOT NULL AND m2.user IS NOT NULL\n+ GROUP BY t.id, m1.user\n+ ) t ON t.user = x.user AND t.user_count = 2\n+ WHERE x.min_code_version < ${currentCodeVersion}\n+ GROUP BY x.user, x.min_code_version\n+ `;\n+ const [ result ] = await dbQuery(query);\n+\n+ const codeVersions = new Map();\n+ const squadbotThreads = new Map();\n+ const usersToSquadbotThreadPromises = {};\n+ for (let row of result) {\n+ const {\n+ user: userID,\n+ min_code_version: minCodeVersion,\n+ squadbot_thread: squadbotThread,\n+ } = row;\n+ codeVersions.set(userID, minCodeVersion);\n+ if (squadbotThread) {\n+ squadbotThreads.set(userID, squadbotThread);\n+ } else {\n+ usersToSquadbotThreadPromises[userID] = createSquadbotThread(userID);\n+ }\n+ }\n+\n+ const newSquadbotThreads = await promiseAll(usersToSquadbotThreadPromises);\n+ for (let userID in newSquadbotThreads) {\n+ squadbotThreads.set(userID, newSquadbotThreads[userID]);\n+ }\n+\n+ const time = Date.now();\n+ const newMessageDatas = [];\n+ for (let [ userID, threadID ] of squadbotThreads) {\n+ const codeVersion = codeVersions.get(userID);\n+ invariant(codeVersion, \"should be set\");\n+ newMessageDatas.push({\n+ type: messageTypes.TEXT,\n+ threadID,\n+ creatorID: squadbot.userID,\n+ time,\n+ text: `beep boop, I'm a bot! one or more of your devices is on an old ` +\n+ `version (v${codeVersion}). any chance you could update it? on ` +\n+ `Android you do this using the Play Store, same as any other app. on ` +\n+ `iOS, you need to open up the Testflight app and update from there. ` +\n+ `thanks for helping test!`,\n+ });\n+ }\n+\n+ const squadbotViewer = createBotViewer(squadbot.userID);\n+ await createMessages(squadbotViewer, newMessageDatas);\n+}\n+\n+export {\n+ botherMonthlyActivesToUpdateAppVersion,\n+};\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "server/src/bots/squadbot.js",
"diff": "+// @flow\n+\n+import { threadTypes } from 'lib/types/thread-types';\n+\n+import bots from 'lib/facts/bots';\n+\n+import { createBotViewer } from '../session/bots';\n+import createThread from '../creators/thread-creator';\n+\n+const { squadbot } = bots;\n+\n+async function createSquadbotThread(\n+ userID: string,\n+): Promise<string> {\n+ const squadbotViewer = createBotViewer(squadbot.userID);\n+ const newThreadRequest = {\n+ type: threadTypes.CHAT_SECRET,\n+ initialMemberIDs: [ userID ],\n+ };\n+ const result = await createThread(\n+ squadbotViewer,\n+ newThreadRequest,\n+ );\n+ return result.newThreadInfo.id;\n+}\n+\n+export {\n+ createSquadbotThread,\n+};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/account-creator.js",
"new_path": "server/src/creators/account-creator.js",
"diff": "@@ -83,7 +83,7 @@ async function createAccount(\n`;\nconst [ userViewerData ] = await Promise.all([\ncreateNewUserCookie(id, request.platformDetails),\n- deleteCookie(viewer.getData().cookieID),\n+ deleteCookie(viewer.cookieID),\ndbQuery(newUserQuery),\nsendEmailAddressVerificationEmail(\nid,\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/cron.js",
"new_path": "server/src/cron.js",
"diff": "@@ -20,10 +20,13 @@ import {\ndeleteOldWebSessions,\n} from './deleters/session-deleters';\nimport { backupDB } from './backups';\n+import {\n+ botherMonthlyActivesToUpdateAppVersion,\n+} from './bots/app-version-update';\nif (cluster.isMaster) {\nschedule.scheduleJob(\n- '30 3 * * *',\n+ '30 3 * * *', // every day at 3:30 AM Pacific Time\nasync () => {\ntry {\n// Do everything one at a time to reduce load since we're in no hurry,\n@@ -51,7 +54,7 @@ if (cluster.isMaster) {\n},\n);\nschedule.scheduleJob(\n- '0 */4 * * *',\n+ '0 */4 * * *', // every four hours\nasync () => {\ntry {\nawait backupDB();\n@@ -63,4 +66,17 @@ if (cluster.isMaster) {\n}\n},\n);\n+ schedule.scheduleJob(\n+ '30 11 ? * 6', // every Saturday at 11:30 AM Pacific Time\n+ async () => {\n+ try {\n+ await botherMonthlyActivesToUpdateAppVersion();\n+ } catch (e) {\n+ console.warn(\n+ \"encountered error while trying to bother monthly actives to update\",\n+ e,\n+ );\n+ }\n+ },\n+ );\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/user-responders.js",
"new_path": "server/src/responders/user-responders.js",
"diff": "@@ -126,11 +126,10 @@ async function logOutResponder(\nviewer: Viewer,\ninput: any,\n): Promise<LogOutResponse> {\n- const cookieID = viewer.getData().cookieID;\nif (viewer.loggedIn) {\nconst [ anonymousViewerData ] = await Promise.all([\ncreateNewAnonymousCookie(viewer.platformDetails),\n- deleteCookiesOnLogOut(viewer.userID, cookieID),\n+ deleteCookiesOnLogOut(viewer.userID, viewer.cookieID),\n]);\nviewer.setNewCookie(anonymousViewerData);\n}\n@@ -228,7 +227,7 @@ async function logInResponder(\nconst newPingTime = Date.now();\nconst [ userViewerData ] = await Promise.all([\ncreateNewUserCookie(id, request.platformDetails),\n- deleteCookie(viewer.getData().cookieID),\n+ deleteCookie(viewer.cookieID),\n]);\nviewer.setNewCookie(userViewerData);\nif (calendarQuery) {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "server/src/session/bots.js",
"diff": "+// @flow\n+\n+import { ServerError } from 'lib/utils/errors';\n+import bots from 'lib/facts/bots';\n+\n+import { Viewer } from './viewer';\n+\n+// Note that since the returned Viewer doesn't have a valid cookieID or\n+// sessionID, a lot of things can go wrong when trying to use it with certain\n+// functions.\n+function createBotViewer(userID: string): Viewer {\n+ let userIDIsBot = false;\n+ for (let botName in bots) {\n+ if (bots[botName].userID === userID) {\n+ userIDIsBot = true;\n+ break;\n+ }\n+ }\n+ if (!userIDIsBot) {\n+ throw new ServerError('invalid_bot_id');\n+ }\n+ return new Viewer({\n+ loggedIn: true,\n+ id: userID,\n+ platformDetails: null,\n+ deviceToken: null,\n+ userID,\n+ cookieID: null,\n+ cookiePassword: null,\n+ sessionID: null,\n+ sessionInfo: null,\n+ isBotViewer: true,\n+ });\n+}\n+\n+export {\n+ createBotViewer,\n+};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/session/cookies.js",
"new_path": "server/src/session/cookies.js",
"diff": "@@ -136,6 +136,7 @@ async function fetchUserViewer(\nsessionIdentifierType,\nsessionID,\nsessionInfo,\n+ isBotViewer: false,\n});\nreturn { type: \"valid\", viewer };\n}\n@@ -215,6 +216,7 @@ async function fetchAnonymousViewer(\nsessionIdentifierType,\nsessionID,\nsessionInfo,\n+ isBotViewer: false,\n});\nreturn { type: \"valid\", viewer };\n}\n@@ -472,6 +474,7 @@ async function createNewAnonymousCookie(\nsessionID: undefined,\nsessionInfo: null,\ncookieInsertedThisRequest: true,\n+ isBotViewer: false,\n};\n}\n@@ -523,6 +526,7 @@ async function createNewUserCookie(\nsessionInfo: null,\ncookiePassword,\ncookieInsertedThisRequest: true,\n+ isBotViewer: false,\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/session/viewer.js",
"new_path": "server/src/session/viewer.js",
"diff": "@@ -19,13 +19,14 @@ export type UserViewerData = {|\n+platformDetails: ?PlatformDetails,\n+deviceToken: ?string,\n+userID: string,\n- +cookieID: string,\n+ +cookieID: ?string,\n+cookieSource?: CookieSource,\n- +cookiePassword: string,\n+ +cookiePassword: ?string,\n+cookieInsertedThisRequest?: bool,\n+sessionIdentifierType?: SessionIdentifierType,\n+sessionID: ?string,\n+sessionInfo: ?SessionInfo,\n+ +isBotViewer: bool,\n|};\nexport type AnonymousViewerData = {|\n@@ -34,12 +35,13 @@ export type AnonymousViewerData = {|\n+platformDetails: ?PlatformDetails,\n+deviceToken: ?string,\n+cookieSource?: CookieSource,\n- +cookieID: string,\n- +cookiePassword: string,\n+ +cookieID: ?string,\n+ +cookiePassword: ?string,\n+cookieInsertedThisRequest?: bool,\n+sessionIdentifierType?: SessionIdentifierType,\n+sessionID: ?string,\n+sessionInfo: ?SessionInfo,\n+ +isBotViewer: bool,\n|};\ntype SessionInfo = {|\n@@ -149,11 +151,21 @@ class Viewer {\n}\nget cookieID(): string {\n- return this.data.cookieID;\n+ const { cookieID } = this.data;\n+ invariant(\n+ cookieID !== null && cookieID !== undefined,\n+ \"Viewer.cookieID should be set\",\n+ );\n+ return cookieID;\n}\nget cookiePassword(): string {\n- return this.data.cookiePassword;\n+ const { cookiePassword } = this.data;\n+ invariant(\n+ cookiePassword !== null && cookiePassword !== undefined,\n+ \"Viewer.cookieID should be set\",\n+ );\n+ return cookiePassword;\n}\nget sessionIdentifierType(): SessionIdentifierType {\n@@ -242,6 +254,10 @@ class Viewer {\nreturn this.data.deviceToken;\n}\n+ get isBotViewer(): bool {\n+ return this.data.isBotViewer;\n+ }\n+\n}\nexport {\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/updaters/thread-permission-updaters.js",
"new_path": "server/src/updaters/thread-permission-updaters.js",
"diff": "@@ -585,10 +585,10 @@ async function commitMembershipChangeset(\nviewer,\nserverThreadInfoFetchResult,\n);\n- const { viewerUpdates } = await createUpdates(\n- updateDatas,\n- { viewer, calendarQuery, ...threadInfoFetchResult },\n- );\n+ const viewerInfo = viewer.isBotViewer\n+ ? null\n+ : { viewer, calendarQuery, ...threadInfoFetchResult };\n+ const { viewerUpdates } = await createUpdates(updateDatas, viewerInfo);\nreturn {\n...threadInfoFetchResult,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Every Saturday, bother monthly actives on old versions to update |
129,187 | 28.09.2018 15:03:05 | 14,400 | 400f03727eb1eaecd347966d5de19064e60e1e17 | [server] Allow Viewer construction without cookie info | [
{
"change_type": "MODIFY",
"old_path": "server/src/session/viewer.js",
"new_path": "server/src/session/viewer.js",
"diff": "@@ -59,15 +59,6 @@ class Viewer {\ninitialCookieName: string;\nconstructor(data: ViewerData) {\n- invariant(\n- data.cookieSource !== null && data.cookieSource !== undefined,\n- \"data.cookieSource passed to Viewer constructor should be set\",\n- );\n- invariant(\n- data.sessionIdentifierType !== null &&\n- data.sessionIdentifierType !== undefined,\n- \"data.sessionIdentifierType passed to Viewer constructor should be set\",\n- );\nthis.data = data;\nthis.initialCookieName = Viewer.cookieNameFromViewerData(data);\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Allow Viewer construction without cookie info |
129,187 | 28.09.2018 15:20:03 | 14,400 | 42ee3b984f636671d1c53206cc82c329e65a5657 | [server] Fix threadID type in botherMonthlyActivesToUpdateAppVersion | [
{
"change_type": "MODIFY",
"old_path": "server/src/bots/app-version-update.js",
"new_path": "server/src/bots/app-version-update.js",
"diff": "@@ -49,11 +49,9 @@ async function botherMonthlyActivesToUpdateAppVersion(): Promise<void> {\nconst squadbotThreads = new Map();\nconst usersToSquadbotThreadPromises = {};\nfor (let row of result) {\n- const {\n- user: userID,\n- min_code_version: minCodeVersion,\n- squadbot_thread: squadbotThread,\n- } = row;\n+ const userID = row.user.toString();\n+ const minCodeVersion = row.min_code_version;\n+ const squadbotThread = row.squadbot_thread.toString();\ncodeVersions.set(userID, minCodeVersion);\nif (squadbotThread) {\nsquadbotThreads.set(userID, squadbotThread);\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Fix threadID type in botherMonthlyActivesToUpdateAppVersion |
129,187 | 28.09.2018 18:23:14 | 14,400 | d14caf4dd6556de291bc5abc7bf9a4b96a81c734 | [server] Still include cookieChange when ServerError is thrown | [
{
"change_type": "MODIFY",
"old_path": "server/src/responders/handlers.js",
"new_path": "server/src/responders/handlers.js",
"diff": "@@ -19,8 +19,9 @@ export type HTMLResponder = (viewer: Viewer, url: string) => Promise<string>;\nfunction jsonHandler(responder: JSONResponder) {\nreturn async (req: $Request, res: $Response) => {\n+ let viewer;\ntry {\n- const viewer = await fetchViewerForJSONRequest(req);\n+ viewer = await fetchViewerForJSONRequest(req);\nif (!req.body || typeof req.body !== \"object\") {\nthrow new ServerError('invalid_parameters');\n}\n@@ -32,7 +33,7 @@ function jsonHandler(responder: JSONResponder) {\nawait addCookieToJSONResponse(viewer, res, result);\nres.json({ success: true, ...result });\n} catch (e) {\n- handleException(e, res);\n+ await handleException(e, res, viewer);\n}\n};\n}\n@@ -43,7 +44,9 @@ function downloadHandler(responder: DownloadResponder) {\nconst viewer = await fetchViewerForJSONRequest(req);\nawait responder(viewer, req, res);\n} catch (e) {\n- handleException(e, res);\n+ // Passing viewer in only makes sense if we want to handle failures as\n+ // JSON. We don't, and presume all download handlers avoid ServerError.\n+ await handleException(e, res);\n}\n};\n}\n@@ -52,18 +55,27 @@ function getMessageForException(error: Error & { sqlMessage?: string }) {\nreturn error.sqlMessage !== null ? \"database error\" : error.message;\n}\n-function handleException(error: Error, res: $Response) {\n+async function handleException(\n+ error: Error,\n+ res: $Response,\n+ viewer: ?Viewer,\n+) {\nconsole.warn(error);\nif (res.headersSent) {\nreturn;\n}\n- if (error instanceof ServerError && error.payload) {\n- res.json({ error: error.message, payload: error.payload });\n- } else if (error instanceof ServerError) {\n- res.json({ error: error.message });\n- } else {\n+ if (!(error instanceof ServerError)) {\nres.status(500).send(getMessageForException(error));\n+ return;\n+ }\n+ const result: Object = error.payload\n+ ? { error: error.message, payload: error.payload }\n+ : { error: error.message };\n+ if (viewer) {\n+ // This can mutate the result object\n+ await addCookieToJSONResponse(viewer, res, result);\n}\n+ res.json(result);\n}\nasync function handleAsyncPromise(promise: Promise<any>) {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Still include cookieChange when ServerError is thrown |
129,187 | 28.09.2018 18:45:50 | 14,400 | d85864f6704c11016a8e88ebc46298a8ed37feff | Include error from server in SetSessionPayload | [
{
"change_type": "MODIFY",
"old_path": "lib/reducers/calendar-filters-reducer.js",
"new_path": "lib/reducers/calendar-filters-reducer.js",
"diff": "@@ -45,7 +45,7 @@ export default function reduceCalendarFilters(\naction.type === registerActionTypes.success ||\naction.type === resetPasswordActionTypes.success ||\n(action.type === setNewSessionActionType &&\n- action.payload.cookieInvalidated)\n+ action.payload.sessionChange.cookieInvalidated)\n) {\nreturn defaultCalendarFilters;\n} else if (action.type === updateCalendarThreadFilter) {\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/draft-reducer.js",
"new_path": "lib/reducers/draft-reducer.js",
"diff": "@@ -21,7 +21,7 @@ function reduceDrafts(\naction.type === logOutActionTypes.success ||\naction.type === deleteAccountActionTypes.success ||\n(action.type === setNewSessionActionType &&\n- action.payload.cookieInvalidated)\n+ action.payload.sessionChange.cookieInvalidated)\n) {\nreturn {};\n} else if (action.type === saveDraftActionType) {\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/entry-reducer.js",
"new_path": "lib/reducers/entry-reducer.js",
"diff": "@@ -255,7 +255,8 @@ function reduceEntryInfos(\ndaysToEntries,\nnewEntryInfos,\n);\n- const newLastUserInteractionCalendar = action.payload.cookieInvalidated\n+ const newLastUserInteractionCalendar =\n+ action.payload.sessionChange.cookieInvalidated\n? 0\n: lastUserInteractionCalendar;\nif (Object.keys(newEntryInfos).length === Object.keys(entryInfos).length) {\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/thread-reducer.js",
"new_path": "lib/reducers/thread-reducer.js",
"diff": "@@ -237,8 +237,7 @@ export default function reduceThreadInfos(\naction.type === deleteAccountActionTypes.success ||\naction.type === logInActionTypes.success ||\naction.type === registerActionTypes.success ||\n- action.type === resetPasswordActionTypes.success ||\n- action.type === setNewSessionActionType\n+ action.type === resetPasswordActionTypes.success\n) {\nif (_isEqual(state.threadInfos)(action.payload.threadInfos)) {\nreturn state;\n@@ -247,6 +246,15 @@ export default function reduceThreadInfos(\nthreadInfos: action.payload.threadInfos,\ninconsistencyResponses: state.inconsistencyResponses,\n};\n+ } else if (action.type === setNewSessionActionType) {\n+ const { threadInfos } = action.payload.sessionChange;\n+ if (_isEqual(state.threadInfos)(threadInfos)) {\n+ return state;\n+ }\n+ return {\n+ threadInfos,\n+ inconsistencyResponses: state.inconsistencyResponses,\n+ };\n} else if (\naction.type === joinThreadActionTypes.success ||\naction.type === leaveThreadActionTypes.success ||\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/reducers/user-reducer.js",
"new_path": "lib/reducers/user-reducer.js",
"diff": "@@ -52,13 +52,13 @@ function reduceCurrentUserInfo(\nreturn action.payload.currentUserInfo;\n} else if (\naction.type === setNewSessionActionType &&\n- action.payload.cookieInvalidated\n+ action.payload.sessionChange.cookieInvalidated\n) {\n- const payload = action.payload;\n- if (_isEqual(payload.currentUserInfo)(state)) {\n+ const { sessionChange } = action.payload;\n+ if (_isEqual(sessionChange.currentUserInfo)(state)) {\nreturn state;\n}\n- return payload.currentUserInfo;\n+ return sessionChange.currentUserInfo;\n} else if (action.type === pingActionTypes.success) {\nconst { payload } = action;\nfor (let update of payload.updatesResult.newUpdates) {\n@@ -121,22 +121,32 @@ function reduceUserInfos(\naction.type === fetchMostRecentMessagesActionTypes.success ||\naction.type === fetchEntriesActionTypes.success ||\naction.type === updateCalendarQueryActionTypes.success ||\n- action.type === searchUsersActionTypes.success ||\n- (action.type === setNewSessionActionType &&\n- !action.payload.cookieInvalidated)\n+ action.type === searchUsersActionTypes.success\n) {\nconst newUserInfos = _keyBy('id')(action.payload.userInfos);\nconst updated = { ...state, ...newUserInfos };\nif (!_isEqual(state)(updated)) {\nreturn updated;\n}\n+ } else if (action.type === setNewSessionActionType) {\n+ const { sessionChange } = action.payload;\n+ const newUserInfos = _keyBy('id')(sessionChange.userInfos);\n+ if (sessionChange.cookieInvalidated) {\n+ if (!_isEqual(state)(newUserInfos)) {\n+ return newUserInfos;\n+ }\n+ } else {\n+ const updated = { ...state, ...newUserInfos };\n+ if (!_isEqual(state)(updated)) {\n+ return updated;\n+ }\n+ }\n} else if (\naction.type === logInActionTypes.success ||\naction.type === registerActionTypes.success ||\naction.type === resetPasswordActionTypes.success ||\naction.type === logOutActionTypes.success ||\n- action.type === deleteAccountActionTypes.success ||\n- action.type === setNewSessionActionType\n+ action.type === deleteAccountActionTypes.success\n) {\nconst newUserInfos = _keyBy('id')(action.payload.userInfos);\nif (!_isEqual(state)(newUserInfos)) {\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/redux-types.js",
"new_path": "lib/types/redux-types.js",
"diff": "@@ -45,7 +45,7 @@ import type {\nSendTextMessagePayload,\nSaveMessagesPayload,\n} from './message-types';\n-import type { SessionChange } from './session-types';\n+import type { SetSessionPayload } from './session-types';\nimport type { UpdateActivityResult } from './activity-types';\nimport type { ReportCreationResponse } from './report-types';\nimport type { ServerRequest } from './request-types';\n@@ -355,7 +355,7 @@ export type BaseAction =\nloadingInfo: LoadingInfo,\n|} | {|\ntype: \"SET_NEW_SESSION\",\n- payload: SessionChange,\n+ payload: SetSessionPayload,\n|} | {|\ntype: \"PING_STARTED\",\npayload: PingStartingPayload,\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/session-types.js",
"new_path": "lib/types/session-types.js",
"diff": "@@ -56,3 +56,8 @@ export type SessionChange = {|\nsessionID?: null | string,\ncookie?: string,\n|};\n+\n+export type SetSessionPayload = {|\n+ sessionChange: SessionChange,\n+ error: ?string,\n+|};\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/utils/action-utils.js",
"new_path": "lib/utils/action-utils.js",
"diff": "@@ -169,10 +169,14 @@ export type DispatchRecoveryAttempt = (\n) => Promise<bool>;\nconst setNewSessionActionType = \"SET_NEW_SESSION\";\n-function setNewSession(dispatch: Dispatch, sessionChange: SessionChange) {\n+function setNewSession(\n+ dispatch: Dispatch,\n+ sessionChange: SessionChange,\n+ error: ?string,\n+) {\ndispatch({\ntype: setNewSessionActionType,\n- payload: sessionChange,\n+ payload: { sessionChange, error },\n});\n}\n@@ -195,9 +199,12 @@ async function fetchNewCookieFromNativeCredentials(\ndata: {[key: string]: mixed},\noptions?: ?FetchJSONOptions,\n) => {\n- const innerBoundSetNewSession = (sessionChange: SessionChange) => {\n+ const innerBoundSetNewSession = (\n+ sessionChange: SessionChange,\n+ error: ?string,\n+ ) => {\nnewSessionChange = sessionChange;\n- setNewSession(dispatch, sessionChange);\n+ setNewSession(dispatch, sessionChange, error);\n};\ntry {\nconst result = await fetchJSON(\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/utils/fetch-json.js",
"new_path": "lib/utils/fetch-json.js",
"diff": "@@ -42,7 +42,7 @@ type RequestData = {|\n// (indicating we don't have one), and we will then set an empty Cookie header.\nasync function fetchJSON(\ncookie: ?string,\n- setNewSession: (sessionChange: SessionChange) => void,\n+ setNewSession: (sessionChange: SessionChange, error: ?string) => void,\nwaitIfCookieInvalidated: () => Promise<?FetchJSON>,\ncookieInvalidationRecovery:\n(sessionChange: SessionChange) => Promise<?FetchJSON>,\n@@ -104,7 +104,7 @@ async function fetchJSON(\nthrow e;\n}\n- const { cookieChange: sessionChange } = json;\n+ const { cookieChange: sessionChange, error, payload } = json;\nif (sessionChange) {\nif (sessionChange.cookieInvalidated) {\nconst maybeReplacement = await cookieInvalidationRecovery(sessionChange);\n@@ -112,11 +112,11 @@ async function fetchJSON(\nreturn await maybeReplacement(endpoint, input, options);\n}\n}\n- setNewSession(sessionChange);\n+ setNewSession(sessionChange, error);\n}\n- if (json.error) {\n- throw new ServerError(json.error, json.payload);\n+ if (error) {\n+ throw new ServerError(error, payload);\n}\nreturn json;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/navigation-setup.js",
"new_path": "native/navigation/navigation-setup.js",
"diff": "@@ -276,8 +276,7 @@ function reduceNavInfo(state: AppState, action: *): NavInfo {\naction.type === pingActionTypes.success ||\naction.type === joinThreadActionTypes.success ||\naction.type === leaveThreadActionTypes.success ||\n- action.type === deleteThreadActionTypes.success ||\n- action.type === setNewSessionActionType\n+ action.type === deleteThreadActionTypes.success\n) {\nconst filteredNavigationState = filterChatScreensForThreadInfos(\nnavInfoState.navigationState,\n@@ -290,6 +289,18 @@ function reduceNavInfo(state: AppState, action: *): NavInfo {\nnavigationState: filteredNavigationState,\n};\n}\n+ } else if (action.type === setNewSessionActionType) {\n+ const filteredNavigationState = filterChatScreensForThreadInfos(\n+ navInfoState.navigationState,\n+ action.payload.sessionChange.threadInfos,\n+ );\n+ if (navInfoState.navigationState !== filteredNavigationState) {\n+ navInfoState = {\n+ startDate: navInfoState.startDate,\n+ endDate: navInfoState.endDate,\n+ navigationState: filteredNavigationState,\n+ };\n+ }\n}\n// Deep linking\nif (action.type === handleURLActionType) {\n@@ -317,7 +328,10 @@ function reduceNavInfo(state: AppState, action: *): NavInfo {\n) {\nreturn resetNavInfoAndEnsureLoggedOutModalPresence(navInfoState);\n} else if (action.type === setNewSessionActionType) {\n- return logOutIfCookieInvalidated(navInfoState, action.payload);\n+ return logOutIfCookieInvalidated(\n+ navInfoState,\n+ action.payload.sessionChange,\n+ );\n} else if (action.type === leaveThreadActionTypes.success) {\nreturn {\nstartDate: navInfoState.startDate,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/redux-setup.js",
"new_path": "native/redux-setup.js",
"diff": "@@ -274,7 +274,7 @@ function reducer(state: AppState = defaultState, action: *) {\nif (action.type === setNewSessionActionType) {\nstate = {\n...state,\n- cookie: action.payload.cookie,\n+ cookie: action.payload.sessionChange.cookie,\n};\n} else if (action.type === setDeviceTokenActionTypes.started) {\nstate = {\n"
},
{
"change_type": "MODIFY",
"old_path": "web/redux-setup.js",
"new_path": "web/redux-setup.js",
"diff": "@@ -100,7 +100,7 @@ export function reducer(oldState: AppState | void, action: Action) {\nif (action.type === setNewSessionActionType) {\nstate = {\n...state,\n- sessionID: action.payload.sessionID,\n+ sessionID: action.payload.sessionChange.sessionID,\n};\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Include error from server in SetSessionPayload |
129,187 | 29.09.2018 16:52:44 | 14,400 | f64a2c8bc48e4802e91334dd3f80c56dd59da117 | [server] validateInput is async function and takes Viewer now | [
{
"change_type": "MODIFY",
"old_path": "server/src/responders/activity-responders.js",
"new_path": "server/src/responders/activity-responders.js",
"diff": "@@ -33,7 +33,7 @@ async function updateActivityResponder(\ninput: any,\n): Promise<UpdateActivityResult> {\nconst request: UpdateActivityRequest = input;\n- validateInput(inputValidator, request);\n+ await validateInput(viewer, inputValidator, request);\nreturn await activityUpdater(viewer, request);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/device-responders.js",
"new_path": "server/src/responders/device-responders.js",
"diff": "@@ -18,7 +18,7 @@ async function deviceTokenUpdateResponder(\ninput: any,\n): Promise<void> {\nconst request: DeviceTokenUpdateRequest = input;\n- validateInput(deviceTokenUpdateRequestInputValidator, request);\n+ await validateInput(viewer, deviceTokenUpdateRequestInputValidator, request);\nawait deviceTokenUpdater(viewer, request);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/entry-responders.js",
"new_path": "server/src/responders/entry-responders.js",
"diff": "@@ -116,7 +116,7 @@ async function entryFetchResponder(\nviewer: Viewer,\ninput: any,\n): Promise<FetchEntryInfosResponse> {\n- validateInput(entryQueryInputValidator, input);\n+ await validateInput(viewer, entryQueryInputValidator, input);\nconst request = normalizeCalendarQuery(input);\nawait verifyCalendarQueryThreadIDs(request);\n@@ -133,7 +133,7 @@ async function entryRevisionFetchResponder(\ninput: any,\n): Promise<FetchEntryRevisionInfosResult> {\nconst request: FetchEntryRevisionInfosRequest = input;\n- validateInput(entryRevisionHistoryFetchInputValidator, request);\n+ await validateInput(viewer, entryRevisionHistoryFetchInputValidator, request);\nconst entryHistory = await fetchEntryRevisionInfo(viewer, request.id);\nreturn { result: entryHistory };\n}\n@@ -152,7 +152,7 @@ async function entryCreationResponder(\ninput: any,\n): Promise<SaveEntryResponse> {\nconst request: CreateEntryRequest = input;\n- validateInput(createEntryRequestInputValidator, request);\n+ await validateInput(viewer, createEntryRequestInputValidator, request);\nreturn await createEntry(viewer, request);\n}\n@@ -170,7 +170,7 @@ async function entryUpdateResponder(\ninput: any,\n): Promise<SaveEntryResponse> {\nconst request: SaveEntryRequest = input;\n- validateInput(saveEntryRequestInputValidator, request);\n+ await validateInput(viewer, saveEntryRequestInputValidator, request);\nreturn await updateEntry(viewer, request);\n}\n@@ -187,7 +187,7 @@ async function entryDeletionResponder(\ninput: any,\n): Promise<DeleteEntryResponse> {\nconst request: DeleteEntryRequest = input;\n- validateInput(deleteEntryRequestInputValidator, request);\n+ await validateInput(viewer, deleteEntryRequestInputValidator, request);\nreturn await deleteEntry(viewer, request);\n}\n@@ -203,7 +203,7 @@ async function entryRestorationResponder(\ninput: any,\n): Promise<RestoreEntryResponse> {\nconst request: RestoreEntryRequest = input;\n- validateInput(restoreEntryRequestInputValidator, request);\n+ await validateInput(viewer, restoreEntryRequestInputValidator, request);\nreturn await restoreEntry(viewer, request);\n}\n@@ -212,7 +212,7 @@ async function calendarQueryUpdateResponder(\ninput: any,\n): Promise<FetchEntryInfosResult> {\nconst request: CalendarQuery = input;\n- validateInput(newEntryQueryInputValidator, input);\n+ await validateInput(viewer, newEntryQueryInputValidator, input);\nawait verifyCalendarQueryThreadIDs(request);\nif (!viewer.loggedIn) {\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/message-responders.js",
"new_path": "server/src/responders/message-responders.js",
"diff": "@@ -31,7 +31,7 @@ async function textMessageCreationResponder(\ninput: any,\n): Promise<SendTextMessageResponse> {\nconst request: SendTextMessageRequest = input;\n- validateInput(sendTextMessageRequestInputValidator, request);\n+ await validateInput(viewer, sendTextMessageRequestInputValidator, request);\nconst { threadID, text: rawText } = request;\nconst text = rawText.trim();\n@@ -70,7 +70,7 @@ async function messageFetchResponder(\ninput: any,\n): Promise<FetchMessageInfosResult> {\nconst request: FetchMessageInfosRequest = input;\n- validateInput(fetchMessageInfosRequestInputValidator, request);\n+ await validateInput(viewer, fetchMessageInfosRequestInputValidator, request);\nreturn await fetchMessageInfos(\nviewer,\n{ threadCursors: request.cursors },\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/ping-responders.js",
"new_path": "server/src/responders/ping-responders.js",
"diff": "@@ -170,7 +170,7 @@ async function pingResponder(\n): Promise<PingResponse> {\nconst request: PingRequest = input;\nrequest.calendarQuery = normalizeCalendarQuery(request.calendarQuery);\n- validateInput(pingRequestInputValidator, request);\n+ await validateInput(viewer, pingRequestInputValidator, request);\nlet clientMessagesCurrentAsOf;\nif (\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/report-responders.js",
"new_path": "server/src/responders/report-responders.js",
"diff": "@@ -78,7 +78,7 @@ async function reportCreationResponder(\nviewer: Viewer,\ninput: any,\n): Promise<ReportCreationResponse> {\n- validateInput(reportCreationRequestInputValidator, input);\n+ await validateInput(viewer, reportCreationRequestInputValidator, input);\nif (input.type === null || input.type === undefined) {\ninput.type = reportTypes.ERROR;\n}\n@@ -106,7 +106,11 @@ async function errorReportFetchInfosResponder(\ninput: any,\n): Promise<FetchErrorReportInfosResponse> {\nconst request: FetchErrorReportInfosRequest = input;\n- validateInput(fetchErrorReportInfosRequestInputValidator, request);\n+ await validateInput(\n+ viewer,\n+ fetchErrorReportInfosRequestInputValidator,\n+ request,\n+ );\nreturn await fetchErrorReportInfos(viewer, request);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/search-responders.js",
"new_path": "server/src/responders/search-responders.js",
"diff": "@@ -20,7 +20,7 @@ async function userSearchResponder(\ninput: any,\n): Promise<UserSearchResult> {\nconst request: UserSearchRequest = input;\n- validateInput(userSearchRequestInputValidator, request);\n+ await validateInput(viewer, userSearchRequestInputValidator, request);\nconst searchResults = await searchForUsers(request);\nreturn { userInfos: searchResults };\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/thread-responders.js",
"new_path": "server/src/responders/thread-responders.js",
"diff": "@@ -51,7 +51,7 @@ async function threadDeletionResponder(\ninput: any,\n): Promise<LeaveThreadResult> {\nconst request: ThreadDeletionRequest = input;\n- validateInput(threadDeletionRequestInputValidator, request);\n+ await validateInput(viewer, threadDeletionRequestInputValidator, request);\nreturn await deleteThread(viewer, request);\n}\n@@ -72,7 +72,7 @@ async function roleUpdateResponder(\ninput: any,\n): Promise<ChangeThreadSettingsResult> {\nconst request: RoleChangeRequest = input;\n- validateInput(roleChangeRequestInputValidator, request);\n+ await validateInput(viewer, roleChangeRequestInputValidator, request);\nreturn await updateRole(viewer, request);\n}\n@@ -86,7 +86,7 @@ async function memberRemovalResponder(\ninput: any,\n): Promise<ChangeThreadSettingsResult> {\nconst request: RemoveMembersRequest = input;\n- validateInput(removeMembersRequestInputValidator, request);\n+ await validateInput(viewer, removeMembersRequestInputValidator, request);\nreturn await removeMembers(viewer, request);\n}\n@@ -99,7 +99,7 @@ async function threadLeaveResponder(\ninput: any,\n): Promise<LeaveThreadResult> {\nconst request: LeaveThreadRequest = input;\n- validateInput(leaveThreadRequestInputValidator, request);\n+ await validateInput(viewer, leaveThreadRequestInputValidator, request);\nreturn await leaveThread(viewer, request);\n}\n@@ -121,7 +121,7 @@ async function threadUpdateResponder(\nviewer: Viewer,\ninput: any,\n): Promise<ChangeThreadSettingsResult> {\n- validateInput(updateThreadRequestInputValidator, input);\n+ await validateInput(viewer, updateThreadRequestInputValidator, input);\nlet request;\nif (\ninput.changes.visibilityRules !== null &&\n@@ -174,7 +174,7 @@ async function threadCreationResponder(\nviewer: Viewer,\ninput: any,\n): Promise<NewThreadResult> {\n- validateInput(newThreadRequestInputValidator, input);\n+ await validateInput(viewer, newThreadRequestInputValidator, input);\nlet request;\nif (\n(input.visibilityRules === null ||\n@@ -206,7 +206,7 @@ async function threadJoinResponder(\ninput: any,\n): Promise<ThreadJoinResult> {\nconst request: ServerThreadJoinRequest = input;\n- validateInput(joinThreadRequestInputValidator, request);\n+ await validateInput(viewer, joinThreadRequestInputValidator, request);\nif (request.calendarQuery) {\nawait verifyCalendarQueryThreadIDs(request.calendarQuery);\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/user-responders.js",
"new_path": "server/src/responders/user-responders.js",
"diff": "@@ -80,7 +80,7 @@ async function userSubscriptionUpdateResponder(\ninput: any,\n): Promise<SubscriptionUpdateResponse> {\nconst request: SubscriptionUpdateRequest = input;\n- validateInput(subscriptionUpdateRequestInputValidator, request);\n+ await validateInput(viewer, subscriptionUpdateRequestInputValidator, request);\nconst threadSubscription = await userSubscriptionUpdater(viewer, request);\nreturn { threadSubscription };\n}\n@@ -98,7 +98,7 @@ async function accountUpdateResponder(\ninput: any,\n): Promise<void> {\nconst request: AccountUpdate = input;\n- validateInput(accountUpdateInputValidator, request);\n+ await validateInput(viewer, accountUpdateInputValidator, request);\nawait accountUpdater(viewer, request);\n}\n@@ -106,6 +106,7 @@ async function sendVerificationEmailResponder(\nviewer: Viewer,\ninput: any,\n): Promise<void> {\n+ await validateInput(viewer, null, null);\nawait checkAndSendVerificationEmail(viewer);\n}\n@@ -118,7 +119,7 @@ async function sendPasswordResetEmailResponder(\ninput: any,\n): Promise<void> {\nconst request: ResetPasswordRequest = input;\n- validateInput(resetPasswordRequestInputValidator, request);\n+ await validateInput(viewer, resetPasswordRequestInputValidator, request);\nawait checkAndSendPasswordResetEmail(request);\n}\n@@ -126,6 +127,7 @@ async function logOutResponder(\nviewer: Viewer,\ninput: any,\n): Promise<LogOutResponse> {\n+ await validateInput(viewer, null, null);\nif (viewer.loggedIn) {\nconst [ anonymousViewerData ] = await Promise.all([\ncreateNewAnonymousCookie(viewer.platformDetails),\n@@ -150,7 +152,7 @@ async function accountDeletionResponder(\ninput: any,\n): Promise<LogOutResponse> {\nconst request: DeleteAccountRequest = input;\n- validateInput(deleteAccountRequestInputValidator, request);\n+ await validateInput(viewer, deleteAccountRequestInputValidator, request);\nreturn await deleteAccount(viewer, request);\n}\n@@ -173,7 +175,7 @@ async function accountCreationResponder(\ndelete input.platform;\n}\nconst request: RegisterRequest = input;\n- validateInput(registerRequestInputValidator, request);\n+ await validateInput(viewer, registerRequestInputValidator, request);\nreturn await createAccount(viewer, request);\n}\n@@ -191,7 +193,7 @@ async function logInResponder(\nviewer: Viewer,\ninput: any,\n): Promise<LogInResponse> {\n- validateInput(logInRequestInputValidator, input);\n+ await validateInput(viewer, logInRequestInputValidator, input);\nif (!input.platformDetails && input.platform) {\ninput.platformDetails = { platform: input.platform };\ndelete input.platform;\n@@ -288,7 +290,7 @@ async function passwordUpdateResponder(\nviewer: Viewer,\ninput: any,\n): Promise<LogInResponse> {\n- validateInput(updatePasswordRequestInputValidator, input);\n+ await validateInput(viewer, updatePasswordRequestInputValidator, input);\nif (!input.platformDetails && input.platform) {\ninput.platformDetails = { platform: input.platform };\ndelete input.platform;\n@@ -316,7 +318,7 @@ async function requestAccessResponder(\ninput: any,\n): Promise<void> {\nconst request: AccessRequest = input;\n- validateInput(accessRequestInputValidator, request);\n+ await validateInput(viewer, accessRequestInputValidator, request);\nawait sendAccessRequestEmailToAshoat(request);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/verification-responders.js",
"new_path": "server/src/responders/verification-responders.js",
"diff": "@@ -24,7 +24,7 @@ async function codeVerificationResponder(\ninput: any,\n): Promise<HandleVerificationCodeResult> {\nconst request: CodeVerificationRequest = input;\n- validateInput(codeVerificationRequestInputValidator, request);\n+ await validateInput(viewer, codeVerificationRequestInputValidator, request);\nconst result = await handleCodeVerificationRequest(viewer, request.code);\nif (!result) {\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/utils/validation-utils.js",
"new_path": "server/src/utils/validation-utils.js",
"diff": "// @flow\n+import type { Viewer } from '../session/viewer';\n+\nimport t from 'tcomb';\nimport { ServerError } from 'lib/utils/errors';\n-function validateInput(inputValidator: *, input: *) {\n- if (inputValidator.is(input)) {\n+function validateInput(viewer: Viewer, inputValidator: *, input: *) {\n+ if (inputValid(viewer, inputValidator, input)) {\nreturn;\n}\n- const sanitizedInput = sanitizeInput(inputValidator, input);\n+ const sanitizedInput = input ? sanitizeInput(inputValidator, input) : null;\nthrow new ServerError('invalid_parameters', { input: sanitizedInput });\n}\n+function inputValid(viewer: Viewer, inputValidator: *, input: *) {\n+ if (inputValidator && !inputValidator.is(input)) {\n+ return false;\n+ }\n+ return true;\n+}\n+\nconst fakePassword = \"********\";\nfunction sanitizeInput(inputValidator: *, input: *) {\nif (!inputValidator) {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] validateInput is async function and takes Viewer now |
129,187 | 29.09.2018 19:56:49 | 14,400 | 86653b50e2c1af0326dd3576473cb20574d9bf15 | Logic to invalidate clients that are too old | [
{
"change_type": "MODIFY",
"old_path": "lib/shared/message-utils.js",
"new_path": "lib/shared/message-utils.js",
"diff": "@@ -622,7 +622,7 @@ function combineTruncationStatuses(\nfunction shimUnsupportedRawMessageInfos(\nrawMessageInfos: $ReadOnlyArray<RawMessageInfo>,\n- codeVersion: ?PlatformDetails,\n+ platformDetails: ?PlatformDetails,\n): RawMessageInfo[] {\nreturn [ ...rawMessageInfos ];\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/account/log-in-panel.react.js",
"new_path": "native/account/log-in-panel.react.js",
"diff": "@@ -20,6 +20,7 @@ import {\nAlert,\nKeyboard,\nAnimated,\n+ Platform,\n} from 'react-native';\nimport Icon from 'react-native-vector-icons/FontAwesome';\nimport invariant from 'invariant';\n@@ -264,6 +265,20 @@ class LogInPanel extends React.PureComponent<Props> {\n],\n{ cancelable: false },\n);\n+ } else if (e.message === 'client_version_unsupported') {\n+ const app = Platform.select({\n+ ios: \"Testflight\",\n+ android: \"Play Store\",\n+ });\n+ Alert.alert(\n+ \"App out of date\",\n+ \"Your app version is pretty old, and the server doesn't know how \" +\n+ `to speak to it anymore. Please use the ${app} app to update!`,\n+ [\n+ { text: 'OK', onPress: this.onAppOutOfDateAlertAcknowledged },\n+ ],\n+ { cancelable: false },\n+ );\n} else {\nAlert.alert(\n\"Unknown error\",\n@@ -305,6 +320,10 @@ class LogInPanel extends React.PureComponent<Props> {\n);\n}\n+ onAppOutOfDateAlertAcknowledged = () => {\n+ this.props.setActiveAlert(false);\n+ }\n+\nonPressOnePassword = async () => {\ntry {\nconst credentials = await OnePassword.findLogin(\"https://squadcal.org\");\n"
},
{
"change_type": "MODIFY",
"old_path": "native/account/register-panel.react.js",
"new_path": "native/account/register-panel.react.js",
"diff": "@@ -347,6 +347,20 @@ class RegisterPanel extends React.PureComponent<Props> {\n],\n{ cancelable: false },\n);\n+ } else if (e.message === 'client_version_unsupported') {\n+ const app = Platform.select({\n+ ios: \"Testflight\",\n+ android: \"Play Store\",\n+ });\n+ Alert.alert(\n+ \"App out of date\",\n+ \"Your app version is pretty old, and the server doesn't know how \" +\n+ `to speak to it anymore. Please use the ${app} app to update!`,\n+ [\n+ { text: 'OK', onPress: this.onAppOutOfDateAlertAcknowledged },\n+ ],\n+ { cancelable: false },\n+ );\n} else {\nAlert.alert(\n\"Unknown error\",\n@@ -377,6 +391,10 @@ class RegisterPanel extends React.PureComponent<Props> {\n);\n}\n+ onAppOutOfDateAlertAcknowledged = () => {\n+ this.props.setActiveAlert(false);\n+ }\n+\nonPressOnePassword = async () => {\ntry {\nconst credentials = await OnePassword.findLogin(\"https://squadcal.org\");\n"
},
{
"change_type": "MODIFY",
"old_path": "native/account/reset-password-panel.react.js",
"new_path": "native/account/reset-password-panel.react.js",
"diff": "@@ -17,6 +17,7 @@ import {\nKeyboard,\nView,\nText,\n+ Platform,\n} from 'react-native';\nimport invariant from 'invariant';\nimport OnePassword from 'react-native-onepassword';\n@@ -216,6 +217,21 @@ class ResetPasswordPanel extends React.PureComponent<Props, State> {\nthis.props.onSuccess();\nreturn result;\n} catch (e) {\n+ if (e.message === 'client_version_unsupported') {\n+ const app = Platform.select({\n+ ios: \"Testflight\",\n+ android: \"Play Store\",\n+ });\n+ Alert.alert(\n+ \"App out of date\",\n+ \"Your app version is pretty old, and the server doesn't know how \" +\n+ `to speak to it anymore. Please use the ${app} app to update!`,\n+ [\n+ { text: 'OK', onPress: this.onAppOutOfDateAlertAcknowledged },\n+ ],\n+ { cancelable: false },\n+ );\n+ } else {\nAlert.alert(\n\"Unknown error\",\n\"Uhh... try again?\",\n@@ -227,6 +243,11 @@ class ResetPasswordPanel extends React.PureComponent<Props, State> {\nthrow e;\n}\n}\n+ }\n+\n+ onAppOutOfDateAlertAcknowledged = () => {\n+ this.props.setActiveAlert(false);\n+ }\nonPressOnePassword = async () => {\ntry {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/navigation-setup.js",
"new_path": "native/navigation/navigation-setup.js",
"diff": "@@ -14,7 +14,7 @@ import type {\nNavigationRoute,\n} from 'react-navigation';\nimport type { AppState } from '../redux-setup';\n-import type { SessionChange } from 'lib/types/session-types';\n+import type { SetSessionPayload } from 'lib/types/session-types';\nimport type { NotificationPressPayload } from 'lib/shared/notif-utils';\nimport type { AndroidNotificationActions } from '../push/android';\nimport type { UserInfo } from 'lib/types/user-types';\n@@ -330,7 +330,7 @@ function reduceNavInfo(state: AppState, action: *): NavInfo {\n} else if (action.type === setNewSessionActionType) {\nreturn logOutIfCookieInvalidated(\nnavInfoState,\n- action.payload.sessionChange,\n+ action.payload,\n);\n} else if (action.type === leaveThreadActionTypes.success) {\nreturn {\n@@ -501,11 +501,27 @@ function resetNavInfoAndEnsureLoggedOutModalPresence(state: NavInfo): NavInfo {\nfunction logOutIfCookieInvalidated(\nstate: NavInfo,\n- payload: SessionChange,\n+ payload: SetSessionPayload,\n): NavInfo {\n- if (payload.cookieInvalidated) {\n+ if (!payload.sessionChange.cookieInvalidated) {\n+ return state;\n+ }\nconst newState = resetNavInfoAndEnsureLoggedOutModalPresence(state);\n- if (state !== newState) {\n+ if (state.navigationState === newState.navigationState) {\n+ return newState;\n+ }\n+ if (payload.error === \"client_version_unsupported\") {\n+ const app = Platform.select({\n+ ios: \"Testflight\",\n+ android: \"Play Store\",\n+ });\n+ Alert.alert(\n+ \"App out of date\",\n+ \"Your app version is pretty old, and the server doesn't know how to \" +\n+ `speak to it anymore. Please use the ${app} app to update!`,\n+ [ { text: 'OK' } ],\n+ );\n+ } else {\nAlert.alert(\n\"Session invalidated\",\n\"We're sorry, but your session was invalidated by the server. \" +\n@@ -515,8 +531,6 @@ function logOutIfCookieInvalidated(\n}\nreturn newState;\n}\n- return state;\n-}\nfunction popChatScreensForThreadID(\nstate: NavigationState,\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "server/src/session/version.js",
"diff": "+// @flow\n+\n+import type { PlatformDetails } from 'lib/types/device-types';\n+import type { Viewer } from '../session/viewer';\n+\n+import { ServerError } from 'lib/utils/errors';\n+\n+import { createNewAnonymousCookie } from './cookies';\n+import { deleteCookiesOnLogOut } from '../deleters/cookie-deleters';\n+\n+async function verifyClientSupported(\n+ viewer: Viewer,\n+ platformDetails: ?PlatformDetails,\n+) {\n+ if (clientSupported(platformDetails)) {\n+ return;\n+ }\n+ if (viewer.loggedIn) {\n+ const [ data ] = await Promise.all([\n+ createNewAnonymousCookie(platformDetails),\n+ deleteCookiesOnLogOut(viewer.userID, viewer.cookieID),\n+ ]);\n+ viewer.setNewCookie(data);\n+ viewer.cookieInvalidated = true;\n+ }\n+ throw new ServerError(\"client_version_unsupported\");\n+}\n+\n+function clientSupported(platformDetails: ?PlatformDetails): bool {\n+ // In the future when we decide to deprecate server support for an old client\n+ // version, we should update this function to return false for those clients\n+ return true;\n+}\n+\n+export {\n+ verifyClientSupported,\n+};\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/utils/validation-utils.js",
"new_path": "server/src/utils/validation-utils.js",
"diff": "@@ -6,19 +6,38 @@ import t from 'tcomb';\nimport { ServerError } from 'lib/utils/errors';\n-function validateInput(viewer: Viewer, inputValidator: *, input: *) {\n- if (inputValid(viewer, inputValidator, input)) {\n- return;\n+import { verifyClientSupported } from '../session/version';\n+\n+async function validateInput(viewer: Viewer, inputValidator: *, input: *) {\n+ let platformDetails;\n+ if (inputValidator) {\n+ platformDetails = findFirstInputMatchingValidator(\n+ inputValidator,\n+ tPlatformDetails,\n+ input,\n+ );\n+ }\n+ if (!platformDetails && inputValidator) {\n+ const platform = findFirstInputMatchingValidator(\n+ inputValidator,\n+ tPlatform,\n+ input,\n+ );\n+ if (platform) {\n+ platformDetails = { platform };\n}\n- const sanitizedInput = input ? sanitizeInput(inputValidator, input) : null;\n- throw new ServerError('invalid_parameters', { input: sanitizedInput });\n}\n+ if (!platformDetails) {\n+ ({ platformDetails } = viewer);\n+ }\n+ await verifyClientSupported(viewer, platformDetails);\n-function inputValid(viewer: Viewer, inputValidator: *, input: *) {\n- if (inputValidator && !inputValidator.is(input)) {\n- return false;\n+ if (!inputValidator || inputValidator.is(input)) {\n+ return;\n}\n- return true;\n+\n+ const sanitizedInput = input ? sanitizeInput(inputValidator, input) : null;\n+ throw new ServerError('invalid_parameters', { input: sanitizedInput });\n}\nconst fakePassword = \"********\";\n@@ -52,6 +71,74 @@ function sanitizeInput(inputValidator: *, input: *) {\nreturn result;\n}\n+function findFirstInputMatchingValidator(\n+ wholeInputValidator: *,\n+ inputValidatorToMatch: *,\n+ input: *,\n+): any {\n+ if (!wholeInputValidator || input === null || input === undefined) {\n+ return null;\n+ }\n+ if (\n+ wholeInputValidator === inputValidatorToMatch &&\n+ wholeInputValidator.is(input)\n+ ) {\n+ return input;\n+ }\n+ if (wholeInputValidator.meta.kind === \"maybe\") {\n+ return findFirstInputMatchingValidator(\n+ wholeInputValidator.meta.type,\n+ inputValidatorToMatch,\n+ input,\n+ );\n+ }\n+ if (\n+ wholeInputValidator.meta.kind === \"interface\" &&\n+ typeof input === \"object\"\n+ ) {\n+ for (let key in input) {\n+ const value = input[key];\n+ const validator = wholeInputValidator.meta.props[key];\n+ const innerResult = findFirstInputMatchingValidator(\n+ validator,\n+ inputValidatorToMatch,\n+ value,\n+ );\n+ if (innerResult) {\n+ return innerResult;\n+ }\n+ }\n+ }\n+ if (wholeInputValidator.meta.kind === \"union\") {\n+ for (let validator of wholeInputValidator.meta.types) {\n+ if (validator.is(input)) {\n+ return findFirstInputMatchingValidator(\n+ validator,\n+ inputValidatorToMatch,\n+ input,\n+ );\n+ }\n+ }\n+ }\n+ if (\n+ wholeInputValidator.meta.kind === \"list\" &&\n+ Array.isArray(input)\n+ ) {\n+ const validator = wholeInputValidator.meta.type;\n+ for (let value of input) {\n+ const innerResult = findFirstInputMatchingValidator(\n+ validator,\n+ inputValidatorToMatch,\n+ value,\n+ );\n+ if (innerResult) {\n+ return innerResult;\n+ }\n+ }\n+ }\n+ return null;\n+}\n+\nfunction tBool(value: bool) {\nreturn t.irreducible('literal bool', x => x === value);\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Logic to invalidate clients that are too old |
129,187 | 29.09.2018 21:11:16 | 14,400 | daac3de1e4d52b24f0f58938cfa85195233c69fd | [native] codeVersion -> 19 | [
{
"change_type": "MODIFY",
"old_path": "lib/facts/version.json",
"new_path": "lib/facts/version.json",
"diff": "{\n- \"currentCodeVersion\": 18\n+ \"currentCodeVersion\": 19\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/android/app/build.gradle",
"new_path": "native/android/app/build.gradle",
"diff": "@@ -109,8 +109,8 @@ android {\napplicationId \"org.squadcal\"\nminSdkVersion rootProject.ext.minSdkVersion\ntargetSdkVersion rootProject.ext.targetSdkVersion\n- versionCode 18\n- versionName \"0.0.18\"\n+ versionCode 19\n+ versionName \"0.0.19\"\nndk {\nabiFilters \"armeabi-v7a\", \"x86\"\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/android/app/src/main/AndroidManifest.xml",
"new_path": "native/android/app/src/main/AndroidManifest.xml",
"diff": "xmlns:android=\"http://schemas.android.com/apk/res/android\"\nxmlns:tools=\"http://schemas.android.com/tools\"\npackage=\"org.squadcal\"\n- android:versionCode=\"18\"\n- android:versionName=\"0.0.18\"\n+ android:versionCode=\"19\"\n+ android:versionName=\"0.0.19\"\n>\n<uses-permission android:name=\"android.permission.INTERNET\" />\n<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "native/ios/SquadCal/Info.plist",
"new_path": "native/ios/SquadCal/Info.plist",
"diff": "<key>CFBundlePackageType</key>\n<string>APPL</string>\n<key>CFBundleShortVersionString</key>\n- <string>0.0.18</string>\n+ <string>0.0.19</string>\n<key>CFBundleSignature</key>\n<string>????</string>\n<key>CFBundleVersion</key>\n- <string>18</string>\n+ <string>19</string>\n<key>LSApplicationQueriesSchemes</key>\n<array>\n<string>org-appextension-feature-password-management</string>\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] codeVersion -> 19 |
129,187 | 03.10.2018 11:35:45 | 14,400 | 583c606d5e6e7781302228853dd814214dea2b00 | [native] Fix up KeyboardAvoidingModal | [
{
"change_type": "MODIFY",
"old_path": "native/calendar/calendar.react.js",
"new_path": "native/calendar/calendar.react.js",
"diff": "@@ -58,7 +58,6 @@ import {\n} from 'lib/actions/entry-actions';\nimport { connect } from 'lib/utils/redux-utils';\nimport { registerFetchKey } from 'lib/reducers/loading-reducer';\n-import Modal from 'react-native-modal';\nimport { Entry, InternalEntry, entryStyles } from './entry.react';\nimport { contentVerticalOffset, windowHeight, tabBarSize } from '../dimensions';\n@@ -791,16 +790,11 @@ class InnerCalendar extends React.PureComponent<Props, State> {\ndisabled={this.state.threadPickerOpen}\n/>\n</KeyboardAvoidingView>\n- <Modal\n- isVisible={this.state.threadPickerOpen}\n- onBackButtonPress={this.closePicker}\n- onBackdropPress={this.closePicker}\n- >\n<ThreadPicker\n+ isVisible={this.state.threadPickerOpen}\ndateString={this.state.pendingNewEntryDateString}\nclose={this.closePicker}\n/>\n- </Modal>\n</SafeAreaView>\n);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/calendar/thread-picker.react.js",
"new_path": "native/calendar/thread-picker.react.js",
"diff": "@@ -25,11 +25,12 @@ import ThreadList from '../components/thread-list.react';\nimport KeyboardAvoidingModal from '../components/keyboard-avoiding-modal.react';\ntype Props = {\n+ isVisible: bool,\ndateString: ?string,\nclose: () => void,\n// Redux state\nonScreenThreadInfos: $ReadOnlyArray<ThreadInfo>,\n- viewerID: string,\n+ viewerID: ?string,\nthreadSearchIndex: SearchIndex,\n// Redux dispatch functions\ndispatchActionPayload: DispatchActionPayload,\n@@ -37,10 +38,11 @@ type Props = {\nclass ThreadPicker extends React.PureComponent<Props> {\nstatic propTypes = {\n+ isVisible: PropTypes.bool.isRequired,\ndateString: PropTypes.string,\nclose: PropTypes.func.isRequired,\nonScreenThreadInfos: PropTypes.arrayOf(threadInfoPropType).isRequired,\n- viewerID: PropTypes.string.isRequired,\n+ viewerID: PropTypes.string,\nthreadSearchIndex: PropTypes.instanceOf(SearchIndex).isRequired,\ndispatchActionPayload: PropTypes.func.isRequired,\n};\n@@ -48,6 +50,8 @@ class ThreadPicker extends React.PureComponent<Props> {\nrender() {\nreturn (\n<KeyboardAvoidingModal\n+ isVisible={this.props.isVisible}\n+ onClose={this.props.close}\ncontainerStyle={styles.container}\nstyle={styles.container}\n>\n@@ -63,12 +67,12 @@ class ThreadPicker extends React.PureComponent<Props> {\nthreadPicked = (threadID: string) => {\nthis.props.close();\n- const dateString = this.props.dateString;\n- invariant(dateString, \"should be set\");\n+ const { dateString, viewerID } = this.props;\n+ invariant(dateString && viewerID, \"should be set\");\nsetTimeout(\n() => this.props.dispatchActionPayload(\ncreateLocalEntryActionType,\n- createLocalEntry(threadID, dateString, this.props.viewerID),\n+ createLocalEntry(threadID, dateString, viewerID),\n),\nPlatform.OS === \"android\" ? 500 : 100,\n);\n@@ -94,15 +98,11 @@ const styles = StyleSheet.create({\n});\nexport default connect(\n- (state: AppState) => {\n- const viewerID = state.currentUserInfo && state.currentUserInfo.id;\n- invariant(viewerID, \"should have viewer ID in to use ThreadPicker\");\n- return {\n+ (state: AppState) => ({\nonScreenThreadInfos: onScreenEntryEditableThreadInfos(state),\n- viewerID,\n+ viewerID: state.currentUserInfo && state.currentUserInfo.id,\nthreadSearchIndex: threadSearchIndex(state),\n- };\n- },\n+ }),\nnull,\ntrue,\n)(ThreadPicker);\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/settings/add-users-modal.react.js",
"new_path": "native/chat/settings/add-users-modal.react.js",
"diff": "@@ -60,6 +60,7 @@ const tagInputProps = {\n};\ntype Props = {\n+ isVisible: bool,\nthreadInfo: ThreadInfo,\nclose: () => void,\n// Redux state\n@@ -83,6 +84,7 @@ type State = {|\nclass AddUsersModal extends React.PureComponent<Props, State> {\nstatic propTypes = {\n+ isVisible: PropTypes.bool.isRequired,\nthreadInfo: threadInfoPropType.isRequired,\nclose: PropTypes.func.isRequired,\nparentThreadInfo: threadInfoPropType,\n@@ -210,6 +212,8 @@ class AddUsersModal extends React.PureComponent<Props, State> {\nreturn (\n<KeyboardAvoidingModal\n+ isVisible={this.props.isVisible}\n+ onClose={this.props.close}\ncontainerStyle={styles.container}\nstyle={styles.modal}\n>\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/settings/thread-settings.react.js",
"new_path": "native/chat/settings/thread-settings.react.js",
"diff": "@@ -581,16 +581,11 @@ class InnerThreadSettings extends React.PureComponent<Props, State> {\ncontentContainerStyle={styles.flatList}\nrenderItem={this.renderItem}\n/>\n- <Modal\n- isVisible={this.state.showAddUsersModal}\n- onBackButtonPress={this.closeAddUsersModal}\n- onBackdropPress={this.closeAddUsersModal}\n- >\n<AddUsersModal\n+ isVisible={this.state.showAddUsersModal}\nthreadInfo={threadInfo}\nclose={this.closeAddUsersModal}\n/>\n- </Modal>\n<Modal\nisVisible={this.state.showComposeSubthreadModal}\nonBackButtonPress={this.closeComposeSubthreadModal}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/components/keyboard-avoiding-modal.react.js",
"new_path": "native/components/keyboard-avoiding-modal.react.js",
"diff": "@@ -5,10 +5,11 @@ import type { ViewStyle } from '../types/styles';\nimport * as React from 'react';\nimport { StyleSheet, View, ViewPropTypes } from 'react-native';\nimport PropTypes from 'prop-types';\n-\n-import KeyboardAvoidingView from './keyboard-avoiding-view.react';\n+import Modal from 'react-native-modal';\ntype Props = {|\n+ isVisible: bool,\n+ onClose: () => void,\nchildren?: React.Node,\nstyle?: ViewStyle,\ncontainerStyle?: ViewStyle,\n@@ -16,21 +17,26 @@ type Props = {|\nclass KeyboardAvoidingModal extends React.PureComponent<Props> {\nstatic propTypes = {\n+ isVisible: PropTypes.bool.isRequired,\n+ onClose: PropTypes.func.isRequired,\nchildren: PropTypes.node,\nstyle: ViewPropTypes.style,\ncontainerStyle: ViewPropTypes.style,\n};\nrender() {\n- const content = (\n+ return (\n+ <Modal\n+ isVisible={this.props.isVisible}\n+ onBackButtonPress={this.props.onClose}\n+ onBackdropPress={this.props.onClose}\n+ avoidKeyboard={true}\n+ style={[styles.container, this.props.containerStyle]}\n+ >\n<View style={[styles.modal, this.props.style]}>\n{this.props.children}\n</View>\n- );\n- return (\n- <KeyboardAvoidingView\n- style={[styles.container, this.props.containerStyle]}\n- >{content}</KeyboardAvoidingView>\n+ </Modal>\n);\n}\n@@ -39,7 +45,8 @@ class KeyboardAvoidingModal extends React.PureComponent<Props> {\nconst styles = StyleSheet.create({\ncontainer: {\nmarginHorizontal: 15,\n- marginTop: 100,\n+ marginTop: 50,\n+ marginBottom: 30,\n},\nmodal: {\npadding: 12,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/more/custom-server-selector.react.js",
"new_path": "native/more/custom-server-selector.react.js",
"diff": "@@ -13,7 +13,9 @@ import Button from '../components/button.react';\nimport KeyboardAvoidingModal from '../components/keyboard-avoiding-modal.react';\ntype Props = {|\n+ isVisible: bool,\ncurrentCustomServer: ?string,\n+ onClose: () => void,\nonCompleteInput: (customServer: string) => void,\n|};\ntype State = {|\n@@ -22,7 +24,9 @@ type State = {|\nclass CustomServerSelector extends React.PureComponent<Props, State> {\nstatic propTypes = {\n+ isVisible: PropTypes.bool.isRequired,\ncurrentCustomServer: PropTypes.string,\n+ onClose: PropTypes.func.isRequired,\nonCompleteInput: PropTypes.func.isRequired,\n};\n@@ -38,6 +42,8 @@ class CustomServerSelector extends React.PureComponent<Props, State> {\nrender() {\nreturn (\n<KeyboardAvoidingModal\n+ isVisible={this.props.isVisible}\n+ onClose={this.props.onClose}\ncontainerStyle={styles.container}\nstyle={styles.modal}\n>\n@@ -64,6 +70,7 @@ class CustomServerSelector extends React.PureComponent<Props, State> {\nonPressGo = () => {\nthis.props.onCompleteInput(this.state.customServer);\n+ this.props.onClose();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/more/dev-tools.react.js",
"new_path": "native/more/dev-tools.react.js",
"diff": "@@ -8,7 +8,6 @@ import { StyleSheet, View, Text, ScrollView, Platform } from 'react-native';\nimport ExitApp from 'react-native-exit-app';\nimport Icon from 'react-native-vector-icons/Ionicons';\nimport PropTypes from 'prop-types';\n-import Modal from 'react-native-modal';\nimport { connect } from 'lib/utils/redux-utils';\nimport { setURLPrefix } from 'lib/utils/url-utils';\n@@ -137,16 +136,12 @@ class InnerDevTools extends React.PureComponent<Props, State> {\n{serverButtons}\n</View>\n</ScrollView>\n- <Modal\n- isVisible={this.state.customServerModalOpen}\n- onBackButtonPress={this.closeCustomServerModal}\n- onBackdropPress={this.closeCustomServerModal}\n- >\n<CustomServerSelector\n+ isVisible={this.state.customServerModalOpen}\ncurrentCustomServer={this.props.customServer}\n+ onClose={this.closeCustomServerModal}\nonCompleteInput={this.onCompleteCustomServerInput}\n/>\n- </Modal>\n</View>\n);\n}\n@@ -186,7 +181,6 @@ class InnerDevTools extends React.PureComponent<Props, State> {\nif (customServer && customServer != this.props.customServer) {\nthis.props.dispatchActionPayload(setCustomServer, customServer);\n}\n- this.setState({ customServerModalOpen: false });\n}\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Fix up KeyboardAvoidingModal |
129,187 | 03.10.2018 17:03:09 | 14,400 | 7abc5cea10b2b5833a28a398d9089752131e3bff | [native] Specify isTransitioning when changing react-navigation state
Otherwise animations no longer work | [
{
"change_type": "MODIFY",
"old_path": "native/navigation/navigation-setup.js",
"new_path": "native/navigation/navigation-setup.js",
"diff": "@@ -46,7 +46,6 @@ import { pingActionTypes } from 'lib/actions/ping-actions';\nimport {\nleaveThreadActionTypes,\ndeleteThreadActionTypes,\n- joinThreadActionTypes,\nnewThreadActionTypes,\n} from 'lib/actions/thread-actions';\nimport { notificationPressActionType } from 'lib/shared/notif-utils';\n@@ -315,7 +314,10 @@ function reduceNavInfo(\nnavInfoState,\naction.payload,\n);\n- } else if (action.type === leaveThreadActionTypes.success) {\n+ } else if (\n+ action.type === leaveThreadActionTypes.success ||\n+ action.type === deleteThreadActionTypes.success\n+ ) {\nreturn {\nstartDate: navInfoState.startDate,\nendDate: navInfoState.endDate,\n@@ -389,6 +391,7 @@ function handleURL(\n},\n},\n],\n+ isTransitioning: true,\n};\n}\n@@ -440,12 +443,19 @@ function removeModals(\nstate: NavigationState,\nmodalRouteNames: string[],\n): NavigationState {\n- return removeScreensFromStack(\n+ const newState = removeScreensFromStack(\nstate,\n(route: NavigationRoute) => _includes(route.routeName)(modalRouteNames)\n? \"remove\"\n: \"keep\",\n);\n+ if (newState === state) {\n+ return state;\n+ }\n+ return {\n+ ...newState,\n+ isTransitioning: true,\n+ };\n}\nfunction resetNavInfoAndEnsureLoggedOutModalPresence(state: NavInfo): NavInfo {\n@@ -466,6 +476,7 @@ function resetNavInfoAndEnsureLoggedOutModalPresence(state: NavInfo): NavInfo {\nnavigationState: {\n...navigationState,\nindex: currentModalIndex,\n+ isTransitioning: true,\n},\n};\n}\n@@ -478,6 +489,7 @@ function resetNavInfoAndEnsureLoggedOutModalPresence(state: NavInfo): NavInfo {\n...navigationState.routes,\n{ key: 'LoggedOutModal', routeName: LoggedOutModalRouteName },\n],\n+ isTransitioning: true,\n},\n};\n}\n@@ -548,7 +560,11 @@ function popChatScreensForThreadID(\nnewAppSubRoutes[1] = newChatRoute;\nconst newRootSubRoutes = [ ...state.routes ];\nnewRootSubRoutes[0] = { ...appRoute, routes: newAppSubRoutes };\n- return { ...state, routes: newRootSubRoutes };\n+ return {\n+ ...state,\n+ routes: newRootSubRoutes,\n+ isTransitioning: true,\n+ };\n}\nfunction filterChatScreensForThreadInfos(\n@@ -583,7 +599,11 @@ function filterChatScreensForThreadInfos(\nnewAppSubRoutes[1] = newChatRoute;\nconst newRootSubRoutes = [ ...state.routes ];\nnewRootSubRoutes[0] = { ...appRoute, routes: newAppSubRoutes };\n- return { ...state, routes: newRootSubRoutes };\n+ return {\n+ ...state,\n+ routes: newRootSubRoutes,\n+ isTransitioning: true,\n+ };\n}\nfunction handleNewThread(\n@@ -617,7 +637,11 @@ function handleNewThread(\nnewAppSubRoutes[1] = newChatRoute;\nconst newRootSubRoutes = [ ...state.routes ];\nnewRootSubRoutes[0] = { ...appRoute, routes: newAppSubRoutes };\n- return { ...state, routes: newRootSubRoutes };\n+ return {\n+ ...state,\n+ routes: newRootSubRoutes,\n+ isTransitioning: true,\n+ };\n}\nfunction replaceChatStackWithThread(\n@@ -651,7 +675,11 @@ function replaceChatStackWithThread(\nnewAppSubRoutes[1] = newChatRoute;\nconst newRootSubRoutes = [ ...state.routes ];\nnewRootSubRoutes[0] = { ...appRoute, routes: newAppSubRoutes };\n- return { ...state, routes: newRootSubRoutes };\n+ return {\n+ ...state,\n+ routes: newRootSubRoutes,\n+ isTransitioning: true,\n+ };\n}\nfunction handleNotificationPress(\n@@ -707,7 +735,11 @@ function handleNotificationPress(\nnewAppSubRoutes[1] = newChatRoute;\nconst newRootSubRoutes = [ ...state.routes ];\nnewRootSubRoutes[0] = { ...appRoute, routes: newAppSubRoutes, index: 1 };\n- return { ...state, routes: newRootSubRoutes };\n+ return {\n+ ...state,\n+ routes: newRootSubRoutes,\n+ isTransitioning: true,\n+ };\n}\nexport {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Specify isTransitioning when changing react-navigation state
Otherwise animations no longer work |
129,187 | 03.10.2018 20:01:32 | 14,400 | 1ee541df250b00fce4516c0039f4f1c39726a51c | [native] Use react-navigation-stack transparentCard | [
{
"change_type": "MODIFY",
"old_path": "native/calendar/calendar.react.js",
"new_path": "native/calendar/calendar.react.js",
"diff": "@@ -1095,6 +1095,7 @@ const styles = StyleSheet.create({\n},\ncontainer: {\nflex: 1,\n+ backgroundColor: '#E9E9EF',\n},\nflatList: {\nflex: 1,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/react-navigation_v2.x.x.js",
"new_path": "native/flow-typed/npm/react-navigation_v2.x.x.js",
"diff": "@@ -401,6 +401,7 @@ declare module 'react-navigation' {\ntransitionConfig?: () => TransitionConfig,\nonTransitionStart?: () => void,\nonTransitionEnd?: () => void,\n+ transparentCard?: bool,\n|};\ndeclare export type StackNavigatorConfig = {|\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/navigation-setup.js",
"new_path": "native/navigation/navigation-setup.js",
"diff": "@@ -211,6 +211,10 @@ const RootNavigator = createStackNavigator(\n{\nheaderMode: 'none',\nmode: 'modal',\n+ transparentCard: true,\n+ cardStyle: {\n+ opacity: 1,\n+ },\n},\n);\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Use react-navigation-stack transparentCard |
129,187 | 03.10.2018 20:06:21 | 14,400 | dcd83cd4ff2b41bc202dc94654c982bec9b5099a | [native] Refactor ThreadPicker
1. Introducing `Modal`, which uses `react-navigation` to replace `react-native-modal`
2. No longer need the hack to avoid `keyboardDismissMode="on-drag"` on Android | [
{
"change_type": "MODIFY",
"old_path": "native/calendar/calendar.react.js",
"new_path": "native/calendar/calendar.react.js",
"diff": "@@ -62,11 +62,13 @@ import { registerFetchKey } from 'lib/reducers/loading-reducer';\nimport { Entry, InternalEntry, entryStyles } from './entry.react';\nimport { contentVerticalOffset, windowHeight, tabBarSize } from '../dimensions';\nimport { calendarListData } from '../selectors/calendar-selectors';\n-import { createActiveTabSelector } from '../selectors/nav-selectors';\n+import {\n+ createIsForegroundSelector,\n+ createActiveTabSelector,\n+} from '../selectors/nav-selectors';\nimport TextHeightMeasurer from '../text-height-measurer.react';\nimport ListLoadingIndicator from '../list-loading-indicator.react';\nimport SectionFooter from './section-footer.react';\n-import ThreadPicker from './thread-picker.react';\nimport CalendarInputBar from './calendar-input-bar.react';\nimport {\naddKeyboardShowListener,\n@@ -74,7 +76,10 @@ import {\nremoveKeyboardListener,\n} from '../keyboard';\nimport KeyboardAvoidingView from '../components/keyboard-avoiding-view.react';\n-import { CalendarRouteName } from '../navigation/route-names';\n+import {\n+ CalendarRouteName,\n+ ThreadPickerModalRouteName,\n+} from '../navigation/route-names';\nexport type EntryInfoWithHeight = {|\n...EntryInfo,\n@@ -109,6 +114,7 @@ type Props = {\n// Redux state\nlistData: ?$ReadOnlyArray<CalendarItem>,\ntabActive: bool,\n+ threadPickerOpen: bool,\nstartDate: string,\nendDate: string,\ncalendarFilters: $ReadOnlyArray<CalendarFilter>,\n@@ -124,10 +130,7 @@ type State = {\ntextToMeasure: TextToMeasure[],\nlistDataWithHeights: ?$ReadOnlyArray<CalendarItemWithHeight>,\nreadyToShowList: bool,\n- threadPickerOpen: bool,\n- pendingNewEntryDateString: ?string,\nextraData: ExtraData,\n- scrollToOffsetAfterSuppressingKeyboardDismissal: ?number,\n};\nclass InnerCalendar extends React.PureComponent<Props, State> {\n@@ -154,6 +157,7 @@ class InnerCalendar extends React.PureComponent<Props, State> {\n}),\n])),\ntabActive: PropTypes.bool.isRequired,\n+ threadPickerOpen: PropTypes.bool.isRequired,\nstartDate: PropTypes.string.isRequired,\nendDate: PropTypes.string.isRequired,\ncalendarFilters: PropTypes.arrayOf(calendarFilterPropType).isRequired,\n@@ -217,10 +221,7 @@ class InnerCalendar extends React.PureComponent<Props, State> {\ntextToMeasure,\nlistDataWithHeights: null,\nreadyToShowList: false,\n- threadPickerOpen: false,\n- pendingNewEntryDateString: null,\nextraData: this.latestExtraData,\n- scrollToOffsetAfterSuppressingKeyboardDismissal: null,\n};\ncurrentCalendarRef = this;\n}\n@@ -410,29 +411,6 @@ class InnerCalendar extends React.PureComponent<Props, State> {\n}\ncomponentDidUpdate(prevProps: Props, prevState: State) {\n- // On Android, if the keyboardDismissMode is set to \"on-drag\", our attempt\n- // to scroll the FlatList to avoid the keyboard when the keyboard is being\n- // shown can cause the keyboard to immediately get dismissed. To avoid this,\n- // we make sure to temporarily set the keyboardDismissMode to \"none\" when\n- // doing this scroll. Only after that do we execute the scroll, and we make\n- // sure to reset keyboardDismissMode 0.5s after the scroll starts.\n- const newOffset =\n- this.state.scrollToOffsetAfterSuppressingKeyboardDismissal;\n- const oldOffset = prevState.scrollToOffsetAfterSuppressingKeyboardDismissal;\n- if (\n- (newOffset !== undefined && newOffset !== null) &&\n- (oldOffset === undefined || oldOffset === null)\n- ) {\n- invariant(this.flatList, \"flatList should be set\");\n- this.flatList.scrollToOffset({ offset: newOffset, animated: true });\n- setTimeout(\n- () => this.setState({\n- scrollToOffsetAfterSuppressingKeyboardDismissal: null,\n- }),\n- 500,\n- );\n- }\n-\nconst lastLDWH = prevState.listDataWithHeights;\nconst newLDWH = this.state.listDataWithHeights;\nif (!lastLDWH || !newLDWH) {\n@@ -628,12 +606,12 @@ class InnerCalendar extends React.PureComponent<Props, State> {\nconst key = entryKey(item.entryInfo);\nreturn (\n<Entry\n+ navigation={this.props.navigation}\nentryInfo={item.entryInfo}\nactive={!!this.state.extraData.activeEntries[key]}\nvisible={!!this.state.extraData.visibleEntries[key]}\nmakeActive={this.makeActive}\nonEnterEditMode={this.onEnterEntryEditMode}\n- navigate={this.props.navigation.navigate}\nonPressWhitespace={this.makeAllEntriesInactive}\nentryRef={this.entryRef}\n/>\n@@ -675,11 +653,10 @@ class InnerCalendar extends React.PureComponent<Props, State> {\n}\nonAdd = (dayString: string) => {\n- Keyboard.dismiss();\n- this.setState({\n- threadPickerOpen: true,\n- pendingNewEntryDateString: dayString,\n- });\n+ this.props.navigation.navigate(\n+ ThreadPickerModalRouteName,\n+ { dateString: dayString },\n+ );\n}\nstatic keyExtractor = (item: CalendarItemWithHeight) => {\n@@ -734,12 +711,6 @@ class InnerCalendar extends React.PureComponent<Props, State> {\nconst flatListStyle = { opacity: this.state.readyToShowList ? 1 : 0 };\nconst initialScrollIndex =\nInnerCalendar.initialScrollIndex(listDataWithHeights);\n- const pendingScrollOffset =\n- this.state.scrollToOffsetAfterSuppressingKeyboardDismissal;\n- const keyboardDismissMode =\n- pendingScrollOffset !== null && pendingScrollOffset !== undefined\n- ? \"none\"\n- : \"on-drag\";\nflatList = (\n<FlatList\ndata={listDataWithHeights}\n@@ -750,7 +721,7 @@ class InnerCalendar extends React.PureComponent<Props, State> {\nonScroll={this.onScroll}\ninitialScrollIndex={initialScrollIndex}\nkeyboardShouldPersistTaps=\"handled\"\n- keyboardDismissMode={keyboardDismissMode}\n+ keyboardDismissMode=\"on-drag\"\nonMomentumScrollEnd={this.onMomentumScrollEnd}\nonScrollEndDrag={this.onScrollEndDrag}\nscrollsToTop={false}\n@@ -787,14 +758,9 @@ class InnerCalendar extends React.PureComponent<Props, State> {\n{flatList}\n<CalendarInputBar\nonSave={this.onSaveEntry}\n- disabled={this.state.threadPickerOpen}\n+ disabled={this.props.threadPickerOpen}\n/>\n</KeyboardAvoidingView>\n- <ThreadPicker\n- isVisible={this.state.threadPickerOpen}\n- dateString={this.state.pendingNewEntryDateString}\n- close={this.closePicker}\n- />\n</SafeAreaView>\n);\n}\n@@ -914,6 +880,9 @@ class InnerCalendar extends React.PureComponent<Props, State> {\n(item: CalendarItemWithHeight) =>\nInnerCalendar.keyExtractor(item) === lastEntryKeyActive,\n)(data);\n+ if (index === null || index === undefined) {\n+ return;\n+ }\nconst itemStart = InnerCalendar.heightOfItems(\ndata.filter((_, i) => i < index),\n);\n@@ -935,15 +904,6 @@ class InnerCalendar extends React.PureComponent<Props, State> {\nreturn;\n}\nconst offset = itemStart - (visibleHeight - itemHeight) / 2;\n- if (Platform.OS === \"android\") {\n- // On Android, we need to wait for the keyboardDismissMode to be updated\n- // before executing this scroll. See the comment in componentDidUpdate for\n- // more details\n- this.setState({\n- scrollToOffsetAfterSuppressingKeyboardDismissal: offset,\n- });\n- return;\n- }\ninvariant(this.flatList, \"flatList should be set\");\nthis.flatList.scrollToOffset({ offset, animated: true });\n}\n@@ -1070,11 +1030,6 @@ class InnerCalendar extends React.PureComponent<Props, State> {\n);\n}\n- closePicker = () => {\n- LayoutAnimation.easeInEaseOut();\n- this.setState({ threadPickerOpen: false });\n- }\n-\nonSaveEntry = () => {\nconst entryKeys = Object.keys(this.latestExtraData.activeEntries);\nif (entryKeys.length === 0) {\n@@ -1133,10 +1088,13 @@ const styles = StyleSheet.create({\nregisterFetchKey(updateCalendarQueryActionTypes);\nconst activeTabSelector = createActiveTabSelector(CalendarRouteName);\n+const activeThreadPickerSelector =\n+ createIsForegroundSelector(ThreadPickerModalRouteName);\nconst Calendar = connect(\n(state: AppState) => ({\nlistData: calendarListData(state),\n- tabActive: activeTabSelector(state),\n+ tabActive: activeTabSelector(state) || activeThreadPickerSelector(state),\n+ threadPickerOpen: activeThreadPickerSelector(state),\nstartDate: state.navInfo.startDate,\nendDate: state.navInfo.endDate,\ncalendarFilters: state.calendarFilters,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/calendar/entry.react.js",
"new_path": "native/calendar/entry.react.js",
"diff": "@@ -20,8 +20,8 @@ import type {\n} from 'lib/utils/action-utils';\nimport type { LoadingStatus } from 'lib/types/loading-types';\nimport type {\n- NavigationParams,\n- NavigationNavigateAction,\n+ NavigationScreenProp,\n+ NavigationRoute,\n} from 'react-navigation';\nimport * as React from 'react';\n@@ -65,25 +65,30 @@ import { dateString } from 'lib/utils/date-utils';\nimport { nonThreadCalendarQuery } from 'lib/selectors/nav-selectors';\nimport Button from '../components/button.react';\n-import { MessageListRouteName, ChatRouteName } from '../navigation/route-names';\n+import {\n+ MessageListRouteName,\n+ ChatRouteName,\n+ ThreadPickerModalRouteName,\n+} from '../navigation/route-names';\n+import {\n+ createIsForegroundSelector,\n+ foregroundKeySelector,\n+} from '../selectors/nav-selectors';\ntype Props = {\n+ navigation: NavigationScreenProp<NavigationRoute>,\nentryInfo: EntryInfoWithHeight,\nvisible: bool,\nactive: bool,\nmakeActive: (entryKey: string, active: bool) => void,\nonEnterEditMode: (entryInfo: EntryInfoWithHeight) => void,\n- navigate: ({\n- routeName: string,\n- params?: NavigationParams,\n- action?: NavigationNavigateAction,\n- key?: string,\n- }) => bool,\nonPressWhitespace: () => void,\nentryRef: (entryKey: string, entry: ?InternalEntry) => void,\n// Redux state\nthreadInfo: ThreadInfo,\ncalendarQuery: () => CalendarQuery,\n+ threadPickerActive: bool,\n+ foregroundKey: string,\n// Redux dispatch functions\ndispatchActionPayload: DispatchActionPayload,\ndispatchActionPromise: DispatchActionPromise,\n@@ -102,16 +107,21 @@ type State = {|\nclass InternalEntry extends React.Component<Props, State> {\nstatic propTypes = {\n+ navigation: PropTypes.shape({\n+ navigate: PropTypes.func.isRequired,\n+ goBack: PropTypes.func.isRequired,\n+ }).isRequired,\nentryInfo: entryInfoPropType.isRequired,\nvisible: PropTypes.bool.isRequired,\nactive: PropTypes.bool.isRequired,\nmakeActive: PropTypes.func.isRequired,\nonEnterEditMode: PropTypes.func.isRequired,\n- navigate: PropTypes.func.isRequired,\nonPressWhitespace: PropTypes.func.isRequired,\nentryRef: PropTypes.func.isRequired,\nthreadInfo: threadInfoPropType.isRequired,\ncalendarQuery: PropTypes.func.isRequired,\n+ threadPickerActive: PropTypes.bool.isRequired,\n+ foregroundKey: PropTypes.string.isRequired,\ndispatchActionPayload: PropTypes.func.isRequired,\ndispatchActionPromise: PropTypes.func.isRequired,\ncreateEntry: PropTypes.func.isRequired,\n@@ -375,18 +385,30 @@ class InternalEntry extends React.Component<Props, State> {\ntextInputRef = (textInput: ?TextInput) => {\nthis.textInput = textInput;\nif (textInput && InternalEntry.isEditing(this.props, this.state)) {\n- this.enterEditMode(textInput);\n+ this.enterEditMode();\n}\n}\n- enterEditMode = (textInput: TextInput) => {\n+ enterEditMode = () => {\nthis.setActive();\nthis.props.onEnterEditMode(this.props.entryInfo);\n- // For some reason if we don't do this the keyboard immediately dismisses\n- // after focus\n- InteractionManager.runAfterInteractions(() => {\n- setTimeout(textInput.focus);\n- });\n+ if (Platform.OS !== \"android\") {\n+ this.focus();\n+ } else {\n+ // For some reason if we don't do this the scroll stops halfway through\n+ InteractionManager.runAfterInteractions(() => setTimeout(this.focus));\n+ }\n+ }\n+\n+ focus = () => {\n+ const { textInput } = this;\n+ if (!textInput) {\n+ return;\n+ }\n+ textInput.focus();\n+ if (this.props.threadPickerActive) {\n+ this.props.navigation.goBack(this.props.foregroundKey);\n+ }\n}\nsetActive = () => this.props.makeActive(entryKey(this.props.entryInfo), true);\n@@ -579,7 +601,7 @@ class InternalEntry extends React.Component<Props, State> {\nonPressThreadName = () => {\nKeyboard.dismiss();\nconst threadInfo = this.props.threadInfo;\n- this.props.navigate({\n+ this.props.navigation.navigate({\nrouteName: ChatRouteName,\nparams: {},\naction: NavigationActions.navigate({\n@@ -675,11 +697,15 @@ const styles = StyleSheet.create({\nregisterFetchKey(saveEntryActionTypes);\nregisterFetchKey(deleteEntryActionTypes);\n+const activeThreadPickerSelector =\n+ createIsForegroundSelector(ThreadPickerModalRouteName);\nconst Entry = connect(\n(state: AppState, ownProps: { entryInfo: EntryInfoWithHeight }) => ({\nthreadInfo: threadInfoSelector(state)[ownProps.entryInfo.threadID],\ncalendarQuery: nonThreadCalendarQuery(state),\n+ threadPickerActive: activeThreadPickerSelector(state),\n+ foregroundKey: foregroundKeySelector(state),\n}),\n{ createEntry, saveEntry, deleteEntry },\n)(InternalEntry);\n"
},
{
"change_type": "RENAME",
"old_path": "native/calendar/thread-picker.react.js",
"new_path": "native/calendar/thread-picker-modal.react.js",
"diff": "@@ -4,10 +4,14 @@ import type { AppState } from '../redux-setup';\nimport type { ThreadInfo } from 'lib/types/thread-types';\nimport { threadInfoPropType } from 'lib/types/thread-types';\nimport type { DispatchActionPayload } from 'lib/utils/action-utils';\n+import type {\n+ NavigationScreenProp,\n+ NavigationLeafRoute,\n+} from 'react-navigation';\nimport React from 'react';\nimport PropTypes from 'prop-types';\n-import { View, Text, StyleSheet, Platform } from 'react-native';\n+import { StyleSheet } from 'react-native';\nimport invariant from 'invariant';\nimport {\n@@ -21,13 +25,13 @@ import { threadSearchIndex } from 'lib/selectors/nav-selectors';\nimport SearchIndex from 'lib/shared/search-index';\nimport { connect } from 'lib/utils/redux-utils';\n+import Modal from '../components/modal.react';\nimport ThreadList from '../components/thread-list.react';\n-import KeyboardAvoidingModal from '../components/keyboard-avoiding-modal.react';\ntype Props = {\n- isVisible: bool,\n- dateString: ?string,\n- close: () => void,\n+ navigation:\n+ & { state: { params: { dateString: string } } }\n+ & NavigationScreenProp<NavigationLeafRoute>,\n// Redux state\nonScreenThreadInfos: $ReadOnlyArray<ThreadInfo>,\nviewerID: ?string,\n@@ -35,12 +39,16 @@ type Props = {\n// Redux dispatch functions\ndispatchActionPayload: DispatchActionPayload,\n};\n-class ThreadPicker extends React.PureComponent<Props> {\n+class ThreadPickerModal extends React.PureComponent<Props> {\nstatic propTypes = {\n- isVisible: PropTypes.bool.isRequired,\n- dateString: PropTypes.string,\n- close: PropTypes.func.isRequired,\n+ navigation: PropTypes.shape({\n+ state: PropTypes.shape({\n+ params: PropTypes.shape({\n+ dateString: PropTypes.string.isRequired,\n+ }).isRequired,\n+ }).isRequired,\n+ }).isRequired,\nonScreenThreadInfos: PropTypes.arrayOf(threadInfoPropType).isRequired,\nviewerID: PropTypes.string,\nthreadSearchIndex: PropTypes.instanceOf(SearchIndex).isRequired,\n@@ -49,41 +57,30 @@ class ThreadPicker extends React.PureComponent<Props> {\nrender() {\nreturn (\n- <KeyboardAvoidingModal\n- isVisible={this.props.isVisible}\n- onClose={this.props.close}\n- containerStyle={styles.container}\n- style={styles.container}\n- >\n+ <Modal navigation={this.props.navigation}>\n<ThreadList\nthreadInfos={this.props.onScreenThreadInfos}\nonSelect={this.threadPicked}\nitemStyle={styles.threadListItem}\nsearchIndex={this.props.threadSearchIndex}\n/>\n- </KeyboardAvoidingModal>\n+ </Modal>\n);\n}\nthreadPicked = (threadID: string) => {\n- this.props.close();\n- const { dateString, viewerID } = this.props;\n+ const { viewerID } = this.props;\n+ const { dateString } = this.props.navigation.state.params;\ninvariant(dateString && viewerID, \"should be set\");\n- setTimeout(\n- () => this.props.dispatchActionPayload(\n+ this.props.dispatchActionPayload(\ncreateLocalEntryActionType,\ncreateLocalEntry(threadID, dateString, viewerID),\n- ),\n- Platform.OS === \"android\" ? 500 : 100,\n);\n}\n}\nconst styles = StyleSheet.create({\n- container: {\n- flex: 1,\n- },\nheaderText: {\nfontSize: 24,\ntextAlign: 'center',\n@@ -105,4 +102,4 @@ export default connect(\n}),\nnull,\ntrue,\n-)(ThreadPicker);\n+)(ThreadPickerModal);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "native/components/modal.react.js",
"diff": "+// @flow\n+\n+import type {\n+ NavigationScreenProp,\n+ NavigationLeafRoute,\n+} from 'react-navigation';\n+\n+import * as React from 'react';\n+import {\n+ StyleSheet,\n+ View,\n+ TouchableWithoutFeedback,\n+} from 'react-native';\n+import PropTypes from 'prop-types';\n+\n+import KeyboardAvoidingView from './keyboard-avoiding-view.react';\n+\n+type Props = $ReadOnly<{|\n+ navigation: NavigationScreenProp<NavigationLeafRoute>,\n+ children: React.Node,\n+|}>;\n+class Modal extends React.PureComponent<Props> {\n+\n+ static propTypes = {\n+ children: PropTypes.node,\n+ navigation: PropTypes.shape({\n+ goBack: PropTypes.func.isRequired,\n+ }).isRequired,\n+ };\n+\n+ render() {\n+ return (\n+ <KeyboardAvoidingView style={styles.container}>\n+ <TouchableWithoutFeedback onPress={this.onPressBackdrop}>\n+ <View style={styles.backdrop} />\n+ </TouchableWithoutFeedback>\n+ <View style={styles.modal}>\n+ {this.props.children}\n+ </View>\n+ </KeyboardAvoidingView>\n+ );\n+ }\n+\n+ onPressBackdrop = () => {\n+ this.props.navigation.goBack();\n+ }\n+\n+}\n+\n+const styles = StyleSheet.create({\n+ container: {\n+ flex: 1,\n+ justifyContent: \"center\",\n+ },\n+ backdrop: {\n+ position: \"absolute\",\n+ top: 0,\n+ bottom: 0,\n+ left: 0,\n+ right: 0,\n+ opacity: 0,\n+ },\n+ modal: {\n+ flex: 1,\n+ justifyContent: \"center\",\n+ padding: 12,\n+ borderRadius: 5,\n+ backgroundColor: '#EEEEEE',\n+ marginHorizontal: 15,\n+ marginTop: 100,\n+ marginBottom: 30,\n+ },\n+});\n+\n+export default Modal;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/navigation-setup.js",
"new_path": "native/navigation/navigation-setup.js",
"diff": "@@ -75,11 +75,13 @@ import {\nChatRouteName,\nChatThreadListRouteName,\nCalendarRouteName,\n+ ThreadPickerModalRouteName,\n} from './route-names';\nimport {\nhandleURLActionType,\nnavigateToAppActionType,\n} from './action-types';\n+import ThreadPickerModal from '../calendar/thread-picker-modal.react';\nexport type NavInfo = {|\n...$Exact<BaseNavInfo>,\n@@ -207,6 +209,7 @@ const RootNavigator = createStackNavigator(\n[LoggedOutModalRouteName]: { screen: LoggedOutModal },\n[VerificationModalRouteName]: { screen: VerificationModal },\n[AppRouteName]: { screen: ReduxWrappedAppNavigator },\n+ [ThreadPickerModalRouteName]: { screen: ThreadPickerModal },\n},\n{\nheaderMode: 'none',\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/route-names.js",
"new_path": "native/navigation/route-names.js",
"diff": "@@ -17,3 +17,4 @@ export const DeleteAccountRouteName = 'DeleteAccount';\nexport const DevToolsRouteName = 'DevTools';\nexport const EditEmailRouteName = 'EditEmail';\nexport const EditPasswordRouteName = 'EditPassword';\n+export const ThreadPickerModalRouteName = 'ThreadPickerModal';\n"
},
{
"change_type": "MODIFY",
"old_path": "native/selectors/nav-selectors.js",
"new_path": "native/selectors/nav-selectors.js",
"diff": "@@ -25,6 +25,12 @@ const baseCreateIsForegroundSelector = (routeName: string) => createSelector(\n);\nconst createIsForegroundSelector = _memoize(baseCreateIsForegroundSelector);\n+const foregroundKeySelector = createSelector(\n+ (state: AppState) => state.navInfo.navigationState,\n+ (navigationState: NavigationState) =>\n+ navigationState.routes[navigationState.index].key,\n+);\n+\nconst baseCreateActiveTabSelector = (routeName: string) => createSelector(\n(state: AppState) => state.navInfo.navigationState,\n(navigationState: NavigationState) => {\n@@ -64,6 +70,7 @@ const activeThreadSelector = createSelector(\nexport {\ncreateIsForegroundSelector,\n+ foregroundKeySelector,\ncreateActiveTabSelector,\nactiveThreadSelector,\n};\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Refactor ThreadPicker
1. Introducing `Modal`, which uses `react-navigation` to replace `react-native-modal`
2. No longer need the hack to avoid `keyboardDismissMode="on-drag"` on Android |
129,187 | 03.10.2018 20:11:47 | 14,400 | 97f0901b11d5952dcd1e7ce38ea7441ea8604377 | [native] Stop using iosKeyboardOffset in KeyboardAvoidingView
This hack doesn't seem to be necessary on the current version of things. | [
{
"change_type": "MODIFY",
"old_path": "native/components/keyboard-avoiding-view.react.js",
"new_path": "native/components/keyboard-avoiding-view.react.js",
"diff": "@@ -15,8 +15,6 @@ import {\nimport PropTypes from 'prop-types';\nimport _isEqual from 'lodash/fp/isEqual';\n-import { iosKeyboardOffset } from '../dimensions';\n-\ntype ViewLayout = {\ny: number,\nheight: number,\n@@ -52,7 +50,7 @@ class KeyboardAvoidingView extends React.PureComponent<Props, State> {\nkeyboardVerticalOffset: PropTypes.number.isRequired,\n};\nstatic defaultProps = {\n- keyboardVerticalOffset: iosKeyboardOffset,\n+ keyboardVerticalOffset: 0,\n};\nstate = {\nbottom: 0,\n@@ -62,7 +60,7 @@ class KeyboardAvoidingView extends React.PureComponent<Props, State> {\ncurrentState = AppState.currentState;\nrelativeKeyboardHeight(keyboardFrame: ScreenRect): number {\n- const frame = this.frame;\n+ const { frame } = this;\nif (!frame || !keyboardFrame) {\nreturn 0;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/dimensions.js",
"new_path": "native/dimensions.js",
"diff": "@@ -18,14 +18,11 @@ if (Platform.OS === \"ios\") {\ncontentVerticalOffset = DeviceInfo.isIPhoneX_deprecated ? 44 : 20;\n}\n-const iosKeyboardOffset = DeviceInfo.isIPhoneX_deprecated ? 89 : 65;\n-\nconst tabBarSize = Platform.OS === \"android\" ? 50 : 49;\nexport {\nwindowHeight,\nwindowWidth,\ncontentVerticalOffset,\n- iosKeyboardOffset,\ntabBarSize,\n};\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Stop using iosKeyboardOffset in KeyboardAvoidingView
This hack doesn't seem to be necessary on the current version of things. |
129,187 | 03.10.2018 20:48:04 | 14,400 | 45928d7be9e28053741e30a24628d1abde21471c | [server] Fix Android back button behavior | [
{
"change_type": "MODIFY",
"old_path": "native/calendar/thread-picker-modal.react.js",
"new_path": "native/calendar/thread-picker-modal.react.js",
"diff": "@@ -25,8 +25,9 @@ import { threadSearchIndex } from 'lib/selectors/nav-selectors';\nimport SearchIndex from 'lib/shared/search-index';\nimport { connect } from 'lib/utils/redux-utils';\n-import Modal from '../components/modal.react';\n+import { createModal } from '../components/modal.react';\nimport ThreadList from '../components/thread-list.react';\n+import { ThreadPickerModalRouteName } from '../navigation/route-names';\ntype Props = {\nnavigation:\n@@ -39,6 +40,7 @@ type Props = {\n// Redux dispatch functions\ndispatchActionPayload: DispatchActionPayload,\n};\n+const Modal = createModal(ThreadPickerModalRouteName);\nclass ThreadPickerModal extends React.PureComponent<Props> {\nstatic propTypes = {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/components/modal.react.js",
"new_path": "native/components/modal.react.js",
"diff": "@@ -4,20 +4,26 @@ import type {\nNavigationScreenProp,\nNavigationLeafRoute,\n} from 'react-navigation';\n+import type { AppState } from '../redux-setup';\nimport * as React from 'react';\nimport {\nStyleSheet,\nView,\nTouchableWithoutFeedback,\n+ BackHandler,\n} from 'react-native';\nimport PropTypes from 'prop-types';\n+import { connect } from 'lib/utils/redux-utils';\nimport KeyboardAvoidingView from './keyboard-avoiding-view.react';\n+import { createIsForegroundSelector } from '../selectors/nav-selectors';\ntype Props = $ReadOnly<{|\nnavigation: NavigationScreenProp<NavigationLeafRoute>,\nchildren: React.Node,\n+ // Redux state\n+ isForeground: bool,\n|}>;\nclass Modal extends React.PureComponent<Props> {\n@@ -26,12 +32,50 @@ class Modal extends React.PureComponent<Props> {\nnavigation: PropTypes.shape({\ngoBack: PropTypes.func.isRequired,\n}).isRequired,\n+ isForeground: PropTypes.bool.isRequired,\n};\n+ componentDidMount() {\n+ if (this.props.isForeground) {\n+ this.onForeground();\n+ }\n+ }\n+\n+ componentWillUnmount() {\n+ if (this.props.isForeground) {\n+ this.onBackground();\n+ }\n+ }\n+\n+ componentWillReceiveProps(nextProps: Props) {\n+ if (!this.props.isForeground && nextProps.isForeground) {\n+ this.onForeground();\n+ } else if (this.props.isForeground && !nextProps.isForeground) {\n+ this.onBackground();\n+ }\n+ }\n+\n+ onForeground() {\n+ BackHandler.addEventListener('hardwareBackPress', this.hardwareBack);\n+ }\n+\n+ onBackground() {\n+ BackHandler.removeEventListener('hardwareBackPress', this.hardwareBack);\n+ }\n+\n+ hardwareBack = () => {\n+ this.close();\n+ return true;\n+ }\n+\n+ close = () => {\n+ this.props.navigation.goBack();\n+ }\n+\nrender() {\nreturn (\n<KeyboardAvoidingView style={styles.container}>\n- <TouchableWithoutFeedback onPress={this.onPressBackdrop}>\n+ <TouchableWithoutFeedback onPress={this.close}>\n<View style={styles.backdrop} />\n</TouchableWithoutFeedback>\n<View style={styles.modal}>\n@@ -41,10 +85,6 @@ class Modal extends React.PureComponent<Props> {\n);\n}\n- onPressBackdrop = () => {\n- this.props.navigation.goBack();\n- }\n-\n}\nconst styles = StyleSheet.create({\n@@ -72,4 +112,13 @@ const styles = StyleSheet.create({\n},\n});\n-export default Modal;\n+function createModal(routeName: string) {\n+ const isForegroundSelector = createIsForegroundSelector(routeName);\n+ return connect((state: AppState) => ({\n+ isForeground: isForegroundSelector(state),\n+ }))(Modal);\n+}\n+\n+export {\n+ createModal,\n+};\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/navigation-setup.js",
"new_path": "native/navigation/navigation-setup.js",
"diff": "@@ -57,7 +57,10 @@ import Chat from '../chat/chat.react';\nimport More from '../more/more.react';\nimport LoggedOutModal from '../account/logged-out-modal.react';\nimport VerificationModal from '../account/verification-modal.react';\n-import { createIsForegroundSelector } from '../selectors/nav-selectors';\n+import {\n+ createIsForegroundSelector,\n+ appCanRespondToBackButtonSelector,\n+} from '../selectors/nav-selectors';\nimport {\nassertNavigationRouteNotLeafNode,\ngetThreadIDFromParams,\n@@ -139,7 +142,7 @@ const AppNavigator = createTabNavigator(\ntype WrappedAppNavigatorProps = {|\nnavigation: NavigationScreenProp<*>,\nisForeground: bool,\n- atInitialRoute: bool,\n+ appCanRespondToBackButton: bool,\n|};\nclass WrappedAppNavigator\nextends React.PureComponent<WrappedAppNavigatorProps> {\n@@ -149,7 +152,7 @@ class WrappedAppNavigator\ngoBack: PropTypes.func.isRequired,\n}).isRequired,\nisForeground: PropTypes.bool.isRequired,\n- atInitialRoute: PropTypes.bool.isRequired,\n+ appCanRespondToBackButton: PropTypes.bool.isRequired,\n};\ncomponentDidMount() {\n@@ -158,6 +161,12 @@ class WrappedAppNavigator\n}\n}\n+ componentWillUnmount() {\n+ if (this.props.isForeground) {\n+ this.onBackground();\n+ }\n+ }\n+\ncomponentWillReceiveProps(nextProps: WrappedAppNavigatorProps) {\nif (!this.props.isForeground && nextProps.isForeground) {\nthis.onForeground();\n@@ -175,7 +184,7 @@ class WrappedAppNavigator\n}\nhardwareBack = () => {\n- if (this.props.atInitialRoute) {\n+ if (!this.props.appCanRespondToBackButton) {\nreturn false;\n}\nthis.props.navigation.goBack(null);\n@@ -189,19 +198,10 @@ class WrappedAppNavigator\n}\nconst isForegroundSelector = createIsForegroundSelector(AppRouteName);\n-const ReduxWrappedAppNavigator = connect((state: AppState) => {\n- const appNavState = state.navInfo.navigationState.routes[0];\n- invariant(\n- appNavState.index !== undefined &&\n- appNavState.index !== null &&\n- typeof appNavState.index === \"number\",\n- \"appNavState should have member index that is a number\",\n- );\n- return {\n- atInitialRoute: appNavState.index === 0,\n+const ReduxWrappedAppNavigator = connect((state: AppState) => ({\n+ appCanRespondToBackButton: appCanRespondToBackButtonSelector(state),\nisForeground: isForegroundSelector(state),\n- };\n-})(WrappedAppNavigator);\n+}))(WrappedAppNavigator);\n(ReduxWrappedAppNavigator: Object).router = AppNavigator.router;\nconst RootNavigator = createStackNavigator(\n"
},
{
"change_type": "MODIFY",
"old_path": "native/selectors/nav-selectors.js",
"new_path": "native/selectors/nav-selectors.js",
"diff": "@@ -34,11 +34,11 @@ const foregroundKeySelector = createSelector(\nconst baseCreateActiveTabSelector = (routeName: string) => createSelector(\n(state: AppState) => state.navInfo.navigationState,\n(navigationState: NavigationState) => {\n- const innerState = navigationState.routes[navigationState.index];\n- if (innerState.routeName !== AppRouteName) {\n+ const currentRoute = navigationState.routes[navigationState.index];\n+ if (currentRoute.routeName !== AppRouteName) {\nreturn false;\n}\n- const appRoute = assertNavigationRouteNotLeafNode(innerState);\n+ const appRoute = assertNavigationRouteNotLeafNode(currentRoute);\nreturn appRoute.routes[appRoute.index].routeName === routeName;\n},\n);\n@@ -47,11 +47,11 @@ const createActiveTabSelector = _memoize(baseCreateActiveTabSelector);\nconst activeThreadSelector = createSelector(\n(state: AppState) => state.navInfo.navigationState,\n(navigationState: NavigationState): ?string => {\n- const innerState = navigationState.routes[navigationState.index];\n- if (innerState.routeName !== AppRouteName) {\n+ const currentRoute = navigationState.routes[navigationState.index];\n+ if (currentRoute.routeName !== AppRouteName) {\nreturn null;\n}\n- const appRoute = assertNavigationRouteNotLeafNode(innerState);\n+ const appRoute = assertNavigationRouteNotLeafNode(currentRoute);\nconst innerInnerState = appRoute.routes[appRoute.index];\nif (innerInnerState.routeName !== ChatRouteName) {\nreturn null;\n@@ -68,9 +68,25 @@ const activeThreadSelector = createSelector(\n},\n);\n+const appCanRespondToBackButtonSelector = createSelector(\n+ (state: AppState) => state.navInfo.navigationState,\n+ (navigationState: NavigationState): bool => {\n+ const currentRoute = navigationState.routes[navigationState.index];\n+ if (currentRoute.routeName !== AppRouteName) {\n+ return false;\n+ }\n+ const appRoute = assertNavigationRouteNotLeafNode(currentRoute);\n+ const currentTabRoute = appRoute.routes[appRoute.index];\n+ return currentTabRoute.index !== null\n+ && currentTabRoute.index !== undefined\n+ && currentTabRoute.index > 0;\n+ },\n+);\n+\nexport {\ncreateIsForegroundSelector,\nforegroundKeySelector,\ncreateActiveTabSelector,\nactiveThreadSelector,\n+ appCanRespondToBackButtonSelector,\n};\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] Fix Android back button behavior |
129,187 | 04.10.2018 22:57:30 | 14,400 | 5c548c1f5e14ede379567e3489fc1f15798f9302 | [native] disableKeyboardHandling to avoid keyboard dismiss on navigation transition
Enables seamless transition between `ThreadPicker` and `Entry` focus. | [
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/react-navigation_v2.x.x.js",
"new_path": "native/flow-typed/npm/react-navigation_v2.x.x.js",
"diff": "@@ -406,6 +406,7 @@ declare module 'react-navigation' {\nonTransitionStart?: () => void,\nonTransitionEnd?: () => void,\ntransparentCard?: bool,\n+ disableKeyboardHandling?: bool,\n|};\ndeclare export type StackNavigatorConfig = {|\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/navigation-setup.js",
"new_path": "native/navigation/navigation-setup.js",
"diff": "@@ -217,6 +217,7 @@ const RootNavigator = createStackNavigator(\nheaderMode: 'none',\nmode: 'modal',\ntransparentCard: true,\n+ disableKeyboardHandling: true,\ntransitionConfig: (\ntransitionProps: NavigationTransitionProps,\nprevTransitionProps: ?NavigationTransitionProps,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] disableKeyboardHandling to avoid keyboard dismiss on navigation transition
Enables seamless transition between `ThreadPicker` and `Entry` focus. |
129,187 | 04.10.2018 22:58:34 | 14,400 | c682ae878c545e16b898b4576e710e8a10258d78 | [native] Prevent CalendarInputBar showing when dismissing ThreadPicker | [
{
"change_type": "MODIFY",
"old_path": "native/calendar/calendar-input-bar.react.js",
"new_path": "native/calendar/calendar-input-bar.react.js",
"diff": "@@ -83,6 +83,7 @@ const styles = StyleSheet.create({\n},\ninactiveContainer: {\nheight: 0,\n+ opacity: 0,\n},\nsaveButtonText: {\ncolor: \"#036AFF\",\n"
},
{
"change_type": "MODIFY",
"old_path": "native/calendar/calendar.react.js",
"new_path": "native/calendar/calendar.react.js",
"diff": "@@ -73,6 +73,7 @@ import CalendarInputBar from './calendar-input-bar.react';\nimport {\naddKeyboardShowListener,\naddKeyboardDismissListener,\n+ addKeyboardDidDismissListener,\nremoveKeyboardListener,\n} from '../keyboard';\nimport KeyboardAvoidingView from '../components/keyboard-avoiding-view.react';\n@@ -93,10 +94,10 @@ type CalendarItemWithHeight =\nitemType: \"entryInfo\",\nentryInfo: EntryInfoWithHeight,\n|};\n-type ExtraData = {\n+type ExtraData = $ReadOnly<{|\nactiveEntries: {[key: string]: bool},\nvisibleEntries: {[key: string]: bool},\n-};\n+|}>;\n// This is v sad :(\n// Overall, I have to say, this component is probably filled with more sadness\n@@ -126,12 +127,13 @@ type Props = {\nreduxAlreadyUpdated?: bool,\n) => Promise<CalendarQueryUpdateResult>,\n};\n-type State = {\n+type State = {|\ntextToMeasure: TextToMeasure[],\nlistDataWithHeights: ?$ReadOnlyArray<CalendarItemWithHeight>,\nreadyToShowList: bool,\nextraData: ExtraData,\n-};\n+ disableInputBar: bool,\n+|};\nclass InnerCalendar extends React.PureComponent<Props, State> {\nstatic propTypes = {\n@@ -201,7 +203,9 @@ class InnerCalendar extends React.PureComponent<Props, State> {\nlastEntryKeyActive: ?string = null;\nkeyboardShowListener: ?Object;\nkeyboardDismissListener: ?Object;\n+ keyboardDidDismissListener: ?Object;\nkeyboardShownHeight: ?number = null;\n+ keyboardPartiallyVisible = false;\n// We wait until the loaders leave view before letting them be triggered again\ntopLoaderWaitingToLeaveView = true;\nbottomLoaderWaitingToLeaveView = true;\n@@ -222,6 +226,7 @@ class InnerCalendar extends React.PureComponent<Props, State> {\nlistDataWithHeights: null,\nreadyToShowList: false,\nextraData: this.latestExtraData,\n+ disableInputBar: false,\n};\ncurrentCalendarRef = this;\n}\n@@ -242,12 +247,13 @@ class InnerCalendar extends React.PureComponent<Props, State> {\ncomponentDidMount() {\nNativeAppState.addEventListener('change', this.handleAppStateChange);\n- if (this.props.tabActive) {\nthis.keyboardShowListener = addKeyboardShowListener(this.keyboardShow);\nthis.keyboardDismissListener = addKeyboardDismissListener(\nthis.keyboardDismiss,\n);\n- }\n+ this.keyboardDidDismissListener = addKeyboardDidDismissListener(\n+ this.keyboardDidDismiss,\n+ );\n}\ncomponentWillUnmount() {\n@@ -260,6 +266,10 @@ class InnerCalendar extends React.PureComponent<Props, State> {\nremoveKeyboardListener(this.keyboardDismissListener);\nthis.keyboardDismissListener = null;\n}\n+ if (this.keyboardDidDismissListener) {\n+ removeKeyboardListener(this.keyboardDidDismissListener);\n+ this.keyboardDidDismissListener = null;\n+ }\n}\nhandleAppStateChange = (nextAppState: ?string) => {\n@@ -344,26 +354,6 @@ class InnerCalendar extends React.PureComponent<Props, State> {\n}\ncomponentWillUpdate(nextProps: Props, nextState: State) {\n- if (nextProps.tabActive && !this.props.tabActive) {\n- if (!this.keyboardShowListener) {\n- this.keyboardShowListener = addKeyboardShowListener(this.keyboardShow);\n- }\n- if (!this.keyboardDismissListener) {\n- this.keyboardDismissListener = addKeyboardDismissListener(\n- this.keyboardDismiss,\n- );\n- }\n- } else if (!nextProps.tabActive && this.props.tabActive) {\n- if (this.keyboardShowListener) {\n- removeKeyboardListener(this.keyboardShowListener);\n- this.keyboardShowListener = null;\n- }\n- if (this.keyboardDismissListener) {\n- removeKeyboardListener(this.keyboardDismissListener);\n- this.keyboardDismissListener = null;\n- }\n- }\n-\nif (\nnextProps.listData &&\nthis.props.listData &&\n@@ -427,6 +417,17 @@ class InnerCalendar extends React.PureComponent<Props, State> {\nthis.scrollToKey(lastEntryKeyActive, keyboardShownHeight);\nthis.lastEntryKeyActive = null;\n}\n+\n+ if (this.props.threadPickerOpen && !this.state.disableInputBar) {\n+ this.setState({ disableInputBar: true });\n+ }\n+ if (\n+ !this.props.threadPickerOpen &&\n+ prevProps.threadPickerOpen &&\n+ !this.keyboardPartiallyVisible\n+ ) {\n+ this.setState({ disableInputBar: false });\n+ }\n}\nstatic datesFromListData(\n@@ -758,7 +759,7 @@ class InnerCalendar extends React.PureComponent<Props, State> {\n{flatList}\n<CalendarInputBar\nonSave={this.onSaveEntry}\n- disabled={this.props.threadPickerOpen}\n+ disabled={this.state.disableInputBar}\n/>\n</KeyboardAvoidingView>\n</SafeAreaView>\n@@ -856,6 +857,7 @@ class InnerCalendar extends React.PureComponent<Props, State> {\n} else {\nthis.lastEntryKeyActive = key;\n}\n+ this.setState({ disableInputBar: false })\n}\nkeyboardShow = (event: KeyboardEvent) => {\n@@ -867,12 +869,20 @@ class InnerCalendar extends React.PureComponent<Props, State> {\nthis.scrollToKey(lastEntryKeyActive, keyboardShownHeight);\nthis.lastEntryKeyActive = null;\n}\n+ this.keyboardPartiallyVisible = true;\n}\nkeyboardDismiss = (event: KeyboardEvent) => {\nthis.keyboardShownHeight = null;\n}\n+ keyboardDidDismiss = (event: KeyboardEvent) => {\n+ this.keyboardPartiallyVisible = false;\n+ if (!this.props.threadPickerOpen) {\n+ this.setState({ disableInputBar: false });\n+ }\n+ }\n+\nscrollToKey(lastEntryKeyActive: string, keyboardHeight: number) {\nconst data = this.state.listDataWithHeights;\ninvariant(data, \"should be set\");\n@@ -1094,7 +1104,8 @@ const Calendar = connect(\n(state: AppState) => ({\nlistData: calendarListData(state),\ntabActive: activeTabSelector(state) || activeThreadPickerSelector(state),\n- threadPickerOpen: activeThreadPickerSelector(state),\n+ threadPickerOpen: activeThreadPickerSelector(state)\n+ || !!state.navInfo.navigationState.isTransitioning,\nstartDate: state.navInfo.startDate,\nendDate: state.navInfo.endDate,\ncalendarFilters: state.calendarFilters,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/keyboard.js",
"new_path": "native/keyboard.js",
"diff": "@@ -87,6 +87,13 @@ function addKeyboardDismissListener(callback: KeyboardCallback) {\ncallCallbackIfAppActive(callback),\n);\n}\n+function addKeyboardDidDismissListener(callback: KeyboardCallback) {\n+ incrementAppStateListeners();\n+ return Keyboard.addListener(\n+ \"keyboardDidHide\",\n+ callCallbackIfAppActive(callback),\n+ );\n+}\nfunction removeKeyboardListener(listener: EmitterSubscription) {\ndecrementAppStateListeners();\nlistener.remove();\n@@ -95,5 +102,6 @@ function removeKeyboardListener(listener: EmitterSubscription) {\nexport {\naddKeyboardShowListener,\naddKeyboardDismissListener,\n+ addKeyboardDidDismissListener,\nremoveKeyboardListener,\n};\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Prevent CalendarInputBar showing when dismissing ThreadPicker |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.