X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fupload.ex;h=e0cb545b0b9adba94b6ceaf574bf5a5cc4375992;hb=5debd7b5cc31a6dedd8d0c8bc177be2cd1b995aa;hp=e62ab820a33c93b01212b40785711b2e5534cff5;hpb=0a95b5594b654dbec73a9e50e340f4975aa3e8e5;p=akkoma

diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index e62ab820a..e0cb545b0 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -18,8 +18,10 @@ defmodule Pleroma.Upload do
       File.cp!(file.path, result_file)
     end
 
+    strip_exif_data(content_type, result_file)
+
     %{
-      "type" => "Image",
+      "type" => "Document",
       "url" => [
         %{
           "type" => "Link",
@@ -67,6 +69,8 @@ defmodule Pleroma.Upload do
       File.rename(uuidpath, result_file)
     end
 
+    strip_exif_data(content_type, result_file)
+
     %{
       "type" => "Image",
       "url" => [
@@ -80,6 +84,16 @@ defmodule Pleroma.Upload do
     }
   end
 
+  def strip_exif_data(content_type, file) do
+    settings = Application.get_env(:pleroma, Pleroma.Upload)
+    do_strip = Keyword.fetch!(settings, :strip_exif)
+    [filetype, ext] = String.split(content_type, "/")
+
+    if filetype == "image" and do_strip == true do
+      Mogrify.open(file) |> Mogrify.custom("strip") |> Mogrify.save(in_place: true)
+    end
+  end
+
   def upload_path do
     settings = Application.get_env(:pleroma, Pleroma.Upload)
     Keyword.fetch!(settings, :uploads)
@@ -110,20 +124,20 @@ defmodule Pleroma.Upload do
     if should_dedupe do
       create_name(uuid, List.last(String.split(file.filename, ".")), type)
     else
-      unless String.contains?(file.filename, ".") do
-        case type do
-          "image/png" -> file.filename <> ".png"
-          "image/jpeg" -> file.filename <> ".jpg"
-          "image/gif" -> file.filename <> ".gif"
-          "video/webm" -> file.filename <> ".webm"
-          "video/mp4" -> file.filename <> ".mp4"
-          "audio/mpeg" -> file.filename <> ".mp3"
-          "audio/ogg" -> file.filename <> ".ogg"
-          "audio/wav" -> file.filename <> ".wav"
-          _ -> file.filename
+      parts = String.split(file.filename, ".")
+
+      new_filename =
+        if length(parts) > 1 do
+          Enum.drop(parts, -1) |> Enum.join(".")
+        else
+          Enum.join(parts)
         end
-      else
-        file.filename
+
+      case type do
+        "application/octet-stream" -> file.filename
+        "audio/mpeg" -> new_filename <> ".mp3"
+        "image/jpeg" -> new_filename <> ".jpg"
+        _ -> Enum.join([new_filename, String.split(type, "/") |> List.last()], ".")
       end
     end
   end
@@ -170,6 +184,9 @@ defmodule Pleroma.Upload do
           <<0x49, 0x44, 0x33, _, _, _, _, _>> ->
             "audio/mpeg"
 
+          <<255, 251, _, 68, 0, 0, 0, 0>> ->
+            "audio/mpeg"
+
           <<0x4F, 0x67, 0x67, 0x53, 0x00, 0x02, 0x00, 0x00>> ->
             "audio/ogg"