Move API under GraphQL context

lib/graphql/resolvers/comment.ex

@@ -9,7 +9,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Comment do
   alias Mobilizon.Events.Comment, as: CommentModel
   alias Mobilizon.Users.User
 
-  alias MobilizonWeb.API.Comments
+  alias Mobilizon.GraphQL.API.Comments
 
   require Logger
 

lib/graphql/resolvers/event.ex

@@ -8,12 +8,11 @@ defmodule Mobilizon.GraphQL.Resolvers.Event do
   alias Mobilizon.Events.{Event, Participant, EventParticipantStats}
   alias Mobilizon.Users.User
 
+  alias Mobilizon.GraphQL.API
   alias Mobilizon.GraphQL.Resolvers.Person
 
   alias Mobilizon.Federation.ActivityPub.Activity
 
-  alias MobilizonWeb.API
-
   # We limit the max number of events that can be retrieved
   @event_max_limit 100
   @number_of_related_events 3
@@ -231,7 +230,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Event do
            {:actor_approve_permission,
             Mobilizon.Events.moderator_for_event?(participation.event.id, moderator_actor_id)},
          {:ok, _activity, participation} <-
-           MobilizonWeb.API.Participations.update(participation, moderator_actor, new_role) do
+           API.Participations.update(participation, moderator_actor, new_role) do
       {:ok, participation}
     else
       {:is_owned, nil} ->
@@ -268,7 +267,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Event do
          {:is_owned, %Actor{} = organizer_actor} <- User.owns_actor(user, organizer_actor_id),
          args_with_organizer <- Map.put(args, :organizer_actor, organizer_actor),
          {:ok, %Activity{data: %{"object" => %{"type" => "Event"}}}, %Event{} = event} <-
-           MobilizonWeb.API.Events.create_event(args_with_organizer) do
+           API.Events.create_event(args_with_organizer) do
       {:ok, event}
     else
       {:is_owned, nil} ->
@@ -302,7 +301,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Event do
            User.owns_actor(user, organizer_actor_id),
          args <- Map.put(args, :organizer_actor, organizer_actor),
          {:ok, %Activity{data: %{"object" => %{"type" => "Event"}}}, %Event{} = event} <-
-           MobilizonWeb.API.Events.update_event(args, event) do
+           API.Events.update_event(args, event) do
       {:ok, event}
     else
       {:error, :event_not_found} ->
@@ -360,7 +359,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Event do
   end
 
   defp do_delete_event(event, federate \\ true) when is_boolean(federate) do
-    with {:ok, _activity, event} <- MobilizonWeb.API.Events.delete_event(event) do
+    with {:ok, _activity, event} <- API.Events.delete_event(event) do
       {:ok, %{id: event.id}}
     end
   end

lib/graphql/resolvers/group.ex

@@ -7,12 +7,11 @@ defmodule Mobilizon.GraphQL.Resolvers.Group do
   alias Mobilizon.Actors.{Actor, Member}
   alias Mobilizon.Users.User
 
+  alias Mobilizon.GraphQL.API
   alias Mobilizon.GraphQL.Resolvers.Person
 
   alias Mobilizon.Federation.ActivityPub
 
-  alias MobilizonWeb.API
-
   require Logger
 
   @doc """

lib/graphql/resolvers/member.ex

@@ -2,6 +2,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Member do
   @moduledoc """
   Handles the member-related GraphQL calls
   """
+
   alias Mobilizon.Actors
   alias Mobilizon.Actors.{Actor}
 

lib/graphql/resolvers/picture.ex

@@ -2,6 +2,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Picture do
   @moduledoc """
   Handles the picture-related GraphQL calls
   """
+
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Media
   alias Mobilizon.Media.Picture

lib/graphql/resolvers/report.ex

@@ -11,7 +11,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Report do
   alias Mobilizon.Reports.{Note, Report}
   alias Mobilizon.Users.User
 
-  alias MobilizonWeb.API.Reports, as: ReportsAPI
+  alias Mobilizon.GraphQL.API
 
   def list_reports(
         _parent,
@@ -50,7 +50,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Report do
         %{context: %{current_user: user}} = _resolution
       ) do
     with {:is_owned, %Actor{}} <- User.owns_actor(user, reporter_id),
-         {:ok, _, %Report{} = report} <- ReportsAPI.report(args) do
+         {:ok, _, %Report{} = report} <- API.Reports.report(args) do
       {:ok, report}
     else
       {:is_owned, nil} ->
@@ -76,8 +76,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Report do
       when is_moderator(role) do
     with {:is_owned, %Actor{} = actor} <- User.owns_actor(user, moderator_id),
          %Report{} = report <- Mobilizon.Reports.get_report(report_id),
-         {:ok, %Report{} = report} <-
-           MobilizonWeb.API.Reports.update_report_status(actor, report, status) do
+         {:ok, %Report{} = report} <- API.Reports.update_report_status(actor, report, status) do
       {:ok, report}
     else
       {:is_owned, nil} ->
@@ -101,8 +100,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Report do
     with {:is_owned, %Actor{}} <- User.owns_actor(user, moderator_id),
          %Report{} = report <- Reports.get_report(report_id),
          %Actor{} = moderator <- Actors.get_local_actor_with_preload(moderator_id),
-         {:ok, %Note{} = note} <-
-           MobilizonWeb.API.Reports.create_report_note(report, moderator, content) do
+         {:ok, %Note{} = note} <- API.Reports.create_report_note(report, moderator, content) do
       {:ok, note}
     end
   end
@@ -116,8 +114,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Report do
     with {:is_owned, %Actor{}} <- User.owns_actor(user, moderator_id),
          %Note{} = note <- Reports.get_note(note_id),
          %Actor{} = moderator <- Actors.get_local_actor_with_preload(moderator_id),
-         {:ok, %Note{} = note} <-
-           MobilizonWeb.API.Reports.delete_report_note(note, moderator) do
+         {:ok, %Note{} = note} <- API.Reports.delete_report_note(note, moderator) do
       {:ok, %{id: note.id}}
     end
   end

lib/graphql/resolvers/search.ex

@@ -2,7 +2,8 @@ defmodule Mobilizon.GraphQL.Resolvers.Search do
   @moduledoc """
   Handles the event-related GraphQL calls
   """
-  alias MobilizonWeb.API.Search
+
+  alias Mobilizon.GraphQL.API.Search
 
   @doc """
   Search persons

lib/graphql/resolvers/tag.ex

@@ -2,6 +2,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Tag do
   @moduledoc """
   Handles the tag-related GraphQL calls
   """
+
   alias Mobilizon.Events
   alias Mobilizon.Events.{Event, Tag}