diff options
| author | href <href+git-pleroma@random.sh> | 2018-12-14 18:50:44 +0000 |
|---|---|---|
| committer | href <href+git-pleroma@random.sh> | 2018-12-14 18:50:44 +0000 |
| commit | 980131b4db4f2da319d9054889bdb962aa8c837e (patch) | |
| tree | 271e2ad818a0417fd2e4fe67276466e5d5a866ac /lib/pleroma/web/twitter_api/controllers/util_controller.ex | |
| parent | 91236c60c7aa266c1e874ebdd2aa44becfc6709b (diff) | |
| parent | 412df2cd3845802daf80c6d45db13f23f1e1b78b (diff) | |
| download | pleroma-980131b4db4f2da319d9054889bdb962aa8c837e.tar.gz | |
Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'
Improve web push
Closes #393, #422, and #452
See merge request pleroma/pleroma!524
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers/util_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 387f5bd71..a8e3467c4 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -156,8 +156,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do |> send_resp(200, response) _ -> - vapid_public_key = - Keyword.get(Application.get_env(:web_push_encryption, :vapid_details), :public_key) + vapid_public_key = Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key) uploadlimit = %{ uploadlimit: to_string(Keyword.get(instance, :upload_limit)), |