Move Mobilizon.Events.Activity to Mobilizon.Service.ActivityPub.Activity

It's only used for ActivityPub stuff, nothing DB related.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

lib/service/activity_pub/activity.ex

@@ -0,0 +1,21 @@
+defmodule Mobilizon.Service.ActivityPub.Activity do
+  @moduledoc """
+  Represents an activity.
+  """
+
+  @type t :: %__MODULE__{
+          data: String.t(),
+          local: boolean,
+          actor: Actor.t(),
+          recipients: [String.t()]
+          # notifications: [???]
+        }
+
+  defstruct [
+    :data,
+    :local,
+    :actor,
+    :recipients
+    # :notifications
+  ]
+end

lib/service/activity_pub/activity_pub.ex

@@ -12,7 +12,7 @@ defmodule Mobilizon.Service.ActivityPub do
 
   alias Mobilizon.Config
   alias Mobilizon.Events
-  alias Mobilizon.Events.{Activity, Event, Comment, Participant}
+  alias Mobilizon.Events.{Event, Comment, Participant}
   alias Mobilizon.Service.ActivityPub.Transmogrifier
   alias Mobilizon.Service.WebFinger
 
@@ -22,11 +22,10 @@ defmodule Mobilizon.Service.ActivityPub do
   alias Mobilizon.Service.Federator
   alias Mobilizon.Service.HTTPSignatures.Signature
 
-  alias Mobilizon.Service.ActivityPub.Convertible
+  alias Mobilizon.Service.ActivityPub.{Activity, Convertible}
 
   require Logger
-  import Mobilizon.Service.ActivityPub.Utils
-  import Mobilizon.Service.ActivityPub.Visibility
+  import Mobilizon.Service.ActivityPub.{Utils, Visibility}
 
   @doc """
   Get recipients for an activity or object

lib/service/activity_pub/relay.ex

@@ -10,7 +10,7 @@ defmodule Mobilizon.Service.ActivityPub.Relay do
 
   alias Mobilizon.Actors
   alias Mobilizon.Actors.Actor
-  alias Mobilizon.Events.Activity
+  alias Mobilizon.Service.ActivityPub.Activity
   alias Mobilizon.Service.ActivityPub
 
   alias MobilizonWeb.API.Follows

lib/service/activity_pub/transmogrifier.ex

@@ -12,8 +12,7 @@ defmodule Mobilizon.Service.ActivityPub.Transmogrifier do
   alias Mobilizon.Events
   alias Mobilizon.Events.{Event, Comment, Participant}
   alias Mobilizon.Service.ActivityPub
-  alias Mobilizon.Service.ActivityPub.Utils
-  alias Mobilizon.Service.ActivityPub.Visibility
+  alias Mobilizon.Service.ActivityPub.{Visibility, Utils}
 
   require Logger
 

lib/service/activity_pub/utils.ex

@@ -17,11 +17,11 @@ defmodule Mobilizon.Service.ActivityPub.Utils do
   alias Mobilizon.Actors
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Events
-  alias Mobilizon.Events.{Activity, Comment, Event}
+  alias Mobilizon.Events.{Comment, Event}
   alias Mobilizon.Media.Picture
   alias Mobilizon.Reports
   alias Mobilizon.Reports.Report
-  alias Mobilizon.Service.ActivityPub.Converters
+  alias Mobilizon.Service.ActivityPub.{Activity, Converters}
   alias Mobilizon.Storage.Repo
   alias Mobilizon.Users
 

lib/service/activity_pub/visibility.ex

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

lib/service/federator.ex

@@ -11,9 +11,8 @@ defmodule Mobilizon.Service.Federator do
   use GenServer
 
   alias Mobilizon.Actors
-  alias Mobilizon.Events.Activity
   alias Mobilizon.Service.ActivityPub
-  alias Mobilizon.Service.ActivityPub.Transmogrifier
+  alias Mobilizon.Service.ActivityPub.{Activity, Transmogrifier}
 
   require Logger