Revert "Use more specifics format functions"

This reverts commit 43d1002402.
This commit is contained in:
Saumya Pandey committed 2021-06-04 15:11:57 +05:30
1 parent 8eb5fe6eaf
commit 761959ff7e
4 files changed
+10 -10

No files matched your search

@@ -1,5 +1,5 @@
// @flow
import { formatRFC7231 } from "date-fns";
import { format } from "date-fns";
import * as React from "react";
import { NavLink } from "react-router-dom";
import styled, { withTheme } from "styled-components";
@@ -37,7 +37,7 @@ class RevisionListItem extends React.Component<Props> {
</Author>
<Meta>
<Time dateTime={revision.createdAt} tooltipDelay={250}>
{formatRFC7231(Date.parse(revision.createdAt))}
{format(Date.parse(revision.createdAt), "MMMM do, yyyy h:mm a")}
</Time>
</Meta>
{showMenu && (
+2 -2
View File
@@ -1,5 +1,5 @@
// @flow
import { formatRFC7231, formatDistanceToNow } from "date-fns";
import { format, formatDistanceToNow } from "date-fns";
import * as React from "react";
import Tooltip from "components/Tooltip";
import useUserLocale from "hooks/useUserLocale";
@@ -78,7 +78,7 @@ function LocaleTime({
return (
<Tooltip
tooltip={formatRFC7231(Date.parse(dateTime))}
tooltip={format(Date.parse(dateTime), "MMMM do, yyyy h:mm a")}
delay={tooltipDelay}
placement="bottom"
>
+2 -2
View File
@@ -1,5 +1,5 @@
// @flow
import { lightFormat } from "date-fns";
import { format } from "date-fns";
import Router from "koa-router";
import { v4 as uuidv4 } from "uuid";
import { NotFoundError } from "../errors";
@@ -39,7 +39,7 @@ router.post("attachments.create", auth(), async (ctx) => {
const bucket = acl === "public-read" ? "public" : "uploads";
const key = `${bucket}/${user.id}/${s3Key}/${name}`;
const credential = makeCredential();
const longDate = lightFormat(new Date(), "yyyyMMdd'T'HHmmss'Z'");
const longDate = format(new Date(), "yyyyMMdd'T'HHmmss'Z'");
const policy = makePolicy(credential, longDate, acl, contentType);
const endpoint = publicS3Endpoint();
const url = `${endpoint}/${key}`;
+4 -4
View File
@@ -2,7 +2,7 @@
import crypto from "crypto";
import * as Sentry from "@sentry/node";
import AWS from "aws-sdk";
import { addHours, lightFormat } from "date-fns";
import { addHours, format } from "date-fns";
import fetch from "fetch-with-proxy";
const AWS_SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY;
@@ -35,7 +35,7 @@ export const makeCredential = () => {
const credential =
AWS_ACCESS_KEY_ID +
"/" +
lightFormat(new Date(), "yyyyMMdd") +
format(new Date(), "yyyyMMdd") +
"/" +
AWS_REGION +
"/s3/aws4_request";
@@ -61,7 +61,7 @@ export const makePolicy = (
{ "x-amz-credential": credential },
{ "x-amz-date": longDate },
],
expiration: lightFormat(tomorrow, "yyyy-MM-dd'T'HH:mm:ss'Z'"),
expiration: format(tomorrow, "yyyy-MM-dd'T'HH:mm:ss'Z'"),
};
return Buffer.from(JSON.stringify(policy)).toString("base64");
@@ -70,7 +70,7 @@ export const makePolicy = (
export const getSignature = (policy: any) => {
const kDate = hmac(
"AWS4" + AWS_SECRET_ACCESS_KEY,
lightFormat(new Date(), "yyyyMMdd")
format(new Date(), "yyyyMMdd")
);
const kRegion = hmac(kDate, AWS_REGION);
const kService = hmac(kRegion, "s3");