[Glitch] Remove setting for unfollow confirmation modal, and make it unconditional

Port 37ca59815c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

app/javascript/flavours/glitch/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/flavours/glitch/features/account_timeline/containers/header_container.jsx

@@ -19,7 +19,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';
 
@@ -45,7 +44,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
 
   onFollow (account) {
     if (account.getIn(['relationship', 'following'])) {
-      if (unfollowModal) {
       dispatch(openModal({
         modalType: 'CONFIRM',
         modalProps: {
@@ -54,11 +52,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: {
@@ -67,9 +61,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/flavours/glitch/features/directory/components/account_card.jsx

@@ -21,7 +21,7 @@ import { DisplayName } from 'flavours/glitch/components/display_name';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 import { Permalink } from 'flavours/glitch/components/permalink';
 import { ShortNumber } from 'flavours/glitch/components/short_number';
-import { autoPlayGif, me, unfollowModal } from 'flavours/glitch/initial_state';
+import { autoPlayGif, me } from 'flavours/glitch/initial_state';
 import { makeGetAccount } from 'flavours/glitch/selectors';
 
 const messages = defineMessages({
@@ -50,7 +50,6 @@ const makeMapStateToProps = () => {
 const mapDispatchToProps = (dispatch, { intl }) => ({
   onFollow(account) {
     if (account.getIn(['relationship', 'following'])) {
-      if (unfollowModal) {
       dispatch(
         openModal({
           modalType: 'CONFIRM',
@@ -66,11 +65,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: {
@@ -79,9 +74,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/flavours/glitch/initial_state.js

@@ -118,7 +118,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');