projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
[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 36071cd25dbaa70672bc6cec69335923f16769a7..e44272c6f6309d50ab98cc7f3a05335996528d9b 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/app_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/app_view.ex
@@
-45,10
+45,6
@@
defmodule Pleroma.Web.MastodonAPI.AppView do
defp with_vapid_key(data) do
vapid_key = Application.get_env(:web_push_encryption, :vapid_details, [])[:public_key]
defp with_vapid_key(data) do
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
+ Pleroma.Maps.put_if_present(data, "vapid_key", vapid_key)
end
end
end
end