Merge branch 'revert-0a82a7e6' into 'develop'

Revert "Merge branch 'feature/split-hide-network' into 'develop'"

See merge request pleroma/pleroma!758

lib/pleroma/user/info.ex

@@ -30,8 +30,7 @@ defmodule Pleroma.User.Info do
     field(:topic, :string, default: nil)
     field(:hub, :string, default: nil)
     field(:salmon, :string, default: nil)
-    field(:hide_followers, :boolean, default: false)
+    field(:hide_network, :boolean, default: false)
-    field(:hide_followings, :boolean, default: false)
     field(:pinned_activities, {:array, :string}, default: [])
 
     # Found in the wild
@@ -144,8 +143,7 @@ def profile_update(info, params) do
       :no_rich_text,
       :default_scope,
       :banner,
-      :hide_followings,
+      :hide_network,
-      :hide_followers,
       :background
     ])
   end

lib/pleroma/web/activity_pub/views/user_view.ex

@@ -86,7 +86,7 @@ def render("following.json", %{user: user, page: page}) do
     query = from(user in query, select: [:ap_id])
     following = Repo.all(query)
 
-    collection(following, "#{user.ap_id}/following", page, !user.info.hide_followings)
+    collection(following, "#{user.ap_id}/following", page, !user.info.hide_network)
     |> Map.merge(Utils.make_json_ld_header())
   end
 
@@ -99,7 +99,7 @@ def render("following.json", %{user: user}) do
       "id" => "#{user.ap_id}/following",
       "type" => "OrderedCollection",
       "totalItems" => length(following),
-      "first" => collection(following, "#{user.ap_id}/following", 1, !user.info.hide_followings)
+      "first" => collection(following, "#{user.ap_id}/following", 1, !user.info.hide_network)
     }
     |> Map.merge(Utils.make_json_ld_header())
   end
@@ -109,7 +109,7 @@ def render("followers.json", %{user: user, page: page}) do
     query = from(user in query, select: [:ap_id])
     followers = Repo.all(query)
 
-    collection(followers, "#{user.ap_id}/followers", page, !user.info.hide_followers)
+    collection(followers, "#{user.ap_id}/followers", page, !user.info.hide_network)
     |> Map.merge(Utils.make_json_ld_header())
   end
 
@@ -122,7 +122,7 @@ def render("followers.json", %{user: user}) do
       "id" => "#{user.ap_id}/followers",
       "type" => "OrderedCollection",
       "totalItems" => length(followers),
-      "first" => collection(followers, "#{user.ap_id}/followers", 1, !user.info.hide_followers)
+      "first" => collection(followers, "#{user.ap_id}/followers", 1, !user.info.hide_network)
     }
     |> Map.merge(Utils.make_json_ld_header())
   end

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

@@ -605,7 +605,7 @@ def followers(%{assigns: %{user: for_user}} = conn, %{"id" => id}) do
       followers =
         cond do
           for_user && user.id == for_user.id -> followers
-          user.info.hide_followers -> []
+          user.info.hide_network -> []
           true -> followers
         end
 
@@ -621,7 +621,7 @@ def following(%{assigns: %{user: for_user}} = conn, %{"id" => id}) do
       followers =
         cond do
           for_user && user.id == for_user.id -> followers
-          user.info.hide_followings -> []
+          user.info.hide_network -> []
           true -> followers
         end
 

lib/pleroma/web/twitter_api/twitter_api_controller.ex

@@ -503,7 +503,7 @@ def followers(%{assigns: %{user: for_user}} = conn, params) do
       followers =
         cond do
           for_user && user.id == for_user.id -> followers
-          user.info.hide_followers -> []
+          user.info.hide_network -> []
           true -> followers
         end
 
@@ -523,7 +523,7 @@ def friends(%{assigns: %{user: for_user}} = conn, params) do
       friends =
         cond do
           for_user && user.id == for_user.id -> friends
-          user.info.hide_followings -> []
+          user.info.hide_network -> []
           true -> friends
         end
 
@@ -618,7 +618,7 @@ def raw_empty_array(conn, _params) do
 
   defp build_info_cng(user, params) do
     info_params =
-      ["no_rich_text", "locked", "hide_followers", "hide_followings"]
+      ["no_rich_text", "locked", "hide_network"]
       |> Enum.reduce(%{}, fn key, res ->
         if value = params[key] do
           Map.put(res, key, value == "true")

lib/pleroma/web/twitter_api/views/user_view.ex

@@ -108,8 +108,7 @@ defp do_render("user.json", %{user: user = %User{}} = assigns) do
       "locked" => user.info.locked,
       "default_scope" => user.info.default_scope,
       "no_rich_text" => user.info.no_rich_text,
-      "hide_followers" => user.info.hide_followers,
+      "hide_network" => user.info.hide_network,
-      "hide_followings" => user.info.hide_followings,
       "fields" => fields,
 
       # Pleroma extension

priv/repo/migrations/20190128181211_split_hide_network.exs

@@ -1,10 +0,0 @@
-defmodule Pleroma.Repo.Migrations.SplitHideNetwork do
-  use Ecto.Migration
-
-  def up do
-    execute("UPDATE users SET info = jsonb_set(jsonb_set(info, '{hide_followers}'::text[], info->'hide_network'), '{hide_followings}'::text[], info->'hide_network')")
-  end
-
-  def down do
-  end
-end

test/web/activity_pub/activity_pub_controller_test.exs

@@ -386,9 +386,9 @@ test "it returns the followers in a collection", %{conn: conn} do
       assert result["first"]["orderedItems"] == [user.ap_id]
     end
 
-    test "it returns returns empty if the user has 'hide_followers' set", %{conn: conn} do
+    test "it returns returns empty if the user has 'hide_network' set", %{conn: conn} do
       user = insert(:user)
-      user_two = insert(:user, %{info: %{hide_followers: true}})
+      user_two = insert(:user, %{info: %{hide_network: true}})
       User.follow(user, user_two)
 
       result =
@@ -441,8 +441,8 @@ test "it returns the following in a collection", %{conn: conn} do
       assert result["first"]["orderedItems"] == [user_two.ap_id]
     end
 
-    test "it returns returns empty if the user has 'hide_followings' set", %{conn: conn} do
+    test "it returns returns empty if the user has 'hide_network' set", %{conn: conn} do
-      user = insert(:user, %{info: %{hide_followings: true}})
+      user = insert(:user, %{info: %{hide_network: true}})
       user_two = insert(:user)
       User.follow(user, user_two)
 

test/web/mastodon_api/mastodon_api_controller_test.exs

@@ -1099,9 +1099,9 @@ test "getting followers", %{conn: conn} do
     assert id == to_string(user.id)
   end
 
-  test "getting followers, hide_followers", %{conn: conn} do
+  test "getting followers, hide_network", %{conn: conn} do
     user = insert(:user)
-    other_user = insert(:user, %{info: %{hide_followers: true}})
+    other_user = insert(:user, %{info: %{hide_network: true}})
     {:ok, _user} = User.follow(user, other_user)
 
     conn =
@@ -1111,9 +1111,9 @@ test "getting followers, hide_followers", %{conn: conn} do
     assert [] == json_response(conn, 200)
   end
 
-  test "getting followers, hide_followers, same user requesting", %{conn: conn} do
+  test "getting followers, hide_network, same user requesting", %{conn: conn} do
     user = insert(:user)
-    other_user = insert(:user, %{info: %{hide_followers: true}})
+    other_user = insert(:user, %{info: %{hide_network: true}})
     {:ok, _user} = User.follow(user, other_user)
 
     conn =
@@ -1137,8 +1137,8 @@ test "getting following", %{conn: conn} do
     assert id == to_string(other_user.id)
   end
 
-  test "getting following, hide_followings", %{conn: conn} do
+  test "getting following, hide_network", %{conn: conn} do
-    user = insert(:user, %{info: %{hide_followings: true}})
+    user = insert(:user, %{info: %{hide_network: true}})
     other_user = insert(:user)
     {:ok, user} = User.follow(user, other_user)
 
@@ -1149,8 +1149,8 @@ test "getting following, hide_followings", %{conn: conn} do
     assert [] == json_response(conn, 200)
   end
 
-  test "getting following, hide_followings, same user requesting", %{conn: conn} do
+  test "getting following, hide_network, same user requesting", %{conn: conn} do
-    user = insert(:user, %{info: %{hide_followings: true}})
+    user = insert(:user, %{info: %{hide_network: true}})
     other_user = insert(:user)
     {:ok, user} = User.follow(user, other_user)
 

test/web/twitter_api/twitter_api_controller_test.exs

@@ -1132,8 +1132,8 @@ test "it returns a given user's followers with user_id", %{conn: conn} do
              )
     end
 
-    test "it returns empty when hide_followers is set to true", %{conn: conn} do
+    test "it returns empty for a hidden network", %{conn: conn} do
-      user = insert(:user, %{info: %{hide_followers: true}})
+      user = insert(:user, %{info: %{hide_network: true}})
       follower_one = insert(:user)
       follower_two = insert(:user)
       not_follower = insert(:user)
@@ -1150,11 +1150,10 @@ test "it returns empty when hide_followers is set to true", %{conn: conn} do
       assert [] == response
     end
 
-    test "it returns the followers when hide_followers is set to true if requested by the user themselves",
+    test "it returns the followers for a hidden network if requested by the user themselves", %{
-         %{
+      conn: conn
-           conn: conn
+    } do
-         } do
+      user = insert(:user, %{info: %{hide_network: true}})
-      user = insert(:user, %{info: %{hide_followers: true}})
       follower_one = insert(:user)
       follower_two = insert(:user)
       _not_follower = insert(:user)
@@ -1257,8 +1256,8 @@ test "it returns a given user's friends with user_id", %{conn: conn} do
              )
     end
 
-    test "it returns empty when hide_followings is set to true", %{conn: conn} do
+    test "it returns empty for a hidden network", %{conn: conn} do
-      user = insert(:user, %{info: %{hide_followings: true}})
+      user = insert(:user, %{info: %{hide_network: true}})
       followed_one = insert(:user)
       followed_two = insert(:user)
       not_followed = insert(:user)
@@ -1274,11 +1273,10 @@ test "it returns empty when hide_followings is set to true", %{conn: conn} do
       assert [] == json_response(conn, 200)
     end
 
-    test "it returns friends when hide_followings is set to true if the user themselves request it",
+    test "it returns friends for a hidden network if the user themselves request it", %{
-         %{
+      conn: conn
-           conn: conn
+    } do
-         } do
+      user = insert(:user, %{info: %{hide_network: true}})
-      user = insert(:user, %{info: %{hide_followings: true}})
       followed_one = insert(:user)
       followed_two = insert(:user)
       _not_followed = insert(:user)
@@ -1366,51 +1364,27 @@ test "it updates a user's profile", %{conn: conn} do
       assert json_response(conn, 200) == UserView.render("user.json", %{user: user, for: user})
     end
 
-    test "it sets and un-sets hide_followings", %{conn: conn} do
+    test "it sets and un-sets hide_network", %{conn: conn} do
       user = insert(:user)
 
       conn
       |> assign(:user, user)
       |> post("/api/account/update_profile.json", %{
-        "hide_followings" => "true"
+        "hide_network" => "true"
       })
 
       user = Repo.get!(User, user.id)
-      assert user.info.hide_followings == true
+      assert user.info.hide_network == true
 
       conn =
         conn
         |> assign(:user, user)
         |> post("/api/account/update_profile.json", %{
-          "hide_followings" => "false"
+          "hide_network" => "false"
         })
 
       user = Repo.get!(User, user.id)
-      assert user.info.hide_followings == false
+      assert user.info.hide_network == false
-      assert json_response(conn, 200) == UserView.render("user.json", %{user: user, for: user})
-    end
-
-    test "it sets and un-sets hide_followers", %{conn: conn} do
-      user = insert(:user)
-
-      conn
-      |> assign(:user, user)
-      |> post("/api/account/update_profile.json", %{
-        "hide_followers" => "true"
-      })
-
-      user = Repo.get!(User, user.id)
-      assert user.info.hide_followers == true
-
-      conn =
-        conn
-        |> assign(:user, user)
-        |> post("/api/account/update_profile.json", %{
-          "hide_followers" => "false"
-        })
-
-      user = Repo.get!(User, user.id)
-      assert user.info.hide_followers == false
       assert json_response(conn, 200) == UserView.render("user.json", %{user: user, for: user})
     end
 

test/web/twitter_api/views/user_view_test.exs

@@ -100,8 +100,7 @@ test "A user" do
       "locked" => false,
       "default_scope" => "public",
       "no_rich_text" => false,
-      "hide_followings" => false,
+      "hide_network" => false,
-      "hide_followers" => false,
       "fields" => [],
       "pleroma" => %{
         "confirmation_pending" => false,
@@ -148,8 +147,7 @@ test "A user for a given other follower", %{user: user} do
       "locked" => false,
       "default_scope" => "public",
       "no_rich_text" => false,
-      "hide_followings" => false,
+      "hide_network" => false,
-      "hide_followers" => false,
       "fields" => [],
       "pleroma" => %{
         "confirmation_pending" => false,
@@ -197,8 +195,7 @@ test "A user that follows you", %{user: user} do
       "locked" => false,
       "default_scope" => "public",
       "no_rich_text" => false,
-      "hide_followings" => false,
+      "hide_network" => false,
-      "hide_followers" => false,
       "fields" => [],
       "pleroma" => %{
         "confirmation_pending" => false,
@@ -260,8 +257,7 @@ test "A blocked user for the blocker" do
       "locked" => false,
       "default_scope" => "public",
       "no_rich_text" => false,
-      "hide_followings" => false,
+      "hide_network" => false,
-      "hide_followers" => false,
       "fields" => [],
       "pleroma" => %{
         "confirmation_pending" => false,