diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2018-10-29 17:59:24 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2018-10-29 17:59:24 +0000 |
| commit | f407831120318dcd8fa5b31f39137cdb1ee87519 (patch) | |
| tree | 6eaada18d3c69f902e5312fad2359b7f2da32be7 | |
| parent | f61acdc5b41a8d05401c5d24d589f35ba1b573de (diff) | |
| download | pleroma-f407831120318dcd8fa5b31f39137cdb1ee87519.tar.gz | |
common api: prefer formatting attachments using the attachment's name instead of URI
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index ed1fe1ad9..2a5a2cc15 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -89,8 +89,8 @@ defmodule Pleroma.Web.CommonAPI.Utils do def add_attachments(text, attachments) do attachment_text = Enum.map(attachments, fn - %{"url" => [%{"href" => href} | _]} -> - name = URI.decode(Path.basename(href)) + %{"url" => [%{"href" => href} | _]} = attachment -> + name = attachment["name"] || URI.decode(Path.basename(href)) href = MediaProxy.url(href) "<a href=\"#{href}\" class='attachment'>#{shortname(name)}</a>" |