index.html

@@ -24,7 +24,6 @@
     <noscript>To use Pleroma, please enable JavaScript.</noscript>
     <script>if('serviceWorker' in navigator){navigator.serviceWorker.register('/static/service-worker.js');} else {console.log("Service worker is not supported");}</script>
     <div id="app"></div>
-    <div id="modal"></div>
     <!-- built files will be auto injected -->
   </body>
 </html>

src/App.vue

@@ -59,7 +59,7 @@
     <UserReportingModal />
     <PostStatusModal />
     <SettingsModal />
-    <UpdateNotification />
+    <div id="modal" />
     <GlobalNoticeList />
   </div>
 </template>

src/components/account_actions/account_actions.js

@@ -1,8 +1,6 @@
 import ProgressButton from '../progress_button/progress_button.vue'
 import Popover from '../popover/popover.vue'
-import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { mapState } from 'vuex'
 import {
   faEllipsisV
 } from '@fortawesome/free-solid-svg-icons'
@@ -16,22 +14,13 @@ const AccountActions = {
     'user', 'relationship'
   ],
   data () {
-    return {
-      showingConfirmBlock: false
-    }
+    return { }
   },
   components: {
     ProgressButton,
-    Popover,
-    ConfirmModal
+    Popover
   },
   methods: {
-    showConfirmBlock () {
-      this.showingConfirmBlock = true
-    },
-    hideConfirmBlock () {
-      this.showingConfirmBlock = false
-    },
     showRepeats () {
       this.$store.dispatch('showReblogs', this.user.id)
     },
@@ -39,15 +28,7 @@ const AccountActions = {
       this.$store.dispatch('hideReblogs', this.user.id)
     },
     blockUser () {
-      if (!this.shouldConfirmBlock) {
-        this.doBlockUser()
-      } else {
-        this.showConfirmBlock()
-      }
-    },
-    doBlockUser () {
       this.$store.dispatch('blockUser', this.user.id)
-      this.hideConfirmBlock()
     },
     unblockUser () {
       this.$store.dispatch('unblockUser', this.user.id)
@@ -55,14 +36,6 @@ const AccountActions = {
     reportUser () {
       this.$store.dispatch('openUserReportingModal', { userId: this.user.id })
     }
-  },
-  computed: {
-    shouldConfirmBlock () {
-      return this.$store.getters.mergedConfig.modalOnBlock
-    },
-    ...mapState({
-      pleromaChatMessagesAvailable: state => state.instance.pleromaChatMessagesAvailable
-    })
   }
 }
 

src/components/account_actions/account_actions.vue

@@ -59,27 +59,6 @@
         </button>
       </template>
     </Popover>
-    <teleport to="#modal">
-      <confirm-modal
-        v-if="showingConfirmBlock"
-        :title="$t('user_card.block_confirm_title')"
-        :confirm-text="$t('user_card.block_confirm_accept_button')"
-        :cancel-text="$t('user_card.block_confirm_cancel_button')"
-        @accepted="doBlockUser"
-        @cancelled="hideConfirmBlock"
-      >
-        <i18n-t
-          keypath="user_card.block_confirm"
-          tag="span"
-        >
-          <template v-slot:user>
-            <span
-              v-text="user.screen_name_ui"
-            />
-          </template>
-        </i18n-t>
-      </confirm-modal>
-    </teleport>
   </div>
 </template>
 

src/components/confirm_modal/confirm_modal.js

@@ -1,37 +0,0 @@
-import DialogModal from '../dialog_modal/dialog_modal.vue'
-
-/**
- * This component emits the following events:
- * cancelled, emitted when the action should not be performed;
- * accepted, emitted when the action should be performed;
- *
- * The caller should close this dialog after receiving any of the two events.
- */
-const ConfirmModal = {
-  components: {
-    DialogModal
-  },
-  props: {
-    title: {
-      type: String
-    },
-    cancelText: {
-      type: String
-    },
-    confirmText: {
-      type: String
-    }
-  },
-  computed: {
-  },
-  methods: {
-    onCancel () {
-      this.$emit('cancelled')
-    },
-    onAccept () {
-      this.$emit('accepted')
-    }
-  }
-}
-
-export default ConfirmModal

src/components/confirm_modal/confirm_modal.vue

@@ -1,39 +0,0 @@
-<template>
-  <dialog-modal
-    v-body-scroll-lock="true"
-    class="confirm-modal"
-    :on-cancel="onCancel"
-  >
-    <template #header>
-      <span v-text="title" />
-    </template>
-
-    <slot />
-
-    <template #footer>
-      <button
-        class="btn button-default"
-        @click.prevent="onCancel"
-        v-text="cancelText"
-      />
-      <button
-        class="btn button-default button-positive"
-        @click.prevent="onAccept"
-        v-text="confirmText"
-      />
-    </template>
-  </dialog-modal>
-</template>
-
-<style lang="scss" scoped>
-@import '../../_variables';
-
-.confirm-modal {
-  .button-positive {
-    border: 3px solid var(--accent, $fallback--link);
-    border-radius: var(--btnRadius, $fallback--btnRadius);
-  }
-}
-</style>
-
-<script src="./confirm_modal.js"></script>

src/components/desktop_nav/desktop_nav.js

@@ -1,5 +1,4 @@
 import SearchBar from 'components/search_bar/search_bar.vue'
-import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faSignInAlt,
@@ -41,8 +40,7 @@ library.add(
 
 export default {
   components: {
-    SearchBar,
-    ConfirmModal
+    SearchBar
   },
   data: () => ({
     searchBarHidden: true,
@@ -52,8 +50,7 @@ export default {
         window.CSS.supports('-moz-mask-size', 'contain') ||
         window.CSS.supports('-ms-mask-size', 'contain') ||
         window.CSS.supports('-o-mask-size', 'contain')
-    ),
-    showingConfirmLogout: false
+    )
   }),
   computed: {
     enableMask () { return this.supportsMask && this.$store.state.instance.logoMask },
@@ -97,10 +94,7 @@ export default {
     hideSitename () { return this.$store.state.instance.hideSitename },
     logoLeft () { return this.$store.state.instance.logoLeft },
     currentUser () { return this.$store.state.users.currentUser },
-    privateMode () { return this.$store.state.instance.private },
-    shouldConfirmLogout () {
-      return this.$store.getters.mergedConfig.modalOnLogout
-    }
+    privateMode () { return this.$store.state.instance.private }
   },
   methods: {
     scrollToTop () {

src/components/desktop_nav/desktop_nav.vue

@@ -166,18 +166,6 @@
         </a>
       </div>
     </div>
-    <teleport to="#modal">
-      <confirm-modal
-        v-if="showingConfirmLogout"
-        :title="$t('login.logout_confirm_title')"
-        :confirm-text="$t('login.logout_confirm_accept_button')"
-        :cancel-text="$t('login.logout_confirm_cancel_button')"
-        @accepted="doLogout"
-        @cancelled="hideConfirmLogout"
-      >
-        {{ $t('login.logout_confirm') }}
-      </confirm-modal>
-    </teleport>
   </nav>
 </template>
 <script src="./desktop_nav.js"></script>

src/components/dialog_modal/dialog_modal.vue

@@ -39,7 +39,7 @@
     right: 0;
     top: 0;
     background: rgba(27,31,35,.5);
-    z-index: 2000;
+    z-index: 99;
   }
 }
 
@@ -51,7 +51,7 @@
   margin: 15vh auto;
   position: fixed;
   transform: translateX(-50%);
-  z-index: 2001;
+  z-index: 999;
   cursor: default;
   display: block;
   background-color: $fallback--bg;

src/components/extra_buttons/extra_buttons.js

@@ -1,5 +1,4 @@
 import Popover from '../popover/popover.vue'
-import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faEllipsisH,
@@ -28,35 +27,15 @@ library.add(
 )
 
 const ExtraButtons = {
-  props: ['status'],
-  components: {
-    Popover,
-    ConfirmModal
-  },
-  data () {
-    return {
-      expanded: false,
-      showingDeleteDialog: false
-    }
-  },
+  props: [ 'status' ],
+  components: { Popover },
   methods: {
     deleteStatus () {
-      if (this.shouldConfirmDelete) {
-        this.showDeleteStatusConfirmDialog()
-      } else {
-        this.doDeleteStatus()
+      const confirmed = window.confirm(this.$t('status.delete_confirm'))
+      if (confirmed) {
+        this.$store.dispatch('deleteStatus', { id: this.status.id })
       }
     },
-    doDeleteStatus () {
-      this.$store.dispatch('deleteStatus', { id: this.status.id })
-      this.hideDeleteStatusConfirmDialog()
-    },
-    showDeleteStatusConfirmDialog () {
-      this.showingDeleteDialog = true
-    },
-    hideDeleteStatusConfirmDialog () {
-      this.showingDeleteDialog = false
-    },
     pinStatus () {
       this.$store.dispatch('pinStatus', this.status.id)
         .then(() => this.$emit('onSuccess'))
@@ -114,9 +93,6 @@ const ExtraButtons = {
     },
     statusLink () {
       return `${this.$store.state.instance.server}${this.$router.resolve({ name: 'conversation', params: { id: this.status.id } }).href}`
-    },
-    shouldConfirmDelete () {
-      return this.$store.getters.mergedConfig.modalOnDelete
     }
   }
 }

src/components/extra_buttons/extra_buttons.vue

@@ -136,18 +136,6 @@
           icon="ellipsis-h"
         />
       </button>
-      <teleport to="#modal">
-        <ConfirmModal
-          v-if="showingDeleteDialog"
-          :title="$t('status.delete_confirm_title')"
-          :cancel-text="$t('status.delete_confirm_cancel_button')"
-          :confirm-text="$t('status.delete_confirm_accept_button')"
-          @cancelled="hideDeleteStatusConfirmDialog"
-          @accepted="doDeleteStatus"
-        >
-          {{ $t('status.delete_confirm') }}
-        </ConfirmModal>
-      </teleport>
     </template>
   </Popover>
 </template>

src/components/follow_button/follow_button.js

@@ -1,20 +1,12 @@
-import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { requestFollow, requestUnfollow } from '../../services/follow_manipulate/follow_manipulate'
 export default {
   props: ['relationship', 'user', 'labelFollowing', 'buttonClass'],
-  components: {
-    ConfirmModal
-  },
   data () {
     return {
-      inProgress: false,
-      showingConfirmUnfollow: false
+      inProgress: false
     }
   },
   computed: {
-    shouldConfirmUnfollow () {
-      return this.$store.getters.mergedConfig.modalOnUnfollow
-    },
     isPressed () {
       return this.inProgress || this.relationship.following
     },
@@ -43,12 +35,6 @@ export default {
     }
   },
   methods: {
-    showConfirmUnfollow () {
-      this.showingConfirmUnfollow = true
-    },
-    hideConfirmUnfollow () {
-      this.showingConfirmUnfollow = false
-    },
     onClick () {
       this.relationship.following || this.relationship.requested ? this.unfollow() : this.follow()
     },
@@ -59,21 +45,12 @@ export default {
       })
     },
     unfollow () {
-      if (this.shouldConfirmUnfollow) {
-        this.showConfirmUnfollow()
-      } else {
-        this.doUnfollow()
-      }
-    },
-    doUnfollow () {
       const store = this.$store
       this.inProgress = true
       requestUnfollow(this.relationship.id, store).then(() => {
         this.inProgress = false
         store.commit('removeStatus', { timeline: 'friends', userId: this.relationship.id })
       })
-
-      this.hideConfirmUnfollow()
     }
   }
 }

src/components/follow_button/follow_button.vue

@@ -7,27 +7,6 @@
     @click="onClick"
   >
     {{ label }}
-    <teleport to="#modal">
-      <confirm-modal
-        v-if="showingConfirmUnfollow"
-        :title="$t('user_card.unfollow_confirm_title')"
-        :confirm-text="$t('user_card.unfollow_confirm_accept_button')"
-        :cancel-text="$t('user_card.unfollow_confirm_cancel_button')"
-        @accepted="doUnfollow"
-        @cancelled="hideConfirmUnfollow"
-      >
-        <i18n-t
-          keypath="user_card.unfollow_confirm"
-          tag="span"
-        >
-          <template #user>
-            <span
-              v-text="user.screen_name_ui"
-            />
-          </template>
-        </i18n-t>
-      </confirm-modal>
-    </teleport>
   </button>
 </template>
 

src/components/follow_request_card/follow_request_card.js

@@ -1,18 +1,10 @@
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
-import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { notificationsFromStore } from '../../services/notification_utils/notification_utils.js'
 
 const FollowRequestCard = {
   props: ['user'],
   components: {
-    BasicUserCard,
-    ConfirmModal
-  },
-  data () {
-    return {
-      showingApproveConfirmDialog: false,
-      showingDenyConfirmDialog: false
-    }
+    BasicUserCard
   },
   methods: {
     findFollowRequestNotificationId () {
@@ -21,26 +13,7 @@ const FollowRequestCard = {
       )
       return notif && notif.id
     },
-    showApproveConfirmDialog () {
-      this.showingApproveConfirmDialog = true
-    },
-    hideApproveConfirmDialog () {
-      this.showingApproveConfirmDialog = false
-    },
-    showDenyConfirmDialog () {
-      this.showingDenyConfirmDialog = true
-    },
-    hideDenyConfirmDialog () {
-      this.showingDenyConfirmDialog = false
-    },
     approveUser () {
-      if (this.shouldConfirmApprove) {
-        this.showApproveConfirmDialog()
-      } else {
-        this.doApprove()
-      }
-    },
-    doApprove () {
       this.$store.state.api.backendInteractor.approveUser({ id: this.user.id })
       this.$store.dispatch('removeFollowRequest', this.user)
 
@@ -52,34 +25,14 @@ const FollowRequestCard = {
           notification.type = 'follow'
         }
       })
-      this.hideApproveConfirmDialog()
     },
     denyUser () {
-      if (this.shouldConfirmDeny) {
-        this.showDenyConfirmDialog()
-      } else {
-        this.doDeny()
-      }
-    },
-    doDeny () {
       const notifId = this.findFollowRequestNotificationId()
       this.$store.state.api.backendInteractor.denyUser({ id: this.user.id })
         .then(() => {
           this.$store.dispatch('dismissNotificationLocal', { id: notifId })
           this.$store.dispatch('removeFollowRequest', this.user)
         })
-      this.hideDenyConfirmDialog()
-    }
-  },
-  computed: {
-    mergedConfig () {
-      return this.$store.getters.mergedConfig
-    },
-    shouldConfirmApprove () {
-      return this.mergedConfig.modalOnApproveFollow
-    },
-    shouldConfirmDeny () {
-      return this.mergedConfig.modalOnDenyFollow
     }
   }
 }

src/components/follow_request_card/follow_request_card.vue

@@ -14,28 +14,6 @@
         {{ $t('user_card.deny') }}
       </button>
     </div>
-    <teleport to="#modal">
-      <confirm-modal
-        v-if="showingApproveConfirmDialog"
-        :title="$t('user_card.approve_confirm_title')"
-        :confirm-text="$t('user_card.approve_confirm_accept_button')"
-        :cancel-text="$t('user_card.approve_confirm_cancel_button')"
-        @accepted="doApprove"
-        @cancelled="hideApproveConfirmDialog"
-      >
-        {{ $t('user_card.approve_confirm', { user: user.screen_name_ui }) }}
-      </confirm-modal>
-      <confirm-modal
-        v-if="showingDenyConfirmDialog"
-        :title="$t('user_card.deny_confirm_title')"
-        :confirm-text="$t('user_card.deny_confirm_accept_button')"
-        :cancel-text="$t('user_card.deny_confirm_cancel_button')"
-        @accepted="doDeny"
-        @cancelled="hideDenyConfirmDialog"
-      >
-        {{ $t('user_card.deny_confirm', { user: user.screen_name_ui }) }}
-      </confirm-modal>
-    </teleport>
   </basic-user-card>
 </template>
 

src/components/mobile_nav/mobile_nav.js

@@ -1,9 +1,7 @@
 import SideDrawer from '../side_drawer/side_drawer.vue'
 import Notifications from '../notifications/notifications.vue'
-import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
 import GestureService from '../../services/gesture_service/gesture_service'
-import { mapGetters } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faTimes,
@@ -20,13 +18,11 @@ library.add(
 const MobileNav = {
   components: {
     SideDrawer,
-    Notifications,
-    ConfirmModal
+    Notifications
   },
   data: () => ({
     notificationsCloseGesture: undefined,
-    notificationsOpen: false,
-    showingConfirmLogout: false
+    notificationsOpen: false
   }),
   created () {
     this.notificationsCloseGesture = GestureService.swipeGesture(
@@ -51,11 +47,7 @@ const MobileNav = {
     hideSiteName () {
       return this.mergedConfig.hideSiteName
     },
-    sitename () { return this.$store.state.instance.name },
-    shouldConfirmLogout () {
-      return this.$store.getters.mergedConfig.modalOnLogout
-    },
-    ...mapGetters(['unreadChatCount'])
+    sitename () { return this.$store.state.instance.name }
   },
   methods: {
     toggleMobileSidebar () {
@@ -81,23 +73,9 @@ const MobileNav = {
     scrollToTop () {
       window.scrollTo(0, 0)
     },
-    showConfirmLogout () {
-      this.showingConfirmLogout = true
-    },
-    hideConfirmLogout () {
-      this.showingConfirmLogout = false
-    },
     logout () {
-      if (!this.shouldConfirmLogout) {
-        this.doLogout()
-      } else {
-        this.showConfirmLogout()
-      }
-    },
-    doLogout () {
       this.$router.replace('/main/public')
       this.$store.dispatch('logout')
-      this.hideConfirmLogout()
     },
     markNotificationsAsSeen () {
       // this.$refs.notifications.markAsSeen()

src/components/mobile_nav/mobile_nav.vue

@@ -76,18 +76,6 @@
       ref="sideDrawer"
       :logout="logout"
     />
-    <teleport to="#modal">
-      <confirm-modal
-        v-if="showingConfirmLogout"
-        :title="$t('login.logout_confirm_title')"
-        :confirm-text="$t('login.logout_confirm_accept_button')"
-        :cancel-text="$t('login.logout_confirm_cancel_button')"
-        @accepted="doLogout"
-        @cancelled="hideConfirmLogout"
-      >
-        {{ $t('login.logout_confirm') }}
-      </confirm-modal>
-    </teleport>
   </div>
 </template>
 
@@ -218,14 +206,6 @@
       }
     }
   }
-  .confirm-modal.dark-overlay {
-    &::before {
-      z-index: 3000;
-    }
-    .dialog-modal.panel {
-      z-index: 3001;
-    }
-  }
 }
 
 </style>

src/components/notification/notification.js

@@ -5,7 +5,6 @@ import UserAvatar from '../user_avatar/user_avatar.vue'
 import UserCard from '../user_card/user_card.vue'
 import Timeago from '../timeago/timeago.vue'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
-import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { isStatusNotification } from '../../services/notification_utils/notification_utils.js'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
@@ -37,9 +36,7 @@ const Notification = {
     return {
       userExpanded: false,
       betterShadow: this.$store.state.interface.browserSupport.cssFilter,
-      unmuted: false,
-      showingApproveConfirmDialog: false,
-      showingDenyConfirmDialog: false
+      unmuted: false
     }
   },
   props: [ 'notification' ],
@@ -49,8 +46,7 @@ const Notification = {
     UserCard,
     Timeago,
     Status,
-    RichContent,
-    ConfirmModal
+    RichContent
   },
   methods: {
     toggleUserExpanded () {
@@ -65,26 +61,7 @@ const Notification = {
     toggleMute () {
       this.unmuted = !this.unmuted
     },
-    showApproveConfirmDialog () {
-      this.showingApproveConfirmDialog = true
-    },
-    hideApproveConfirmDialog () {
-      this.showingApproveConfirmDialog = false
-    },
-    showDenyConfirmDialog () {
-      this.showingDenyConfirmDialog = true
-    },
-    hideDenyConfirmDialog () {
-      this.showingDenyConfirmDialog = false
-    },
     approveUser () {
-      if (this.shouldConfirmApprove) {
-        this.showApproveConfirmDialog()
-      } else {
-        this.doApprove()
-      }
-    },
-    doApprove () {
       this.$store.state.api.backendInteractor.approveUser({ id: this.user.id })
       this.$store.dispatch('removeFollowRequest', this.user)
       this.$store.dispatch('markSingleNotificationAsSeen', { id: this.notification.id })
@@ -94,22 +71,13 @@ const Notification = {
           notification.type = 'follow'
         }
       })
-      this.hideApproveConfirmDialog()
     },
     denyUser () {
-      if (this.shouldConfirmDeny) {
-        this.showDenyConfirmDialog()
-      } else {
-        this.doDeny()
-      }
-    },
-    doDeny () {
       this.$store.state.api.backendInteractor.denyUser({ id: this.user.id })
         .then(() => {
           this.$store.dispatch('dismissNotificationLocal', { id: this.notification.id })
           this.$store.dispatch('removeFollowRequest', this.user)
         })
-      this.hideDenyConfirmDialog()
     }
   },
   computed: {
@@ -139,15 +107,6 @@ const Notification = {
     isStatusNotification () {
       return isStatusNotification(this.notification.type)
     },
-    mergedConfig () {
-      return this.$store.getters.mergedConfig
-    },
-    shouldConfirmApprove () {
-      return this.mergedConfig.modalOnApproveFollow
-    },
-    shouldConfirmDeny () {
-      return this.mergedConfig.modalOnDenyFollow
-    },
     ...mapState({
       currentUser: state => state.users.currentUser
     })

src/components/notification/notification.vue

@@ -230,28 +230,6 @@
         </template>
       </div>
     </div>
-    <teleport to="#modal">
-      <confirm-modal
-        v-if="showingApproveConfirmDialog"
-        :title="$t('user_card.approve_confirm_title')"
-        :confirm-text="$t('user_card.approve_confirm_accept_button')"
-        :cancel-text="$t('user_card.approve_confirm_cancel_button')"
-        @accepted="doApprove"
-        @cancelled="hideApproveConfirmDialog"
-      >
-        {{ $t('user_card.approve_confirm', { user: user.screen_name_ui }) }}
-      </confirm-modal>
-      <confirm-modal
-        v-if="showingDenyConfirmDialog"
-        :title="$t('user_card.deny_confirm_title')"
-        :confirm-text="$t('user_card.deny_confirm_accept_button')"
-        :cancel-text="$t('user_card.deny_confirm_cancel_button')"
-        @accepted="doDeny"
-        @cancelled="hideDenyConfirmDialog"
-      >
-        {{ $t('user_card.deny_confirm', { user: user.screen_name_ui }) }}
-      </confirm-modal>
-    </teleport>
   </div>
 </template>
 

src/components/retweet_button/retweet_button.js

@@ -1,4 +1,3 @@
-import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faRetweet } from '@fortawesome/free-solid-svg-icons'
 
@@ -6,24 +5,13 @@ library.add(faRetweet)
 
 const RetweetButton = {
   props: ['status', 'loggedIn', 'visibility'],
-  components: {
-    ConfirmModal
-  },
   data () {
     return {
-      animated: false,
-      showingConfirmDialog: false
+      animated: false
     }
   },
   methods: {
     retweet () {
-      if (!this.status.repeated && this.shouldConfirmRepeat) {
-        this.showConfirmDialog()
-      } else {
-        this.doRetweet()
-      }
-    },
-    doRetweet () {
       if (!this.status.repeated) {
         this.$store.dispatch('retweet', { id: this.status.id })
       } else {
@@ -33,13 +21,6 @@ const RetweetButton = {
       setTimeout(() => {
         this.animated = false
       }, 500)
-      this.hideConfirmDialog()
-    },
-    showConfirmDialog () {
-      this.showingConfirmDialog = true
-    },
-    hideConfirmDialog () {
-      this.showingConfirmDialog = false
     }
   },
   computed: {
@@ -48,9 +29,6 @@ const RetweetButton = {
     },
     mergedConfig () {
       return this.$store.getters.mergedConfig
-    },
-    shouldConfirmRepeat () {
-      return this.mergedConfig.modalOnRepeat
     }
   }
 }

src/components/retweet_button/retweet_button.vue

@@ -33,18 +33,6 @@
     >
       {{ status.repeat_num }}
     </span>
-    <teleport to="#modal">
-      <confirm-modal
-        v-if="showingConfirmDialog"
-        :title="$t('status.repeat_confirm_title')"
-        :confirm-text="$t('status.repeat_confirm_accept_button')"
-        :cancel-text="$t('status.repeat_confirm_cancel_button')"
-        @accepted="doRetweet"
-        @cancelled="hideConfirmDialog"
-      >
-        {{ $t('status.repeat_confirm') }}
-      </confirm-modal>
-    </teleport>
   </div>
 </template>
 

src/components/settings_modal/tabs/general_tab.vue

@@ -164,77 +164,6 @@
             {{ $t('settings.autohide_floating_post_button') }}
           </BooleanSetting>
         </li>
-        <li>
-          <h3>{{ $t('settings.columns') }}</h3>
-        </li>
-        <li>
-          <BooleanSetting path="disableStickyHeaders">
-            {{ $t('settings.disable_sticky_headers') }}
-          </BooleanSetting>
-        </li>
-        <li>
-          <BooleanSetting path="showScrollbars">
-            {{ $t('settings.show_scrollbars') }}
-          </BooleanSetting>
-        </li>
-        <li>
-          <BooleanSetting path="sidebarRight">
-            {{ $t('settings.right_sidebar') }}
-          </BooleanSetting>
-        </li>
-        <li>
-          <ChoiceSetting
-            v-if="user"
-            id="thirdColumnMode"
-            path="thirdColumnMode"
-            :options="thirdColumnModeOptions"
-          >
-            {{ $t('settings.third_column_mode') }}
-          </ChoiceSetting>
-        </li>
-        <li>
-          <h3>{{ $t('settings.confirmation_dialogs') }}</h3>
-        </li>
-        <li class="select-multiple">
-          <span class="label">{{ $t('settings.confirm_dialogs') }}</span>
-          <ul class="option-list">
-            <li>
-              <BooleanSetting path="modalOnRepeat">
-                {{ $t('settings.confirm_dialogs_repeat') }}
-              </BooleanSetting>
-            </li>
-            <li>
-              <BooleanSetting path="modalOnUnfollow">
-                {{ $t('settings.confirm_dialogs_unfollow') }}
-              </BooleanSetting>
-            </li>
-            <li>
-              <BooleanSetting path="modalOnBlock">
-                {{ $t('settings.confirm_dialogs_block') }}
-              </BooleanSetting>
-            </li>
-            <li>
-              <BooleanSetting path="modalOnMute">
-                {{ $t('settings.confirm_dialogs_mute') }}
-              </BooleanSetting>
-            </li>
-            <li>
-              <BooleanSetting path="modalOnDelete">
-                {{ $t('settings.confirm_dialogs_delete') }}
-              </BooleanSetting>
-            </li>
-            <li>
-              <BooleanSetting path="modalOnApproveFollow">
-                {{ $t('settings.confirm_dialogs_approve_follow') }}
-              </BooleanSetting>
-            </li>
-            <li>
-              <BooleanSetting path="modalOnDenyFollow">
-                {{ $t('settings.confirm_dialogs_deny_follow') }}
-              </BooleanSetting>
-            </li>
-          </ul>
-        </li>
       </ul>
     </div>
     <div class="setting-item">

src/components/user_card/user_card.js

@@ -6,7 +6,6 @@ import ModerationTools from '../moderation_tools/moderation_tools.vue'
 import AccountActions from '../account_actions/account_actions.vue'
 import Select from '../select/select.vue'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
-import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 import { mapGetters } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -33,8 +32,7 @@ export default {
   data () {
     return {
       followRequestInProgress: false,
-      betterShadow: this.$store.state.interface.browserSupport.cssFilter,
-      showingConfirmMute: false
+      betterShadow: this.$store.state.interface.browserSupport.cssFilter
     }
   },
   created () {
@@ -114,9 +112,6 @@ export default {
     hideFollowersCount () {
       return this.isOtherUser && this.user.hide_followers_count
     },
-    shouldConfirmMute () {
-      return this.mergedConfig.modalOnMute
-    },
     ...mapGetters(['mergedConfig'])
   },
   components: {
@@ -127,29 +122,14 @@ export default {
     ProgressButton,
     FollowButton,
     Select,
-    RichContent,
-    ConfirmModal
+    RichContent
   },
   methods: {
     refetchRelationship () {
       return this.$store.dispatch('fetchUserRelationship', this.user.id)
     },
-    showConfirmMute () {
-      this.showingConfirmMute = true
-    },
-    hideConfirmMute () {
-      this.showingConfirmMute = false
-    },
     muteUser () {
-      if (!this.shouldConfirmMute) {
-        this.doMuteUser()
-      } else {
-        this.showConfirmMute()
-      }
-    },
-    doMuteUser () {
       this.$store.dispatch('muteUser', this.user.id)
-      this.hideConfirmMute()
     },
     unmuteUser () {
       this.$store.dispatch('unmuteUser', this.user.id)

src/components/user_card/user_card.vue

@@ -295,27 +295,6 @@
         :handle-links="true"
       />
     </div>
-    <teleport to="#modal">
-      <confirm-modal
-        v-if="showingConfirmMute"
-        :title="$t('user_card.mute_confirm_title')"
-        :confirm-text="$t('user_card.mute_confirm_accept_button')"
-        :cancel-text="$t('user_card.mute_confirm_cancel_button')"
-        @accepted="doMuteUser"
-        @cancelled="hideConfirmMute"
-      >
-        <i18n-t
-          keypath="user_card.mute_confirm"
-          tag="span"
-        >
-          <template #user>
-            <span
-              v-text="user.screen_name_ui"
-            />
-          </template>
-        </i18n-t>
-      </confirm-modal>
-    </teleport>
   </div>
 </template>
 

src/i18n/en.json

@@ -370,17 +370,7 @@
         "changed_password": "Password changed successfully!",
         "chatMessageRadius": "Chat message",
         "collapse_subject": "Collapse posts with subjects",
-        "columns": "Columns",
         "composing": "Composing",
-        "confirmation_dialogs": "Confirmation options",
-        "confirm_dialogs": "Require confirmation for:",
-        "confirm_dialogs_repeat": "Repeating a post",
-        "confirm_dialogs_unfollow": "Unfollowing someone",
-        "confirm_dialogs_block": "Blocking someone",
-        "confirm_dialogs_mute": "Muting someone",
-        "confirm_dialogs_delete": "Deleting a post",
-        "confirm_dialogs_approve_follow": "Accepting a follow request",
-        "confirm_dialogs_deny_follow": "Rejecting a follow request",
         "confirm_new_password": "Confirm new password",
         "current_avatar": "Your current avatar",
         "current_mascot": "Your current mascot",
@@ -815,13 +805,6 @@
         "unbookmark": "Unbookmark",
         "delete_confirm": "Do you really want to delete this status?",
         "reply_to": "Reply to",
-        "delete_confirm_title": "Confirm deletion",
-        "delete_confirm_accept_button": "Yes, delete it",
-        "delete_confirm_cancel_button": "No, keep it",
-        "repeat_confirm": "Do you really want to repeat this status?",
-        "repeat_confirm_title": "Confirm repeat",
-        "repeat_confirm_accept_button": "Yes, repeat it",
-        "repeat_confirm_cancel_button": "No, don't repeat",
         "mentions": "Mentions",
         "replies_list": "Replies:",
         "replies_list_with_others": "Replies (+{numReplies} other): | Replies (+{numReplies} others):",
@@ -866,23 +849,10 @@
     },
     "user_card": {
         "approve": "Approve",
-        "approve_confirm_title": "Approve follow request",
-        "approve_confirm": "Are you sure you want to let this user follow you?",
-        "approve_confirm_accept_button": "Yes, accept",
-        "approve_confirm_cancel_button": "No, cancel",
         "block": "Block",
-        "block_confirm": "Are you sure you want to block {user}?",
-        "block_confirm_title": "Block user",
-        "block_confirm_cancel_button": "No, don't block",
-        "block_confirm_accept_button": "Yes, block",
-        "block_progress": "Blocking…",
         "blocked": "Blocked!",
         "deactivated": "Deactivated",
         "deny": "Deny",
-        "deny_confirm_title": "Deny follow request",
-        "deny_confirm": "Are you sure you want to deny this user's follow request?",
-        "deny_confirm_accept_button": "Yes, deny",
-        "deny_confirm_cancel_button": "No, cancel",
         "edit_profile": "Edit profile",
         "favorites": "Favorites",
         "follow": "Follow",
@@ -900,10 +870,6 @@
         "mention": "Mention",
         "message": "Message",
         "mute": "Mute",
-        "mute_confirm": "Are you sure you want to mute {user}?",
-        "mute_confirm_title": "Mute user",
-        "mute_confirm_cancel_button": "No, don't mute",
-        "mute_confirm_accept_button": "Yes, mute",
         "muted": "Muted",
         "per_day": "per day",
         "remote_follow": "Remote follow",
@@ -914,10 +880,6 @@
         "unblock": "Unblock",
         "unblock_progress": "Unblocking…",
         "block_progress": "Blocking…",
-        "unfollow_confirm": "Are you sure you want to unfollow {user}?",
-        "unfollow_confirm_title": "Unfollow user",
-        "unfollow_confirm_cancel_button": "No, don't unfollow",
-        "unfollow_confirm_accept_button": "Yes, unfollow",
         "unmute": "Unmute",
         "unmute_progress": "Unmuting…",
         "mute_progress": "Muting…",

src/modules/config.js

@@ -80,14 +80,6 @@ export const defaultState = {
   minimalScopesMode: undefined, // instance default
   // This hides statuses filtered via a word filter
   hideFilteredStatuses: undefined, // instance default
-  modalOnRepeat: undefined, // instance default
-  modalOnUnfollow: undefined, // instance default
-  modalOnBlock: undefined, // instance default
-  modalOnMute: undefined, // instance default
-  modalOnDelete: undefined, // instance default
-  modalOnLogout: undefined, // instance default
-  modalOnApproveFollow: undefined, // instance default
-  modalOnDenyFollow: undefined, // instance default
   playVideosInModal: false,
   useOneClickNsfw: false,
   useContainFit: true,

src/modules/instance.js

@@ -38,14 +38,6 @@ const defaultState = {
   hideSiteName: false,
   hideUserStats: false,
   muteBotStatuses: false,
-  modalOnRepeat: false,
-  modalOnUnfollow: false,
-  modalOnBlock: true,
-  modalOnMute: false,
-  modalOnDelete: true,
-  modalOnLogout: true,
-  modalOnApproveFollow: false,
-  modalOnDenyFollow: false,
   loginMethod: 'password',
   logo: '/static/logo.svg',
   logoMargin: '.2em',