diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/upload.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex index 47279dc0b..c7de08634 100644 --- a/lib/pleroma/upload.ex +++ b/lib/pleroma/upload.ex @@ -91,7 +91,7 @@ defmodule Pleroma.Upload do } ], "name" => description, - "filename" => Map.get(opts, :filename) || upload.name + "filename" => Map.get(opts, :filename) }} else {:description_limit, _} -> diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 1c74ea787..385414c41 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -255,7 +255,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do end defp build_attachment_link(%{"url" => [%{"href" => href} | _]} = attachment) do - name = attachment["name"] || URI.decode(Path.basename(href)) + name = attachment["filename"] || attachment["name"] || URI.decode(Path.basename(href)) href = MediaProxy.url(href) "<a href=\"#{href}\" class='attachment'>#{shortname(name)}</a>" end |