diff options
| author | Sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-07-22 02:42:29 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-22 02:42:29 +0000 |
| commit | a5d6287ba861b9b30edb2ac52584369b9c4665bc (patch) | |
| tree | f66598868870810a9a70ac58632e04580d57ba35 /lib | |
| parent | a00aab340275036858aecfef16b719abde3276c6 (diff) | |
| download | pleroma-a5d6287ba861b9b30edb2ac52584369b9c4665bc.tar.gz | |
Hide blocked users from interactions
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index e8b43e475..d660f3f05 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -883,7 +883,10 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do with %Activity{data: %{"object" => object}} <- Activity.get_by_id(id), %Object{data: %{"likes" => likes}} <- Object.normalize(object) do q = from(u in User, where: u.ap_id in ^likes) - users = Repo.all(q) + + users = + Repo.all(q) + |> Enum.filter(&(not User.blocks?(user, &1))) conn |> put_view(AccountView) @@ -897,7 +900,10 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do with %Activity{data: %{"object" => object}} <- Activity.get_by_id(id), %Object{data: %{"announcements" => announces}} <- Object.normalize(object) do q = from(u in User, where: u.ap_id in ^announces) - users = Repo.all(q) + + users = + Repo.all(q) + |> Enum.filter(&(not User.blocks?(user, &1))) conn |> put_view(AccountView) |