aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/instances.ex13
-rw-r--r--lib/pleroma/instances/instance.ex28
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex4
-rw-r--r--lib/pleroma/web/salmon/salmon.ex4
-rw-r--r--lib/pleroma/web/websub/websub.ex10
5 files changed, 27 insertions, 32 deletions
diff --git a/lib/pleroma/instances.ex b/lib/pleroma/instances.ex
index 0b08f0eb8..5e107f4c9 100644
--- a/lib/pleroma/instances.ex
+++ b/lib/pleroma/instances.ex
@@ -3,14 +3,17 @@ defmodule Pleroma.Instances do
@adapter Pleroma.Instances.Instance
- defdelegate filter_reachable(urls), to: @adapter
- defdelegate reachable?(url), to: @adapter
- defdelegate set_reachable(url), to: @adapter
- defdelegate set_unreachable(url, unreachable_since \\ nil), to: @adapter
+ defdelegate filter_reachable(urls_or_hosts), to: @adapter
+ defdelegate reachable?(url_or_host), to: @adapter
+ defdelegate set_reachable(url_or_host), to: @adapter
+ defdelegate set_unreachable(url_or_host, unreachable_since \\ nil), to: @adapter
+
+ def set_consistently_unreachable(url_or_host),
+ do: set_unreachable(url_or_host, reachability_datetime_threshold())
def reachability_datetime_threshold do
federation_reachability_timeout_days =
- Pleroma.Config.get(:instance)[:federation_reachability_timeout_days] || 90
+ Pleroma.Config.get(:instance)[:federation_reachability_timeout_days] || 0
if federation_reachability_timeout_days > 0 do
NaiveDateTime.add(
diff --git a/lib/pleroma/instances/instance.ex b/lib/pleroma/instances/instance.ex
index e3af4a8a7..a87590d8b 100644
--- a/lib/pleroma/instances/instance.ex
+++ b/lib/pleroma/instances/instance.ex
@@ -17,7 +17,7 @@ defmodule Pleroma.Instances.Instance do
timestamps()
end
- defdelegate host(url), to: Instances
+ defdelegate host(url_or_host), to: Instances
def changeset(struct, params \\ %{}) do
struct
@@ -28,9 +28,9 @@ defmodule Pleroma.Instances.Instance do
def filter_reachable([]), do: []
- def filter_reachable(urls) when is_list(urls) do
+ def filter_reachable(urls_or_hosts) when is_list(urls_or_hosts) do
hosts =
- urls
+ urls_or_hosts
|> Enum.map(&(&1 && host(&1)))
|> Enum.filter(&(to_string(&1) != ""))
@@ -44,14 +44,14 @@ defmodule Pleroma.Instances.Instance do
)
)
- Enum.filter(urls, &(&1 && host(&1) not in unreachable_hosts))
+ Enum.filter(urls_or_hosts, &(&1 && host(&1) not in unreachable_hosts))
end
- def reachable?(url) when is_binary(url) do
+ def reachable?(url_or_host) when is_binary(url_or_host) do
!Repo.one(
from(i in Instance,
where:
- i.host == ^host(url) and
+ i.host == ^host(url_or_host) and
i.unreachable_since <= ^Instances.reachability_datetime_threshold(),
select: true
)
@@ -60,8 +60,8 @@ defmodule Pleroma.Instances.Instance do
def reachable?(_), do: true
- def set_reachable(url) when is_binary(url) do
- with host <- host(url),
+ def set_reachable(url_or_host) when is_binary(url_or_host) do
+ with host <- host(url_or_host),
%Instance{} = existing_record <- Repo.get_by(Instance, %{host: host}) do
{:ok, _instance} =
existing_record
@@ -70,13 +70,13 @@ defmodule Pleroma.Instances.Instance do
end
end
- def set_reachable(_), do: {0, :noop}
+ def set_reachable(_), do: {:error, nil}
- def set_unreachable(url, unreachable_since \\ nil)
+ def set_unreachable(url_or_host, unreachable_since \\ nil)
- def set_unreachable(url, unreachable_since) when is_binary(url) do
+ def set_unreachable(url_or_host, unreachable_since) when is_binary(url_or_host) do
unreachable_since = unreachable_since || DateTime.utc_now()
- host = host(url)
+ host = host(url_or_host)
existing_record = Repo.get_by(Instance, %{host: host})
changes = %{unreachable_since: unreachable_since}
@@ -89,7 +89,7 @@ defmodule Pleroma.Instances.Instance do
existing_record.unreachable_since &&
NaiveDateTime.compare(existing_record.unreachable_since, unreachable_since) != :gt ->
- {:noop, existing_record}
+ {:ok, existing_record}
true ->
existing_record
@@ -98,5 +98,5 @@ defmodule Pleroma.Instances.Instance do
end
end
- def set_unreachable(_, _), do: {0, :noop}
+ def set_unreachable(_, _), do: {:error, nil}
end
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 4232d6c0a..6cad02da6 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -750,9 +750,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
Instances.set_reachable(inbox)
result
else
- e ->
+ {_post_result, response} ->
Instances.set_unreachable(inbox)
- e
+ {:error, response}
end
end
diff --git a/lib/pleroma/web/salmon/salmon.ex b/lib/pleroma/web/salmon/salmon.ex
index 80023127c..e96455423 100644
--- a/lib/pleroma/web/salmon/salmon.ex
+++ b/lib/pleroma/web/salmon/salmon.ex
@@ -181,10 +181,6 @@ defmodule Pleroma.Web.Salmon do
Logger.debug(fn -> "Pushed to #{url}, code #{code}" end)
:ok
else
- {:reachable, false} ->
- Logger.debug(fn -> "Pushing Salmon to #{url} skipped as marked unreachable)" end)
- :noop
-
e ->
Instances.set_unreachable(url)
Logger.debug(fn -> "Pushing Salmon to #{url} failed, #{inspect(e)}" end)
diff --git a/lib/pleroma/web/websub/websub.ex b/lib/pleroma/web/websub/websub.ex
index 64eba7221..abe148270 100644
--- a/lib/pleroma/web/websub/websub.ex
+++ b/lib/pleroma/web/websub/websub.ex
@@ -286,14 +286,10 @@ defmodule Pleroma.Web.Websub do
Logger.info(fn -> "Pushed to #{callback}, code #{code}" end)
{:ok, code}
else
- {:reachable, false} ->
- Logger.debug(fn -> "Pushing to #{callback} skipped as marked unreachable)" end)
- {:error, :noop}
-
- e ->
+ {_post_result, response} ->
Instances.set_unreachable(callback)
- Logger.debug(fn -> "Couldn't push to #{callback}, #{inspect(e)}" end)
- {:error, e}
+ Logger.debug(fn -> "Couldn't push to #{callback}, #{inspect(response)}" end)
+ {:error, response}
end
end
end
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 22:59:27 +0000