Move Activity under Events context

lib/mobilizon_web/api/reports.ex

@@ -3,17 +3,18 @@ defmodule MobilizonWeb.API.Reports do
   API for Reports
   """
 
+  import MobilizonWeb.API.Utils
+  import Mobilizon.Service.Admin.ActionLogService
+
   alias Mobilizon.Actors
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Events
-  alias Mobilizon.Activity
+  alias Mobilizon.Events.Activity
   alias Mobilizon.Reports, as: ReportsAction
   alias Mobilizon.Reports.{Report, Note}
   alias Mobilizon.Service.ActivityPub
   alias Mobilizon.Users
   alias Mobilizon.Users.User
-  import MobilizonWeb.API.Utils
-  import Mobilizon.Service.Admin.ActionLogService
 
   @doc """
   Create a report/flag on an actor, and optionally on an event or on comments.

lib/mobilizon_web/resolvers/comment.ex

@@ -2,12 +2,14 @@ defmodule MobilizonWeb.Resolvers.Comment do
   @moduledoc """
   Handles the comment-related GraphQL calls
   """
-  require Logger
-  alias Mobilizon.Events.Comment
-  alias Mobilizon.Activity
+
+  alias Mobilizon.Events.{Activity, Comment}
   alias Mobilizon.Users.User
+
   alias MobilizonWeb.API.Comments
 
+  require Logger
+
   def create_comment(_parent, %{text: comment, actor_username: username}, %{
         context: %{current_user: %User{} = _user}
       }) do

lib/mobilizon_web/resolvers/event.ex

@@ -2,12 +2,11 @@ defmodule MobilizonWeb.Resolvers.Event do
   @moduledoc """
   Handles the event-related GraphQL calls
   """
-  alias Mobilizon.Activity
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Addresses
   alias Mobilizon.Addresses.Address
   alias Mobilizon.Events
-  alias Mobilizon.Events.{Event, Participant}
+  alias Mobilizon.Events.{Activity, Event, Participant}
   alias Mobilizon.Media.Picture
   alias Mobilizon.Users.User
   alias MobilizonWeb.Resolvers.Person

lib/mobilizon_web/resolvers/group.ex

@@ -4,10 +4,12 @@ defmodule MobilizonWeb.Resolvers.Group do
   """
   alias Mobilizon.Actors
   alias Mobilizon.Actors.{Actor, Member}
+  alias Mobilizon.Events.Activity
   alias Mobilizon.Users.User
   alias Mobilizon.Service.ActivityPub
-  alias Mobilizon.Activity
+
   alias MobilizonWeb.Resolvers.Person
+
   require Logger
 
   @doc """

lib/mobilizon_web/views/activity_pub/actor_view.ex

@@ -3,9 +3,9 @@ defmodule MobilizonWeb.ActivityPub.ActorView do
 
   alias Mobilizon.Actors
   alias Mobilizon.Actors.Actor
+  alias Mobilizon.Events.Activity
   alias Mobilizon.Service.ActivityPub
   alias Mobilizon.Service.ActivityPub.Utils
-  alias Mobilizon.Activity
 
   @private_visibility_empty_collection %{elements: [], total: 0}
 

lib/mobilizon_web/views/activity_pub/object_view.ex

@@ -1,7 +1,8 @@
 defmodule MobilizonWeb.ActivityPub.ObjectView do
   use MobilizonWeb, :view
+
+  alias Mobilizon.Events.Activity
   alias Mobilizon.Service.ActivityPub.Utils
-  alias Mobilizon.Activity
 
   def render("activity.json", %{activity: %Activity{local: local, data: data} = activity}) do
     %{