From 3ec664ce0282f82a2f48954e0d61eadf8f00287f Mon Sep 17 00:00:00 2001 From: lain Date: Tue, 30 Jun 2020 15:02:27 +0200 Subject: [PATCH] Mutes and Blocks: Reduxify. --- .../settings_modal/tabs/mutes_and_blocks_tab.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js index 40a87b81..3c6895bb 100644 --- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js +++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js @@ -80,12 +80,12 @@ const MutesAndBlocks = { // Get addresses return users.map((user) => { // check is it's a local user - if (user && user.is_local) { + if (user && user.redux.is_local) { // append the instance address // eslint-disable-next-line no-undef - return user.screen_name + '@' + location.hostname + return user.redux.acct + '@' + location.hostname } - return user.screen_name + return user.redux.acct }).join('\n') }, activateTab (tabName) { @@ -94,13 +94,13 @@ const MutesAndBlocks = { filterUnblockedUsers (userIds) { return reject(userIds, (userId) => { const relationship = this.$store.getters.relationship(this.userId) - return relationship.blocking || userId === this.user.id + return relationship.blocking || userId === this.user.redux.id }) }, filterUnMutedUsers (userIds) { return reject(userIds, (userId) => { const relationship = this.$store.getters.relationship(this.userId) - return relationship.muting || userId === this.user.id + return relationship.muting || userId === this.user.redux.id }) }, queryUserIds (query) {