:setting_default_sensitive,
:setting_unfollow_modal,
:setting_boost_modal,
+ :setting_favourite_modal,
:setting_delete_modal,
:setting_auto_play_gif,
:setting_reduce_motion,
'settings',
'prepend',
'boostModal',
+ 'favouriteModal',
'muted',
'collapse',
'notification',
this.props.onReply(this.props.status, this.context.router.history);
}
- handleHotkeyFavourite = () => {
- this.props.onFavourite(this.props.status);
+ handleHotkeyFavourite = e => {
+ this.props.onFavourite(this.props.status, e);
}
handleHotkeyBoost = e => {
import { initReport } from 'flavours/glitch/actions/reports';
import { openModal } from 'flavours/glitch/actions/modal';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import { boostModal, deleteModal } from 'flavours/glitch/util/initial_state';
+import { boostModal, favouriteModal, deleteModal } from 'flavours/glitch/util/initial_state';
const messages = defineMessages({
deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
}
},
- onFavourite (status) {
+ onModalFavourite (status) {
+ dispatch(favourite(status));
+ },
+
+ onFavourite (status, e) {
if (status.get('favourited')) {
dispatch(unfavourite(status));
} else {
- dispatch(favourite(status));
+ if (e.shiftKey || !favouriteModal) {
+ this.onModalFavourite(status);
+ } else {
+ dispatch(openModal('FAVOURITE', { status, onFavourite: this.onModalFavourite }));
+ }
}
},
-
+
onPin (status) {
if (status.get('pinned')) {
dispatch(unpin(status));
this.props.onReblog(this.props.status, e);
}
- handleFavouriteClick = () => {
- this.props.onFavourite(this.props.status);
+ handleFavouriteClick = (e) => {
+ this.props.onFavourite(this.props.status, e);
}
handleDeleteClick = () => {
import { defineMessages, injectIntl } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { HotKeys } from 'react-hotkeys';
-import { boostModal, deleteModal } from 'flavours/glitch/util/initial_state';
+import { boostModal, favouriteModal, deleteModal } from 'flavours/glitch/util/initial_state';
import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from 'flavours/glitch/util/fullscreen';
const messages = defineMessages({
}
};
- handleFavouriteClick = (status) => {
+ handleModalFavourite = (status) => {
+ this.props.dispatch(favourite(status));
+ }
+
+ handleFavouriteClick = (status, e) => {
if (status.get('favourited')) {
this.props.dispatch(unfavourite(status));
} else {
- this.props.dispatch(favourite(status));
+ if (e.shiftKey || !favoriteModal) {
+ this.handleModalFavourite(status);
+ } else {
+ this.props.dispatch(openModal('FAVOURITE', { status, onFavourite: this.handleModalFavourite }));
+ }
}
}
handleModalReblog = (status) => {
this.props.dispatch(reblog(status));
}
-
+
handleReblogClick = (status, e) => {
if (status.get('reblogged')) {
this.props.dispatch(unreblog(status));
--- /dev/null
+import React from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import PropTypes from 'prop-types';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import Button from 'flavours/glitch/components/button';
+import StatusContent from 'flavours/glitch/components/status_content';
+import Avatar from 'flavours/glitch/components/avatar';
+import RelativeTimestamp from 'flavours/glitch/components/relative_timestamp';
+import DisplayName from 'flavours/glitch/components/display_name';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+
+const messages = defineMessages({
+ reblog: { id: 'status.favourite', defaultMessage: 'Favourite' },
+});
+
+@injectIntl
+export default class BoostModal extends ImmutablePureComponent {
+
+ static contextTypes = {
+ router: PropTypes.object,
+ };
+
+ static propTypes = {
+ status: ImmutablePropTypes.map.isRequired,
+ onReblog: PropTypes.func.isRequired,
+ onClose: PropTypes.func.isRequired,
+ intl: PropTypes.object.isRequired,
+ };
+
+ componentDidMount() {
+ this.button.focus();
+ }
+
+ handleFavourite = () => {
+ this.props.onFavourite(this.props.status);
+ this.props.onClose();
+ }
+
+ handleAccountClick = (e) => {
+ if (e.button === 0) {
+ e.preventDefault();
+ this.props.onClose();
+ this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
+ }
+ }
+
+ setRef = (c) => {
+ this.button = c;
+ }
+
+ render () {
+ const { status, intl } = this.props;
+
+ return (
+ <div className='modal-root__modal favourite-modal'>
+ <div className='favourite-modal__container'>
+ <div className='status light'>
+ <div className='favourite-modal__status-header'>
+ <div className='favourite-modal__status-time'>
+ <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener'><RelativeTimestamp timestamp={status.get('created_at')} /></a>
+ </div>
+
+ <a onClick={this.handleAccountClick} href={status.getIn(['account', 'url'])} className='status__display-name'>
+ <div className='status__avatar'>
+ <Avatar account={status.get('account')} size={48} />
+ </div>
+
+ <DisplayName account={status.get('account')} />
+ </a>
+ </div>
+
+ <StatusContent status={status} />
+ </div>
+ </div>
+
+ <div className='favourite-modal__action-bar'>
+ <div><FormattedMessage id='favourite_modal.combo' defaultMessage='You can press {combo} to skip this next time' values={{ combo: <span>Shift + <i className='fa fa-star' /></span> }} /></div>
+ <Button text={intl.formatMessage(messages.reblog)} onClick={this.handleReblog} ref={this.setRef} />
+ </div>
+ </div>
+ );
+ }
+
+}
import MediaModal from './media_modal';
import VideoModal from './video_modal';
import BoostModal from './boost_modal';
+import FavouriteModal from './favourite_modal';
import DoodleModal from './doodle_modal';
import ConfirmationModal from './confirmation_modal';
import {
'ONBOARDING': OnboardingModal,
'VIDEO': () => Promise.resolve({ default: VideoModal }),
'BOOST': () => Promise.resolve({ default: BoostModal }),
+ 'FAVOURITE': () => Promise.resolve({ default: FavouriteModal }),
'DOODLE': () => Promise.resolve({ default: DoodleModal }),
'CONFIRM': () => Promise.resolve({ default: ConfirmationModal }),
'MUTE': MuteModal,
}
renderLoading = modalId => () => {
- return ['MEDIA', 'VIDEO', 'BOOST', 'DOODLE', 'CONFIRM', 'ACTIONS'].indexOf(modalId) === -1 ? <ModalLoading /> : null;
+ return ['MEDIA', 'VIDEO', 'BOOST', 'FAVOURITE', 'DOODLE', 'CONFIRM', 'ACTIONS'].indexOf(modalId) === -1 ? <ModalLoading /> : null;
}
renderError = (props) => {
}
.boost-modal,
+.favourite-modal,
.confirmation-modal,
.report-modal,
.actions-modal,
}
}
-.boost-modal__container {
+.boost-modal__container,
+.favourite-modal__container{
overflow-x: scroll;
padding: 10px;
}
.boost-modal__action-bar,
+.favourite-modal__action-bar,
.confirmation-modal__action-bar,
.mute-modal__action-bar,
.report-modal__action-bar {
}
}
-.boost-modal__status-header {
+.boost-modal__status-header,
+.favourite-modal__status-header {
font-size: 15px;
}
-.boost-modal__status-time {
+.boost-modal__status-time,
+.favourite-modal__status-time {
float: right;
font-size: 14px;
}
export const autoPlayGif = getMeta('auto_play_gif');
export const unfollowModal = getMeta('unfollow_modal');
export const boostModal = getMeta('boost_modal');
+export const favouriteModal = getMeta('favourite_modal');
export const deleteModal = getMeta('delete_modal');
export const me = getMeta('me');
has_many :session_activations, dependent: :destroy
- delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :delete_modal,
+ delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :favourite_modal, :delete_modal,
:reduce_motion, :system_font_ui, :noindex, :flavour, :skin,
to: :settings, prefix: :setting, allow_nil: false
= f.input :setting_unfollow_modal, as: :boolean, wrapper: :with_label
= f.input :setting_boost_modal, as: :boolean, wrapper: :with_label
+ = f.input :setting_favourite_modal, as: :boolean, wrapper: :with_label
= f.input :setting_delete_modal, as: :boolean, wrapper: :with_label
.fields-group
password: Password
setting_auto_play_gif: Auto-play animated GIFs
setting_boost_modal: Show confirmation dialog before boosting
+ setting_favourite_modal: Show confirmation dialog before favouriting
setting_default_privacy: Post privacy
setting_default_sensitive: Always mark media as sensitive
setting_delete_modal: Show confirmation dialog before deleting a toot
default_sensitive: false
unfollow_modal: false
boost_modal: false
+ favourite_modal: false
delete_modal: true
auto_play_gif: false
reduce_motion: false
cat aescling's git repositories / mastodon.git / commitdiff