diff --git a/src/store/modules/users.js b/src/store/modules/users.js index da152069..ddac3938 100644 --- a/src/store/modules/users.js +++ b/src/store/modules/users.js @@ -26,7 +26,7 @@ const users = { fetchedUsers: [], loading: true, searchQuery: '', - tagPolicies: [], + mrfPolicies: [], totalUsersCount: 0, currentPage: 1, pageSize: 50, @@ -80,8 +80,8 @@ const users = { SET_SEARCH_QUERY: (state, query) => { state.searchQuery = query }, - SET_TAG_POLICY: (state, tagPolicies) => { - state.tagPolicies = tagPolicies + SET_TAG_POLICY: (state, mrfPolicies) => { + state.mrfPolicies = mrfPolicies }, SET_USERS_FILTERS: (state, filters) => { state.filters = filters @@ -215,7 +215,7 @@ const users = { const configs = [{ group: ':pleroma', key: ':mrf', - value: [{ tuple: [':policies', [...state.tagPolicies, 'Pleroma.Web.ActivityPub.MRF.TagPolicy']] }] + value: [{ tuple: [':policies', [...state.mrfPolicies, 'Pleroma.Web.ActivityPub.MRF.TagPolicy']] }] }] await updateSettings(configs, getters.authHost, getters.token) @@ -223,11 +223,11 @@ const users = { }, async FetchTagPolicySetting({ commit, getters }) { const { data } = await fetchSettings(getters.authHost, getters.token) - const tagPolicies = data.configs + const mrfPolicies = data.configs .find(el => el.key === ':mrf').value .find(el => el.tuple[0] === ':policies').tuple[1] || [] - commit('SET_TAG_POLICY', Array.isArray(tagPolicies) ? tagPolicies : [tagPolicies]) + commit('SET_TAG_POLICY', Array.isArray(mrfPolicies) ? mrfPolicies : [mrfPolicies]) }, async FetchUsers({ commit, dispatch, getters, state }, { page }) { commit('SET_LOADING', true) diff --git a/src/views/users/components/ModerationDropdown.vue b/src/views/users/components/ModerationDropdown.vue index 28156fc8..d4dd1239 100644 --- a/src/views/users/components/ModerationDropdown.vue +++ b/src/views/users/components/ModerationDropdown.vue @@ -174,7 +174,7 @@ export default { return this.$store.state.app.device === 'desktop' }, tagPolicyEnabled() { - return this.$store.state.users.tagPolicies.includes('Pleroma.Web.ActivityPub.MRF.TagPolicy') + return this.$store.state.users.mrfPolicies.includes('Pleroma.Web.ActivityPub.MRF.TagPolicy') } }, methods: { diff --git a/src/views/users/components/MultipleUsersMenu.vue b/src/views/users/components/MultipleUsersMenu.vue index eb9f4826..f104ef24 100644 --- a/src/views/users/components/MultipleUsersMenu.vue +++ b/src/views/users/components/MultipleUsersMenu.vue @@ -172,7 +172,7 @@ export default { return this.$props.selectedUsers.length > 0 }, tagPolicyEnabled() { - return this.$store.state.users.tagPolicies.includes('Pleroma.Web.ActivityPub.MRF.TagPolicy') + return this.$store.state.users.mrfPolicies.includes('Pleroma.Web.ActivityPub.MRF.TagPolicy') } }, methods: { diff --git a/test/views/users/store.conf.js b/test/views/users/store.conf.js index 4f24e9bf..7edf2865 100644 --- a/test/views/users/store.conf.js +++ b/test/views/users/store.conf.js @@ -22,7 +22,7 @@ export const storeWithTagPolicy = { settings, user, userProfile, - users: { ...users, state: { ...users.state, tagPolicies: ['Pleroma.Web.ActivityPub.MRF.TagPolicy'] }} + users: { ...users, state: { ...users.state, mrfPolicies: ['Pleroma.Web.ActivityPub.MRF.TagPolicy'] }} }, getters }