mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-15 08:48:53 +00:00
[Glitch] Add hotkey Q for quoting the currently focused post
Port 229cbc6a24 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
@@ -105,6 +105,7 @@ const hotkeyMatcherMap = {
|
|||||||
reply: just('r'),
|
reply: just('r'),
|
||||||
favourite: just('f'),
|
favourite: just('f'),
|
||||||
boost: just('b'),
|
boost: just('b'),
|
||||||
|
quote: just('q'),
|
||||||
mention: just('m'),
|
mention: just('m'),
|
||||||
open: any('enter', 'o'),
|
open: any('enter', 'o'),
|
||||||
openProfile: just('p'),
|
openProfile: just('p'),
|
||||||
|
|||||||
@@ -95,6 +95,7 @@ class Status extends ImmutablePureComponent {
|
|||||||
onReply: PropTypes.func,
|
onReply: PropTypes.func,
|
||||||
onFavourite: PropTypes.func,
|
onFavourite: PropTypes.func,
|
||||||
onReblog: PropTypes.func,
|
onReblog: PropTypes.func,
|
||||||
|
onQuote: PropTypes.func,
|
||||||
onBookmark: PropTypes.func,
|
onBookmark: PropTypes.func,
|
||||||
onDelete: PropTypes.func,
|
onDelete: PropTypes.func,
|
||||||
onDirect: PropTypes.func,
|
onDirect: PropTypes.func,
|
||||||
@@ -359,6 +360,10 @@ class Status extends ImmutablePureComponent {
|
|||||||
this.props.onBookmark(this.props.status, e);
|
this.props.onBookmark(this.props.status, e);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
handleHotkeyQuote = () => {
|
||||||
|
this.props.onQuote(this._properStatus());
|
||||||
|
};
|
||||||
|
|
||||||
handleHotkeyMention = e => {
|
handleHotkeyMention = e => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
this.props.onMention(this.props.status.get('account'));
|
this.props.onMention(this.props.status.get('account'));
|
||||||
@@ -479,6 +484,7 @@ class Status extends ImmutablePureComponent {
|
|||||||
reply: this.handleHotkeyReply,
|
reply: this.handleHotkeyReply,
|
||||||
favourite: this.handleHotkeyFavourite,
|
favourite: this.handleHotkeyFavourite,
|
||||||
boost: this.handleHotkeyBoost,
|
boost: this.handleHotkeyBoost,
|
||||||
|
quote: this.handleHotkeyQuote,
|
||||||
mention: this.handleHotkeyMention,
|
mention: this.handleHotkeyMention,
|
||||||
open: this.handleHotkeyOpen,
|
open: this.handleHotkeyOpen,
|
||||||
openProfile: this.handleHotkeyOpenProfile,
|
openProfile: this.handleHotkeyOpenProfile,
|
||||||
|
|||||||
@@ -59,6 +59,10 @@ const messages = defineMessages({
|
|||||||
defaultMessage: 'Private posts cannot be quoted',
|
defaultMessage: 'Private posts cannot be quoted',
|
||||||
},
|
},
|
||||||
reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
|
reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
|
||||||
|
reblog_or_quote: {
|
||||||
|
id: 'status.reblog_or_quote',
|
||||||
|
defaultMessage: 'Boost or quote',
|
||||||
|
},
|
||||||
reblog_cancel: {
|
reblog_cancel: {
|
||||||
id: 'status.cancel_reblog_private',
|
id: 'status.cancel_reblog_private',
|
||||||
defaultMessage: 'Unboost',
|
defaultMessage: 'Unboost',
|
||||||
@@ -176,7 +180,7 @@ export const StatusReblogButton: FC<ReblogButtonProps> = ({
|
|||||||
>
|
>
|
||||||
<IconButton
|
<IconButton
|
||||||
title={intl.formatMessage(
|
title={intl.formatMessage(
|
||||||
!disabled ? messages.reblog : messages.all_disabled,
|
!disabled ? messages.reblog_or_quote : messages.all_disabled,
|
||||||
)}
|
)}
|
||||||
icon='retweet'
|
icon='retweet'
|
||||||
iconComponent={iconComponent}
|
iconComponent={iconComponent}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import {
|
|||||||
mentionCompose,
|
mentionCompose,
|
||||||
directCompose,
|
directCompose,
|
||||||
} from 'flavours/glitch/actions/compose';
|
} from 'flavours/glitch/actions/compose';
|
||||||
|
import { quoteComposeById } from 'flavours/glitch/actions/compose_typed';
|
||||||
import {
|
import {
|
||||||
initAddFilter,
|
initAddFilter,
|
||||||
} from 'flavours/glitch/actions/filters';
|
} from 'flavours/glitch/actions/filters';
|
||||||
@@ -34,6 +35,7 @@ import {
|
|||||||
import Status from 'flavours/glitch/components/status';
|
import Status from 'flavours/glitch/components/status';
|
||||||
import { deleteModal } from 'flavours/glitch/initial_state';
|
import { deleteModal } from 'flavours/glitch/initial_state';
|
||||||
import { makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selectors';
|
import { makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selectors';
|
||||||
|
import { isFeatureEnabled } from 'flavours/glitch/utils/environment';
|
||||||
|
|
||||||
import { setStatusQuotePolicy } from '../actions/statuses_typed';
|
import { setStatusQuotePolicy } from '../actions/statuses_typed';
|
||||||
|
|
||||||
@@ -82,6 +84,12 @@ const mapDispatchToProps = (dispatch, { contextType }) => ({
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
onQuote (status) {
|
||||||
|
if (isFeatureEnabled('outgoing_quotes')) {
|
||||||
|
dispatch(quoteComposeById(status.get('id')));
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
onReblog (status, e) {
|
onReblog (status, e) {
|
||||||
dispatch(toggleReblog(status.get('id'), e.shiftKey));
|
dispatch(toggleReblog(status.get('id'), e.shiftKey));
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
|
|||||||
import InfoIcon from '@/material-icons/400-24px/info.svg?react';
|
import InfoIcon from '@/material-icons/400-24px/info.svg?react';
|
||||||
import Column from 'flavours/glitch/components/column';
|
import Column from 'flavours/glitch/components/column';
|
||||||
import ColumnHeader from 'flavours/glitch/components/column_header';
|
import ColumnHeader from 'flavours/glitch/components/column_header';
|
||||||
|
import { isFeatureEnabled } from 'flavours/glitch/utils/environment';
|
||||||
|
|
||||||
const messages = defineMessages({
|
const messages = defineMessages({
|
||||||
heading: { id: 'keyboard_shortcuts.heading', defaultMessage: 'Keyboard Shortcuts' },
|
heading: { id: 'keyboard_shortcuts.heading', defaultMessage: 'Keyboard Shortcuts' },
|
||||||
@@ -62,6 +63,12 @@ class KeyboardShortcuts extends ImmutablePureComponent {
|
|||||||
<td><kbd>b</kbd></td>
|
<td><kbd>b</kbd></td>
|
||||||
<td><FormattedMessage id='keyboard_shortcuts.boost' defaultMessage='to boost' /></td>
|
<td><FormattedMessage id='keyboard_shortcuts.boost' defaultMessage='to boost' /></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
{isFeatureEnabled('outgoing_quotes') && (
|
||||||
|
<tr>
|
||||||
|
<td><kbd>q</kbd></td>
|
||||||
|
<td><FormattedMessage id='keyboard_shortcuts.quote' defaultMessage='Quote post' /></td>
|
||||||
|
</tr>
|
||||||
|
)}
|
||||||
<tr>
|
<tr>
|
||||||
<td><kbd>d</kbd></td>
|
<td><kbd>d</kbd></td>
|
||||||
<td><FormattedMessage id='keyboard_shortcuts.bookmark' defaultMessage='to bookmark' /></td>
|
<td><FormattedMessage id='keyboard_shortcuts.bookmark' defaultMessage='to bookmark' /></td>
|
||||||
|
|||||||
@@ -63,6 +63,7 @@ import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from
|
|||||||
import ActionBar from './components/action_bar';
|
import ActionBar from './components/action_bar';
|
||||||
import { DetailedStatus } from './components/detailed_status';
|
import { DetailedStatus } from './components/detailed_status';
|
||||||
import { RefreshController } from './components/refresh_controller';
|
import { RefreshController } from './components/refresh_controller';
|
||||||
|
import { quoteComposeById } from '@/flavours/glitch/actions/compose_typed';
|
||||||
|
|
||||||
const messages = defineMessages({
|
const messages = defineMessages({
|
||||||
revealAll: { id: 'status.show_more_all', defaultMessage: 'Show more for all' },
|
revealAll: { id: 'status.show_more_all', defaultMessage: 'Show more for all' },
|
||||||
@@ -429,6 +430,10 @@ class Status extends ImmutablePureComponent {
|
|||||||
this.handleBookmarkClick(this.props.status);
|
this.handleBookmarkClick(this.props.status);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
handleHotkeyQuote = () => {
|
||||||
|
this.props.dispatch(quoteComposeById(this.props.status.get('id')));
|
||||||
|
};
|
||||||
|
|
||||||
handleHotkeyMention = e => {
|
handleHotkeyMention = e => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
this.handleMentionClick(this.props.status);
|
this.handleMentionClick(this.props.status);
|
||||||
@@ -573,6 +578,7 @@ class Status extends ImmutablePureComponent {
|
|||||||
reply: this.handleHotkeyReply,
|
reply: this.handleHotkeyReply,
|
||||||
favourite: this.handleHotkeyFavourite,
|
favourite: this.handleHotkeyFavourite,
|
||||||
boost: this.handleHotkeyBoost,
|
boost: this.handleHotkeyBoost,
|
||||||
|
quote: this.handleHotkeyQuote,
|
||||||
bookmark: this.handleHotkeyBookmark,
|
bookmark: this.handleHotkeyBookmark,
|
||||||
mention: this.handleHotkeyMention,
|
mention: this.handleHotkeyMention,
|
||||||
openProfile: this.handleHotkeyOpenProfile,
|
openProfile: this.handleHotkeyOpenProfile,
|
||||||
|
|||||||
Reference in New Issue
Block a user