squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix user fetching error.

Browse Source
This commit is contained in:
Roger Braun 2017-05-07 12:45:37 +02:00
parent ff2945dfdc
commit c51e15975a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/ostatus/ostatus.ex
View File

@ -195,7 +195,7 @@ defmodule Pleroma.Web.OStatus do
def find_or_make_user(uri) do def find_or_make_user(uri) do
query = from user in User, query = from user in User,
where: user.local == false and fragment("? @> ?", user.info, ^%{uri: uri}) where: user.ap_id == ^uri
user = Repo.one(query) user = Repo.one(query)

9
test/web/ostatus/ostatus_test.exs
View File

@ -140,8 +140,14 @@ defmodule Pleroma.Web.OStatusTest do
end end
describe "new remote user creation" do describe "new remote user creation" do
test "returns local users" do
local_user = insert(:user)
{:ok, user} = OStatus.find_or_make_user(local_user.ap_id)
assert user == local_user
end
test "tries to use the information in poco fields" do test "tries to use the information in poco fields" do
# TODO make test local
uri = "https://social.heldscal.la/user/23211" uri = "https://social.heldscal.la/user/23211"
{:ok, user} = OStatus.find_or_make_user(uri) {:ok, user} = OStatus.find_or_make_user(uri)
@ -160,7 +166,6 @@ defmodule Pleroma.Web.OStatusTest do
end end
test "find_make_or_update_user takes an author element and returns an updated user" do test "find_make_or_update_user takes an author element and returns an updated user" do
# TODO make test local
uri = "https://social.heldscal.la/user/23211" uri = "https://social.heldscal.la/user/23211"
{:ok, user} = OStatus.find_or_make_user(uri) {:ok, user} = OStatus.find_or_make_user(uri)