Improve handling of media file deletion

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

lib/service/actor_suspension.ex

@@ -4,7 +4,7 @@ defmodule Mobilizon.Service.ActorSuspension do
   """
 
   alias Ecto.Multi
-  alias Mobilizon.{Actors, Events, Users}
+  alias Mobilizon.{Actors, Events, Medias, Users}
   alias Mobilizon.Actors.{Actor, Member}
   alias Mobilizon.Discussions.{Comment, Discussion}
   alias Mobilizon.Events.{Event, Participant}
@@ -15,7 +15,6 @@ defmodule Mobilizon.Service.ActorSuspension do
   alias Mobilizon.Users.User
   alias Mobilizon.Web.Email.Actor, as: ActorEmail
   alias Mobilizon.Web.Email.Group
-  alias Mobilizon.Web.Upload
   require Logger
   import Ecto.Query
 
@@ -249,7 +248,7 @@ defmodule Mobilizon.Service.ActorSuspension do
 
   @spec safe_remove_file(String.t(), Actor.t()) :: {:ok, Actor.t()}
   defp safe_remove_file(url, %Actor{} = actor) do
-    case Upload.remove(url) do
+    case Medias.delete_user_profile_media_by_url(url) do
       {:ok, _value} ->
         {:ok, actor}
 

lib/service/clean_orphan_media.ex

@@ -3,12 +3,8 @@ defmodule Mobilizon.Service.CleanOrphanMedia do
   Service to clean orphan media
   """
 
-  alias Mobilizon.Actors.Actor
   alias Mobilizon.Medias
-  alias Mobilizon.Medias.File
   alias Mobilizon.Medias.Media
-  alias Mobilizon.Storage.Repo
-  import Ecto.Query
 
   @doc """
   Clean orphan media
@@ -21,7 +17,7 @@ defmodule Mobilizon.Service.CleanOrphanMedia do
   """
   @spec clean(Keyword.t()) :: {:ok, list(Media.t())}
   def clean(opts \\ []) do
-    medias = find_media(opts)
+    medias = Medias.find_media_to_clean(opts)
 
     if Keyword.get(opts, :dry_run, false) do
       {:ok, medias}
@@ -35,80 +31,4 @@ defmodule Mobilizon.Service.CleanOrphanMedia do
       {:ok, medias}
     end
   end
-
-  # Ecto doesn't currently allow us to use exists with a subquery,
-  # so we can't create the union through Ecto
-  # https://github.com/elixir-ecto/ecto/issues/3619
-  @union_query [
-                 [from: "events", param: "picture_id"],
-                 [from: "events_medias", param: "media_id"],
-                 [from: "posts", param: "picture_id"],
-                 [from: "posts_medias", param: "media_id"],
-                 [from: "comments_medias", param: "media_id"]
-               ]
-               |> Enum.map_join(" UNION ", fn [from: from, param: param] ->
-                 "SELECT 1 FROM #{from} WHERE #{from}.#{param} = m0.id"
-               end)
-               |> (&"NOT EXISTS(#{&1})").()
-
-  @spec find_media(Keyword.t()) :: list(list(Media.t()))
-  defp find_media(opts) do
-    default_grace_period =
-      Mobilizon.Config.get([:instance, :orphan_upload_grace_period_hours], 48)
-
-    grace_period = Keyword.get(opts, :grace_period, default_grace_period)
-    expiration_date = DateTime.add(DateTime.utc_now(), grace_period * -3600)
-
-    query =
-      from(m in Media,
-        as: :media,
-        distinct: true,
-        join: a in Actor,
-        on: a.id == m.actor_id,
-        where: is_nil(a.domain),
-        where: m.inserted_at < ^expiration_date,
-        where: fragment(@union_query)
-      )
-
-    query
-    |> Repo.all(timeout: :infinity)
-    |> Enum.filter(fn %Media{file: %File{url: url}} ->
-      !url_is_also_a_profile_file?(url) && is_all_media_orphan?(url, expiration_date)
-    end)
-    |> Enum.chunk_by(fn %Media{file: %File{url: url}} ->
-      url
-      |> String.split("?", parts: 2)
-      |> hd
-    end)
-  end
-
-  def is_all_media_orphan?(url, expiration_date) do
-    url
-    |> Medias.get_all_media_by_url()
-    |> Enum.all?(&is_media_orphan?(&1, expiration_date))
-  end
-
-  @spec is_media_orphan?(Media.t(), DateTime.t()) :: boolean()
-  def is_media_orphan?(%Media{id: media_id}, expiration_date) do
-    media_query =
-      from(m in Media,
-        as: :media,
-        distinct: true,
-        join: a in Actor,
-        on: a.id == m.actor_id,
-        where: m.id == ^media_id,
-        where: is_nil(a.domain),
-        where: m.inserted_at < ^expiration_date,
-        where: fragment(@union_query)
-      )
-
-    Repo.exists?(media_query)
-  end
-
-  @spec url_is_also_a_profile_file?(String.t()) :: nil
-  defp url_is_also_a_profile_file?(url) when is_binary(url) do
-    Actor
-    |> where([a], fragment("avatar->>'url'") == ^url or fragment("banner->>'url'") == ^url)
-    |> Repo.exists?()
-  end
 end