Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

[akkoma] / lib / pleroma / web / mastodon_api / views / push_subscription_view.ex

diff --git a/lib/pleroma/web/mastodon_api/views/push_subscription_view.ex b/lib/pleroma/web/mastodon_api/views/push_subscription_view.ex
index a910bb43e991bb16a7dda0f9b3a77feb0215b905..d32cef6e2bfb3605e396c53d975042e74763087a 100644 (file)
--- a/lib/pleroma/web/mastodon_api/views/push_subscription_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/push_subscription_view.ex
@@ -1,14 +1,19 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.MastodonAPI.PushSubscriptionView do
   use Pleroma.Web, :view
-  alias Pleroma.Web.MastodonAPI.PushSubscriptionView
+  alias Pleroma.Web.Push
 
   def render("push_subscription.json", %{subscription: subscription}) do
     %{
       id: to_string(subscription.id),
       endpoint: subscription.endpoint,
       alerts: Map.get(subscription.data, "alerts"),
-      # TODO: generate VAPID server key
-      server_key: "N/A"
+      server_key: server_key()
     }
   end
+
+  defp server_key, do: Keyword.get(Push.vapid_config(), :public_key)
 end