diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-26 11:17:19 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-26 11:17:19 +0000 |
| commit | db3be77890b35cefff6071e0c5ae448c2cde8f14 (patch) | |
| tree | ae6c5db39cfb6e2c54ad4f8483edce79c3ce3e55 /app | |
| parent | 837b3804bfed9db1cf92923c4f6202aa7117d408 (diff) | |
| parent | 605a92b4607589c64acf9c5cb58d2fcc68e2606a (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/mastodon/actions/importer/index.js | 2 | ||||
| -rw-r--r-- | app/javascript/mastodon/actions/importer/normalizer.js | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/javascript/mastodon/actions/importer/index.js b/app/javascript/mastodon/actions/importer/index.js index d1ea40c36..a97f4d173 100644 --- a/app/javascript/mastodon/actions/importer/index.js +++ b/app/javascript/mastodon/actions/importer/index.js @@ -39,7 +39,7 @@ export function importFetchedAccounts(accounts) { pushUnique(normalAccounts, normalizeAccount(account)); if (account.moved) { - processAccount(account); + processAccount(account.moved); } } diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js index c88f6946f..1b09f319f 100644 --- a/app/javascript/mastodon/actions/importer/normalizer.js +++ b/app/javascript/mastodon/actions/importer/normalizer.js @@ -10,6 +10,10 @@ export function normalizeAccount(account) { account.display_name_html = emojify(escapeTextContentForBrowser(displayName)); account.note_emojified = emojify(account.note); + if (account.moved) { + account.moved = account.moved.id; + } + return account; } |