projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into fix/support-conversations-pagination
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
app_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/app_view.ex
b/lib/pleroma/web/mastodon_api/views/app_view.ex
index f52b693a6fc20077eb1677a241bc901cb56febf6..d934e21072ffafe780ad0d3fc7495cf670c5ba2d 100644
(file)
--- 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
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.AppView do
# 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
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,
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
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
else
data
end