post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Merge branch 'kb_development' into upstream-20240906

Browse source
This commit is contained in:
KMY（雪あすか） 2024-09-06 08:49:45 +09:00 • committed by GitHub
commit db6db7e7e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/features/notifications/components/notification.jsx
View file

@ -35,7 +35,7 @@ import Report from './report';
const messages = defineMessages({
favourite: { id: 'notification.favourite', defaultMessage: '{name} favorited your post' },
emojiReaction: { id: 'notification.emoji_reaction', defaultMessage: '{name} reacted your status with emoji' },
emojiReaction: { id: 'notification.emoji_reaction', defaultMessage: '{name} reacted your post with emoji' },
follow: { id: 'notification.follow', defaultMessage: '{name} followed you' },
ownPoll: { id: 'notification.own_poll', defaultMessage: 'Your poll has ended' },
poll: { id: 'notification.poll', defaultMessage: 'A poll you voted in has ended' },
@ -241,7 +241,7 @@ class Notification extends ImmutablePureComponent {
</div>
<span title={notification.get('created_at')}>
<FormattedMessage id='notification.emoji_reaction' defaultMessage='{name} reacted your status with emoji' values={{ name: link }} />
<FormattedMessage id='notification.emoji_reaction' defaultMessage='{name} reacted your post with emoji' values={{ name: link }} />
</span>
</div>

2
app/javascript/mastodon/features/notifications_v2/components/notification_emoji_reaction.tsx
View file

@ -14,7 +14,7 @@ const labelRenderer: LabelRenderer = (displayedName, total, seeMoreHref) => {
return (
<FormattedMessage
id='notification.emoji_reaction'
defaultMessage='{name} reacted your status with emoji'
defaultMessage='{name} reacted your post with emoji'
values={{ name: displayedName }}
/>
);

4
app/javascript/mastodon/features/status/components/detailed_status.jsx
View file

@ -25,6 +25,7 @@ import { DisplayName } from '../../../components/display_name';
import MediaGallery from '../../../components/media_gallery';
import StatusContent from '../../../components/status_content';
import StatusEmojiReactionsBar from '../../../components/status_emoji_reactions_bar';
import CompactedStatusContainer from '../../../containers/compacted_status_container';
import Audio from '../../audio';
import scheduleIdleTask from '../../ui/util/schedule_idle_task';
import Video from '../../video';
@ -323,6 +324,8 @@ class DetailedStatus extends ImmutablePureComponent {
const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
const expanded = !status.get('hidden') || status.get('spoiler_text').length === 0;
const quote = !this.props.muted && status.get('quote_id') && <CompactedStatusContainer id={status.get('quote_id')} history={this.props.history} />;
return (
<div style={outerStyle}>
<div ref={this.setRef} className={classNames('detailed-status', { compact })}>
@ -349,6 +352,7 @@ class DetailedStatus extends ImmutablePureComponent {
{media}
{hashtagBar}
{quote}
{emojiReactionsBar}
</>
)}

2
app/javascript/mastodon/features/status/index.jsx
View file

@ -156,7 +156,7 @@ const makeMapStateToProps = () => {
if (status) {
ancestorsIds = getAncestorsIds(state, { id: status.get('in_reply_to_id') });
descendantsIds = getDescendantsIds(state, { id: status.get('id') });
referenceIds = getReferenceIds(state, { id: status.get('id') });
referenceIds = getReferenceIds(state, { id: status.get('id') }).filter((id) => id !== status.get('quote_id'));
}
return {