From b460c3904a6700ebf7708233f5336e729947ebc8 Mon Sep 17 00:00:00 2001 From: Sam Therapy Date: Thu, 15 Dec 2022 22:18:35 +0100 Subject: [PATCH] Revert "Do not pass transient undo-y activities through MRF" This reverts commit dcf58a3c532d22bc13505b84a50c2c1ddfdaa960. --- CHANGELOG.md | 1 - lib/pleroma/web/activity_pub/mrf.ex | 6 ------ 2 files changed, 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2088f6b5c..2b5e019f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,7 +35,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Removed - FollowBotPolicy -- Passing of undo/block into MRF ## Upgrade Notes - If you have an old instance, you will probably want to run `mix pleroma.database prune_task` in the foreground to catch it up with the history of your instance. diff --git a/lib/pleroma/web/activity_pub/mrf.ex b/lib/pleroma/web/activity_pub/mrf.ex index dae6d7f6a..064ffc527 100644 --- a/lib/pleroma/web/activity_pub/mrf.ex +++ b/lib/pleroma/web/activity_pub/mrf.ex @@ -63,12 +63,6 @@ defmodule Pleroma.Web.ActivityPub.MRF do @required_description_keys [:key, :related_policy] - def filter_one(policy, %{"type" => type} = message) - when type in ["Undo", "Block", "Delete"] and - policy != Pleroma.Web.ActivityPub.MRF.SimplePolicy do - {:ok, message} - end - def filter_one(policy, message) do should_plug_history? = if function_exported?(policy, :history_awareness, 0) do