diff options
| author | lain <lain@soykaf.club> | 2024-11-12 10:01:05 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2024-11-12 10:01:05 +0000 |
| commit | 91b26c683a5d9823bf07888f731a9e5655975cd8 (patch) | |
| tree | 272d49c970e86fbb1c01ce25619d99f5ac1ccd03 | |
| parent | ee3ab8b625ccb26aa633276c1676a077e3b155d4 (diff) | |
| parent | 7dd3a4d86defff9c0960f7e39481215603ac85b9 (diff) | |
| download | pleroma-91b26c683a5d9823bf07888f731a9e5655975cd8.tar.gz pleroma-91b26c683a5d9823bf07888f731a9e5655975cd8.zip | |
Merge branch 'fix/vapid_keyword_fallback' into 'develop'
push: make vapid_config fallback to empty array
See merge request pleroma/pleroma!4276
| -rw-r--r-- | changelog.d/vapid_keyword_fallback.fix | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/push.ex | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/vapid_keyword_fallback.fix b/changelog.d/vapid_keyword_fallback.fix new file mode 100644 index 000000000..aa48f8938 --- /dev/null +++ b/changelog.d/vapid_keyword_fallback.fix @@ -0,0 +1 @@ +Make vapid_config return empty array, fixing preloading for instances without push notifications configured
\ No newline at end of file diff --git a/lib/pleroma/web/push.ex b/lib/pleroma/web/push.ex index 6d777142e..77f77f88e 100644 --- a/lib/pleroma/web/push.ex +++ b/lib/pleroma/web/push.ex @@ -20,7 +20,7 @@ defmodule Pleroma.Web.Push do end def vapid_config do - Application.get_env(:web_push_encryption, :vapid_details, nil) + Application.get_env(:web_push_encryption, :vapid_details, []) end def enabled, do: match?([subject: _, public_key: _, private_key: _], vapid_config()) |