Revert "Merge branch 'feature/attachments-cleanup' into 'develop'"revert/attachment-cleanup

This reverts commit a431e8c9f7033c739e10b0e8b34c75f2cc1d38d4, reversing
changes made to 8b4d81609d5627d62b826bcd3e87290cb513495f.

3 files changed, 0 insertions, 167 deletions

diff --git a/test/object_test.exs b/test/object_test.exs
index c6b2bc399..6252975f2 100644
--- a/test/object_test.exs
+++ b/test/object_test.exs
@@ -73,145 +73,6 @@ defmodule Pleroma.ObjectTest do
     end
   end
 
-  describe "delete attachments" do
-    clear_config([Pleroma.Upload])
-
-    test "in subdirectories" do
-      Pleroma.Config.put([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
-
-      file = %Plug.Upload{
-        content_type: "image/jpg",
-        path: Path.absname("test/fixtures/image.jpg"),
-        filename: "an_image.jpg"
-      }
-
-      user = insert(:user)
-
-      {:ok, %Object{} = attachment} =
-        Pleroma.Web.ActivityPub.ActivityPub.upload(file, actor: user.ap_id)
-
-      %{data: %{"attachment" => [%{"url" => [%{"href" => href}]}]}} =
-        note = insert(:note, %{user: user, data: %{"attachment" => [attachment.data]}})
-
-      uploads_dir = Pleroma.Config.get!([Pleroma.Uploaders.Local, :uploads])
-
-      path = href |> Path.dirname() |> Path.basename()
-
-      assert {:ok, ["an_image.jpg"]} == File.ls("#{uploads_dir}/#{path}")
-
-      Object.delete(note)
-
-      ObanHelpers.perform(all_enqueued(worker: Pleroma.Workers.AttachmentsCleanupWorker))
-
-      assert Object.get_by_id(attachment.id) == nil
-
-      assert {:ok, []} == File.ls("#{uploads_dir}/#{path}")
-    end
-
-    test "with dedupe enabled" do
-      Pleroma.Config.put([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
-      Pleroma.Config.put([Pleroma.Upload, :filters], [Pleroma.Upload.Filter.Dedupe])
-
-      uploads_dir = Pleroma.Config.get!([Pleroma.Uploaders.Local, :uploads])
-
-      File.mkdir_p!(uploads_dir)
-
-      file = %Plug.Upload{
-        content_type: "image/jpg",
-        path: Path.absname("test/fixtures/image.jpg"),
-        filename: "an_image.jpg"
-      }
-
-      user = insert(:user)
-
-      {:ok, %Object{} = attachment} =
-        Pleroma.Web.ActivityPub.ActivityPub.upload(file, actor: user.ap_id)
-
-      %{data: %{"attachment" => [%{"url" => [%{"href" => href}]}]}} =
-        note = insert(:note, %{user: user, data: %{"attachment" => [attachment.data]}})
-
-      filename = Path.basename(href)
-
-      assert {:ok, files} = File.ls(uploads_dir)
-      assert filename in files
-
-      Object.delete(note)
-
-      ObanHelpers.perform(all_enqueued(worker: Pleroma.Workers.AttachmentsCleanupWorker))
-
-      assert Object.get_by_id(attachment.id) == nil
-      assert {:ok, files} = File.ls(uploads_dir)
-      refute filename in files
-    end
-
-    test "with objects that have legacy data.url attribute" do
-      Pleroma.Config.put([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
-
-      file = %Plug.Upload{
-        content_type: "image/jpg",
-        path: Path.absname("test/fixtures/image.jpg"),
-        filename: "an_image.jpg"
-      }
-
-      user = insert(:user)
-
-      {:ok, %Object{} = attachment} =
-        Pleroma.Web.ActivityPub.ActivityPub.upload(file, actor: user.ap_id)
-
-      {:ok, %Object{}} = Object.create(%{url: "https://google.com", actor: user.ap_id})
-
-      %{data: %{"attachment" => [%{"url" => [%{"href" => href}]}]}} =
-        note = insert(:note, %{user: user, data: %{"attachment" => [attachment.data]}})
-
-      uploads_dir = Pleroma.Config.get!([Pleroma.Uploaders.Local, :uploads])
-
-      path = href |> Path.dirname() |> Path.basename()
-
-      assert {:ok, ["an_image.jpg"]} == File.ls("#{uploads_dir}/#{path}")
-
-      Object.delete(note)
-
-      ObanHelpers.perform(all_enqueued(worker: Pleroma.Workers.AttachmentsCleanupWorker))
-
-      assert Object.get_by_id(attachment.id) == nil
-
-      assert {:ok, []} == File.ls("#{uploads_dir}/#{path}")
-    end
-
-    test "With custom base_url" do
-      Pleroma.Config.put([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
-      Pleroma.Config.put([Pleroma.Upload, :base_url], "https://sub.domain.tld/dir/")
-
-      file = %Plug.Upload{
-        content_type: "image/jpg",
-        path: Path.absname("test/fixtures/image.jpg"),
-        filename: "an_image.jpg"
-      }
-
-      user = insert(:user)
-
-      {:ok, %Object{} = attachment} =
-        Pleroma.Web.ActivityPub.ActivityPub.upload(file, actor: user.ap_id)
-
-      %{data: %{"attachment" => [%{"url" => [%{"href" => href}]}]}} =
-        note = insert(:note, %{user: user, data: %{"attachment" => [attachment.data]}})
-
-      uploads_dir = Pleroma.Config.get!([Pleroma.Uploaders.Local, :uploads])
-
-      path = href |> Path.dirname() |> Path.basename()
-
-      assert {:ok, ["an_image.jpg"]} == File.ls("#{uploads_dir}/#{path}")
-
-      Object.delete(note)
-
-      ObanHelpers.perform(all_enqueued(worker: Pleroma.Workers.AttachmentsCleanupWorker))
-
-      assert Object.get_by_id(attachment.id) == nil
-
-      assert {:ok, []} == File.ls("#{uploads_dir}/#{path}")
-    end
-  end
-
   describe "normalizer" do
     test "fetches unknown objects by default" do
       %Object{} =
diff --git a/test/uploaders/local_test.exs b/test/uploaders/local_test.exs
index 1963dac23..fc442d0f1 100644
--- a/test/uploaders/local_test.exs
+++ b/test/uploaders/local_test.exs
@@ -29,25 +29,4 @@ defmodule Pleroma.Uploaders.LocalTest do
              |> File.exists?()
     end
   end
-
-  describe "delete_file/1" do
-    test "deletes local file" do
-      file_path = "local_upload/files/image.jpg"
-
-      file = %Pleroma.Upload{
-        name: "image.jpg",
-        content_type: "image/jpg",
-        path: file_path,
-        tempfile: Path.absname("test/fixtures/image_tmp.jpg")
-      }
-
-      :ok = Local.put_file(file)
-      local_path = Path.join([Local.upload_path(), file_path])
-      assert File.exists?(local_path)
-
-      Local.delete_file(file_path)
-
-      refute File.exists?(local_path)
-    end
-  end
 end
diff --git a/test/uploaders/s3_test.exs b/test/uploaders/s3_test.exs
index ab7795c3b..171316340 100644
--- a/test/uploaders/s3_test.exs
+++ b/test/uploaders/s3_test.exs
@@ -79,11 +79,4 @@ defmodule Pleroma.Uploaders.S3Test do
       end
     end
   end
-
-  describe "delete_file/1" do
-    test_with_mock "deletes file", ExAws, request: fn _req -> {:ok, %{status_code: 204}} end do
-      assert :ok = S3.delete_file("image.jpg")
-      assert_called(ExAws.request(:_))
-    end
-  end
 end