diff --git a/src/components/block_card/block_card.js b/src/components/block_card/block_card.js
index 9a618db3f..2d4b17ef8 100644
--- a/src/components/block_card/block_card.js
+++ b/src/components/block_card/block_card.js
@@ -15,10 +15,10 @@ const BlockCard = {
return this.relationship.blocking
},
blockExpiryAvailable () {
- return this.user.block_expires_at !== undefined
+ return Object.hasOwn(this.user, 'block_expires_at')
},
blockExpiry () {
- return this.user.block_expires_at == null
+ return this.user.block_expires_at === false
? this.$t('user_card.block_expires_forever')
: this.$t('user_card.block_expires_at', [new Date(this.user.mute_expires_at).toLocaleString()])
},
diff --git a/src/components/mute_card/mute_card.js b/src/components/mute_card/mute_card.js
index 895586888..592df8dfe 100644
--- a/src/components/mute_card/mute_card.js
+++ b/src/components/mute_card/mute_card.js
@@ -14,10 +14,10 @@ const MuteCard = {
return this.relationship.muting
},
muteExpiryAvailable () {
- return this.user.mute_expires_at !== undefined
+ return Object.hasOwn(this.user, 'mute_expires_at')
},
muteExpiry () {
- return this.user.mute_expires_at == null
+ return this.user.mute_expires_at === false
? this.$t('user_card.mute_expires_forever')
: this.$t('user_card.mute_expires_at', [new Date(this.user.mute_expires_at).toLocaleString()])
}
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index 5e387d38b..ccc03b414 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -122,12 +122,8 @@ export default {
data () {
const user = this.$store.getters.findUser(this.userId)
- console.log('LOL', JSON.parse(JSON.stringify(user)))
-
return {
followRequestInProgress: false,
- muteExpiryAmount: 0,
- muteExpiryUnit: 'minutes',
// Editable stuff
editImage: false,
@@ -261,15 +257,15 @@ export default {
return 'note' in this.relationship
},
muteExpiryAvailable () {
- return this.user.mute_expires_at !== undefined
+ return Object.hasOwn(this.user, 'mute_expires_at')
},
muteExpiry () {
- return this.user.mute_expires_at == null
+ return this.user.mute_expires_at === false
? this.$t('user_card.mute_expires_forever')
: this.$t('user_card.mute_expires_at', [new Date(this.user.mute_expires_at).toLocaleString()])
},
blockExpiryAvailable () {
- return this.user.block_expires_at !== undefined
+ return Object.hasOwn(this.user, 'block_expires_at')
},
blockExpiry () {
return this.user.block_expires_at == null
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index e3b1b0175..66529f59b 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -212,18 +212,6 @@
>
{{ $t('user_card.group') }}
-
- {{ muteExpiry }}
-
-
- {{ blockExpiry }}
-
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 28f1bc2aa..36b42dd47 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -51,8 +51,14 @@ export const parseUser = (data) => {
output.screen_name = data.acct
output.fqn = data.fqn
output.statusnet_profile_url = data.url
- output.mute_expires_at = data.mute_expires_at
- output.block_expires_at = data.block_expires_at
+
+ if (Object.hasOwn(data, 'mute_expires_at')) {
+ output.mute_expires_at = data.mute_expires_at == null ? false : data.mute_expires_at
+ }
+
+ if (Object.hasOwn(data, 'block_expires_at')) {
+ output.block_expires_at = data.block_expires_at == null ? false : data.block_expires_at
+ }
// There's nothing else to get
if (mastoShort) {