From: href <href+git-pleroma@random.sh>
Date: Fri, 14 Dec 2018 18:50:44 +0000 (+0000)
Subject: Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=980131b4db4f2da319d9054889bdb962aa8c837e;p=akkoma

Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'

Improve web push

Closes #393, #422, and #452

See merge request pleroma/pleroma!524
---

980131b4db4f2da319d9054889bdb962aa8c837e
diff --cc lib/pleroma/web/twitter_api/controllers/util_controller.ex
index 387f5bd71,29edca9fe..a8e3467c4
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@@ -156,16 -156,8 +156,15 @@@ defmodule Pleroma.Web.TwitterAPI.UtilCo
          |> 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)),
 +          avatarlimit: to_string(Keyword.get(instance, :avatar_upload_limit)),
 +          backgroundlimit: to_string(Keyword.get(instance, :background_upload_limit)),
 +          bannerlimit: to_string(Keyword.get(instance, :banner_upload_limit))
 +        }
 +
          data = %{
            name: Keyword.get(instance, :name),
            description: Keyword.get(instance, :description),