Actor suspension refactoring

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

test/federation/activity_pub/transmogrifier_test.exs

@@ -202,7 +202,7 @@ defmodule Mobilizon.Federation.ActivityPub.TransmogrifierTest do
       with_mock ActivityPubActor, [:passthrough],
         get_or_fetch_actor_by_url: fn url ->
           case url do
-            @mobilizon_group_url -> {:error, "Not found"}
+            @mobilizon_group_url -> {:error, :http_not_found}
             ^actor_url -> {:ok, actor}
           end
         end do
@@ -308,7 +308,7 @@ defmodule Mobilizon.Federation.ActivityPub.TransmogrifierTest do
       with_mock ActivityPubActor, [:passthrough],
         get_or_fetch_actor_by_url: fn url ->
           case url do
-            @mobilizon_group_url -> {:error, "Not found"}
+            @mobilizon_group_url -> {:error, :http_not_found}
             ^actor_url -> {:ok, actor}
           end
         end do

test/mobilizon/actors/actors_test.exs

@@ -5,7 +5,7 @@ defmodule Mobilizon.ActorsTest do
 
   import Mobilizon.Factory
 
-  alias Mobilizon.{Actors, Config, Discussions, Events, Tombstone, Users}
+  alias Mobilizon.{Actors, Config, Discussions, Events, Users}
   alias Mobilizon.Actors.{Actor, Bot, Follower, Member}
   alias Mobilizon.Discussions.Comment
   alias Mobilizon.Events.Event
@@ -292,57 +292,7 @@ defmodule Mobilizon.ActorsTest do
     test "update_actor/2 with invalid data returns error changeset", %{actor: actor} do
       assert {:error, %Ecto.Changeset{}} = Actors.update_actor(actor, @invalid_attrs)
       actor_fetched = Actors.get_actor!(actor.id)
-      assert actor = actor_fetched
-    end
-
-    test "perform delete the actor actually deletes the actor", %{
-      actor: %Actor{avatar: %{url: avatar_url}, banner: %{url: banner_url}, id: actor_id} = actor
-    } do
-      %Event{url: event1_url} = event1 = insert(:event, organizer_actor: actor)
-      insert(:event, organizer_actor: actor)
-
-      %Comment{url: comment1_url} = comment1 = insert(:comment, actor: actor)
-      insert(:comment, actor: actor)
-
-      %URI{path: "/media/" <> avatar_path} = URI.parse(avatar_url)
-      %URI{path: "/media/" <> banner_path} = URI.parse(banner_url)
-
-      assert File.exists?(
-               Config.get!([Uploader.Local, :uploads]) <>
-                 "/" <> avatar_path
-             )
-
-      assert File.exists?(
-               Config.get!([Uploader.Local, :uploads]) <>
-                 "/" <> banner_path
-             )
-
-      assert {:ok, %Actor{}} = Actors.perform(:delete_actor, actor)
-
-      assert %Actor{
-               name: nil,
-               summary: nil,
-               suspended: true,
-               avatar: nil,
-               banner: nil,
-               user_id: nil
-             } = Actors.get_actor(actor_id)
-
-      assert {:error, :event_not_found} = Events.get_event(event1.id)
-      assert %Tombstone{} = Tombstone.find_tombstone(event1_url)
-      assert %Comment{deleted_at: deleted_at} = Discussions.get_comment(comment1.id)
-      refute is_nil(deleted_at)
-      assert %Tombstone{} = Tombstone.find_tombstone(comment1_url)
-
-      refute File.exists?(
-               Config.get!([Uploader.Local, :uploads]) <>
-                 "/" <> avatar_path
-             )
-
-      refute File.exists?(
-               Config.get!([Uploader.Local, :uploads]) <>
-                 "/" <> banner_path
-             )
+      assert actor.id == actor_fetched.id
     end
 
     test "delete_actor/1 deletes the actor", %{
@@ -392,10 +342,8 @@ defmodule Mobilizon.ActorsTest do
              } = Actors.get_actor(actor_id)
 
       assert {:error, :event_not_found} = Events.get_event(event1.id)
-      assert %Tombstone{} = Tombstone.find_tombstone(event1_url)
       assert %Comment{deleted_at: deleted_at} = Discussions.get_comment(comment1.id)
       refute is_nil(deleted_at)
-      assert %Tombstone{} = Tombstone.find_tombstone(comment1_url)
 
       refute File.exists?(
                Config.get!([Uploader.Local, :uploads]) <>

test/service/actor_suspension_test.exs

@@ -0,0 +1,103 @@
+defmodule Mobilizon.Service.ActorSuspensionTest do
+  use Mobilizon.DataCase
+
+  import Mobilizon.Factory
+
+  alias Mobilizon.{Actors, Config, Discussions, Events}
+  alias Mobilizon.Actors.Actor
+  alias Mobilizon.Discussions.Comment
+  alias Mobilizon.Events.{Event, Participant}
+  alias Mobilizon.Service.ActorSuspension
+  alias Mobilizon.Web.Upload.Uploader
+
+  describe "suspend a person" do
+    setup do
+      %Actor{} = actor = insert(:actor)
+
+      %Comment{} = comment = insert(:comment, actor: actor)
+      %Event{} = event = insert(:event, organizer_actor: actor)
+      %Event{} = insert(:event)
+      insert(:participant, event: event)
+
+      %Participant{} =
+        participant = insert(:participant, actor: actor, event: event, role: :participant)
+
+      {:ok, actor: actor, comment: comment, event: event, participant: participant}
+    end
+
+    test "local", %{actor: actor, comment: comment, event: event, participant: participant} do
+      assert actor
+             |> media_paths()
+             |> media_exists?()
+
+      assert {:ok, %Actor{}} = ActorSuspension.suspend_actor(actor)
+      assert %Actor{suspended: true} = Actors.get_actor(actor.id)
+      assert %Comment{deleted_at: %DateTime{}} = Discussions.get_comment(comment.id)
+      assert {:error, :event_not_found} = Events.get_event(event.id)
+      assert nil == Events.get_participant(participant.id)
+
+      refute actor
+             |> media_paths()
+             |> media_exists?()
+    end
+  end
+
+  describe "delete a person" do
+    setup do
+      %Actor{} = actor = insert(:actor)
+
+      %Comment{} = comment = insert(:comment, actor: actor)
+      %Event{} = event = insert(:event, organizer_actor: actor)
+
+      {:ok, actor: actor, comment: comment, event: event}
+    end
+
+    test "local", %{actor: actor, comment: comment, event: event} do
+      assert actor
+             |> media_paths()
+             |> media_exists?()
+
+      assert {:ok, %Actor{}} = ActorSuspension.suspend_actor(actor, reserve_username: false)
+      assert nil == Actors.get_actor(actor.id)
+      assert %Comment{deleted_at: %DateTime{}} = Discussions.get_comment(comment.id)
+      assert {:error, :event_not_found} = Events.get_event(event.id)
+
+      refute actor
+             |> media_paths()
+             |> media_exists?()
+    end
+  end
+
+  describe "suspend a group" do
+    setup do
+      %Actor{} = group = insert(:group)
+
+      %Event{} = event = insert(:event, attributed_to: group)
+
+      {:ok, group: group, event: event}
+    end
+
+    test "local", %{group: group, event: event} do
+      assert {:ok, %Actor{}} = ActorSuspension.suspend_actor(group)
+      assert %Actor{suspended: true} = Actors.get_actor(group.id)
+      assert {:error, :event_not_found} = Events.get_event(event.id)
+    end
+  end
+
+  defp media_paths(%Actor{avatar: %{url: avatar_url}, banner: %{url: banner_url}}) do
+    %URI{path: "/media/" <> avatar_path} = URI.parse(avatar_url)
+    %URI{path: "/media/" <> banner_path} = URI.parse(banner_url)
+    %{avatar: avatar_path, banner: banner_path}
+  end
+
+  defp media_exists?(%{avatar: avatar_path, banner: banner_path}) do
+    File.exists?(
+      Config.get!([Uploader.Local, :uploads]) <>
+        "/" <> avatar_path
+    ) &&
+      File.exists?(
+        Config.get!([Uploader.Local, :uploads]) <>
+          "/" <> banner_path
+      )
+  end
+end