Merge branch 'develop' into issue/1411

diff --cc lib/pleroma/object.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc test/web/activity_pub/activity_pub_test.exs
index 4f2d2d093713c75d1be5a44f6fcf48020247ab80,30f5dde0cb344830cd355b60edbd6d37d0165e50..5c977826f50ae7680628b46fe55a3f133a718172
--- 1/test/web/activity_pub/activity_pub_test.exs
--- 2/test/web/activity_pub/activity_pub_test.exs
+++ b/test/web/activity_pub/activity_pub_test.exs
@@@ -1554,37 -1554,20 +1554,52 @@@ defmodule Pleroma.Web.ActivityPub.Activ
        assert follow_info.hide_followers == false
        assert follow_info.hide_follows == true
      end
+ 
+     test "detects hidden follows/followers for friendica" do
+       user =
+         insert(:user,
+           local: false,
+           follower_address: "http://localhost:8080/followers/fuser3",
+           following_address: "http://localhost:8080/following/fuser3"
+         )
+ 
+       {:ok, follow_info} = ActivityPub.fetch_follow_information_for_user(user)
+       assert follow_info.hide_followers == true
+       assert follow_info.follower_count == 296
+       assert follow_info.following_count == 32
+       assert follow_info.hide_follows == true
+     end
    end
 +
 +  describe "fetch_favourites/3" do
 +    test "returns a favourite activities sorted by adds to favorite" do
 +      user = insert(:user)
 +      other_user = insert(:user)
 +      user1 = insert(:user)
 +      user2 = insert(:user)
 +      {:ok, a1} = CommonAPI.post(user1, %{"status" => "bla"})
 +      {:ok, _a2} = CommonAPI.post(user2, %{"status" => "traps are happy"})
 +      {:ok, a3} = CommonAPI.post(user2, %{"status" => "Trees Are "})
 +      {:ok, a4} = CommonAPI.post(user2, %{"status" => "Agent Smith "})
 +      {:ok, a5} = CommonAPI.post(user1, %{"status" => "Red or Blue "})
 +
 +      {:ok, _, _} = CommonAPI.favorite(a4.id, user)
 +      {:ok, _, _} = CommonAPI.favorite(a3.id, other_user)
 +      Process.sleep(1000)
 +      {:ok, _, _} = CommonAPI.favorite(a3.id, user)
 +      {:ok, _, _} = CommonAPI.favorite(a5.id, other_user)
 +      Process.sleep(1000)
 +      {:ok, _, _} = CommonAPI.favorite(a5.id, user)
 +      {:ok, _, _} = CommonAPI.favorite(a4.id, other_user)
 +      Process.sleep(1000)
 +      {:ok, _, _} = CommonAPI.favorite(a1.id, user)
 +      {:ok, _, _} = CommonAPI.favorite(a1.id, other_user)
 +      result = ActivityPub.fetch_favourites(user)
 +
 +      assert Enum.map(result, & &1.id) == [a1.id, a5.id, a3.id, a4.id]
 +
 +      result = ActivityPub.fetch_favourites(user, %{"limit" => 2})
 +      assert Enum.map(result, & &1.id) == [a1.id, a5.id]
 +    end
 +  end
  end