logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://anongit.hacktivis.me/git/pleroma.git/
commit: 91b26c683a5d9823bf07888f731a9e5655975cd8
parent ee3ab8b625ccb26aa633276c1676a077e3b155d4
Author: lain <lain@soykaf.club>
Date:   Tue, 12 Nov 2024 10:01:05 +0000

Merge branch 'fix/vapid_keyword_fallback' into 'develop'

push: make vapid_config fallback to empty array

See merge request pleroma/pleroma!4276

Diffstat:

Achangelog.d/vapid_keyword_fallback.fix2++
Mlib/pleroma/web/push.ex2+-
2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/changelog.d/vapid_keyword_fallback.fix 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 @@ -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())