diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index 277f0f657..9177d37da 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -33,6 +33,7 @@ class Settings::PreferencesController < Settings::BaseController
:setting_default_sensitive,
:setting_unfollow_modal,
:setting_boost_modal,
+ :setting_favourite_modal,
:setting_delete_modal,
:setting_auto_play_gif,
:setting_reduce_motion,
diff --git a/app/javascript/flavours/glitch/components/status.js b/app/javascript/flavours/glitch/components/status.js
index b0d9e3757..b8a0fd180 100644
--- a/app/javascript/flavours/glitch/components/status.js
+++ b/app/javascript/flavours/glitch/components/status.js
@@ -58,6 +58,7 @@ export default class Status extends ImmutablePureComponent {
'settings',
'prepend',
'boostModal',
+ 'favouriteModal',
'muted',
'collapse',
'notification',
@@ -204,8 +205,8 @@ export default class Status extends ImmutablePureComponent {
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 => {
diff --git a/app/javascript/flavours/glitch/components/status_action_bar.js b/app/javascript/flavours/glitch/components/status_action_bar.js
index 5a06782be..cb663e773 100644
--- a/app/javascript/flavours/glitch/components/status_action_bar.js
+++ b/app/javascript/flavours/glitch/components/status_action_bar.js
@@ -71,8 +71,8 @@ export default class StatusActionBar extends ImmutablePureComponent {
});
}
- handleFavouriteClick = () => {
- this.props.onFavourite(this.props.status);
+ handleFavouriteClick = (e) => {
+ this.props.onFavourite(this.props.status, e);
}
handleReblogClick = (e) => {
diff --git a/app/javascript/flavours/glitch/containers/status_container.js b/app/javascript/flavours/glitch/containers/status_container.js
index b753de7b3..c0b9b5800 100644
--- a/app/javascript/flavours/glitch/containers/status_container.js
+++ b/app/javascript/flavours/glitch/containers/status_container.js
@@ -20,7 +20,7 @@ import { initMuteModal } from 'flavours/glitch/actions/mutes';
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' },
@@ -78,11 +78,19 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
}
},
- 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 }));
+ }
}
},
diff --git a/app/javascript/flavours/glitch/features/status/components/action_bar.js b/app/javascript/flavours/glitch/features/status/components/action_bar.js
index 4d660ee3c..3190fd0be 100644
--- a/app/javascript/flavours/glitch/features/status/components/action_bar.js
+++ b/app/javascript/flavours/glitch/features/status/components/action_bar.js
@@ -48,8 +48,8 @@ export default class ActionBar extends React.PureComponent {
this.props.onReblog(this.props.status, e);
}
- handleFavouriteClick = () => {
- this.props.onFavourite(this.props.status);
+ handleFavouriteClick = (e) => {
+ this.props.onFavourite(this.props.status, e);
}
handleDeleteClick = () => {
diff --git a/app/javascript/flavours/glitch/features/status/index.js b/app/javascript/flavours/glitch/features/status/index.js
index 93b0fe9d9..40ae380ab 100644
--- a/app/javascript/flavours/glitch/features/status/index.js
+++ b/app/javascript/flavours/glitch/features/status/index.js
@@ -30,7 +30,7 @@ import { openModal } from 'flavours/glitch/actions/modal';
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({
@@ -95,11 +95,19 @@ export default class Status extends ImmutablePureComponent {
}
};
- 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 || !favouriteModal) {
+ this.handleModalFavourite(status);
+ } else {
+ this.props.dispatch(openModal('FAVOURITE', { status, onFavourite: this.handleModalFavourite }));
+ }
}
}
diff --git a/app/javascript/flavours/glitch/features/ui/components/favourite_modal.js b/app/javascript/flavours/glitch/features/ui/components/favourite_modal.js
new file mode 100644
index 000000000..70722411d
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/ui/components/favourite_modal.js
@@ -0,0 +1,84 @@
+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({
+ favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
+});
+
+@injectIntl
+export default class FavouriteModal extends ImmutablePureComponent {
+
+ static contextTypes = {
+ router: PropTypes.object,
+ };
+
+ static propTypes = {
+ status: ImmutablePropTypes.map.isRequired,
+ onFavourite: 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 (
+
+ );
+ }
+
+}
diff --git a/app/javascript/flavours/glitch/features/ui/components/modal_root.js b/app/javascript/flavours/glitch/features/ui/components/modal_root.js
index 679578b75..a3e734867 100644
--- a/app/javascript/flavours/glitch/features/ui/components/modal_root.js
+++ b/app/javascript/flavours/glitch/features/ui/components/modal_root.js
@@ -7,6 +7,7 @@ import ActionsModal from './actions_modal';
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 {
@@ -23,6 +24,7 @@ const MODAL_COMPONENTS = {
'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,
@@ -92,7 +94,7 @@ export default class ModalRoot extends React.PureComponent {
}
renderLoading = modalId => () => {
- return ['MEDIA', 'VIDEO', 'BOOST', 'DOODLE', 'CONFIRM', 'ACTIONS'].indexOf(modalId) === -1 ? : null;
+ return ['MEDIA', 'VIDEO', 'BOOST', 'FAVOURITE', 'DOODLE', 'CONFIRM', 'ACTIONS'].indexOf(modalId) === -1 ? : null;
}
renderError = (props) => {
diff --git a/app/javascript/flavours/glitch/locales/en.js b/app/javascript/flavours/glitch/locales/en.js
index 1d2e0ecf4..0681d27d8 100644
--- a/app/javascript/flavours/glitch/locales/en.js
+++ b/app/javascript/flavours/glitch/locales/en.js
@@ -34,6 +34,8 @@ const messages = {
'status.collapse': 'Collapse',
'status.uncollapse': 'Uncollapse',
+ 'favourite_modal.combo': 'You can press {combo} to skip this next time',
+
'home.column_settings.show_direct': 'Show DMs',
'notification.markForDeletion': 'Mark for deletion',
diff --git a/app/javascript/flavours/glitch/styles/components/index.scss b/app/javascript/flavours/glitch/styles/components/index.scss
index e171b72c1..0c36373b7 100644
--- a/app/javascript/flavours/glitch/styles/components/index.scss
+++ b/app/javascript/flavours/glitch/styles/components/index.scss
@@ -3913,6 +3913,7 @@ button.icon-button.active i.fa-retweet {
}
.boost-modal,
+.favourite-modal,
.confirmation-modal,
.report-modal,
.actions-modal,
@@ -3944,7 +3945,8 @@ button.icon-button.active i.fa-retweet {
}
}
-.boost-modal__container {
+.boost-modal__container,
+.favourite-modal__container{
overflow-x: scroll;
padding: 10px;
@@ -3955,6 +3957,7 @@ button.icon-button.active i.fa-retweet {
}
.boost-modal__action-bar,
+.favourite-modal__action-bar,
.confirmation-modal__action-bar,
.mute-modal__action-bar,
.report-modal__action-bar {
@@ -3976,11 +3979,13 @@ button.icon-button.active i.fa-retweet {
}
}
-.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;
}
diff --git a/app/javascript/flavours/glitch/util/initial_state.js b/app/javascript/flavours/glitch/util/initial_state.js
index ef5d8b0ef..607d6b9b0 100644
--- a/app/javascript/flavours/glitch/util/initial_state.js
+++ b/app/javascript/flavours/glitch/util/initial_state.js
@@ -15,6 +15,7 @@ export const reduceMotion = getMeta('reduce_motion');
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');
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index bb82cf5f5..65e20c17a 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -1293,6 +1293,19 @@
],
"path": "app/javascript/mastodon/features/ui/components/boost_modal.json"
},
+ {
+ "descriptors": [
+ {
+ "defaultMessage": "Favourite",
+ "id": "status.favourite"
+ },
+ {
+ "defaultMessage": "You can press {combo} to skip this next time",
+ "id": "favourite_modal.combo"
+ }
+ ],
+ "path": "app/javascript/mastodon/features/ui/components/favourite_modal.json"
+ },
{
"descriptors": [
{
@@ -1601,4 +1614,4 @@
],
"path": "app/javascript/mastodon/features/video/index.json"
}
-]
\ No newline at end of file
+]
diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb
index 8af384a2d..5f0176f27 100644
--- a/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@@ -21,6 +21,7 @@ class UserSettingsDecorator
user.settings['default_sensitive'] = default_sensitive_preference if change?('setting_default_sensitive')
user.settings['unfollow_modal'] = unfollow_modal_preference if change?('setting_unfollow_modal')
user.settings['boost_modal'] = boost_modal_preference if change?('setting_boost_modal')
+ user.settings['favourite_modal'] = favourite_modal_preference if change?('setting_favourite_modal')
user.settings['delete_modal'] = delete_modal_preference if change?('setting_delete_modal')
user.settings['auto_play_gif'] = auto_play_gif_preference if change?('setting_auto_play_gif')
user.settings['reduce_motion'] = reduce_motion_preference if change?('setting_reduce_motion')
@@ -53,6 +54,10 @@ class UserSettingsDecorator
def boost_modal_preference
boolean_cast_setting 'setting_boost_modal'
end
+
+ def favourite_modal_preference
+ boolean_cast_setting 'setting_favourite_modal'
+ end
def delete_modal_preference
boolean_cast_setting 'setting_delete_modal'
diff --git a/app/models/user.rb b/app/models/user.rb
index 29bdcbd67..47bf22e17 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -75,7 +75,7 @@ class User < ApplicationRecord
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
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 9dfa019f5..904daa804 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -28,6 +28,7 @@ class InitialStateSerializer < ActiveModel::Serializer
store[:me] = object.current_account.id.to_s
store[:unfollow_modal] = object.current_account.user.setting_unfollow_modal
store[:boost_modal] = object.current_account.user.setting_boost_modal
+ store[:favourite_modal] = object.current_account.user.setting_favourite_modal
store[:delete_modal] = object.current_account.user.setting_delete_modal
store[:auto_play_gif] = object.current_account.user.setting_auto_play_gif
store[:reduce_motion] = object.current_account.user.setting_reduce_motion
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index e2e48a699..45a3b2eb0 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -32,6 +32,7 @@
= 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
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 756f6b119..1722eea7b 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -46,6 +46,7 @@ en:
setting_default_privacy: Post privacy
setting_default_sensitive: Always mark media as sensitive
setting_delete_modal: Show confirmation dialog before deleting a toot
+ setting_favourite_modal: Show confirmation dialog before favouriting
setting_flavour: Flavour
setting_noindex: Opt-out of search engine indexing
setting_reduce_motion: Reduce motion in animations
diff --git a/config/settings.yml b/config/settings.yml
index 5aad45da2..dbc5f6a26 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -22,6 +22,7 @@ defaults: &defaults
default_sensitive: false
unfollow_modal: false
boost_modal: false
+ favourite_modal: false
delete_modal: true
auto_play_gif: false
reduce_motion: false