aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-11-02 22:44:36 +0100
committerRoger Braun <roger@rogerbraun.net>2017-11-02 22:44:36 +0100
commit8ef58a266b6c73ac2ec49873d48fda82315c63fd (patch)
tree2452bdf46daa332a58c944cfcc6f26043d5fad13 /lib
parenta47727adde426ab1e80299f5b5bdb23edabd0cd8 (diff)
downloadpleroma-8ef58a266b6c73ac2ec49873d48fda82315c63fd.tar.gz
Don't return blocked users' activities in contexts.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 75b59f375..db986f8f2 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -93,10 +93,11 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
end
end
- def fetch_activities_for_context(context) do
+ def fetch_activities_for_context(context, opts \\ %{}) do
query = from activity in Activity,
where: fragment("?->>'type' = ? and ?->>'context' = ?", activity.data, "Create", activity.data, ^context),
order_by: [desc: :id]
+ query = restrict_blocked(query, opts)
Repo.all(query)
end