sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Consider a case when inbox is nil

This commit is contained in:
Kaede Fujisaki 2024-03-02 18:09:08 +09:00
parent 03e54aaba9
commit 6ad4acea50
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/pleroma/web/activity_pub/publisher.ex
View File

@ -159,17 +159,20 @@ defmodule Pleroma.Web.ActivityPub.Publisher do
end
defp should_federate?(inbox, public) do
if public do
true
else
%{host: host} = URI.parse(inbox)
cond do
inbox == nil ->
false
public ->
true
true ->
%{host: host} = URI.parse(inbox)
quarantined_instances =
Config.get([:instance, :quarantined_instances], [])
|> Pleroma.Web.ActivityPub.MRF.instance_list_from_tuples()
|> Pleroma.Web.ActivityPub.MRF.subdomains_regex()
quarantined_instances =
Config.get([:instance, :quarantined_instances], [])
|> Pleroma.Web.ActivityPub.MRF.instance_list_from_tuples()
|> Pleroma.Web.ActivityPub.MRF.subdomains_regex()
!Pleroma.Web.ActivityPub.MRF.subdomain_match?(quarantined_instances, host)
!Pleroma.Web.ActivityPub.MRF.subdomain_match?(quarantined_instances, host)
end
end