X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fmastodon_api%2Fviews%2Fpush_subscription_view.ex;h=021489711c033d0995c85f76e37721fa0938d257;hb=dad23e3766fb90c2c9b6bca7b5531273242659ad;hp=a910bb43e991bb16a7dda0f9b3a77feb0215b905;hpb=8b4397c704147bcc5ca12ab60dde32f2b6e11a41;p=akkoma

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 a910bb43e..021489711 100644
--- 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-2019 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