fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-18 15:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix <RelativeTimestamp> types (#29781)

Browse source
This commit is contained in:
Renaud Chaput 2024-03-28 11:07:01 +01:00 committed by GitHub
parent d088964761
commit 961bb84e4c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/javascript/mastodon/components/relative_timestamp.tsx
View file

@ -191,7 +191,7 @@ const timeRemainingString = (
interface Props { interface Props {
intl: IntlShape; intl: IntlShape;
timestamp: string; timestamp: string;
year: number; year?: number;
futureDate?: boolean; futureDate?: boolean;
short?: boolean; short?: boolean;
} }
@ -203,11 +203,6 @@ class RelativeTimestamp extends Component<Props, States> {
now: Date.now(), now: Date.now(),
}; };
static defaultProps = {
year: new Date().getFullYear(),
short: true,
};
_timer: number | undefined; _timer: number | undefined;
shouldComponentUpdate(nextProps: Props, nextState: States) { shouldComponentUpdate(nextProps: Props, nextState: States) {
@ -257,7 +252,13 @@ class RelativeTimestamp extends Component<Props, States> {
} }
render() { render() {
const { timestamp, intl, year, futureDate, short } = this.props; const {
timestamp,
intl,
futureDate,
year = new Date().getFullYear(),
short = true,
} = this.props;
const timeGiven = timestamp.includes('T'); const timeGiven = timestamp.includes('T');
const date = new Date(timestamp); const date = new Date(timestamp);