moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfix/instance-gen_exiftool' into 'develop' 

pleroma.instance: Fix Exiftool module name

See merge request pleroma/pleroma!3143
This commit is contained in:
Haelwenn 2020-11-14 21:43:07 +00:00
parent 0d149502fe e2f573d68b
commit 28da36975d
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -73,6 +73,9 @@ switched to a new configuration mechanism, however it was not officially removed
### Changed ### Changed
- API: Empty parameter values for integer parameters are now ignored in non-strict validaton mode. - API: Empty parameter values for integer parameters are now ignored in non-strict validaton mode.
### Fixes
- Config generation: rename `Pleroma.Upload.Filter.ExifTool` to `Pleroma.Upload.Filter.Exiftool`
## [2.1.2] - 2020-09-17 ## [2.1.2] - 2020-09-17
### Security ### Security

2
lib/mix/tasks/pleroma/instance.ex
View File

@ -284,7 +284,7 @@ defp write_robots_txt(static_dir, indexable, template_dir) do
defp upload_filters(filters) when is_map(filters) do defp upload_filters(filters) when is_map(filters) do
enabled_filters = enabled_filters =
if filters.strip do if filters.strip do
[Pleroma.Upload.Filter.ExifTool] [Pleroma.Upload.Filter.Exiftool]
else else
[] []
end end

2
test/mix/tasks/pleroma/instance_test.exs
View File

@ -88,7 +88,7 @@ test "running gen" do
assert generated_config =~ "password: \"dbpass\"" assert generated_config =~ "password: \"dbpass\""
assert generated_config =~ "configurable_from_database: true" assert generated_config =~ "configurable_from_database: true"
assert generated_config =~ "http: [ip: {127, 0, 0, 1}, port: 4000]" assert generated_config =~ "http: [ip: {127, 0, 0, 1}, port: 4000]"
assert generated_config =~ "filters: [Pleroma.Upload.Filter.ExifTool]" assert generated_config =~ "filters: [Pleroma.Upload.Filter.Exiftool]"
assert File.read!(tmp_path() <> "setup.psql") == generated_setup_psql() assert File.read!(tmp_path() <> "setup.psql") == generated_setup_psql()
assert File.exists?(Path.expand("./test/instance/static/robots.txt")) assert File.exists?(Path.expand("./test/instance/static/robots.txt"))
end end