projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add follow_requests_outstanding_since?/3 to Pleroma.Activity
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
mrf.ex
diff --git
a/lib/pleroma/web/activity_pub/mrf.ex
b/lib/pleroma/web/activity_pub/mrf.ex
index 3de21b219c5a27fa7dd9279dec4be9009746e874..f2fec3ff61fa37a45149fa1de14b09b8bd376b51 100644
(file)
--- a/
lib/pleroma/web/activity_pub/mrf.ex
+++ b/
lib/pleroma/web/activity_pub/mrf.ex
@@
-1,11
+1,7
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
# SPDX-License-Identifier: AGPL-3.0-only
-defmodule Pleroma.Web.ActivityPub.MRF.PipelineFiltering do
- @callback pipeline_filter(map(), keyword()) :: {:ok, map(), keyword()} | {:error, any()}
-end
-
defmodule Pleroma.Web.ActivityPub.MRF do
require Logger
defmodule Pleroma.Web.ActivityPub.MRF do
require Logger
@@
-96,7
+92,9
@@
defmodule Pleroma.Web.ActivityPub.MRF do
end
def get_policies do
end
def get_policies do
- Pleroma.Config.get([:mrf, :policies], []) |> get_policies()
+ Pleroma.Config.get([:mrf, :policies], [])
+ |> get_policies()
+ |> Enum.concat([Pleroma.Web.ActivityPub.MRF.HashtagPolicy])
end
defp get_policies(policy) when is_atom(policy), do: [policy]
end
defp get_policies(policy) when is_atom(policy), do: [policy]