Split Federation as separate context

test/mobilizon_web/api/report_test.exs

@@ -6,15 +6,16 @@ defmodule MobilizonWeb.API.ReportTest do
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Events.{Comment, Event}
   alias Mobilizon.Reports.{Note, Report}
-  alias Mobilizon.Service.ActivityPub.Activity
   alias Mobilizon.Users
   alias Mobilizon.Users.User
 
+  alias Mobilizon.Federation.ActivityPub.{Activity, Relay}
+
   alias MobilizonWeb.API.Reports
 
   describe "reports" do
     test "creates a report on a event" do
-      %Actor{url: relay_reporter_url} = Mobilizon.Service.ActivityPub.Relay.get_actor()
+      %Actor{url: relay_reporter_url} = Relay.get_actor()
       %Actor{id: reporter_id} = insert(:actor)
       %Actor{id: reported_id, url: reported_url} = reported = insert(:actor)
 
@@ -44,7 +45,7 @@ defmodule MobilizonWeb.API.ReportTest do
     end
 
     test "creates a report on several comments" do
-      %Actor{url: relay_reporter_url} = Mobilizon.Service.ActivityPub.Relay.get_actor()
+      %Actor{url: relay_reporter_url} = Relay.get_actor()
       %Actor{id: reporter_id} = insert(:actor)
       %Actor{id: reported_id, url: reported_url} = reported = insert(:actor)
 
@@ -79,7 +80,7 @@ defmodule MobilizonWeb.API.ReportTest do
     end
 
     test "creates a report that gets federated" do
-      %Actor{url: relay_reporter_url} = Mobilizon.Service.ActivityPub.Relay.get_actor()
+      %Actor{url: relay_reporter_url} = Relay.get_actor()
       %Actor{id: reporter_id} = insert(:actor)
       %Actor{id: reported_id, url: reported_url} = reported = insert(:actor)
 

test/mobilizon_web/api/search_test.exs

@@ -7,9 +7,10 @@ defmodule MobilizonWeb.API.SearchTest do
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Events
   alias Mobilizon.Events.Event
-  alias Mobilizon.Service.ActivityPub
   alias Mobilizon.Storage.Page
 
+  alias Mobilizon.Federation.ActivityPub
+
   alias MobilizonWeb.API.Search
 
   test "search an user by username" do

test/mobilizon_web/controllers/activity_pub_controller_test.exs

@@ -12,7 +12,8 @@ defmodule MobilizonWeb.ActivityPubControllerTest do
 
   alias Mobilizon.{Actors, Config}
   alias Mobilizon.Actors.Actor
-  alias Mobilizon.Service.ActivityPub
+
+  alias Mobilizon.Federation.ActivityPub
 
   alias MobilizonWeb.ActivityPub.ActorView
   alias MobilizonWeb.Endpoint
@@ -318,7 +319,7 @@ defmodule MobilizonWeb.ActivityPubControllerTest do
   #    test "it returns the following in a collection", %{conn: conn} do
   #      actor = insert(:actor)
   #      actor2 = insert(:actor)
-  #      Mobilizon.Service.ActivityPub.follow(actor, actor2)
+  #      Mobilizon.Federation.ActivityPub.follow(actor, actor2)
 
   #      result =
   #        conn

test/mobilizon_web/controllers/webfinger_controller_test.exs

@@ -3,14 +3,17 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 # Upstream: https://git.pleroma.social/pleroma/pleroma/blob/develop/test/web/web_finger/web_finger_test.exs
 
-defmodule MobilizonWeb.WebFingerTest do
+defmodule MobilizonWeb.WebFingerControllerTest do
   use MobilizonWeb.ConnCase
-  alias Mobilizon.Actors.Actor
-  alias Mobilizon.Service.WebFinger
+
   import Mobilizon.Factory
 
+  alias Mobilizon.Actors.Actor
+  alias Mobilizon.Federation.ActivityPub.WebFinger
+
   setup_all do
     Mobilizon.Config.put([:instance, :federating], true)
+
     :ok
   end
 

test/mobilizon_web/resolvers/admin_resolver_test.exs

@@ -8,6 +8,8 @@ defmodule MobilizonWeb.Resolvers.AdminResolverTest do
   alias Mobilizon.Reports.{Note, Report}
   alias Mobilizon.Users.User
 
+  alias Mobilizon.Federation.ActivityPub.Relay
+
   alias MobilizonWeb.AbsintheHelpers
   alias MobilizonWeb.API
 
@@ -135,7 +137,7 @@ defmodule MobilizonWeb.Resolvers.AdminResolverTest do
           name: "I am an instance actor"
         )
 
-      %Actor{} = relay_actor = Mobilizon.Service.ActivityPub.Relay.get_actor()
+      %Actor{} = relay_actor = Relay.get_actor()
       insert(:follower, actor: follower_actor, target_actor: relay_actor)
 
       query = """
@@ -182,7 +184,7 @@ defmodule MobilizonWeb.Resolvers.AdminResolverTest do
           name: "I am an instance actor"
         )
 
-      %Actor{} = relay_actor = Mobilizon.Service.ActivityPub.Relay.get_actor()
+      %Actor{} = relay_actor = Relay.get_actor()
       insert(:follower, actor: relay_actor, target_actor: following_actor)
 
       query = """