diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-11-28 21:26:56 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-11-28 21:27:01 +0300 |
| commit | b7c449118bc09ab36610e85292d153ace67c2b89 (patch) | |
| tree | 1b00c2dec9d233ec3aaefd699aee3f4080f68119 /lib/pleroma/application.ex | |
| parent | 1403a1441de36e8a58da5e996c208a9c10f65440 (diff) | |
| parent | ca1acfa314a57f78c2f5f8e60a4bd1380350e483 (diff) | |
| download | pleroma-b7c449118bc09ab36610e85292d153ace67c2b89.tar.gz | |
Merge branch 'develop' into issue/1383
Diffstat (limited to 'lib/pleroma/application.ex')
| -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 695cc28d6..793df56ee 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 |