diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-25 18:17:53 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-25 18:17:53 +0000 |
| commit | 854d0e80512d2da80cd5153144698a5148da4aa6 (patch) | |
| tree | 0d27c6088ef6ae1dc754ddcc44c10cff92a69289 /src/modules/users.js | |
| parent | b02085f2ef2842f06fe9d29eb6bf8e71809aed64 (diff) | |
| parent | cb122e3a99cbb5c3b76b9c5b15a9dd69ef3ed323 (diff) | |
Merge branch 'mastoapi/convos' into 'develop'
Fetching convos via MastoAPI
See merge request pleroma/pleroma-fe!662
Diffstat (limited to 'src/modules/users.js')
| -rw-r--r-- | src/modules/users.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/users.js b/src/modules/users.js index f83ae298..5cfa128e 100644 --- a/src/modules/users.js +++ b/src/modules/users.js @@ -16,9 +16,9 @@ export const mergeOrAdd = (arr, obj, item) => { } else { // This is a new item, prepare it arr.push(item) - obj[item.id] = item + set(obj, item.id, item) if (item.screen_name && !item.screen_name.includes('@')) { - obj[item.screen_name.toLowerCase()] = item + set(obj, item.screen_name.toLowerCase(), item) } return { item, new: true } } |