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/reducers/accounts.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/reducers/accounts.js')
-rw-r--r-- | app/javascript/mastodon/reducers/accounts.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/javascript/mastodon/reducers/accounts.js b/app/javascript/mastodon/reducers/accounts.js index 8a4d69f26..5891d0fdd 100644 --- a/app/javascript/mastodon/reducers/accounts.js +++ b/app/javascript/mastodon/reducers/accounts.js @@ -59,6 +59,11 @@ const normalizeAccount = (state, account) => { account.display_name_html = emojify(escapeTextContentForBrowser(displayName)); account.note_emojified = emojify(account.note); + if (account.moved) { + state = normalizeAccount(state, account.moved); + account.moved = account.moved.id; + } + return state.set(account.id, fromJS(account)); }; |