Refactor the ActivityPub module

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

lib/federation/http_signatures/signature.ex

@@ -12,7 +12,7 @@ defmodule Mobilizon.Federation.HTTPSignatures.Signature do
 
   alias Mobilizon.Actors.Actor
 
-  alias Mobilizon.Federation.ActivityPub
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
 
   require Logger
 
@@ -53,7 +53,7 @@ defmodule Mobilizon.Federation.HTTPSignatures.Signature do
           {:ok, String.t()}
           | {:error, :actor_fetch_error | :pem_decode_error | :actor_not_fetchable}
   defp get_public_key_for_url(url) do
-    with {:ok, %Actor{keys: keys}} <- ActivityPub.get_or_fetch_actor_by_url(url),
+    with {:ok, %Actor{keys: keys}} <- ActivityPubActor.get_or_fetch_actor_by_url(url),
          {:ok, public_key} <- prepare_public_key(keys) do
       {:ok, public_key}
     else
@@ -90,7 +90,7 @@ defmodule Mobilizon.Federation.HTTPSignatures.Signature do
     with %{"keyId" => kid} <- HTTPSignatures.signature_for_conn(conn),
          actor_id <- key_id_to_actor_url(kid),
          :ok <- Logger.debug("Refetching public key for #{actor_id}"),
-         {:ok, _actor} <- ActivityPub.make_actor_from_url(actor_id),
+         {:ok, _actor} <- ActivityPubActor.make_actor_from_url(actor_id),
          {:ok, public_key} <- get_public_key_for_url(actor_id) do
       {:ok, public_key}
     end