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

Remove: kmyblue独自機能の引用

Browse source
This commit is contained in:
KMY 2025-04-24 08:48:28 +09:00
parent 620a895184
commit d845d1e9fb
70 changed files with 812 additions and 1788 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/features/notifications/components/column_settings.jsx
View file

@ -164,7 +164,7 @@ class ColumnSettings extends PureComponent {
<section>
<div role='group' aria-labelledby='notifications-status_reference'>
<h3 id='notifications-status_reference'><FormattedMessage id='notifications.column_settings.status_reference' defaultMessage='Quotes:' /></h3>
<h3 id='notifications-status_reference'><FormattedMessage id='notifications.column_settings.status_reference' defaultMessage='Links:' /></h3>
<div className='column-settings__row'>
<SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'status_reference']} onChange={onChange} label={alertStr} />

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

@ -42,7 +42,7 @@ const messages = defineMessages({
reblog: { id: 'notification.reblog', defaultMessage: '{name} boosted your post' },
status: { id: 'notification.status', defaultMessage: '{name} just posted' },
listStatus: { id: 'notification.list_status', defaultMessage: '{name} post is added to {listName}' },
statusReference: { id: 'notification.status_reference', defaultMessage: '{name} quoted your post' },
statusReference: { id: 'notification.status_reference', defaultMessage: '{name} linked your post' },
update: { id: 'notification.update', defaultMessage: '{name} edited a post' },
adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
@ -305,7 +305,7 @@ class Notification extends ImmutablePureComponent {
</div>
<span title={notification.get('created_at')}>
<FormattedMessage id='notification.status_reference' defaultMessage='{name} quoted your post' values={{ name: link }} />
<FormattedMessage id='notification.status_reference' defaultMessage='{name} linked your post' values={{ name: link }} />
</span>
</div>

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

@ -9,7 +9,7 @@ import { NotificationWithStatus } from './notification_with_status';
const labelRenderer: LabelRenderer = (displayedName) => (
<FormattedMessage
id='notification.status_reference'
defaultMessage='{name} quoted your post'
defaultMessage='{name} linked your post'
values={{ name: displayedName }}
/>
);

17
app/javascript/mastodon/features/status/components/action_bar.jsx
View file

@ -64,8 +64,7 @@ const messages = defineMessages({
admin_status: { id: 'status.admin_status', defaultMessage: 'Open this post in the moderation interface' },
admin_domain: { id: 'status.admin_domain', defaultMessage: 'Open moderation interface for {domain}' },
copy: { id: 'status.copy', defaultMessage: 'Copy link to post' },
reference: { id: 'status.reference', defaultMessage: 'Quiet quote' },
quote: { id: 'status.quote', defaultMessage: 'Quote' },
reference: { id: 'status.reference', defaultMessage: 'Link' },
blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
@ -89,7 +88,6 @@ class ActionBar extends PureComponent {
onFavourite: PropTypes.func.isRequired,
onEmojiReact: PropTypes.func.isRequired,
onReference: PropTypes.func.isRequired,
onQuote: PropTypes.func.isRequired,
onBookmark: PropTypes.func.isRequired,
onBookmarkCategoryAdder: PropTypes.func.isRequired,
onDelete: PropTypes.func.isRequired,
@ -225,10 +223,6 @@ class ActionBar extends PureComponent {
this.props.onReference(this.props.status, this.props.history);
};
handleQuote = () => {
this.props.onQuote(this.props.status, this.props.history);
};
handleEmojiPick = (data) => {
this.props.onEmojiReact(this.props.status, data);
};
@ -244,7 +238,6 @@ class ActionBar extends PureComponent {
const account = status.get('account');
const writtenByMe = status.getIn(['account', 'id']) === me;
const isRemote = status.getIn(['account', 'username']) !== status.getIn(['account', 'acct']);
const allowQuote = status.getIn(['account', 'other_settings', 'allow_quote']);
let menu = [];
@ -269,10 +262,6 @@ class ActionBar extends PureComponent {
menu.push({ text: intl.formatMessage(status.get('reblogged') ? messages.cancel_reblog : messages.reblog), action: this.handleReblogForceModalClick, tag: 'reblog' });
if (publicStatus) {
if (allowQuote && (account.getIn(['server_features', 'quote']) || !isHideItem('quote_unavailable_server'))) {
menu.push({ text: intl.formatMessage(messages.quote), action: this.handleQuote, tag: 'reblog' });
}
if (account.getIn(['server_features', 'status_reference']) || !isHideItem('status_reference_unavailable_server')) {
menu.push({ text: intl.formatMessage(messages.reference), action: this.handleReference, tag: 'reblog' });
}
@ -350,10 +339,6 @@ class ActionBar extends PureComponent {
}
if (publicStatus) {
if (allowQuote && (account.getIn(['server_features', 'quote']) || !isHideItem('quote_unavailable_server'))) {
reblogMenu.push({ text: intl.formatMessage(messages.quote), action: this.handleQuote });
}
if (account.getIn(['server_features', 'status_reference']) || !isHideItem('status_reference_unavailable_server')) {
reblogMenu.push({ text: intl.formatMessage(messages.reference), action: this.handleReference });
}

12
app/javascript/mastodon/features/status/components/detailed_status.tsx
View file

@ -32,7 +32,6 @@ 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';
@ -77,7 +76,6 @@ export const DetailedStatus: React.FC<{
onToggleHidden,
onEmojiReact,
onUnEmojiReact,
muted,
}) => {
const properStatus = status?.get('reblog') ?? status;
const [height, setHeight] = useState(0);
@ -330,7 +328,7 @@ export const DetailedStatus: React.FC<{
<AnimatedNumber value={status.get('status_referred_by_count')} />
</span>
<FormattedMessage
id='status.quotes'
id='status.references'
defaultMessage='{count, plural, one {boost} other {boosts}}'
values={{ count: status.get('status_referred_by_count') }}
/>
@ -383,13 +381,6 @@ export const DetailedStatus: React.FC<{
(!matchedFilters || showDespiteFilter) &&
(!status.get('hidden') || status.get('spoiler_text').length === 0);
const quote = !muted && status.get('quote_id') && (
<>
{/* @ts-expect-error: CompactedStatusContainer class is not typescript still. */}
<CompactedStatusContainer id={status.get('quote_id')} history={history} />
</>
);
return (
<div style={outerStyle}>
<div ref={handleRef} className={classNames('detailed-status')}>
@ -459,7 +450,6 @@ export const DetailedStatus: React.FC<{
{media}
{hashtagBar}
{quote}
{emojiReactionsBar}
</>
)}

7
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') }).filter((id) => id !== status.get('quote_id'));
referenceIds = getReferenceIds(state, { id: status.get('id') });
}
return {
@ -341,10 +341,6 @@ class Status extends ImmutablePureComponent {
this.props.dispatch(insertReferenceCompose(0, status.get('url'), 'BT', router));
};
handleQuote = (status, router) => {
this.props.dispatch(insertReferenceCompose(0, status.get('url'), 'QT', router));
};
handleBookmarkClick = (status) => {
if (bookmarkCategoryNeeded) {
this.handleBookmarkCategoryAdderClick(status);
@ -774,7 +770,6 @@ class Status extends ImmutablePureComponent {
onReblog={this.handleReblogClick}
onReblogForceModal={this.handleReblogForceModalClick}
onReference={this.handleReference}
onQuote={this.handleQuote}
onBookmark={this.handleBookmarkClick}
onBookmarkCategoryAdder={this.handleBookmarkCategoryAdderClick}
onDelete={this.handleDeleteClick}

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

@ -81,7 +81,7 @@ class StatusReferences extends ImmutablePureComponent {
bindToDocument={!multiColumn}
>
{accountIds.map(id =>
<StatusContainer key={id} id={id} withNote={false} withoutQuote />,
<StatusContainer key={id} id={id} withNote={false} />,
)}
</ScrollableList>