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

Basic AP user building.

Browse source
This commit is contained in:
Roger Braun 2018-02-11 17:20:02 +01:00 • committed by lain
commit ae1ec858f4
4 changed files with 47 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pleroma/web/ostatus/ostatus.ex
View file

@ -218,11 +218,6 @@ defmodule Pleroma.Web.OStatus do
end
end
def insert_or_update_user(data) do
cs = User.remote_user_creation(data)
Repo.insert(cs, on_conflict: :replace_all, conflict_target: :nickname)
end
def make_user(uri, update \\ false) do
with {:ok, info} <- gather_user_info(uri) do
data = %{
@ -236,7 +231,7 @@ defmodule Pleroma.Web.OStatus do
with false <- update,
%User{} = user <- User.get_by_ap_id(data.ap_id) do
{:ok, user}
else _e -> insert_or_update_user(data)
else _e -> User.insert_or_update_user(data)
end
end
end