Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Mutes and Blocks: Reduxify.

Browse source
This commit is contained in:
lain 2020-06-30 15:02:27 +02:00
parent 2e131e5b22
commit 3ec664ce02
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/settings_modal/tabs/mutes_and_blocks_tab.js
View file

@ -80,12 +80,12 @@ const MutesAndBlocks = {
// Get addresses // Get addresses
return users.map((user) => { return users.map((user) => {
// check is it's a local user // check is it's a local user
if (user && user.is_local) { if (user && user.redux.is_local) {
// append the instance address // append the instance address
// eslint-disable-next-line no-undef // 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') }).join('\n')
}, },
activateTab (tabName) { activateTab (tabName) {
@ -94,13 +94,13 @@ const MutesAndBlocks = {
filterUnblockedUsers (userIds) { filterUnblockedUsers (userIds) {
return reject(userIds, (userId) => { return reject(userIds, (userId) => {
const relationship = this.$store.getters.relationship(this.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) { filterUnMutedUsers (userIds) {
return reject(userIds, (userId) => { return reject(userIds, (userId) => {
const relationship = this.$store.getters.relationship(this.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) { queryUserIds (query) {