From 71d1baffccf2da5dbb4f667fd8a7a01d4b71bc79 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 9 Jul 2025 17:56:52 +0300
Subject: [PATCH] better support for lack of block expiration

---
 src/components/block_card/block_card.js | 17 ++++++++++++-----
 src/components/mute_card/mute_card.js   |  4 +---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/components/block_card/block_card.js b/src/components/block_card/block_card.js
index cc3e82403..360cfe740 100644
--- a/src/components/block_card/block_card.js
+++ b/src/components/block_card/block_card.js
@@ -1,3 +1,5 @@
+import { mapState } from 'vuex'
+
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 
 const BlockCard = {
@@ -17,7 +19,10 @@ const BlockCard = {
       return this.user.block_expires_at == null
         ? this.$t('user_card.block_expires_forever')
         : this.$t('user_card.block_expires_at', [new Date(this.user.mute_expires_at).toLocaleString()])
-    }
+    },
+    ...mapState({
+      blockExpirationSupported: state => state.instance.blockExpiration,
+    })
   },
   components: {
     BasicUserCard
@@ -25,12 +30,14 @@ const BlockCard = {
   methods: {
     unblockUser () {
       this.progress = true
-      this.$store.dispatch('unblockUser', this.user.id).then(() => {
-        this.progress = false
-      })
+      this.$store.dispatch('unblockUser', this.user.id)
     },
     blockUser () {
-      this.$refs.timedBlockDialog.optionallyPrompt()
+      if (this.blockExpirationSupported) {
+        this.$refs.timedBlockDialog.optionallyPrompt()
+      } else {
+        this.$store.dispatch('blockUser', this.user.id)
+      }
     }
   }
 }
diff --git a/src/components/mute_card/mute_card.js b/src/components/mute_card/mute_card.js
index 3491ff2f7..3d655465f 100644
--- a/src/components/mute_card/mute_card.js
+++ b/src/components/mute_card/mute_card.js
@@ -26,9 +26,7 @@ const MuteCard = {
   methods: {
     unmuteUser () {
       this.progress = true
-      this.$store.dispatch('unmuteUser', this.userId).then(() => {
-        this.progress = false
-      })
+      this.$store.dispatch('unmuteUser', this.userId)
     },
     muteUser () {
       this.$refs.timedMuteDialog.optionallyPrompt()