diff options
author | Kaede Fujisaki <kaede@hexe.net> | 2024-03-02 18:09:08 +0900 |
---|---|---|
committer | Kaede Fujisaki <kaede@hexe.net> | 2024-03-02 18:09:08 +0900 |
commit | 6ad4acea50ab0ac682f0f207d60a640a819c7748 (patch) | |
tree | 97b952ea50e2fdc9608c9439e9ea87b3b1929a89 | |
parent | 03e54aaba9d2d7cd7f4329f53a80f10ac71ab64d (diff) | |
download | pleroma-6ad4acea50ab0ac682f0f207d60a640a819c7748.tar.gz pleroma-6ad4acea50ab0ac682f0f207d60a640a819c7748.zip |
Consider a case when inbox is nil
-rw-r--r-- | lib/pleroma/web/activity_pub/publisher.ex | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/lib/pleroma/web/activity_pub/publisher.ex b/lib/pleroma/web/activity_pub/publisher.ex index 9e7d00519..6267d0760 100644 --- a/lib/pleroma/web/activity_pub/publisher.ex +++ b/lib/pleroma/web/activity_pub/publisher.ex @@ -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 |