Separating of Storage context

lib/service/activity_pub/utils.ex

@@ -10,7 +10,7 @@ defmodule Mobilizon.Service.ActivityPub.Utils do
   Various utils
   """
 
-  alias Mobilizon.Repo
+  alias Mobilizon.Storage.Repo
   alias Mobilizon.Addresses
   alias Mobilizon.Addresses.Address
   alias Mobilizon.Actors
@@ -165,7 +165,7 @@ defmodule Mobilizon.Service.ActivityPub.Utils do
       Enum.each(Users.list_moderators(), fn moderator ->
         moderator
         |> Mobilizon.Email.Admin.report(moderator, report)
-        |> Mobilizon.Mailer.deliver_later()
+        |> Mobilizon.Email.Mailer.deliver_later()
       end)
 
       {:ok, report}

lib/service/users/activation.ex

@@ -1,9 +1,10 @@
 defmodule Mobilizon.Service.Users.Activation do
   @moduledoc false
 
-  alias Mobilizon.{Mailer, Users}
-  alias Mobilizon.Users.User
+  alias Mobilizon.Email.Mailer
   alias Mobilizon.Email.User, as: UserEmail
+  alias Mobilizon.Users
+  alias Mobilizon.Users.User
   alias Mobilizon.Service.Users.Tools
 
   require Logger

lib/service/users/reset_password.ex

@@ -1,12 +1,14 @@
 defmodule Mobilizon.Service.Users.ResetPassword do
   @moduledoc false
 
-  require Logger
-
-  alias Mobilizon.Users.User
-  alias Mobilizon.{Mailer, Repo, Users}
+  alias Mobilizon.Email.Mailer
   alias Mobilizon.Email.User, as: UserEmail
   alias Mobilizon.Service.Users.Tools
+  alias Mobilizon.Storage.Repo
+  alias Mobilizon.Users
+  alias Mobilizon.Users.User
+
+  require Logger
 
   @doc """
   Check that the provided token is correct and update provided password