diff options
| author | kaniini <nenolod@gmail.com> | 2019-02-03 21:06:15 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-02-03 21:06:15 +0000 |
| commit | c57f37bd36702fa8865366fbfaea9ac3f28dfad3 (patch) | |
| tree | f1bf3053204e7bcb26474a664c14037a366853db | |
| parent | 69a38644bc20f49390717f06be30cc2874f7b6f7 (diff) | |
| parent | 0c08bd4181cda08112a9e12ba92cdfb25c602da1 (diff) | |
| download | pleroma-c57f37bd36702fa8865366fbfaea9ac3f28dfad3.tar.gz | |
Merge branch 'mogrify-orient' into 'develop'
Update Mogrify docs and warning for deprecated syntax
See merge request pleroma/pleroma!763
| -rw-r--r-- | docs/config.md | 2 | ||||
| -rw-r--r-- | lib/pleroma/upload.ex | 4 |
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 |