diff --git a/keyserver/src/responders/website-responders.js b/keyserver/src/responders/website-responders.js --- a/keyserver/src/responders/website-responders.js +++ b/keyserver/src/responders/website-responders.js @@ -24,7 +24,6 @@ import { defaultEnabledReports } from 'lib/types/report-types'; import { defaultConnectionInfo } from 'lib/types/socket-types'; import { threadPermissions, threadTypes } from 'lib/types/thread-types'; -import type { CurrentUserInfo } from 'lib/types/user-types'; import { currentDateInTimeZone } from 'lib/utils/date-utils'; import { ServerError } from 'lib/utils/errors'; import { promiseAll } from 'lib/utils/promises'; @@ -309,10 +308,10 @@ var preloadedState = `); - const initialReduxState: any = await promiseAll({ + const initialReduxState = await promiseAll({ navInfo: navInfoPromise, deviceID: null, - currentUserInfo: ((currentUserInfoPromise: any): Promise), + currentUserInfo: currentUserInfoPromise, draftStore: { drafts: {} }, sessionID: sessionIDPromise, entryStore: entryStorePromise, diff --git a/keyserver/src/utils/json-stream.js b/keyserver/src/utils/json-stream.js --- a/keyserver/src/utils/json-stream.js +++ b/keyserver/src/utils/json-stream.js @@ -5,10 +5,9 @@ import replaceStream from 'replacestream'; import Combine from 'stream-combiner'; -type Promisable = Promise | T; -function streamJSON }>( +function streamJSON( res: $Response, - input: T, + input: { +[key: string]: mixed }, ): stream$Readable { const jsonStream = Combine( JSONStream.stringifyObject('{', ',', '}'), @@ -19,9 +18,9 @@ return jsonStream; } -function resolvePromisesToStream }>( +function resolvePromisesToStream( stream: { +write: ([string, mixed]) => mixed, +end: () => mixed, ... }, - input: T, + input: { +[key: string]: mixed }, ) { const blocking = []; for (const key in input) {