hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix formatter tests.

Browse source
This commit is contained in:
lain 2018-11-20 19:07:01 +01:00
commit 2887f4ff1d
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/user.ex
View file

@ -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