From da08388d6af314fb298bae011da31bcfc8ac0a45 Mon Sep 17 00:00:00 2001 From: shpuld Date: Mon, 29 Apr 2019 22:36:39 +0300 Subject: [PATCH] filter outside of component --- src/components/status/status.js | 5 ++++- src/modules/statuses.js | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/components/status/status.js b/src/components/status/status.js index db234ec1..f10eb2e4 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -265,7 +265,10 @@ const Status = { }, combinedFavsAndRepeatsAvatars () { // Use the status from the global status repository since favs and repeats are saved in it - const combinedAvatars = [].concat(this.statusFromGlobalRepository.favoritedBy, this.statusFromGlobalRepository.rebloggedBy).filter(_ => _) + const combinedAvatars = [].concat( + this.statusFromGlobalRepository.favoritedBy, + this.statusFromGlobalRepository.rebloggedBy + ) return uniqBy(combinedAvatars, 'id') } }, diff --git a/src/modules/statuses.js b/src/modules/statuses.js index 527cafc2..1a223d09 100644 --- a/src/modules/statuses.js +++ b/src/modules/statuses.js @@ -533,8 +533,19 @@ const statuses = { }) }, fetchFavsAndRepeats ({ rootState, commit }, id) { - Promise.all([rootState.api.backendInteractor.fetchFavoritedByUsers(id), rootState.api.backendInteractor.fetchRebloggedByUsers(id)]) - .then(([favoritedByUsers, rebloggedByUsers]) => commit('addFavsAndRepeats', { id, favoritedByUsers, rebloggedByUsers })) + Promise.all([ + rootState.api.backendInteractor.fetchFavoritedByUsers(id), + rootState.api.backendInteractor.fetchRebloggedByUsers(id) + ]).then(([favoritedByUsers, rebloggedByUsers]) => + commit( + 'addFavsAndRepeats', + { + id, + favoritedByUsers: favoritedByUsers.filter(_ => _), + rebloggedByUsers: rebloggedByUsers.filter(_ => _) + } + ) + ) } }, mutations