Skip to content

Commit

Permalink
WebUIにおいてタイムライン上の一部パーマリンクが機能しなくなっている問題の修正
Browse files Browse the repository at this point in the history
  • Loading branch information
MitarashiDango committed Dec 23, 2024
1 parent c9fd64c commit b2b51e7
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions app/javascript/mastodon/components/status.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ class Status extends ImmutablePureComponent {
prepend = (
<div className='status__prepend'>
<div className='status__prepend__icon'><Icon id='retweet' icon={RepeatIcon} /></div>
<FormattedMessage id='status.reblogged_by' defaultMessage='{name} boosted' values={{ name: <Permalink data-id={status.getIn(['account', 'id'])} data-hover-card-account={status.getIn(['account', 'id'])} href={status.getIn(['account', 'url'])} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></Permalink> }} />
<FormattedMessage id='status.reblogged_by' defaultMessage='{name} boosted' values={{ name: <Permalink data-id={status.getIn(['account', 'id'])} data-hover-card-account={status.getIn(['account', 'id'])} href={status.getIn(['account', 'url'])} to={`/@${status.getIn(['account', 'acct'])}`} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></Permalink> }} />
</div>
);

Expand Down Expand Up @@ -535,7 +535,7 @@ class Status extends ImmutablePureComponent {
statusAvatar = <AvatarOverlay account={status.get('account')} friend={account} />;
}

const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
const { statusContentProps, hashtagBar } = getHashtagBarForStatus(status);

return (
<HotKeys handlers={handlers} tabIndex={unfocusable ? null : -1}>
Expand All @@ -546,12 +546,12 @@ class Status extends ImmutablePureComponent {
{(connectReply || connectUp || connectToRoot) && <div className={classNames('status__line', { 'status__line--full': connectReply, 'status__line--first': !status.get('in_reply_to_id') && !connectToRoot })} />}

<div onMouseUp={this.handleMouseUp} className='status__info'>
<Permalink href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
<Permalink to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
<span className='status__visibility-icon'><VisibilityIcon visibility={status.get('visibility')} /></span>
<RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
</Permalink>

<Permalink href={status.getIn(['account', 'url'])} title={status.getIn(['account', 'acct'])} data-hover-card-account={status.getIn(['account', 'id'])} className='status__display-name' target='_blank' rel='noopener noreferrer'>
<Permalink to={`/@${status.getIn(['account', 'acct'])}`} href={status.getIn(['account', 'url'])} title={status.getIn(['account', 'acct'])} data-hover-card-account={status.getIn(['account', 'id'])} className='status__display-name' target='_blank' rel='noopener noreferrer'>
<div className='status__avatar'>
{statusAvatar}
</div>
Expand Down

0 comments on commit b2b51e7

Please sign in to comment.