Refactor the ActivityPub module

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

lib/web/controllers/activity_pub_controller.ex

@@ -10,6 +10,7 @@ defmodule Mobilizon.Web.ActivityPubController do
   alias Mobilizon.Actors.{Actor, Member}
 
   alias Mobilizon.Federation.ActivityPub
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
   alias Mobilizon.Federation.ActivityPub.{Federator, Utils}
 
   alias Mobilizon.Web.ActivityPub.ActorView
@@ -108,7 +109,7 @@ defmodule Mobilizon.Web.ActivityPubController do
   def inbox(%{assigns: %{valid_signature: true}} = conn, %{"name" => preferred_username} = params) do
     with %Actor{url: recipient_url} = recipient <-
            Actors.get_local_actor_by_name(preferred_username),
-         {:ok, %Actor{} = actor} <- ActivityPub.get_or_fetch_actor_by_url(params["actor"]),
+         {:ok, %Actor{} = actor} <- ActivityPubActor.get_or_fetch_actor_by_url(params["actor"]),
          true <- Utils.recipient_in_message(recipient, actor, params),
          params <- Utils.maybe_splice_recipient(recipient_url, params) do
       Federator.enqueue(:incoming_ap_doc, params)

lib/web/plugs/mapped_signature_to_identity.ex

@@ -12,7 +12,7 @@ defmodule Mobilizon.Web.Plugs.MappedSignatureToIdentity do
 
   alias Mobilizon.Actors.Actor
 
-  alias Mobilizon.Federation.ActivityPub
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
   alias Mobilizon.Federation.ActivityPub.Utils
   alias Mobilizon.Federation.HTTPSignatures.Signature
 
@@ -34,7 +34,7 @@ defmodule Mobilizon.Web.Plugs.MappedSignatureToIdentity do
   @spec actor_from_key_id(Plug.Conn.t()) :: Actor.t() | nil
   defp actor_from_key_id(conn) do
     with key_actor_id when is_binary(key_actor_id) <- key_id_from_conn(conn),
-         {:ok, %Actor{} = actor} <- ActivityPub.get_or_fetch_actor_by_url(key_actor_id) do
+         {:ok, %Actor{} = actor} <- ActivityPubActor.get_or_fetch_actor_by_url(key_actor_id) do
       actor
     else
       _ ->