pleroma

commit: c57f37bd36702fa8865366fbfaea9ac3f28dfad3
parent: 69a38644bc20f49390717f06be30cc2874f7b6f7
Author: kaniini <nenolod@gmail.com>
Date:   Sun,  3 Feb 2019 21:06:15 +0000

Merge branch 'mogrify-orient' into 'develop'

Update Mogrify docs and warning for deprecated syntax

See merge request pleroma/pleroma!763
Diffstat:
M
docs/config.md
2
+-
M
lib/pleroma/upload.ex
4
++--

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git 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
@@ -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