mastofe

commit: 605a92b4607589c64acf9c5cb58d2fcc68e2606a
parent: 3b2c7a33a9fe151b65724f9076a4ef93ad1d6948
Author: unarist <m.unarist@gmail.com>
Date:   Mon, 26 Mar 2018 19:48:01 +0900

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.
Diffstat:
M
app/javascript/mastodon/actions/importer/index.js
2
+-
M
app/javascript/mastodon/actions/importer/normalizer.js
4
++++

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git 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
@@ -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;
 }