diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-11-25 11:36:59 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-11-25 11:36:59 +0000 |
| commit | 756bdef5f5a879d6a817d833e7b9428f8c7b0c22 (patch) | |
| tree | ade7a694da974f0f1b094f1f3fe87d4b0d0243fe /lib | |
| parent | 34cdbcbb644e14dde562c150fa8ae2881e6a899b (diff) | |
| parent | e2dc89069d6d77a10848e53f321e2e464f539a25 (diff) | |
| download | pleroma-756bdef5f5a879d6a817d833e7b9428f8c7b0c22.tar.gz pleroma-756bdef5f5a879d6a817d833e7b9428f8c7b0c22.zip | |
Merge branch 'feature/useragent-override' into 'develop'
Add ability to set a custom user-agent string
See merge request pleroma/pleroma!2009
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/application.ex | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 2b6a55f98..9dbd1e26b 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -17,8 +17,14 @@ defmodule Pleroma.Application do def repository, do: @repository def user_agent do - info = "#{Pleroma.Web.base_url()} <#{Pleroma.Config.get([:instance, :email], "")}>" - named_version() <> "; " <> info + case Pleroma.Config.get([:http, :user_agent], :default) do + :default -> + info = "#{Pleroma.Web.base_url()} <#{Pleroma.Config.get([:instance, :email], "")}>" + named_version() <> "; " <> info + + custom -> + custom + end end # See http://elixir-lang.org/docs/stable/elixir/Application.html |