X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fmastodon_api%2Fviews%2Fapp_view.ex;h=d934e21072ffafe780ad0d3fc7495cf670c5ba2d;hb=7f692343c80ddf353712490edfbcdb14866f5685;hp=f52b693a6fc20077eb1677a241bc901cb56febf6;hpb=5d871173d189a0019fda0ee76f8a324d90a163ee;p=akkoma
diff --git a/lib/pleroma/web/mastodon_api/views/app_view.ex b/lib/pleroma/web/mastodon_api/views/app_view.ex
index f52b693a6..d934e2107 100644
--- a/lib/pleroma/web/mastodon_api/views/app_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/app_view.ex
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors
+# Copyright © 2017-2020 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.AppView do
@@ -7,10 +7,6 @@ defmodule Pleroma.Web.MastodonAPI.AppView do
alias Pleroma.Web.OAuth.App
- @vapid_key :web_push_encryption
- |> Application.get_env(:vapid_details, [])
- |> Keyword.get(:public_key)
-
def render("show.json", %{app: %App{} = app}) do
%{
id: app.id |> to_string,
@@ -32,8 +28,10 @@ defmodule Pleroma.Web.MastodonAPI.AppView do
end
defp with_vapid_key(data) do
- if @vapid_key do
- Map.put(data, "vapid_key", @vapid_key)
+ vapid_key = Application.get_env(:web_push_encryption, :vapid_details, [])[:public_key]
+
+ if vapid_key do
+ Map.put(data, "vapid_key", vapid_key)
else
data
end