commit: 6e98c7a1ca9feef64e9ad40aaa9249c1459173e2
parent 428e038c58babc43655714be5b29540bb38486ae
Author: nicole mikołajczyk <me@mkljczk.pl>
Date: Sat, 29 Nov 2025 17:25:18 +0100
Merge branch 'rich-media-user-agent' into 'develop'
Allow setting custom user-agent for fetching rich media content
See merge request pleroma/pleroma!4390
Diffstat:
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/changelog.d/rich-media-user-agent.add b/changelog.d/rich-media-user-agent.add
@@ -0,0 +1 @@
+Allow setting custom user-agent for fetching rich media content
diff --git a/config/description.exs b/config/description.exs
@@ -2131,6 +2131,11 @@ config :pleroma, :config_description, [
description:
"Amount of milliseconds after which the HTTP request is forcibly terminated.",
suggestions: [5_000]
+ },
+ %{
+ key: :user_agent,
+ type: :string,
+ description: "Custom User-Agent header to be used when fetching rich media content."
}
]
},
diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex
@@ -126,6 +126,11 @@ defmodule Pleroma.Web.RichMedia.Helpers do
end
defp req_headers do
- [{"user-agent", Pleroma.Application.user_agent() <> "; Bot"}]
+ user_agent = Config.get([:rich_media, :user_agent], :default)
+
+ case user_agent do
+ :default -> [{"user-agent", Pleroma.Application.user_agent() <> "; Bot"}]
+ custom -> [{"user-agent", custom}]
+ end
end
end