Skip to content

Commit

Permalink
Update Prettier
Browse files Browse the repository at this point in the history
Summary:
Our current version of Prettier was printing an error when parsing `import.meta.url`. Upgrading it resolving the problem.

This diff was generated by updating the version of Prettier in `package.json`, running `yarn cleaninstall`, and then running `prettier --write .` from the root of the repo. After that, I just had a couple of places I need to manually fix up.

Test Plan: Flow + ESLint

Reviewers: tomek, atul, jon

Reviewed By: atul

Differential Revision: https://phab.comm.dev/D6783
  • Loading branch information
Ashoat committed Feb 20, 2023
1 parent 4adee5e commit c6ae007
Show file tree
Hide file tree
Showing 242 changed files with 2,317 additions and 2,638 deletions.
2 changes: 1 addition & 1 deletion .buildkite/tunnelbroker_client.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
env:
PATH: "$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:$PATH"
PATH: '$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:$PATH'
steps:
- label: ':nix: Tunnelbroker Client (Shared)'
command:
Expand Down
8 changes: 4 additions & 4 deletions keyserver/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.9"
version: '3.9'
services:
node:
build:
Expand All @@ -12,7 +12,7 @@ services:
image: commapp/node-keyserver:1.0
restart: always
ports:
- "3000:3000"
- '3000:3000'
env_file:
- .env
environment:
Expand All @@ -30,7 +30,7 @@ services:
image: mariadb:10.8.3-jammy
restart: always
expose:
- "3306"
- '3306'
command: >
--max-allowed-packet=256M
--local-infile=0
Expand All @@ -47,7 +47,7 @@ services:
image: redis:6.2.6-bullseye
restart: always
expose:
- "6379"
- '6379'
command: redis-server --loglevel warning
volumes:
mysqldata:
18 changes: 7 additions & 11 deletions keyserver/src/creators/account-creator.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,17 +178,13 @@ async function createAccount(
text: message,
}));
const messageDatas = [...ashoatMessageDatas, ...privateMessageDatas];
const [
messageInfos,
threadsResult,
userInfos,
currentUserInfo,
] = await Promise.all([
createMessages(viewer, messageDatas),
fetchThreadInfos(viewer),
fetchKnownUserInfos(viewer),
fetchLoggedInUserInfo(viewer),
]);
const [messageInfos, threadsResult, userInfos, currentUserInfo] =
await Promise.all([
createMessages(viewer, messageDatas),
fetchThreadInfos(viewer),
fetchKnownUserInfos(viewer),
fetchLoggedInUserInfo(viewer),
]);
const rawMessageInfos = [
...ashoatThreadResult.newMessageInfos,
...privateThreadResult.newMessageInfos,
Expand Down
12 changes: 4 additions & 8 deletions keyserver/src/creators/message-creator.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,8 @@ async function createMessages(
}
messageIndices.push(i);

const content = messageSpecs[messageData.type].messageContentForServerDB?.(
messageData,
);
const content =
messageSpecs[messageData.type].messageContentForServerDB?.(messageData);

const creation =
messageData.localID && viewer.hasSessionInfo
Expand Down Expand Up @@ -497,11 +496,8 @@ function determineLatestMessagesPerThread(
threadsToMessageIndices: $ReadOnlyMap<string, $ReadOnlyArray<number>>,
messageInfos: $ReadOnlyArray<RawMessageInfo>,
) {
const {
threadIDs,
notFocusedThreadIDs,
subthreadsCanSetToUnread,
} = preUserPushInfo;
const { threadIDs, notFocusedThreadIDs, subthreadsCanSetToUnread } =
preUserPushInfo;
const latestMessagesPerThread = new Map();
for (const threadID of threadIDs) {
const messageIndices = threadsToMessageIndices.get(threadID);
Expand Down
27 changes: 11 additions & 16 deletions keyserver/src/creators/thread-creator.js
Original file line number Diff line number Diff line change
Expand Up @@ -301,15 +301,13 @@ async function createThread(
newMessageInfos = joinThreadResult.rawMessageInfos;
}
const {
viewerUpdates: newUpdates,
userInfos: changesetUserInfos,
} = await getChangesetCommitResultForExistingThread(
viewer,
existingThreadID,
joinUpdateInfos,
{ calendarQuery, updatesForCurrentSession },
);
const { viewerUpdates: newUpdates, userInfos: changesetUserInfos } =
await getChangesetCommitResultForExistingThread(
viewer,
existingThreadID,
joinUpdateInfos,
{ calendarQuery, updatesForCurrentSession },
);
userInfos = { ...userInfos, ...changesetUserInfos };
return {
Expand Down Expand Up @@ -390,13 +388,10 @@ async function createThread(
}

const changeset = { membershipRows, relationshipChangeset };
const {
threadInfos,
viewerUpdates,
userInfos,
} = await commitMembershipChangeset(viewer, changeset, {
updatesForCurrentSession,
});
const { threadInfos, viewerUpdates, userInfos } =
await commitMembershipChangeset(viewer, changeset, {
updatesForCurrentSession,
});

const initialMemberAndCreatorIDs = initialMemberIDs
? [...initialMemberIDs, viewer.userID]
Expand Down
6 changes: 2 additions & 4 deletions keyserver/src/cron/daily-updates.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,8 @@ async function createDailyUpdatesThread() {

// Figure out which day the dev sync is on
let devSyncDay = 1; // default to Monday
const entryInfosInDevSyncScheduleThreadThisWeek = await fetchEntryInfosForThreadThisWeek(
viewer,
weeklyDevSyncScheduleThread,
);
const entryInfosInDevSyncScheduleThreadThisWeek =
await fetchEntryInfosForThreadThisWeek(viewer, weeklyDevSyncScheduleThread);
for (const entryInfo of entryInfosInDevSyncScheduleThreadThisWeek) {
const entryInfoDate = getDate(
entryInfo.year,
Expand Down
12 changes: 5 additions & 7 deletions keyserver/src/deleters/thread-deleters.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,11 @@ async function deleteThread(
}
const { threadID } = threadDeletionRequest;

const [
permissionsBlob,
{ threadInfos: serverThreadInfos },
] = await Promise.all([
fetchThreadPermissionsBlob(viewer, threadID),
fetchServerThreadInfos(SQL`t.id = ${threadID}`),
]);
const [permissionsBlob, { threadInfos: serverThreadInfos }] =
await Promise.all([
fetchThreadPermissionsBlob(viewer, threadID),
fetchServerThreadInfos(SQL`t.id = ${threadID}`),
]);

if (!permissionsBlob) {
// This should only occur if the first request goes through but the client
Expand Down
15 changes: 7 additions & 8 deletions keyserver/src/fetchers/message-fetchers.js
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,8 @@ async function fetchMessageInfos(
criteria: MessageSelectionCriteria,
numberPerThread: number,
): Promise<FetchMessageInfosResult> {
const {
sqlClause: selectionClause,
timeFilterData,
} = parseMessageSelectionCriteria(viewer, criteria);
const { sqlClause: selectionClause, timeFilterData } =
parseMessageSelectionCriteria(viewer, criteria);
const truncationStatuses = {};

const viewerID = viewer.id;
Expand Down Expand Up @@ -502,10 +500,11 @@ async function fetchMessageInfosSince(
viewer,
criteria,
);
const truncationStatuses = messageSelectionCriteriaToInitialTruncationStatuses(
criteria,
messageTruncationStatus.UNCHANGED,
);
const truncationStatuses =
messageSelectionCriteriaToInitialTruncationStatuses(
criteria,
messageTruncationStatus.UNCHANGED,
);

const viewerID = viewer.id;
const query = SQL`
Expand Down
15 changes: 6 additions & 9 deletions keyserver/src/fetchers/thread-permission-fetchers.js
Original file line number Diff line number Diff line change
Expand Up @@ -275,15 +275,12 @@ async function validateCandidateMembers(
return results;
})();

const [
fetchedMembers,
parentPermissions,
memberOfContainingThread,
] = await Promise.all([
fetchMembersPromise,
parentPermissionsPromise,
memberOfContainingThreadPromise,
]);
const [fetchedMembers, parentPermissions, memberOfContainingThread] =
await Promise.all([
fetchMembersPromise,
parentPermissionsPromise,
memberOfContainingThreadPromise,
]);

const ignoreMembers = new Set();
for (const memberID of allCandidates) {
Expand Down
5 changes: 2 additions & 3 deletions keyserver/src/fetchers/upload-fetchers.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,8 @@ async function fetchUploadsForMessage(
viewer: Viewer,
mediaMessageContents: $ReadOnlyArray<MediaMessageServerDBContent>,
): Promise<$ReadOnlyArray<Object>> {
const uploadIDs = getUploadIDsFromMediaMessageServerDBContents(
mediaMessageContents,
);
const uploadIDs =
getUploadIDsFromMediaMessageServerDBContents(mediaMessageContents);
const query = SQL`
SELECT id AS uploadID, secret AS uploadSecret,
type AS uploadType, extra AS uploadExtra
Expand Down
6 changes: 2 additions & 4 deletions keyserver/src/push/send.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,8 @@ async function sendPushNotifs(pushInfo: PushInfo) {
...newMessageInfos,
...existingMessageInfos,
]);
const [
firstNewMessageInfo,
...remainingNewMessageInfos
] = newMessageInfos;
const [firstNewMessageInfo, ...remainingNewMessageInfos] =
newMessageInfos;
const threadID = firstNewMessageInfo.threadID;

const threadInfo = threadInfos[threadID];
Expand Down
7 changes: 2 additions & 5 deletions keyserver/src/responders/entry-responders.js
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,8 @@ async function calendarQueryUpdateResponder(
throw new ServerError('not_logged_in');
}

const {
difference,
oldCalendarQuery,
sessionUpdate,
} = compareNewCalendarQuery(viewer, request);
const { difference, oldCalendarQuery, sessionUpdate } =
compareNewCalendarQuery(viewer, request);

const [response] = await Promise.all([
fetchEntriesForSession(viewer, difference, oldCalendarQuery),
Expand Down
15 changes: 6 additions & 9 deletions keyserver/src/responders/message-responders.js
Original file line number Diff line number Diff line change
Expand Up @@ -220,15 +220,12 @@ async function reactionMessageCreationResponder(
throw new ServerError('invalid_parameters');
}

const [
serverThreadInfos,
hasPermission,
targetMessageUserInfos,
] = await Promise.all([
fetchServerThreadInfos(SQL`t.id = ${threadID}`),
checkThreadPermission(viewer, threadID, threadPermissions.VOICED),
fetchKnownUserInfos(viewer, [targetMessageInfo.creatorID]),
]);
const [serverThreadInfos, hasPermission, targetMessageUserInfos] =
await Promise.all([
fetchServerThreadInfos(SQL`t.id = ${threadID}`),
checkThreadPermission(viewer, threadID, threadPermissions.VOICED),
fetchKnownUserInfos(viewer, [targetMessageInfo.creatorID]),
]);

const targetMessageThreadInfo = serverThreadInfos.threadInfos[threadID];
if (targetMessageThreadInfo.sourceMessageID === targetMessageID) {
Expand Down
13 changes: 4 additions & 9 deletions keyserver/src/responders/user-responders.js
Original file line number Diff line number Diff line change
Expand Up @@ -333,9 +333,8 @@ async function logInResponder(
: null;
const promises = {};
if (calendarQuery) {
promises.verifyCalendarQueryThreadIDs = verifyCalendarQueryThreadIDs(
calendarQuery,
);
promises.verifyCalendarQueryThreadIDs =
verifyCalendarQueryThreadIDs(calendarQuery);
}
const username = request.username ?? request.usernameOrEmail;
if (!username) {
Expand Down Expand Up @@ -395,12 +394,8 @@ async function siweAuthResponder(
): Promise<LogInResponse> {
await validateInput(viewer, siweAuthRequestInputValidator, input);
const request: SIWEAuthRequest = input;
const {
message,
signature,
deviceTokenUpdateRequest,
platformDetails,
} = request;
const { message, signature, deviceTokenUpdateRequest, platformDetails } =
request;
const calendarQuery = normalizeCalendarQuery(request.calendarQuery);

// 1. Ensure that `message` is a well formed Comm SIWE Auth message.
Expand Down
18 changes: 7 additions & 11 deletions keyserver/src/responders/website-responders.js
Original file line number Diff line number Diff line change
Expand Up @@ -232,17 +232,13 @@ async function websiteResponder(
})();

const navInfoPromise = (async () => {
const [
{ threadInfos },
messageStore,
currentUserInfo,
userStore,
] = await Promise.all([
threadInfoPromise,
messageStorePromise,
currentUserInfoPromise,
userStorePromise,
]);
const [{ threadInfos }, messageStore, currentUserInfo, userStore] =
await Promise.all([
threadInfoPromise,
messageStorePromise,
currentUserInfoPromise,
userStorePromise,
]);
const finalNavInfo = initialNavInfo;

const requestedActiveChatThreadID = finalNavInfo.activeChatThreadID;
Expand Down
Loading

0 comments on commit c6ae007

Please sign in to comment.