mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 08:36:29 +00:00
Code Issues Projects Releases Wiki Activity

Update user data on fetch if it changed.

Browse source
This commit is contained in:
Roger Braun 2017-06-24 13:09:46 +02:00
parent ffc9d7708b
commit 6935fc3e01
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -192,6 +192,11 @@ 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) do
with {:ok, info} <- gather_user_info(uri) do
data = %{
@ -204,9 +209,7 @@ defmodule Pleroma.Web.OStatus do
}
with %User{} = user <- User.get_by_ap_id(data.ap_id) do
{:ok, user}
else _e ->
cs = User.remote_user_creation(data)
Repo.insert(cs)
else _e -> insert_or_update_user(data)
end
end
end

7
test/web/ostatus/ostatus_test.exs
View file

@ -322,4 +322,11 @@ defmodule Pleroma.Web.OStatusTest do
assert activity.data["object"]["id"] == "tag:shitposter.club,2017-05-05:noticeId=2827873:objectType=comment"
end
end
test "insert or update a user from given data" do
user = insert(:user, %{nickname: "nick@name.de"})
data = %{ ap_id: user.ap_id <> "xxx", name: user.name, nickname: user.nickname }
assert {:ok, %User{}} = OStatus.insert_or_update_user(data)
end
end