Fix formatter tests.

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 565218b4cbe175c232fa071d9b901631d0536ef9..03fe2f1d426d96fca1e764e07a70d9ceca358889 100644 (file)
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -87,7 +87,7 @@ defmodule Pleroma.User do
     info_cng = User.Info.remote_user_creation(%User.Info{}, params[:info])
 
     changes =
-      %User{info: %{}}
+      %User{}
       |> cast(params, [:bio, :name, :ap_id, :nickname, :avatar])
       |> validate_required([:name, :ap_id])
       |> unique_constraint(:nickname)
@@ -718,7 +718,7 @@ defmodule Pleroma.User do
       user
     else
       changes =
-        %User{info: %{}}
+        %User{info: %User.Info{}}
         |> cast(%{}, [:ap_id, :nickname, :local])
         |> put_change(:ap_id, relay_uri)
         |> put_change(:nickname, nil)
@@ -763,9 +763,9 @@ defmodule Pleroma.User do
     data =
       data
       |> Map.put(:name, blank?(data[:name]) || data[:nickname])
-      |> Map.put(:info, data[:info] || %{})
 
     cs = User.remote_user_creation(data)
+
     Repo.insert(cs, on_conflict: :replace_all, conflict_target: :nickname)
   end
 

diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex
index 48f3a4d4a5a9195f558c52406f039f1913edbbfc..7d5df34ba17a553d06e3c7bb08f03c0ac16ef99f 100644 (file)
--- a/lib/pleroma/user/info.ex
+++ b/lib/pleroma/user/info.ex
@@ -89,7 +89,12 @@ defmodule Pleroma.User.Info do
 
   def remote_user_creation(info, params) do
     info
-    |> cast(params, [:source_data])
+    |> cast(params, [
+      :ap_enabled,
+      :source_data,
+      :banner,
+      :locked
+    ])
   end
 
   # Receives data from user_data_from_user_object

diff --git a/test/formatter_test.exs b/test/formatter_test.exs
index 13084baa79bb65cd9d1823d0c929f9f5d08f623f..e4da84c101ad9bc7d7ae9dba3c055405bf81662f 100644 (file)
--- a/test/formatter_test.exs
+++ b/test/formatter_test.exs
@@ -110,7 +110,7 @@ defmodule Pleroma.FormatterTest do
       archaeme =
         insert(:user, %{
           nickname: "archaeme",
-          info: %{"source_data" => %{"url" => "https://archeme/@archaeme"}}
+          info: %Pleroma.User.Info{source_data: %{"url" => "https://archeme/@archaeme"}}
         })
 
       archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"})