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

Mix format

Browse Source
This commit is contained in:
Sadposter 2019-07-23 15:13:05 +01:00
parent fd1fa5a2ec
commit 452980652d
2 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View File

@ -885,11 +885,13 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
q = from(u in User, where: u.ap_id in ^likes) q = from(u in User, where: u.ap_id in ^likes)
users = Repo.all(q) users = Repo.all(q)
users = if is_nil(user) do
users users =
else if is_nil(user) do
Enum.filter(users, &(not User.blocks?(user, &1))) users
end else
Enum.filter(users, &(not User.blocks?(user, &1)))
end
conn conn
|> put_view(AccountView) |> put_view(AccountView)
@ -905,11 +907,13 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
q = from(u in User, where: u.ap_id in ^announces) q = from(u in User, where: u.ap_id in ^announces)
users = Repo.all(q) users = Repo.all(q)
users = if is_nil(user) do
users users =
else if is_nil(user) do
Enum.filter(users, &(not User.blocks?(user, &1))) users
end else
Enum.filter(users, &(not User.blocks?(user, &1)))
end
conn conn
|> put_view(AccountView) |> put_view(AccountView)

36
test/web/mastodon_api/mastodon_api_controller_test.exs
View File

@ -3788,17 +3788,17 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
end end
test "does not fail on an unauthententicated request", %{conn: conn, activity: activity} do test "does not fail on an unauthententicated request", %{conn: conn, activity: activity} do
other_user = insert(:user) other_user = insert(:user)
{:ok, _, _} = CommonAPI.favorite(activity.id, other_user) {:ok, _, _} = CommonAPI.favorite(activity.id, other_user)
response = response =
conn conn
|> assign(:user, nil) |> assign(:user, nil)
|> get("/api/v1/#{activity.id}/favourited_by") |> get("/api/v1/#{activity.id}/favourited_by")
|> json_response(:ok) |> json_response(:ok)
[%{"id" => id}] = response [%{"id" => id}] = response
assert id == other_user.id assert id == other_user.id
end end
end end
@ -3859,17 +3859,17 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
end end
test "does not fail on an unauthententicated request", %{conn: conn, activity: activity} do test "does not fail on an unauthententicated request", %{conn: conn, activity: activity} do
other_user = insert(:user) other_user = insert(:user)
{:ok, _, _} = CommonAPI.favorite(activity.id, other_user) {:ok, _, _} = CommonAPI.favorite(activity.id, other_user)
response = response =
conn conn
|> assign(:user, nil) |> assign(:user, nil)
|> get("/api/v1/#{activity.id}/reblogged_by") |> get("/api/v1/#{activity.id}/reblogged_by")
|> json_response(:ok) |> json_response(:ok)
[%{"id" => id}] = response [%{"id" => id}] = response
assert id == other_user.id assert id == other_user.id
end end
end end