projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
mrf
/
object_age_policy.ex
diff --git
a/lib/pleroma/web/activity_pub/mrf/object_age_policy.ex
b/lib/pleroma/web/activity_pub/mrf/object_age_policy.ex
index b0ccb63c8982cce838c5ace685fb7e689975b457..5f111c72f552ccbf1265bb9230c4cd58a89fdcfb 100644
(file)
--- a/
lib/pleroma/web/activity_pub/mrf/object_age_policy.ex
+++ b/
lib/pleroma/web/activity_pub/mrf/object_age_policy.ex
@@
-28,7
+28,7
@@
defmodule Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy do
defp check_reject(message, actions) do
if :reject in actions do
defp check_reject(message, actions) do
if :reject in actions do
- {:reject,
nil
}
+ {:reject,
"[ObjectAgePolicy]"
}
else
{:ok, message}
end
else
{:ok, message}
end
@@
-47,9
+47,8
@@
defmodule Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy do
{:ok, message}
else
{:ok, message}
else
- # Unhandleable error: somebody is messing around, just drop the message.
_e ->
_e ->
- {:reject,
nil
}
+ {:reject,
"[ObjectAgePolicy] Unhandled error"
}
end
else
{:ok, message}
end
else
{:ok, message}
@@
-69,9
+68,8
@@
defmodule Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy do
{:ok, message}
else
{:ok, message}
else
- # Unhandleable error: somebody is messing around, just drop the message.
_e ->
_e ->
- {:reject,
nil
}
+ {:reject,
"[ObjectAgePolicy] Unhandled error"
}
end
else
{:ok, message}
end
else
{:ok, message}
@@
-98,7
+96,7
@@
defmodule Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy do
@impl true
def describe do
mrf_object_age =
@impl true
def describe do
mrf_object_age =
-
Pleroma.
Config.get(:mrf_object_age)
+ Config.get(:mrf_object_age)
|> Enum.into(%{})
{:ok, %{mrf_object_age: mrf_object_age}}
|> Enum.into(%{})
{:ok, %{mrf_object_age: mrf_object_age}}