diff options
author | ThibG <thib@sitedethib.com> | 2020-07-15 16:56:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-15 16:56:33 +0200 |
commit | 37c092e9fdedd36c167e4b84610e7346c446e1d3 (patch) | |
tree | 88992f2d65c83ece4e93f0b4b5c34ffed0989138 /app/javascript/mastodon/selectors/index.js | |
parent | 7a23347db5be3f262dbcafbecf768588dc648bda (diff) | |
parent | 470458da13586db0e6ca074987fecfc80293d955 (diff) |
Merge pull request #1382 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/mastodon/selectors/index.js')
-rw-r--r-- | app/javascript/mastodon/selectors/index.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js index 673268c5a..fd3b72f96 100644 --- a/app/javascript/mastodon/selectors/index.js +++ b/app/javascript/mastodon/selectors/index.js @@ -154,12 +154,13 @@ export const makeGetNotification = () => { export const getAccountGallery = createSelector([ (state, id) => state.getIn(['timelines', `account:${id}:media`, 'items'], ImmutableList()), state => state.get('statuses'), -], (statusIds, statuses) => { + (state, id) => state.getIn(['accounts', id]), +], (statusIds, statuses, account) => { let medias = ImmutableList(); statusIds.forEach(statusId => { const status = statuses.get(statusId); - medias = medias.concat(status.get('media_attachments').map(media => media.set('status', status))); + medias = medias.concat(status.get('media_attachments').map(media => media.set('status', status).set('account', account))); }); return medias; |