Browse Source

ObjectAgePolicy: Fix pattern matching on published

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3500
stable^2
Haelwenn (lanodan) Monnier 2 years ago
parent
commit
8baaa36a16
No known key found for this signature in database GPG Key ID: D5B7A8E43C997DEE
3 changed files with 7 additions and 1 deletions
  1. +1
    -0
      CHANGELOG.md
  2. +5
    -1
      lib/pleroma/web/activity_pub/mrf/object_age_policy.ex
  3. +1
    -0
      test/pleroma/web/activity_pub/mrf/object_age_policy_test.exs

+ 1
- 0
CHANGELOG.md View File

@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

### Fixed
- MastodonAPI: Stream out Create activities
- MRF ObjectAgePolicy: Fix pattern matching on "published"

## 2.4.0 - 2021-08-08



+ 5
- 1
lib/pleroma/web/activity_pub/mrf/object_age_policy.ex View File

@@ -49,6 +49,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy do
message
|> Map.put("to", to)
|> Map.put("cc", cc)
|> Kernel.put_in(["object", "to"], to)
|> Kernel.put_in(["object", "cc"], cc)

{:ok, message}
else
@@ -70,6 +72,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy do
message
|> Map.put("to", to)
|> Map.put("cc", cc)
|> Kernel.put_in(["object", "to"], to)
|> Kernel.put_in(["object", "cc"], cc)

{:ok, message}
else
@@ -82,7 +86,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy do
end

@impl true
def filter(%{"type" => "Create", "published" => _} = message) do
def filter(%{"type" => "Create", "object" => %{"published" => _}} = message) do
with actions <- Config.get([:mrf_object_age, :actions]),
{:reject, _} <- check_date(message),
{:ok, message} <- check_reject(message, actions),


+ 1
- 0
test/pleroma/web/activity_pub/mrf/object_age_policy_test.exs View File

@@ -22,6 +22,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.ObjectAgePolicyTest do
defp get_old_message do
File.read!("test/fixtures/mastodon-post-activity.json")
|> Jason.decode!()
|> Map.drop(["published"])
end

defp get_new_message do


Loading…
Cancel
Save