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 feature/admin-api-user-statuses
[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 7970bcd473bb2f76009c5652dfaaff10bc3271ed..021489711c033d0995c85f76e37721fa0938d257 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,9
+1,10
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-201
8
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-201
9
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.PushSubscriptionView do
use Pleroma.Web, :view
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.PushSubscriptionView do
use Pleroma.Web, :view
+ alias Pleroma.Web.Push
def render("push_subscription.json", %{subscription: subscription}) do
%{
def render("push_subscription.json", %{subscription: subscription}) do
%{
@@
-14,7
+15,5
@@
defmodule Pleroma.Web.MastodonAPI.PushSubscriptionView do
}
end
}
end
- defp server_key do
- Keyword.get(Application.get_env(:web_push_encryption, :vapid_details), :public_key)
- end
+ defp server_key, do: Keyword.get(Push.vapid_config(), :public_key)
end
end