https://github.com/bonfire-networks/bonfire-app/issues/900

bonfire-networks · Jan 8, 2025 · 8a2e191 · 8a2e191
1 parent 5ccafcd
commit 8a2e191
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/lib/activities.ex b/lib/activities.ex
@@ -1294,7 +1294,7 @@ defmodule Bonfire.Social.Activities do
     end
   end
 
-  def maybe_filter(query, {:circles, circle_ids}, opts) do
+  def maybe_filter(query, {:subject_circles, circle_ids}, opts) do
     case Types.uids(circle_ids, nil) do
       nil ->
         warn(circle_ids, "unrecognized circle_ids")
@@ -1315,7 +1315,7 @@ defmodule Bonfire.Social.Activities do
     end
   end
 
-  def maybe_filter(query, {:exclude_circles, circle_ids}, opts) do
+  def maybe_filter(query, {:exclude_subject_circles, circle_ids}, opts) do
     case Types.uids(circle_ids, nil) do
       nil ->
         warn(circle_ids, "unrecognized circle_ids")

diff --git a/lib/feed_filters.ex b/lib/feed_filters.ex
@@ -20,6 +20,7 @@ defmodule Bonfire.Social.FeedFilters do
     field :subjects, StringList
     field :exclude_subjects, StringList
     field :subject_circles, StringList
+    field :exclude_subject_circles, StringList
     field :subject_types, AtomOrStringList
     field :exclude_subject_types, AtomOrStringList
     field :objects, StringList

diff --git a/test/social/feeds_filter_circles_test.exs b/test/social/feeds_filter_circles_test.exs
@@ -72,15 +72,15 @@ defmodule Bonfire.Social.FeedsCirclesFilterTest do
       refute FeedLoader.feed_contains?(feed, post_by_carl, current_user: user)
     end
 
-    test "`exclude_circles` filters out posts from members of a circle", %{
+    test "`exclude_subject_circles` filters out posts from members of a circle", %{
       user: user,
       circle: circle,
       post_by_alice: post_by_alice,
       # post_by_bob: post_by_bob,
       post_by_carl: post_by_carl
     } do
       # Load a feed excluding posts by members of the "friends" circle
-      feed = FeedLoader.feed(:custom, %{exclude_circles: [circle]}, current_user: user)
+      feed = FeedLoader.feed(:custom, %{exclude_subject_circles: [circle]}, current_user: user)
 
       # Assert posts by Alice (member of the circle) are excluded
       refute FeedLoader.feed_contains?(feed, post_by_alice, current_user: user)
@@ -90,7 +90,7 @@ defmodule Bonfire.Social.FeedsCirclesFilterTest do
     end
 
     # TODO: optimise query with a special case that uses the same join for both?
-    test "`exclude_circles` and `circles` together prioritize exclusions", %{
+    test "`exclude_subject_circles` and `circles` together prioritize exclusions", %{
       user: user,
       carl: carl,
       circle: circle,
@@ -106,7 +106,7 @@ defmodule Bonfire.Social.FeedsCirclesFilterTest do
 
       # Load a feed that includes "friends" circle but excludes "coworkers" circle
       feed =
-        FeedLoader.feed(:custom, %{circles: [circle], exclude_circles: [second_circle]},
+        FeedLoader.feed(:custom, %{circles: [circle], exclude_subject_circles: [second_circle]},
           current_user: user
         )