diff options
Diffstat (limited to 'src/modules/users.js')
| -rw-r--r-- | src/modules/users.js | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/modules/users.js b/src/modules/users.js index 9d00b782..33c02a07 100644 --- a/src/modules/users.js +++ b/src/modules/users.js @@ -7,9 +7,6 @@ import { humanizeErrors } from './errors' // TODO: Unify with mergeOrAdd in statuses.js export const mergeOrAdd = (arr, obj, item) => { - // For sequential IDs BE passes numbers as numbers, we want them as strings. - item.id = String(item.id) - if (!item) { return false } const oldItem = obj[item.id] if (oldItem) { @@ -67,10 +64,11 @@ export const mutations = { each(users, (user) => mergeOrAdd(state.users, state.usersObject, user)) }, setUserForStatus (state, status) { - status.user = state.usersObject[String(status.user.id)] + status.user = state.usersObject[status.user.id] }, setUserForNotification (state, notification) { - notification.action.user = state.usersObject[String(notification.action.user.id)] + notification.action.user = state.usersObject[notification.action.user.id] + notification.from_profile = state.usersObject[notification.action.user.id] }, setColor (state, { user: { id }, highlighted }) { const user = state.usersObject[id] @@ -152,8 +150,8 @@ const users = { }) }, addNewNotifications (store, { notifications }) { - const users = compact(map(notifications, 'from_profile')) - const notificationIds = compact(notifications.map(_ => String(_.id))) + const users = map(notifications, 'from_profile') + const notificationIds = notifications.map(_ => String(_.id)) store.commit('addNewUsers', users) const notificationsObject = store.rootState.statuses.notifications.idStore |