projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remote Timeline: add Streaming support
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
mrf
/
activity_expiration_policy.ex
diff --git
a/lib/pleroma/web/activity_pub/mrf/activity_expiration_policy.ex
b/lib/pleroma/web/activity_pub/mrf/activity_expiration_policy.ex
index 8e47f1e02f18221a987536a8ac6b8a037d4b852d..bee47b4edd4b47e0931d1db953b6b2fd916f61ea 100644
(file)
--- a/
lib/pleroma/web/activity_pub/mrf/activity_expiration_policy.ex
+++ b/
lib/pleroma/web/activity_pub/mrf/activity_expiration_policy.ex
@@
-21,8
+21,8
@@
defmodule Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy do
@impl true
def describe, do: {:ok, %{}}
@impl true
def describe, do: {:ok, %{}}
- defp local?(%{"
id" => id
}) do
- String.starts_with?(
id
, Pleroma.Web.Endpoint.url())
+ defp local?(%{"
actor" => actor
}) do
+ String.starts_with?(
actor
, Pleroma.Web.Endpoint.url())
end
defp note?(activity) do
end
defp note?(activity) do
@@
-31,10
+31,10
@@
defmodule Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy do
defp maybe_add_expiration(activity) do
days = Pleroma.Config.get([:mrf_activity_expiration, :days], 365)
defp maybe_add_expiration(activity) do
days = Pleroma.Config.get([:mrf_activity_expiration, :days], 365)
- expires_at =
Naive
DateTime.utc_now() |> Timex.shift(days: days)
+ expires_at = DateTime.utc_now() |> Timex.shift(days: days)
with %{"expires_at" => existing_expires_at} <- activity,
with %{"expires_at" => existing_expires_at} <- activity,
- :lt <-
Naive
DateTime.compare(existing_expires_at, expires_at) do
+ :lt <- DateTime.compare(existing_expires_at, expires_at) do
activity
else
_ -> Map.put(activity, "expires_at", expires_at)
activity
else
_ -> Map.put(activity, "expires_at", expires_at)