diff options
| author | Henry Jameson <me@hjkos.com> | 2019-03-25 21:06:58 +0200 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2019-03-25 21:06:58 +0200 |
| commit | 72749834f3c82847dd8b584cb0e0622a25f292f8 (patch) | |
| tree | 5ef37dff498ca3daa03b80589d1b641167007501 /src/modules/statuses.js | |
| parent | faef769b40784c32b095db24d16a92c80ce7ea1f (diff) | |
| parent | 854d0e80512d2da80cd5153144698a5148da4aa6 (diff) | |
Merge remote-tracking branch 'upstream/develop' into masto-api/direct
* upstream/develop: (40 commits)
review
Update attachment normalizer
Add fallback for attachments uploaded via the other platforms
Get correct mimetype through entity_normalizer
Set default parameter
Switch to mastoapi for posting status and uploading media
Revert changes
prevent text pasting if image is pasted
remove border radius of suggested emojis
#450 - dispatch login after saved state is loaded
#448 - fix timeline fetch error when status text is null
#451 - add class to username span
No need to fetch mutes on load anymore 🙌
switch to mastoapi
switch to mastoapi
masto api sends muted property now
No need to fetch user data using old api anymore 🎉
Switch to mastoapi
reactivity fixes
less hackery, more direct usage of mastoapi
...
Diffstat (limited to 'src/modules/statuses.js')
| -rw-r--r-- | src/modules/statuses.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/statuses.js b/src/modules/statuses.js index f14b8703..a16342e0 100644 --- a/src/modules/statuses.js +++ b/src/modules/statuses.js @@ -1,4 +1,5 @@ import { remove, slice, each, find, maxBy, minBy, merge, first, last, isArray, omitBy } from 'lodash' +import { set } from 'vue' import apiService from '../services/api/api.service.js' // import parse from '../services/status_parser/status_parser.js' @@ -82,7 +83,7 @@ const mergeOrAdd = (arr, obj, item) => { // This is a new item, prepare it prepareStatus(item) arr.push(item) - obj[item.id] = item + set(obj, item.id, item) return {item, new: true} } } |
