diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js index 4b091e0c4..0c01d5ff4 100644 --- a/src/components/user_card/user_card.js +++ b/src/components/user_card/user_card.js @@ -77,7 +77,6 @@ export default { return this.$store.getters.findUser(this.userId) }, relationship () { - console.log(this.$store.getters.relationship(this.userId)) return this.$store.getters.relationship(this.userId) }, classes () { @@ -160,6 +159,16 @@ export default { supportsNote () { return 'note' in this.relationship }, + muteExpiry () { + return this.user.mute_expires_at == null + ? this.$t('user_card.mute_expires_forever') + : this.$t('user_card.mute_expires_at', [new Date(this.user.mute_expires_at).toLocaleString()]) + }, + blockExpiry () { + 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()]) + }, ...mapGetters(['mergedConfig']) }, methods: { diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index d05f9a6e4..5e606d653 100644 --- a/src/components/user_card/user_card.vue +++ b/src/components/user_card/user_card.vue @@ -136,6 +136,18 @@ size="sm" /> + + {{ muteExpiry }} + + + {{ blockExpiry }} +