From 6519f59d91d858273f929dc1c2a36752f6db07a9 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 26 Nov 2021 23:10:01 -0600
Subject: [PATCH] v2 Suggestions: return `is_suggested` through the API

---
 lib/pleroma/web/admin_api/views/account_view.ex            | 1 +
 lib/pleroma/web/mastodon_api/views/account_view.ex         | 1 +
 .../web/admin_api/controllers/user_controller_test.exs     | 7 +++++--
 test/pleroma/web/mastodon_api/views/account_view_test.exs  | 2 ++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/pleroma/web/admin_api/views/account_view.ex b/lib/pleroma/web/admin_api/views/account_view.ex
index fae0c07f0..2f1f7e627 100644
--- a/lib/pleroma/web/admin_api/views/account_view.ex
+++ b/lib/pleroma/web/admin_api/views/account_view.ex
@@ -80,6 +80,7 @@ defmodule Pleroma.Web.AdminAPI.AccountView do
       "tags" => user.tags || [],
       "is_confirmed" => user.is_confirmed,
       "is_approved" => user.is_approved,
+      "is_suggested" => user.is_suggested,
       "url" => user.uri || user.ap_id,
       "registration_reason" => user.registration_reason,
       "actor_type" => user.actor_type,
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
index 9e9de33f6..6114e12b1 100644
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -269,6 +269,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
         ap_id: user.ap_id,
         also_known_as: user.also_known_as,
         is_confirmed: user.is_confirmed,
+        is_suggested: user.is_suggested,
         tags: user.tags,
         hide_followers_count: user.hide_followers_count,
         hide_follows_count: user.hide_follows_count,
diff --git a/test/pleroma/web/admin_api/controllers/user_controller_test.exs b/test/pleroma/web/admin_api/controllers/user_controller_test.exs
index 1580ca448..b199fa704 100644
--- a/test/pleroma/web/admin_api/controllers/user_controller_test.exs
+++ b/test/pleroma/web/admin_api/controllers/user_controller_test.exs
@@ -877,7 +877,7 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
     user1 = insert(:user, is_suggested: false)
     user2 = insert(:user, is_suggested: false)
 
-    _response =
+    response =
       conn
       |> put_req_header("content-type", "application/json")
       |> patch(
@@ -886,6 +886,7 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
       )
       |> json_response_and_validate_schema(200)
 
+    assert Enum.map(response["users"], & &1["is_suggested"]) == [true, true]
     [user1, user2] = Repo.reload!([user1, user2])
 
     assert user1.is_suggested
@@ -901,7 +902,7 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
     user1 = insert(:user, is_suggested: true)
     user2 = insert(:user, is_suggested: true)
 
-    _response =
+    response =
       conn
       |> put_req_header("content-type", "application/json")
       |> patch(
@@ -910,6 +911,7 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
       )
       |> json_response_and_validate_schema(200)
 
+    assert Enum.map(response["users"], & &1["is_suggested"]) == [false, false]
     [user1, user2] = Repo.reload!([user1, user2])
 
     refute user1.is_suggested
@@ -954,6 +956,7 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
       "display_name" => HTML.strip_tags(user.name || user.nickname),
       "is_confirmed" => true,
       "is_approved" => true,
+      "is_suggested" => false,
       "url" => user.ap_id,
       "registration_reason" => nil,
       "actor_type" => "Person",
diff --git a/test/pleroma/web/mastodon_api/views/account_view_test.exs b/test/pleroma/web/mastodon_api/views/account_view_test.exs
index 60881756d..9af588778 100644
--- a/test/pleroma/web/mastodon_api/views/account_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/account_view_test.exs
@@ -83,6 +83,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
         tags: [],
         is_admin: false,
         is_moderator: false,
+        is_suggested: false,
         hide_favorites: true,
         hide_followers: false,
         hide_follows: false,
@@ -183,6 +184,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
         tags: [],
         is_admin: false,
         is_moderator: false,
+        is_suggested: false,
         hide_favorites: true,
         hide_followers: false,
         hide_follows: false,