aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/upload.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-15 13:33:04 +0200
committerlain <lain@soykaf.club>2020-05-15 13:33:04 +0200
commitf012c3a202ef43d1a8a1dc88f08057b7a41d3d78 (patch)
treea3847182efa357bce56c12d6253492dc0cc2b894 /lib/pleroma/upload.ex
parent1d18721a3c60aa0acc7d1ba858a92277e544a54a (diff)
parent081d1d3f48f2264ee329f7ff7af7c2f88fe0a654 (diff)
downloadpleroma-f012c3a202ef43d1a8a1dc88f08057b7a41d3d78.tar.gz
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'lib/pleroma/upload.ex')
-rw-r--r--lib/pleroma/upload.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index 762d813d9..1be1a3a5b 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -134,7 +134,7 @@ defmodule Pleroma.Upload do
end
end
- defp prepare_upload(%{"img" => "data:image/" <> image_data}, opts) do
+ defp prepare_upload(%{img: "data:image/" <> image_data}, opts) do
parsed = Regex.named_captures(~r/(?<filetype>jpeg|png|gif);base64,(?<data>.*)/, image_data)
data = Base.decode64!(parsed["data"], ignore: :whitespace)
hash = String.downcase(Base.encode16(:crypto.hash(:sha256, data)))