Improve Federation boundaries

lib/mobilizon_web/resolvers/comment.ex

@@ -3,9 +3,7 @@ defmodule MobilizonWeb.Resolvers.Comment do
   Handles the comment-related GraphQL calls.
   """
 
-  import Mobilizon.Service.Admin.ActionLog
-
-  alias Mobilizon.Actors
+  alias Mobilizon.{Actors, Admin, Events}
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Events
   alias Mobilizon.Events.Comment, as: CommentModel
@@ -49,7 +47,7 @@ defmodule MobilizonWeb.Resolvers.Comment do
         role in [:moderator, :administrator] ->
           with {:ok, res} <- do_delete_comment(comment),
                %Actor{} = actor <- Actors.get_actor(actor_id) do
-            log_action(actor, "delete", comment)
+            Admin.log_action(actor, "delete", comment)
 
             {:ok, res}
           end

lib/mobilizon_web/resolvers/event.ex

@@ -3,11 +3,8 @@ defmodule MobilizonWeb.Resolvers.Event do
   Handles the event-related GraphQL calls.
   """
 
-  import Mobilizon.Service.Admin.ActionLog
-
-  alias Mobilizon.Actors
+  alias Mobilizon.{Actors, Admin, Events}
   alias Mobilizon.Actors.Actor
-  alias Mobilizon.Events
   alias Mobilizon.Events.{Event, Participant, EventParticipantStats}
   alias Mobilizon.Users.User
 
@@ -343,7 +340,7 @@ defmodule MobilizonWeb.Resolvers.Event do
         role in [:moderator, :administrator] ->
           with {:ok, res} <- do_delete_event(event, !is_local),
                %Actor{} = actor <- Actors.get_actor(actor_id) do
-            log_action(actor, "delete", event)
+            Admin.log_action(actor, "delete", event)
 
             {:ok, res}
           end

lib/mobilizon_web/resolvers/user.ex

@@ -10,7 +10,7 @@ defmodule MobilizonWeb.Resolvers.User do
   alias Mobilizon.Storage.Repo
   alias Mobilizon.Users.User
 
-  alias MobilizonWeb.Email
+  alias MobilizonWeb.{Auth, Email}
 
   require Logger
 
@@ -94,9 +94,9 @@ defmodule MobilizonWeb.Resolvers.User do
         },
         _context
       ) do
-    with {:ok, user, _claims} <- MobilizonWeb.Guardian.resource_from_token(refresh_token),
+    with {:ok, user, _claims} <- Auth.Guardian.resource_from_token(refresh_token),
          {:ok, _old, {exchanged_token, _claims}} <-
-           MobilizonWeb.Guardian.exchange(refresh_token, ["access", "refresh"], "access"),
+           Auth.Guardian.exchange(refresh_token, ["access", "refresh"], "access"),
          {:ok, refresh_token} <- Users.generate_refresh_token(user) do
       {:ok, %{access_token: exchanged_token, refresh_token: refresh_token}}
     else