Leahnaya/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2026-09-27 17:58:38 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Status redesign: Don't show "to You" when you are the author of a message (#40657)

Browse Source
This commit is contained in:
Echo
2026-09-22 17:09:04 +00:00
committed by GitHub
parent 76e6d5ddcb
commit f0c4e511da
2 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/javascript/mastodon/components/status/header.tsx
View File

@@ -5,6 +5,8 @@ import { FormattedMessage } from 'react-intl';
import classNames from 'classnames';
import { Link } from 'react-router-dom';
import { useAccount } from '@/mastodon/hooks/useAccount';
import { useCurrentAccountId } from '@/mastodon/hooks/useAccountId';
import type { AccountStatusShape } from '@/mastodon/models/status';
import { Avatar } from '../avatar';
@@ -32,6 +34,10 @@ export const StatusRedesignHeader: React.FC<StatusRedesignHeaderProps> = ({
}) => {
const account = status.account;
const handle = useAccountHandle(account);
const currentAccountId = useCurrentAccountId();
const firstMentionAccount = useAccount(
status.mentions.find(({ id }) => id !== currentAccountId)?.id,
);
const handleId = useId();
const accountLinkProps = {
@@ -64,16 +70,35 @@ export const StatusRedesignHeader: React.FC<StatusRedesignHeaderProps> = ({
values={{ author: displayName, count: status.mentions.length }}
/>
);
} else if (status.visibility === 'direct') {
displayName = (
<FormattedMessage
id='status.header.message_to_me'
defaultMessage='{author} to You {count, plural, =0 {} one {+ # other} other {+ # others}}'
description='DisplayName is the author, count is # of other people mentioned in the post'
tagName='span'
values={{ author: displayName, count: status.mentions.length - 1 }}
/>
);
} else if (status.visibility === 'direct' && status.mentions.length > 0) {
if (status.account.id === currentAccountId && firstMentionAccount) {
displayName = (
<FormattedMessage
id='status.header.message_from_me'
defaultMessage='{author} to {name} {count, plural, =0 {} one {+ # other} other {+ # others}}'
description='DisplayName is the author, count is # of other people mentioned in the post'
tagName='span'
values={{
author: displayName,
name: (
<DisplayName account={firstMentionAccount} variant='simple' />
),
// Minus two, as we're removing the current user as well.
count: Math.max(status.mentions.length - 2, 0),
}}
/>
);
} else {
displayName = (
<FormattedMessage
id='status.header.message_to_me'
defaultMessage='{author} to You {count, plural, =0 {} one {+ # other} other {+ # others}}'
description='DisplayName is the author, count is # of other people mentioned in the post'
tagName='span'
values={{ author: displayName, count: status.mentions.length - 1 }}
/>
);
}
}
return (

1
app/javascript/mastodon/locales/en.json
View File

@@ -1406,6 +1406,7 @@
"status.favourites_count": "{count, plural, one {{counter} favorite} other {{counter} favorites}}",
"status.filter": "Filter this post",
"status.follow": "Follow @{name}",
"status.header.message_from_me": "{author} to {name} {count, plural, =0 {} one {+ # other} other {+ # others}}",
"status.header.message_to_me": "{author} to You {count, plural, =0 {} one {+ # other} other {+ # others}}",
"status.header.to_followers": "{author} to Followers {count, plural, =0 {} one {+ # other} other {+ # others}}",
"status.history.created": "{name} created {date}",