Fix following groups + Add interface to manage followers

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

test/federation/activity_pub/transmogrifier/follow_test.exs

@@ -3,19 +3,73 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier.FollowTest do
 
   import Mobilizon.Factory
   alias Mobilizon.Actors
+  alias Mobilizon.Actors.Follower
   alias Mobilizon.Federation.ActivityPub
   alias Mobilizon.Federation.ActivityPub.{Activity, Transmogrifier}
 
+  describe "handle incoming follow requests" do
+    test "it works for incoming follow requests" do
+      actor = insert(:actor)
+
+      data =
+        File.read!("test/fixtures/mastodon-follow-activity.json")
+        |> Jason.decode!()
+        |> Map.put("object", actor.url)
+
+      {:ok, %Activity{data: data, local: false}, _} = Transmogrifier.handle_incoming(data)
+
+      assert data["actor"] == "https://social.tcit.fr/users/tcit"
+      assert data["type"] == "Follow"
+      assert data["id"] == "https://social.tcit.fr/users/tcit#follows/2"
+
+      actor = Actors.get_actor_with_preload(actor.id)
+      assert Actors.is_following(Actors.get_actor_by_url!(data["actor"], true), actor)
+    end
+
+    test "it rejects activities without a valid ID" do
+      actor = insert(:actor)
+
+      data =
+        File.read!("test/fixtures/mastodon-follow-activity.json")
+        |> Jason.decode!()
+        |> Map.put("object", actor.url)
+        |> Map.put("id", "")
+
+      :error = Transmogrifier.handle_incoming(data)
+    end
+
+    #     test "it works for incoming follow requests from hubzilla" do
+    #       user = insert(:user)
+
+    #       data =
+    #         File.read!("test/fixtures/hubzilla-follow-activity.json")
+    #         |> Jason.decode!()
+    #         |> Map.put("object", user.ap_id)
+    #         |> Utils.normalize_params()
+
+    #       {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)
+
+    #       assert data["actor"] == "https://hubzilla.example.org/channel/kaniini"
+    #       assert data["type"] == "Follow"
+    #       assert data["id"] == "https://hubzilla.example.org/channel/kaniini#follows/2"
+    #       assert User.is_following(User.get_by_ap_id(data["actor"]), user)
+    #     end
+  end
+
   describe "handle incoming follow accept activities" do
-    test "it works for incoming accepts which were pre-accepted" do
+    test "it works for incoming accepts" do
       follower = insert(:actor)
-      followed = insert(:actor)
+      followed = insert(:actor, manually_approves_followers: false)
 
       refute Actors.is_following(follower, followed)
 
       {:ok, follow_activity, _} = ActivityPub.follow(follower, followed)
       assert Actors.is_following(follower, followed)
 
+      follow_object_id = follow_activity.data["id"]
+
+      assert %Follower{} = Actors.get_follower_by_url(follow_object_id)
+
       accept_data =
         File.read!("test/fixtures/mastodon-accept-activity.json")
         |> Jason.decode!()
@@ -24,7 +78,39 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier.FollowTest do
       object =
         accept_data["object"]
         |> Map.put("actor", follower.url)
-        |> Map.put("id", follow_activity.data["id"])
+        |> Map.put("id", follow_object_id)
+
+      accept_data = Map.put(accept_data, "object", object)
+
+      :error = Transmogrifier.handle_incoming(accept_data)
+
+      {:ok, follower} = Actors.get_actor_by_url(follower.url)
+
+      assert Actors.is_following(follower, followed)
+    end
+
+    test "it works for incoming accepts which were pre-accepted" do
+      follower = insert(:actor)
+      followed = insert(:actor, manually_approves_followers: true)
+
+      refute Actors.is_following(follower, followed)
+
+      {:ok, follow_activity, _} = ActivityPub.follow(follower, followed)
+      assert Actors.is_following(follower, followed)
+
+      follow_object_id = follow_activity.data["id"]
+
+      assert %Follower{} = Actors.get_follower_by_url(follow_object_id)
+
+      accept_data =
+        File.read!("test/fixtures/mastodon-accept-activity.json")
+        |> Jason.decode!()
+        |> Map.put("actor", followed.url)
+
+      object =
+        accept_data["object"]
+        |> Map.put("actor", follower.url)
+        |> Map.put("id", follow_object_id)
 
       accept_data = Map.put(accept_data, "object", object)
 
@@ -40,7 +126,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier.FollowTest do
 
     test "it works for incoming accepts which are referenced by IRI only" do
       follower = insert(:actor)
-      followed = insert(:actor)
+      followed = insert(:actor, manually_approves_followers: true)
 
       {:ok, follow_activity, _} = ActivityPub.follow(follower, followed)
 

test/federation/activity_pub/transmogrifier_test.exs

@@ -556,57 +556,6 @@ defmodule Mobilizon.Federation.ActivityPub.TransmogrifierTest do
     end
   end
 
-  describe "handle incoming follow requests" do
-    test "it works for incoming follow requests" do
-      use_cassette "activity_pub/mastodon_follow_activity" do
-        actor = insert(:actor)
-
-        data =
-          File.read!("test/fixtures/mastodon-follow-activity.json")
-          |> Jason.decode!()
-          |> Map.put("object", actor.url)
-
-        {:ok, %Activity{data: data, local: false}, _} = Transmogrifier.handle_incoming(data)
-
-        assert data["actor"] == "https://social.tcit.fr/users/tcit"
-        assert data["type"] == "Follow"
-        assert data["id"] == "https://social.tcit.fr/users/tcit#follows/2"
-
-        actor = Actors.get_actor_with_preload(actor.id)
-        assert Actors.is_following(Actors.get_actor_by_url!(data["actor"], true), actor)
-      end
-    end
-
-    test "it rejects activities without a valid ID" do
-      actor = insert(:actor)
-
-      data =
-        File.read!("test/fixtures/mastodon-follow-activity.json")
-        |> Jason.decode!()
-        |> Map.put("object", actor.url)
-        |> Map.put("id", "")
-
-      :error = Transmogrifier.handle_incoming(data)
-    end
-
-    #     test "it works for incoming follow requests from hubzilla" do
-    #       user = insert(:user)
-
-    #       data =
-    #         File.read!("test/fixtures/hubzilla-follow-activity.json")
-    #         |> Jason.decode!()
-    #         |> Map.put("object", user.ap_id)
-    #         |> Utils.normalize_params()
-
-    #       {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)
-
-    #       assert data["actor"] == "https://hubzilla.example.org/channel/kaniini"
-    #       assert data["type"] == "Follow"
-    #       assert data["id"] == "https://hubzilla.example.org/channel/kaniini#follows/2"
-    #       assert User.is_following(User.get_by_ap_id(data["actor"]), user)
-    #     end
-  end
-
   # test "it works for incoming likes" do
   #   %Comment{url: url} = insert(:comment)