diff options
| author | unarist <m.unarist@gmail.com> | 2018-03-26 19:48:01 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-03-26 12:48:01 +0200 |
| commit | 605a92b4607589c64acf9c5cb58d2fcc68e2606a (patch) | |
| tree | 88ab7dfadd9c8da517da52b32eb73a8ad1c7d4fb | |
| parent | 3b2c7a33a9fe151b65724f9076a4ef93ad1d6948 (diff) | |
Fix moved account handling in IndexedDB feature (#6915)
* Fix stack overflow on importFetchedAccounts When the account has moved property, it should process destination account instead of source account itself. * Set account id instead of account object for moved property This restores "foo has moved to" indication on account view, and fixes `reblog` index on `accounts` object store.
| -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; } |