therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop

Browse source
This commit is contained in:
Roger Braun 2017-01-01 18:12:20 +01:00
commit 590782701d
5 changed files with 84 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/users.js
View file

@ -1,6 +1,6 @@
import timelineFetcher from '../services/timeline_fetcher/timeline_fetcher.service.js'
import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
import { map, each, find, merge } from 'lodash'
import { compact, map, each, find, merge } from 'lodash'
// TODO: Unify with mergeOrAdd in statuses.js
export const mergeOrAdd = (arr, item) => {
@ -44,7 +44,9 @@ const users = {
actions: {
addNewStatuses (store, { statuses }) {
const users = map(statuses, 'user')
const retweetedUsers = compact(map(statuses, 'retweeted_status.user'))
store.commit('addNewUsers', users)
store.commit('addNewUsers', retweetedUsers)
},
loginUser (store, userCredentials) {
const commit = store.commit