diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-23 19:14:43 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-23 19:14:43 +0000 |
| commit | 8d3cf7e519ddc0b5e89729d305120d2810e1e3eb (patch) | |
| tree | e9da4fe2be6d45e0e8a77c45ee31fb9c469d97fc /lib | |
| parent | ad608373005036a1181474ec446ed9d882385248 (diff) | |
| parent | 54a161cb7ad58da05ced24daaf0c16964f76fa4c (diff) | |
| download | pleroma-8d3cf7e519ddc0b5e89729d305120d2810e1e3eb.tar.gz | |
Merge branch 'bugfix/unauthed-liked-by' into 'develop'
Bugfix: don't error out on unauthorized request to liked/favourited_by
See merge request pleroma/pleroma!1474
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/user.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index a3f6add28..e017efad6 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -882,6 +882,8 @@ defmodule Pleroma.User do Pleroma.Web.ActivityPub.MRF.subdomain_match?(domain_blocks, host) end + def blocks?(nil, _), do: false + def subscribed_to?(user, %{ap_id: ap_id}) do with %User{} = target <- get_cached_by_ap_id(ap_id) do Enum.member?(target.info.subscribers, user.ap_id) |