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

move unauth'd user blocks?/2 check

Browse Source
This commit is contained in:
Sadposter 2019-07-23 19:44:47 +01:00
parent c400565427
commit 54a161cb7a
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/user.ex
View File

@ -882,6 +882,8 @@ defmodule Pleroma.User do
Pleroma.Web.ActivityPub.MRF.subdomain_match?(domain_blocks, host) Pleroma.Web.ActivityPub.MRF.subdomain_match?(domain_blocks, host)
end end
def blocks?(nil, _), do: false
def subscribed_to?(user, %{ap_id: ap_id}) do def subscribed_to?(user, %{ap_id: ap_id}) do
with %User{} = target <- get_cached_by_ap_id(ap_id) do with %User{} = target <- get_cached_by_ap_id(ap_id) do
Enum.member?(target.info.subscribers, user.ap_id) Enum.member?(target.info.subscribers, user.ap_id)

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

@ -884,14 +884,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
%Object{data: %{"likes" => likes}} <- Object.normalize(object) do %Object{data: %{"likes" => likes}} <- Object.normalize(object) 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 = users =
if is_nil(user) do Repo.all(q)
users |> Enum.filter(&(not User.blocks?(user, &1)))
else
Enum.filter(users, &(not User.blocks?(user, &1)))
end
conn conn
|> put_view(AccountView) |> put_view(AccountView)
@ -906,14 +901,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
%Object{data: %{"announcements" => announces}} <- Object.normalize(object) do %Object{data: %{"announcements" => announces}} <- Object.normalize(object) 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 = users =
if is_nil(user) do Repo.all(q)
users |> Enum.filter(&(not User.blocks?(user, &1)))
else
Enum.filter(users, &(not User.blocks?(user, &1)))
end
conn conn
|> put_view(AccountView) |> put_view(AccountView)