logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 12845c352b9dea1a22b03e0a0e8a6dc3d5673107
parent a8b6f62de41eac5aa08a5af08539482838a13f02
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Tue, 24 Sep 2024 05:59:02 +0200

Merge branch 'fix/vapid_keyword_fallback' into dev-lanodan

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())