aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/upload.ex
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-06-29 16:09:49 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-06-29 16:09:49 +0400
commit4a306720e8be8633e192f7b2c98f129a315939b9 (patch)
treeed5ec059c532777a28eade72f384c8a800ead496 /lib/pleroma/upload.ex
parentd15aa9d9503e59b3cd0731394855781f435ec63c (diff)
parent651f269568cb7e54cd96d8a0d8ea3533f77e9a3a (diff)
downloadpleroma-4a306720e8be8633e192f7b2c98f129a315939b9.tar.gz
Merge branch 'develop' into remove-twitter-api
Diffstat (limited to 'lib/pleroma/upload.ex')
-rw-r--r--lib/pleroma/upload.ex1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index 1be1a3a5b..797555bff 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -67,6 +67,7 @@ defmodule Pleroma.Upload do
{:ok,
%{
"type" => opts.activity_type,
+ "mediaType" => upload.content_type,
"url" => [
%{
"type" => "Link",