Use changeset for remote user creation.

This commit is contained in:
Roger Braun 2017-05-10 10:16:20 +02:00
commit 118c572006
3 changed files with 11 additions and 9 deletions

View file

@ -63,13 +63,14 @@ defmodule Pleroma.User do
@email_regex ~r/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
def remote_user_creation(params) do
changeset = %User{}
|> cast(params, [:bio, :name, :ap_id, :nickname, :info])
|> validate_required([:bio, :name, :ap_id, :nickname])
%User{}
|> cast(params, [:bio, :name, :ap_id, :nickname, :info, :avatar])
|> validate_required([:name, :ap_id, :nickname])
|> unique_constraint(:nickname)
|> validate_format(:nickname, @email_regex)
|> validate_length(:bio, max: 1000)
|> validate_length(:name, max: 100)
|> put_change(:local, false)
end
def register_changeset(struct, params \\ %{}) do

View file

@ -211,16 +211,14 @@ defmodule Pleroma.Web.OStatus do
def make_user(uri) do
with {:ok, info} <- gather_user_info(uri) do
data = %{
local: false,
name: info["name"],
nickname: info["nickname"] <> "@" <> info["host"],
ap_id: info["uri"],
info: info,
avatar: info["avatar"]
}
# TODO: Make remote user changeset
# SHould enforce fqn nickname
Repo.insert(Ecto.Changeset.change(%User{}, data))
cs = User.remote_user_creation(data)
Repo.insert(cs)
end
end