tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2023-08-22 18:50:14 +02:00
parent 245fe855be 1cb978bcc3
commit 10404aece8
22 changed files with 237 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/mastodon/features/status/components/detailed_status.jsx
View File

@ -10,6 +10,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { AnimatedNumber } from 'mastodon/components/animated_number';
import EditedTimestamp from 'mastodon/components/edited_timestamp';
import { HashtagBar } from 'mastodon/components/hashtag_bar';
import { Icon } from 'mastodon/components/icon';
import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
@ -314,6 +315,8 @@ class DetailedStatus extends ImmutablePureComponent {
{media}
<HashtagBar hashtags={status.get('tags')} text={status.get('content')} />
<div className='detailed-status__meta'>
<a className='detailed-status__datetime' href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} target='_blank' rel='noopener noreferrer'>
<FormattedDate value={new Date(status.get('created_at'))} hour12={false} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />