diff options
| author | feld <feld@feld.me> | 2024-05-30 15:38:18 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2024-05-30 15:38:18 +0000 |
| commit | ff6f5a417f1f22d53b1196cc19e1ba9ad6e0ed2c (patch) | |
| tree | 79d90bb408661a4a750f3542f0beb80b1d9fbe7b | |
| parent | 6feb536e79e1d639b8e143451848fbfb33ee2a3f (diff) | |
| parent | f5065eaf99a76695df26966055f90368df7043f3 (diff) | |
| download | pleroma-ff6f5a417f1f22d53b1196cc19e1ba9ad6e0ed2c.tar.gz pleroma-ff6f5a417f1f22d53b1196cc19e1ba9ad6e0ed2c.zip | |
Merge branch 'mrf-nsfw-otp25' into 'develop'
Fix Logger.warn deprecation error on OTP25
See merge request pleroma/pleroma!4135
| -rw-r--r-- | changelog.d/mrf-nsfw-otp25.skip | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/mrf/nsfw_api_policy.ex | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/mrf-nsfw-otp25.skip b/changelog.d/mrf-nsfw-otp25.skip new file mode 100644 index 000000000..e804f19a0 --- /dev/null +++ b/changelog.d/mrf-nsfw-otp25.skip @@ -0,0 +1 @@ +noop diff --git a/lib/pleroma/web/activity_pub/mrf/nsfw_api_policy.ex b/lib/pleroma/web/activity_pub/mrf/nsfw_api_policy.ex index f7863039b..3d1c273b9 100644 --- a/lib/pleroma/web/activity_pub/mrf/nsfw_api_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/nsfw_api_policy.ex @@ -64,7 +64,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.NsfwApiPolicy do Jason.decode(body) else error -> - Logger.warn(""" + Logger.warning(""" [NsfwApiPolicy]: The API server failed. Skipping. #{inspect(error)} """) |