Properly disable Web Push if no VAPID key is set

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

@@ -1167,6 +1167,7 @@ def delete_filter(%{assigns: %{user: user}} = conn, %{"id" => filter_id}) do
   end
 
   def create_push_subscription(%{assigns: %{user: user, token: token}} = conn, params) do
+    true = Pleroma.Web.Push.enabled()
     Pleroma.Web.Push.Subscription.delete_if_exists(user, token)
     {:ok, subscription} = Pleroma.Web.Push.Subscription.create(user, token, params)
     view = PushSubscriptionView.render("push_subscription.json", subscription: subscription)
@@ -1174,6 +1175,7 @@ def create_push_subscription(%{assigns: %{user: user, token: token}} = conn, par
   end
 
   def get_push_subscription(%{assigns: %{user: user, token: token}} = conn, _params) do
+    true = Pleroma.Web.Push.enabled()
     subscription = Pleroma.Web.Push.Subscription.get(user, token)
     view = PushSubscriptionView.render("push_subscription.json", subscription: subscription)
     json(conn, view)
@@ -1183,12 +1185,14 @@ def update_push_subscription(
         %{assigns: %{user: user, token: token}} = conn,
         params
       ) do
+    true = Pleroma.Web.Push.enabled()
     {:ok, subscription} = Pleroma.Web.Push.Subscription.update(user, token, params)
     view = PushSubscriptionView.render("push_subscription.json", subscription: subscription)
     json(conn, view)
   end
 
   def delete_push_subscription(%{assigns: %{user: user, token: token}} = conn, _params) do
+    true = Pleroma.Web.Push.enabled()
     {:ok, _response} = Pleroma.Web.Push.Subscription.delete(user, token)
     json(conn, %{})
   end

lib/pleroma/web/push/push.ex

@@ -9,32 +9,44 @@ defmodule Pleroma.Web.Push do
 
   @types ["Create", "Follow", "Announce", "Like"]
 
-  @gcm_api_key nil
-
   def start_link() do
     GenServer.start_link(__MODULE__, :ok, name: __MODULE__)
   end
 
-  def init(:ok) do
+  def vapid_config() do
-    case Application.get_env(:web_push_encryption, :vapid_details) do
+    Application.get_env(:web_push_encryption, :vapid_details, [])
-      nil ->
+  end
-        Logger.warn(
-          "VAPID key pair is not found. Please, add VAPID configuration to config. Run `mix web_push.gen.keypair` mix task to create a key pair"
-        )
 
-        :ignore
+  def enabled() do
-
+    case vapid_config() do
-      _ ->
+      [] -> false
-        {:ok, %{}}
+      list when is_list(list) -> true
+      _ -> false
     end
   end
 
   def send(notification) do
-    if Application.get_env(:web_push_encryption, :vapid_details) do
+    if enabled() do
       GenServer.cast(Pleroma.Web.Push, {:send, notification})
     end
   end
 
+  def init(:ok) do
+    if enabled() do
+      Logger.warn("""
+      VAPID key pair is not found. If you wish to enabled web push, please run
+
+          mix web_push.gen.keypair
+
+      and add the resulting output to your configuration file.
+      """)
+
+      :ignore
+    else
+      {:ok, nil}
+    end
+  end
+
   def handle_cast(
         {:send, %{activity: %{data: %{"type" => type}}, user_id: user_id} = notification},
         state
@@ -71,7 +83,11 @@ def handle_cast(
           preferred_locale: "en"
         })
 
-      case WebPushEncryption.send_web_push(body, sub) do
+      case WebPushEncryption.send_web_push(
+             body,
+             sub,
+             Application.get_env(:web_push_encryption, :gcm_api_key)
+           ) do
         {:ok, %{status_code: code}} when 400 <= code and code < 500 ->
           Logger.debug("Removing subscription record")
           Repo.delete!(subscription)

lib/pleroma/web/twitter_api/controllers/util_controller.ex

@@ -156,8 +156,7 @@ def config(conn, _params) do
         |> send_resp(200, response)
 
       _ ->
-        vapid_public_key =
+        vapid_public_key = Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key)
-          Keyword.get(Application.get_env(:web_push_encryption, :vapid_details), :public_key)
 
         data = %{
           name: Keyword.get(instance, :name),