diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-11-18 19:39:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-18 19:39:02 +0100 |
commit | 58cede4808baa4db6cc143b80ef23e8179a8415b (patch) | |
tree | acaac099fc46d9293768f9fa70c1d1826d06d7e8 /app/javascript/mastodon/selectors/index.js | |
parent | 6be72a3ec6d87af4de245b96fea45191ac01114e (diff) |
Profile redirect notes (#5746)
* Serialize moved accounts into REST and ActivityPub APIs * Parse federated moved accounts from ActivityPub * Add note about moved accounts to public profiles * Add moved account message to web UI * Fix code style issues
Diffstat (limited to 'app/javascript/mastodon/selectors/index.js')
-rw-r--r-- | app/javascript/mastodon/selectors/index.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js index d26d1b727..e47ec5183 100644 --- a/app/javascript/mastodon/selectors/index.js +++ b/app/javascript/mastodon/selectors/index.js @@ -4,14 +4,18 @@ import { List as ImmutableList } from 'immutable'; const getAccountBase = (state, id) => state.getIn(['accounts', id], null); const getAccountCounters = (state, id) => state.getIn(['accounts_counters', id], null); const getAccountRelationship = (state, id) => state.getIn(['relationships', id], null); +const getAccountMoved = (state, id) => state.getIn(['accounts', state.getIn(['accounts', id, 'moved'])]); export const makeGetAccount = () => { - return createSelector([getAccountBase, getAccountCounters, getAccountRelationship], (base, counters, relationship) => { + return createSelector([getAccountBase, getAccountCounters, getAccountRelationship, getAccountMoved], (base, counters, relationship, moved) => { if (base === null) { return null; } - return base.merge(counters).set('relationship', relationship); + return base.merge(counters).withMutations(map => { + map.set('relationship', relationship); + map.set('moved', moved); + }); }); }; |