v2 Suggestions: actually flter out dismissed suggestions

3 files changed, 45 insertions, 3 deletions

diff --git a/lib/pleroma/user/query.ex b/lib/pleroma/user/query.ex
index 334e395fb..6d4a4ead6 100644
--- a/lib/pleroma/user/query.ex
+++ b/lib/pleroma/user/query.ex
@@ -46,6 +46,7 @@ defmodule Pleroma.User.Query do
             unconfirmed: boolean(),
             is_admin: boolean(),
             is_moderator: boolean(),
+            is_suggested: boolean(),
             super_users: boolean(),
             invisible: boolean(),
             internal: boolean(),
diff --git a/lib/pleroma/web/mastodon_api/controllers/suggestion_controller.ex b/lib/pleroma/web/mastodon_api/controllers/suggestion_controller.ex
index 4ebfc737c..3c5a07b7d 100644
--- a/lib/pleroma/web/mastodon_api/controllers/suggestion_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/suggestion_controller.ex
@@ -4,6 +4,7 @@
 
 defmodule Pleroma.Web.MastodonAPI.SuggestionController do
   use Pleroma.Web, :controller
+  import Ecto.Query
   alias Pleroma.User
   alias Pleroma.UserRelationship
 
@@ -65,15 +66,28 @@ defmodule Pleroma.Web.MastodonAPI.SuggestionController do
     do: Pleroma.Web.MastodonAPI.MastodonAPIController.empty_array(conn, params)
 
   @doc "GET /api/v2/suggestions"
-  def index2(%{assigns: %{user: user}} = conn, params) do
+  def index2(%{assigns: %{user: %{id: user_id} = user}} = conn, params) do
     limit = Map.get(params, :limit, 40) |> min(80)
 
     users =
-      %{is_suggested: true, limit: limit}
+      %{is_suggested: true, invisible: false, limit: limit}
       |> User.Query.build()
+      |> where([u], u.id != ^user_id)
+      |> join(:left, [u], r in UserRelationship,
+        as: :relationships,
+        on:
+          r.target_id == u.id and r.source_id == ^user_id and
+            r.relationship_type in [:block, :mute, :suggestion_dismiss]
+      )
+      |> where([relationships: r], is_nil(r.target_id))
       |> Pleroma.Repo.all()
 
-    render(conn, "index.json", %{users: users, source: :staff, for: user})
+    render(conn, "index.json", %{
+      users: users,
+      source: :staff,
+      for: user,
+      skip_visibility_check: true
+    })
   end
 
   @doc "DELETE /api/v1/suggestions/:account_id"
diff --git a/test/pleroma/web/mastodon_api/controllers/suggestion_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/suggestion_controller_test.exs
index 803a38c67..8948a52de 100644
--- a/test/pleroma/web/mastodon_api/controllers/suggestion_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/suggestion_controller_test.exs
@@ -29,6 +29,33 @@ defmodule Pleroma.Web.MastodonAPI.SuggestionControllerTest do
     assert [%{"source" => "staff", "account" => %{"id" => ^user_id}}] = res
   end
 
+  test "returns v2 suggestions excluding dismissed accounts", %{conn: conn} do
+    %{id: user_id} = insert(:user, is_suggested: true)
+
+    conn
+    |> delete("/api/v1/suggestions/#{user_id}")
+    |> json_response_and_validate_schema(200)
+
+    res =
+      conn
+      |> get("/api/v2/suggestions")
+      |> json_response_and_validate_schema(200)
+
+    assert [] = res
+  end
+
+  test "returns v2 suggestions excluding blocked accounts", %{conn: conn, user: blocker} do
+    blocked = insert(:user, is_suggested: true)
+    {:ok, _} = Pleroma.Web.CommonAPI.block(blocker, blocked)
+
+    res =
+      conn
+      |> get("/api/v2/suggestions")
+      |> json_response_and_validate_schema(200)
+
+    assert [] = res
+  end
+
   test "dismiss suggestion", %{conn: conn, user: source} do
     target = insert(:user, is_suggested: true)