mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-10 12:16:23 +01:00
Code Issues Projects Releases Wiki Activity

Require specific subtype of formatMessage in timeAgoString (#33511)

Browse Source
This commit is contained in:
Claire 2025-01-08 17:26:54 +01:00 committed by GitHub
parent 1bf6195763
commit 6b1ea8dd2c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/javascript/mastodon/components/relative_timestamp.tsx
View File

@ -1,6 +1,6 @@
import { Component } from 'react'; import { Component } from 'react';
import type { IntlShape } from 'react-intl'; import type { MessageDescriptor, PrimitiveType, IntlShape } from 'react-intl';
import { injectIntl, defineMessages } from 'react-intl'; import { injectIntl, defineMessages } from 'react-intl';
const messages = defineMessages({ const messages = defineMessages({
@ -102,7 +102,13 @@ const getUnitDelay = (units: string) => {
}; };
export const timeAgoString = ( export const timeAgoString = (
intl: Pick<IntlShape, 'formatDate' | 'formatMessage'>, intl: {
formatDate: IntlShape['formatDate'];
formatMessage: (
{ id, defaultMessage }: MessageDescriptor,
values?: Record<string, PrimitiveType>,
) => string;
},
date: Date, date: Date,
now: number, now: number,
year: number, year: number,