Commit 2887f4ff authored by lain's avatar lain

Fix formatter tests.

parent fbb70d25
Pipeline #4596 failed with stages
in 8 minutes and 2 seconds
......@@ -87,7 +87,7 @@ def remote_user_creation(params) 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 @@ def get_or_create_instance_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 @@ def insert_or_update_user(data) 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
......
......@@ -89,7 +89,12 @@ def set_keys(info, keys) 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
......
......@@ -110,7 +110,7 @@ test "gives a replacement for user links" 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"})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment