diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-04-10 17:28:42 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-04-10 17:28:42 +0000 |
| commit | 84505e01f5f6b2d0ba462cdccefcedc631ab09ba (patch) | |
| tree | b49893d5b9087d8eb8a92d8b54eca79b822c6a53 /src/modules/users.js | |
| parent | d94a7b63185ce72bd9a61ebc7f6141178176fc4e (diff) | |
| parent | 76cd01e99b832944c5f6faff3167935346438b53 (diff) | |
Merge branch 'issue-436-mastoapi-notifications' into 'develop'
#436: integrate mastoAPI notifications
Closes #436
See merge request pleroma/pleroma-fe!678
Diffstat (limited to 'src/modules/users.js')
| -rw-r--r-- | src/modules/users.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/modules/users.js b/src/modules/users.js index becf66d2..cd789f09 100644 --- a/src/modules/users.js +++ b/src/modules/users.js @@ -144,8 +144,10 @@ export const mutations = { status.user = state.usersObject[status.user.id] }, setUserForNotification (state, notification) { - notification.action.user = state.usersObject[notification.action.user.id] - notification.from_profile = state.usersObject[notification.action.user.id] + if (notification.type !== 'follow') { + notification.action.user = state.usersObject[notification.action.user.id] + } + notification.from_profile = state.usersObject[notification.from_profile.id] }, setColor (state, { user: { id }, highlighted }) { const user = state.usersObject[id] |