From e3bfbcf0d2c7847c35baf25dbda5b7b5a97efafe Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 29 Aug 2025 13:54:03 +0300
Subject: [PATCH] fix being unable to (un)block users in some cases

---
 src/components/account_actions/account_actions.js  | 5 ++++-
 src/components/account_actions/account_actions.vue | 4 ++--
 src/components/block_card/block_card.js            | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js
index f8ad0e11b..2ac74ea76 100644
--- a/src/components/account_actions/account_actions.js
+++ b/src/components/account_actions/account_actions.js
@@ -38,6 +38,9 @@ const AccountActions = {
     hideConfirmRemoveUserFromFollowers () {
       this.showingConfirmRemoveFollower = false
     },
+    hideConfirmBlock () {
+      this.showingConfirmBlock = false
+    },
     showRepeats () {
       this.$store.dispatch('showReblogs', this.user.id)
     },
@@ -56,7 +59,7 @@ const AccountActions = {
       }
     },
     doBlockUser () {
-      this.$store.dispatch('blockUser', this.user.id)
+      this.$store.dispatch('blockUser', { id: this.user.id })
       this.hideConfirmBlock()
     },
     unblockUser () {
diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index cc00a735d..055f68546 100644
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@@ -95,7 +95,7 @@
     </Popover>
     <teleport to="#modal">
       <confirm-modal
-        v-if="showingConfirmBlock && !blockExpirationSupported"
+        v-if="showingConfirmBlock && blockExpirationSupported"
         ref="blockDialog"
         :title="$t('user_card.block_confirm_title')"
         :confirm-text="$t('user_card.block_confirm_accept_button')"
@@ -138,7 +138,7 @@
         </i18n-t>
       </confirm-modal>
       <UserTimedFilterModal
-        v-if="blockExpirationSupported"
+        v-if="!blockExpirationSupported"
         ref="timedBlockDialog"
         :is-mute="false"
         :user="user"
diff --git a/src/components/block_card/block_card.js b/src/components/block_card/block_card.js
index b5be9e7b7..9a618db3f 100644
--- a/src/components/block_card/block_card.js
+++ b/src/components/block_card/block_card.js
@@ -37,7 +37,7 @@ const BlockCard = {
       if (this.blockExpirationSupported) {
         this.$refs.timedBlockDialog.optionallyPrompt()
       } else {
-        this.$store.dispatch('blockUser', this.user.id)
+        this.$store.dispatch('blockUser', { id: this.user.id })
       }
     }
   }