Move Activity under Events context

lib/service/activity_pub/activity_pub.ex

@@ -12,10 +12,9 @@ defmodule Mobilizon.Service.ActivityPub do
 
   alias Mobilizon.Config
   alias Mobilizon.Events
-  alias Mobilizon.Events.{Event, Comment, Participant}
+  alias Mobilizon.Events.{Activity, Event, Comment, Participant}
   alias Mobilizon.Service.ActivityPub.Transmogrifier
   alias Mobilizon.Service.WebFinger
-  alias Mobilizon.Activity
 
   alias Mobilizon.Actors
   alias Mobilizon.Actors.{Actor, Follower}

lib/service/activity_pub/relay.ex

@@ -8,11 +8,13 @@ defmodule Mobilizon.Service.ActivityPub.Relay do
   Handles following and unfollowing relays and instances
   """
 
-  alias Mobilizon.Activity
   alias Mobilizon.Actors
   alias Mobilizon.Actors.Actor
+  alias Mobilizon.Events.Activity
   alias Mobilizon.Service.ActivityPub
+
   alias MobilizonWeb.API.Follows
+
   require Logger
 
   def get_actor do

lib/service/activity_pub/utils.ex

@@ -10,25 +10,26 @@ defmodule Mobilizon.Service.ActivityPub.Utils do
   Various utils
   """
 
-  alias Mobilizon.Storage.Repo
+  alias Ecto.Changeset
+
   alias Mobilizon.Addresses
   alias Mobilizon.Addresses.Address
   alias Mobilizon.Actors
   alias Mobilizon.Actors.Actor
-  alias Mobilizon.Events.Event
-  alias Mobilizon.Events.Comment
-  alias Mobilizon.Media.Picture
   alias Mobilizon.Events
-  alias Mobilizon.Activity
+  alias Mobilizon.Events.{Activity, Comment, Event}
+  alias Mobilizon.Media.Picture
   alias Mobilizon.Reports
   alias Mobilizon.Reports.Report
-  alias Mobilizon.Users
   alias Mobilizon.Service.ActivityPub.Converters
-  alias Ecto.Changeset
-  require Logger
+  alias Mobilizon.Storage.Repo
+  alias Mobilizon.Users
+
   alias MobilizonWeb.Router.Helpers, as: Routes
   alias MobilizonWeb.Endpoint
 
+  require Logger
+
   @actor_types ["Group", "Person", "Application"]
 
   # Some implementations send the actor URI as the actor field, others send the entire actor object,

lib/service/activity_pub/visibility.ex

@@ -7,7 +7,8 @@ defmodule Mobilizon.Service.ActivityPub.Visibility do
   @moduledoc """
   Utility functions related to content visibility
   """
-  alias Mobilizon.Activity
+
+  alias Mobilizon.Events.Activity
 
   @public "https://www.w3.org/ns/activitystreams#Public"
 

lib/service/federator.ex

@@ -9,10 +9,12 @@ defmodule Mobilizon.Service.Federator do
   """
 
   use GenServer
+
   alias Mobilizon.Actors
-  alias Mobilizon.Activity
+  alias Mobilizon.Events.Activity
   alias Mobilizon.Service.ActivityPub
   alias Mobilizon.Service.ActivityPub.Transmogrifier
+
   require Logger
 
   @max_jobs 20