Actor suspension refactoring

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

lib/web/cache/activity_pub.ex

@@ -21,7 +21,7 @@ defmodule Mobilizon.Web.Cache.ActivityPub do
   Gets a actor by username and eventually domain.
   """
   @spec get_actor_by_name(String.t()) ::
-          {:commit, Actor.t()} | {:ignore, nil}
+          {:commit, ActorModel.t()} | {:ignore, nil}
   def get_actor_by_name(name) do
     Cachex.fetch(@cache, "actor_" <> name, fn "actor_" <> name ->
       case Actor.find_or_make_actor_from_nickname(name) do
@@ -38,7 +38,7 @@ defmodule Mobilizon.Web.Cache.ActivityPub do
   Gets a local actor by username.
   """
   @spec get_local_actor_by_name(String.t()) ::
-          {:commit, Actor.t()} | {:ignore, nil}
+          {:commit, ActorModel.t()} | {:ignore, nil}
   def get_local_actor_by_name(name) do
     Cachex.fetch(@cache, "local_actor_" <> name, fn "local_actor_" <> name ->
       case Actors.get_local_actor_by_name(name) do
@@ -195,7 +195,7 @@ defmodule Mobilizon.Web.Cache.ActivityPub do
   @doc """
   Gets a relay.
   """
-  @spec get_relay :: {:commit, Actor.t()} | {:ignore, nil}
+  @spec get_relay :: {:commit, ActorModel.t()} | {:ignore, nil}
   def get_relay do
     Cachex.fetch(@cache, "relay_actor", &Relay.get_actor/0)
   end

lib/web/email/group.ex

@@ -119,41 +119,57 @@ defmodule Mobilizon.Web.Email.Group do
       when role not in @member_roles,
       do: :ok
 
+  @spec send_group_deletion_notification(Member.t(), Actor.t()) :: :ok
   def send_group_deletion_notification(
         %Member{
-          actor: %Actor{user_id: user_id, id: actor_id},
-          parent: %Actor{domain: nil} = group,
-          role: member_role
+          actor: %Actor{user_id: user_id, id: actor_id} = member
         },
         %Actor{id: author_id} = author
       ) do
     with %User{email: email, locale: locale} <- Users.get_user!(user_id),
          {:member_not_author, true} <- {:member_not_author, author_id !== actor_id} do
-      Gettext.put_locale(locale)
-      instance = Config.instance_name()
-
-      subject =
-        gettext(
-          "The group %{group} has been deleted on %{instance}",
-          group: group.name,
-          instance: instance
-        )
-
-      Email.base_email(to: email, subject: subject)
-      |> assign(:locale, locale)
-      |> assign(:group, group)
-      |> assign(:role, member_role)
-      |> assign(:subject, subject)
-      |> assign(:instance, instance)
-      |> assign(:author, author)
-      |> render(:group_deletion)
-      |> Email.Mailer.send_email_later()
-
-      :ok
+      do_send_group_deletion_notification(member, author: author, email: email, locale: locale)
     else
       # Skip if it's the author itself
       {:member_not_author, _} ->
         :ok
     end
   end
+
+  @spec send_group_deletion_notification(Member.t()) :: :ok
+  def send_group_deletion_notification(%Member{actor: %Actor{user_id: user_id}} = member) do
+    case Users.get_user!(user_id) do
+      %User{email: email, locale: locale} ->
+        do_send_group_deletion_notification(member, email: email, locale: locale)
+    end
+  end
+
+  defp do_send_group_deletion_notification(
+         %Member{role: member_role, parent: %Actor{domain: nil} = group},
+         options
+       ) do
+    locale = Keyword.get(options, :locale)
+    Gettext.put_locale(locale)
+    instance = Config.instance_name()
+    author = Keyword.get(options, :author)
+
+    subject =
+      gettext(
+        "The group %{group} has been deleted on %{instance}",
+        group: group.name,
+        instance: instance
+      )
+
+    Email.base_email(to: Keyword.get(options, :email), subject: subject)
+    |> assign(:locale, locale)
+    |> assign(:group, group)
+    |> assign(:role, member_role)
+    |> assign(:subject, subject)
+    |> assign(:instance, instance)
+    |> assign(:author, author)
+    |> render(:group_deletion)
+    |> Email.Mailer.send_email_later()
+
+    :ok
+  end
 end