tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix moved account handling in IndexedDB feature (#6915)

Browse Source 
* 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.
This commit is contained in:
unarist 2018-03-26 19:48:01 +09:00 committed by Eugen Rochko
parent 3b2c7a33a9
commit 605a92b460
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/actions/importer/index.js
View File

@ -39,7 +39,7 @@ export function importFetchedAccounts(accounts) {
pushUnique(normalAccounts, normalizeAccount(account)); pushUnique(normalAccounts, normalizeAccount(account));
if (account.moved) { if (account.moved) {
processAccount(account); processAccount(account.moved);
} }
} }

4
app/javascript/mastodon/actions/importer/normalizer.js
View File

@ -10,6 +10,10 @@ export function normalizeAccount(account) {
account.display_name_html = emojify(escapeTextContentForBrowser(displayName)); account.display_name_html = emojify(escapeTextContentForBrowser(displayName));
account.note_emojified = emojify(account.note); account.note_emojified = emojify(account.note);
if (account.moved) {
account.moved = account.moved.id;
}
return account; return account;
} }