From 42aecb4c13a8edce014a76f2ca38baac0084b5bb Mon Sep 17 00:00:00 2001 From: ThibG Date: Fri, 5 Oct 2018 18:44:44 +0200 Subject: Add a confirmation dialog when hitting reply and the compose box isn't empty (#8893) * Add a confirmation dialog when hitting reply and the compose box isn't empty Fixes #878 * Performance improvement --- app/javascript/mastodon/containers/status_container.js | 15 ++++++++++++++- app/javascript/mastodon/features/status/index.js | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js index bbc0d5e96..b3555c76e 100644 --- a/app/javascript/mastodon/containers/status_container.js +++ b/app/javascript/mastodon/containers/status_container.js @@ -36,6 +36,8 @@ const messages = defineMessages({ redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' }, redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.' }, blockConfirm: { id: 'confirmations.block.confirm', defaultMessage: 'Block' }, + replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' }, + replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' }, }); const makeMapStateToProps = () => { @@ -51,7 +53,18 @@ const makeMapStateToProps = () => { const mapDispatchToProps = (dispatch, { intl }) => ({ onReply (status, router) { - dispatch(replyCompose(status, router)); + dispatch((_, getState) => { + let state = getState(); + if (state.getIn(['compose', 'text']).trim().length !== 0) { + dispatch(openModal('CONFIRM', { + message: intl.formatMessage(messages.replyMessage), + confirm: intl.formatMessage(messages.replyConfirm), + onConfirm: () => dispatch(replyCompose(status, router)), + })); + } else { + dispatch(replyCompose(status, router)); + } + }); }, onModalReblog (status) { diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js index 7d1bc2ca4..2cd17b805 100644 --- a/app/javascript/mastodon/features/status/index.js +++ b/app/javascript/mastodon/features/status/index.js @@ -54,6 +54,8 @@ const messages = defineMessages({ revealAll: { id: 'status.show_more_all', defaultMessage: 'Show more for all' }, hideAll: { id: 'status.show_less_all', defaultMessage: 'Show less for all' }, detailedStatus: { id: 'status.detailed_status', defaultMessage: 'Detailed conversation view' }, + replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' }, + replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' }, }); const makeMapStateToProps = () => { @@ -98,6 +100,7 @@ const makeMapStateToProps = () => { status, ancestorsIds, descendantsIds, + askReplyConfirmation: state.getIn(['compose', 'text']).trim().length !== 0, }; }; @@ -119,6 +122,7 @@ class Status extends ImmutablePureComponent { ancestorsIds: ImmutablePropTypes.list, descendantsIds: ImmutablePropTypes.list, intl: PropTypes.object.isRequired, + askReplyConfirmation: PropTypes.bool, }; state = { @@ -157,7 +161,16 @@ class Status extends ImmutablePureComponent { } handleReplyClick = (status) => { - this.props.dispatch(replyCompose(status, this.context.router.history)); + let { askReplyConfirmation, dispatch, intl } = this.props; + if (askReplyConfirmation) { + dispatch(openModal('CONFIRM', { + message: intl.formatMessage(messages.replyMessage), + confirm: intl.formatMessage(messages.replyConfirm), + onConfirm: () => dispatch(replyCompose(status, this.context.router.history)), + })); + } else { + dispatch(replyCompose(status, this.context.router.history)); + } } handleModalReblog = (status) => { -- cgit From 144d73730de38da84d605f876157bc9bd45c25b4 Mon Sep 17 00:00:00 2001 From: Jeong Arm Date: Sat, 6 Oct 2018 02:17:46 +0900 Subject: Leave unknown language as nil if account is remote (#8861) * Force use language detector if account is remote * Set unknown remote toot's language as nil --- app/lib/language_detector.rb | 4 +++- spec/lib/language_detector_spec.rb | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/lib/language_detector.rb b/app/lib/language_detector.rb index 688d21fd8..58c8e2069 100644 --- a/app/lib/language_detector.rb +++ b/app/lib/language_detector.rb @@ -12,6 +12,7 @@ class LanguageDetector def detect(text, account) input_text = prepare_text(text) return if input_text.blank? + detect_language_code(input_text) || default_locale(account) end @@ -33,6 +34,7 @@ class LanguageDetector def detect_language_code(text) return if unreliable_input?(text) + result = @identifier.find_language(text) iso6391(result.language.to_s).to_sym if result.reliable? end @@ -75,6 +77,6 @@ class LanguageDetector end def default_locale(account) - account.user_locale&.to_sym || I18n.default_locale + return account.user_locale&.to_sym || I18n.default_locale if account.local? end end diff --git a/spec/lib/language_detector_spec.rb b/spec/lib/language_detector_spec.rb index cdc51a656..0fa2a59ef 100644 --- a/spec/lib/language_detector_spec.rb +++ b/spec/lib/language_detector_spec.rb @@ -42,6 +42,7 @@ describe LanguageDetector do describe 'detect' do let(:account_without_user_locale) { Fabricate(:user, locale: nil).account } + let(:account_remote) { Fabricate(:account, domain: 'joinmastodon.org') } it 'detects english language for basic strings' do strings = [ @@ -104,6 +105,15 @@ describe LanguageDetector do end end + describe 'remote user' do + it 'nil for foreign user when language is not present' do + string = '안녕하세요' + result = described_class.instance.detect(string, account_remote) + + expect(result).to eq nil + end + end + describe 'with a non-`en` default locale' do around(:each) do |example| before = I18n.default_locale -- cgit