Remove setting for unfollow confirmation modal, and make it unconditional (#29373)

app/javascript/mastodon/containers/account_container.jsx

@@ -13,7 +13,6 @@ import {
 import { openModal } from '../actions/modal';
 import { initMuteModal } from '../actions/mutes';
 import Account from '../components/account';
-import { unfollowModal } from '../initial_state';
 import { makeGetAccount } from '../selectors';
 
 const messages = defineMessages({
@@ -34,7 +33,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
 
   onFollow (account) {
     if (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) {
-      if (unfollowModal) {
       dispatch(openModal({
         modalType: 'CONFIRM',
         modalProps: {
@@ -43,9 +41,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
           onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
         },
       }));
-      } else {
-        dispatch(unfollowAccount(account.get('id')));
-      }
     } else {
       dispatch(followAccount(account.get('id')));
     }

app/javascript/mastodon/features/account_timeline/containers/header_container.jsx

@@ -21,7 +21,6 @@ import { initDomainBlockModal, unblockDomain } from '../../../actions/domain_blo
 import { openModal } from '../../../actions/modal';
 import { initMuteModal } from '../../../actions/mutes';
 import { initReport } from '../../../actions/reports';
-import { unfollowModal } from '../../../initial_state';
 import { makeGetAccount, getAccountHidden } from '../../../selectors';
 import Header from '../components/header';
 
@@ -47,7 +46,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
 
   onFollow (account) {
     if (account.getIn(['relationship', 'following'])) {
-      if (unfollowModal) {
       dispatch(openModal({
         modalType: 'CONFIRM',
         modalProps: {
@@ -56,11 +54,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
           onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
         },
       }));
-      } else {
-        dispatch(unfollowAccount(account.get('id')));
-      }
     } else if (account.getIn(['relationship', 'requested'])) {
-      if (unfollowModal) {
       dispatch(openModal({
         modalType: 'CONFIRM',
         modalProps: {
@@ -69,9 +63,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
           onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
         },
       }));
-      } else {
-        dispatch(unfollowAccount(account.get('id')));
-      }
     } else {
       dispatch(followAccount(account.get('id')));
     }

app/javascript/mastodon/features/directory/components/account_card.jsx

@@ -20,7 +20,7 @@ import { Avatar } from 'mastodon/components/avatar';
 import { Button } from 'mastodon/components/button';
 import { DisplayName } from 'mastodon/components/display_name';
 import { ShortNumber } from 'mastodon/components/short_number';
-import { autoPlayGif, me, unfollowModal } from 'mastodon/initial_state';
+import { autoPlayGif, me } from 'mastodon/initial_state';
 import { makeGetAccount } from 'mastodon/selectors';
 
 const messages = defineMessages({
@@ -48,7 +48,6 @@ const makeMapStateToProps = () => {
 const mapDispatchToProps = (dispatch, { intl }) => ({
   onFollow(account) {
     if (account.getIn(['relationship', 'following'])) {
-      if (unfollowModal) {
       dispatch(
         openModal({
           modalType: 'CONFIRM',
@@ -64,11 +63,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
             onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
           } }),
       );
-      } else {
-        dispatch(unfollowAccount(account.get('id')));
-      }
     } else if (account.getIn(['relationship', 'requested'])) {
-      if (unfollowModal) {
       dispatch(openModal({
         modalType: 'CONFIRM',
         modalProps: {
@@ -77,9 +72,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
           onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
         },
       }));
-      } else {
-        dispatch(unfollowAccount(account.get('id')));
-      }
     } else {
       dispatch(followAccount(account.get('id')));
     }

app/javascript/mastodon/initial_state.js

@@ -38,7 +38,6 @@
  * @property {string} title
  * @property {boolean} show_trends
  * @property {boolean} trends_as_landing_page
- * @property {boolean} unfollow_modal
  * @property {boolean} use_blurhash
  * @property {boolean=} use_pending_items
  * @property {string} version
@@ -99,7 +98,6 @@ export const source_url = getMeta('source_url');
 export const timelinePreview = getMeta('timeline_preview');
 export const title = getMeta('title');
 export const trendsAsLanding = getMeta('trends_as_landing_page');
-export const unfollowModal = getMeta('unfollow_modal');
 export const useBlurhash = getMeta('use_blurhash');
 export const usePendingItems = getMeta('use_pending_items');
 export const version = getMeta('version');

app/models/concerns/user/has_settings.rb

@@ -27,10 +27,6 @@ module User::HasSettings
     settings['default_sensitive']
   end
 
-  def setting_unfollow_modal
-    settings['web.unfollow_modal']
-  end
-
   def setting_boost_modal
     settings['web.reblog_modal']
   end

app/models/user_settings.rb

@@ -27,7 +27,6 @@ class UserSettings
     setting :disable_swiping, default: false
     setting :delete_modal, default: true
     setting :reblog_modal, default: false
-    setting :unfollow_modal, default: true
     setting :reduce_motion, default: false
     setting :expand_content_warnings, default: false
     setting :display_media, default: 'default', in: %w(default show_all hide_all)

app/serializers/initial_state_serializer.rb

@@ -17,7 +17,6 @@ class InitialStateSerializer < ActiveModel::Serializer
 
     if object.current_account
       store[:me]                = object.current_account.id.to_s
-      store[:unfollow_modal]    = object_account_user.setting_unfollow_modal
       store[:boost_modal]       = object_account_user.setting_boost_modal
       store[:delete_modal]      = object_account_user.setting_delete_modal
       store[:auto_play_gif]     = object_account_user.setting_auto_play_gif

app/views/settings/preferences/appearance/show.html.haml

@@ -66,7 +66,6 @@
     %h4= t 'appearance.confirmation_dialogs'
 
     .fields-group
-      = ff.input :'web.unfollow_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_unfollow_modal')
       = ff.input :'web.reblog_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_boost_modal')
       = ff.input :'web.delete_modal', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_delete_modal')