aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2019-02-03 16:39:42 +0000
committerMark Felder <feld@FreeBSD.org>2019-02-03 16:39:42 +0000
commit0c08bd4181cda08112a9e12ba92cdfb25c602da1 (patch)
tree13cc2b64abf7d91d5a29c53babcb50f311446f13
parent8180de951e2ac1efc6cfb9f64d078d6a1b7d0c0e (diff)
downloadpleroma-0c08bd4181cda08112a9e12ba92cdfb25c602da1.tar.gz
Update Mogrify docs and warning for deprecated syntax to encourage
users to enable both strip and auto-orient
-rw-r--r--docs/config.md2
-rw-r--r--lib/pleroma/upload.ex4
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/config.md b/docs/config.md
index c14746d93..ce37084b9 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -17,7 +17,7 @@ Note: `strip_exif` has been replaced by `Pleroma.Upload.Filter.Mogrify`.
## Pleroma.Upload.Filter.Mogrify
-* `args`: List of actions for the `mogrify` command like `"strip"` or `["strip", {"impode", "1"}]`.
+* `args`: List of actions for the `mogrify` command like `"strip"` or `["strip", "auto-orient", {"impode", "1"}]`.
## Pleroma.Upload.Filter.Dedupe
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index 0a19e737b..ce2a1b696 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -124,10 +124,10 @@ defmodule Pleroma.Upload do
:pleroma, Pleroma.Upload, [filters: [Pleroma.Upload.Filter.Mogrify]]
- :pleroma, Pleroma.Upload.Filter.Mogrify, args: "strip"
+ :pleroma, Pleroma.Upload.Filter.Mogrify, args: ["strip", "auto-orient"]
""")
- Pleroma.Config.put([Pleroma.Upload.Filter.Mogrify], args: "strip")
+ Pleroma.Config.put([Pleroma.Upload.Filter.Mogrify], args: ["strip", "auto-orient"])
Map.put(opts, :filters, opts.filters ++ [Pleroma.Upload.Filter.Mogrify])
else
opts