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

instead of filtering nulls, let's just not have them in the first place

Browse source
This commit is contained in:
Henry Jameson 2019-03-11 23:03:55 +02:00
parent 06d39b62a8
commit a6a162177b
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/users.js
View file

@ -1,5 +1,5 @@
import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
import { compact, map, each, merge, find, omitBy } from 'lodash'
import { compact, map, each, merge, find } from 'lodash'
import { set } from 'vue'
import { registerPushNotifications, unregisterPushNotifications } from '../services/push/push.js'
import oauthApi from '../services/new_api/oauth'
@ -11,7 +11,7 @@ export const mergeOrAdd = (arr, obj, item) => {
const oldItem = obj[item.id]
if (oldItem) {
// We already have this, so only merge the new info.
merge(oldItem, omitBy(item, _ => _ === null))
merge(oldItem, item)
return { item: oldItem, new: false }
} else {
// This is a new item, prepare it
@ -39,7 +39,7 @@ export const mutations = {
},
setCurrentUser (state, user) {
state.lastLoginName = user.screen_name
state.currentUser = merge(state.currentUser || {}, omitBy(user, _ => _ === null))
state.currentUser = merge(state.currentUser || {}, user)
},
clearCurrentUser (state) {
state.currentUser = false