commit: a893c69d203498b43b4eaeb101447e08901c32c4
parent 09df007aef62eda95796b5316d1b54866f264a05
Author: nicole mikołajczyk <me@mkljczk.pl>
Date: Sat, 1 Nov 2025 23:51:27 +0100
Merge branch 'remote-url-fix' into 'develop'
Make `remote_url` link to unproxied URL
See merge request pleroma/pleroma!4365
Diffstat:
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/changelog.d/remote-url.fix b/changelog.d/remote-url.fix
@@ -0,0 +1 @@
+`remote_url` links to unproxied URL
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -602,7 +602,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
def render("attachment.json", %{attachment: attachment}) do
[attachment_url | _] = attachment["url"]
media_type = attachment_url["mediaType"] || attachment_url["mimeType"] || "image"
- href = attachment_url["href"] |> MediaProxy.url()
+ href_remote = attachment_url["href"]
+ href = href_remote |> MediaProxy.url()
href_preview = attachment_url["href"] |> MediaProxy.preview_url()
meta = render("attachment_meta.json", %{attachment: attachment})
@@ -641,7 +642,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
%{
id: attachment_id,
url: href,
- remote_url: href,
+ remote_url: href_remote,
preview_url: href_preview,
text_url: href,
type: type,