commit: ee291f08e82eee596e5e8651a8bbcf7dad147dc7
parent 5851d787b6001c117808d5993ca491d0e58dfaf4
Author: Lain Soykaf <lain@lain.com>
Date: Tue, 25 Feb 2025 16:40:45 +0400
AnonymizeFilename: Asyncify
Diffstat:
4 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/config/test.exs b/config/test.exs
@@ -159,6 +159,9 @@ config :pleroma, Pleroma.Uploaders.IPFS, config_impl: Pleroma.UnstubbedConfigMoc
config :pleroma, Pleroma.Web.Plugs.HTTPSecurityPlug, config_impl: Pleroma.StaticStubbedConfigMock
config :pleroma, Pleroma.Web.Plugs.HTTPSignaturePlug, config_impl: Pleroma.StaticStubbedConfigMock
+config :pleroma, Pleroma.Upload.Filter.AnonymizeFilename,
+ config_impl: Pleroma.StaticStubbedConfigMock
+
config :pleroma, Pleroma.Signature, http_signatures_impl: Pleroma.StubbedHTTPSignaturesMock
peer_module =
diff --git a/lib/pleroma/upload/filter/anonymize_filename.ex b/lib/pleroma/upload/filter/anonymize_filename.ex
@@ -10,7 +10,7 @@ defmodule Pleroma.Upload.Filter.AnonymizeFilename do
"""
@behaviour Pleroma.Upload.Filter
- alias Pleroma.Config
+ @config_impl Application.compile_env(:pleroma, [__MODULE__, :config_impl], Pleroma.Config)
alias Pleroma.Upload
def filter(%Upload{name: name} = upload) do
@@ -23,7 +23,7 @@ defmodule Pleroma.Upload.Filter.AnonymizeFilename do
@spec predefined_name(String.t()) :: String.t() | nil
defp predefined_name(extension) do
- with name when not is_nil(name) <- Config.get([__MODULE__, :text]),
+ with name when not is_nil(name) <- @config_impl.get([__MODULE__, :text]),
do: String.replace(name, "{extension}", extension)
end
diff --git a/test/pleroma/upload/filter/anonymize_filename_test.exs b/test/pleroma/upload/filter/anonymize_filename_test.exs
@@ -3,9 +3,11 @@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Upload.Filter.AnonymizeFilenameTest do
- use Pleroma.DataCase
+ use Pleroma.DataCase, async: true
+ import Mox
alias Pleroma.Upload
+ alias Pleroma.StaticStubbedConfigMock, as: ConfigMock
setup do
File.cp!("test/fixtures/image.jpg", "test/fixtures/image_tmp.jpg")
@@ -19,21 +21,26 @@ defmodule Pleroma.Upload.Filter.AnonymizeFilenameTest do
%{upload_file: upload_file}
end
- setup do: clear_config([Pleroma.Upload.Filter.AnonymizeFilename, :text])
-
test "it replaces filename on pre-defined text", %{upload_file: upload_file} do
- clear_config([Upload.Filter.AnonymizeFilename, :text], "custom-file.png")
+ ConfigMock
+ |> stub(:get, fn [Upload.Filter.AnonymizeFilename, :text] -> "custom-file.png" end)
+
{:ok, :filtered, %Upload{name: name}} = Upload.Filter.AnonymizeFilename.filter(upload_file)
assert name == "custom-file.png"
end
test "it replaces filename on pre-defined text expression", %{upload_file: upload_file} do
- clear_config([Upload.Filter.AnonymizeFilename, :text], "custom-file.{extension}")
+ ConfigMock
+ |> stub(:get, fn [Upload.Filter.AnonymizeFilename, :text] -> "custom-file.{extension}" end)
+
{:ok, :filtered, %Upload{name: name}} = Upload.Filter.AnonymizeFilename.filter(upload_file)
assert name == "custom-file.jpg"
end
test "it replaces filename on random text", %{upload_file: upload_file} do
+ ConfigMock
+ |> stub(:get, fn [Upload.Filter.AnonymizeFilename, :text] -> nil end)
+
{:ok, :filtered, %Upload{name: name}} = Upload.Filter.AnonymizeFilename.filter(upload_file)
assert <<_::bytes-size(14)>> <> ".jpg" = name
refute name == "an… image.jpg"
diff --git a/test/pleroma/upload/filter_test.exs b/test/pleroma/upload/filter_test.exs
@@ -5,12 +5,13 @@
defmodule Pleroma.Upload.FilterTest do
use Pleroma.DataCase
+ import Mox
alias Pleroma.Upload.Filter
-
- setup do: clear_config([Pleroma.Upload.Filter.AnonymizeFilename, :text])
+ alias Pleroma.StaticStubbedConfigMock, as: ConfigMock
test "applies filters" do
- clear_config([Pleroma.Upload.Filter.AnonymizeFilename, :text], "custom-file.png")
+ ConfigMock
+ |> stub(:get, fn [Pleroma.Upload.Filter.AnonymizeFilename, :text] -> "custom-file.png" end)
File.cp!(
"test/fixtures/image.jpg",