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

diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index 1640c1f9c..e0cb545b0 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -18,10 +18,10 @@ defmodule Pleroma.Upload do
       File.cp!(file.path, result_file)
     end
 
-    strip_exif_data(content_type, file.path)
+    strip_exif_data(content_type, result_file)
 
     %{
-      "type" => "Image",
+      "type" => "Document",
       "url" => [
         %{
           "type" => "Link",
@@ -69,7 +69,7 @@ defmodule Pleroma.Upload do
       File.rename(uuidpath, result_file)
     end
 
-    strip_exif_data(content_type, uuidpath)
+    strip_exif_data(content_type, result_file)
 
     %{
       "type" => "Image",
@@ -86,10 +86,10 @@ defmodule Pleroma.Upload do
 
   def strip_exif_data(content_type, file) do
     settings = Application.get_env(:pleroma, Pleroma.Upload)
-    @do_strip = Keyword.fetch!(settings, :strip_exif)
+    do_strip = Keyword.fetch!(settings, :strip_exif)
     [filetype, ext] = String.split(content_type, "/")
 
-    if filetype == "image" and @do_strip == true do
+    if filetype == "image" and do_strip == true do
       Mogrify.open(file) |> Mogrify.custom("strip") |> Mogrify.save(in_place: true)
     end
   end
@@ -124,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