Merge branch '530_federator_user_info_overwrite_fix' into 'develop'

[#530] Prevents user `info` from being overwritten because of race conditions

Closes #530

See merge request pleroma/pleroma!691

test/integration/mastodon_websocket_test.exs

@@ -66,13 +66,10 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
     assert json["payload"]
     assert {:ok, json} = Jason.decode(json["payload"])
 
-    # Note: we remove the "statuses_count" from this result as it changes in the meantime
-
     view_json =
       Pleroma.Web.MastodonAPI.StatusView.render("status.json", activity: activity, for: nil)
       |> Jason.encode!()
       |> Jason.decode!()
-      |> put_in(["account", "statuses_count"], 0)
 
     assert json == view_json
   end